[llvm-dlltool] Handle MIPS R4000 architecture

[hpoussin]

No description provided.

[hpoussin]

This is an extract of PR #107744

[llvmbot]

@llvm/pr-subscribers-llvm-binary-utilities

Author: Hervé Poussineau (hpoussin)

Changes

---

Full diff: https://github.com/llvm/llvm-project/pull/114621.diff

3 Files Affected:

• (modified) llvm/lib/Object/COFFImportFile.cpp (+2)
• (modified) llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp (+2-1)
• (modified) llvm/test/tools/llvm-dlltool/machine-opt.def (+3)

diff --git a/llvm/lib/Object/COFFImportFile.cpp b/llvm/lib/Object/COFFImportFile.cpp
index ff3dcf9e13ffaf..595533ff947252 100644
--- a/llvm/lib/Object/COFFImportFile.cpp
+++ b/llvm/lib/Object/COFFImportFile.cpp
@@ -133,6 +133,8 @@ static uint16_t getImgRelRelocation(MachineTypes Machine) {
     return IMAGE_REL_ARM64_ADDR32NB;
   case IMAGE_FILE_MACHINE_I386:
     return IMAGE_REL_I386_DIR32NB;
+  case IMAGE_FILE_MACHINE_R4000:
+    return IMAGE_REL_MIPS_REFWORDNB;
   }
 }
 
diff --git a/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp b/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
index 58ff720516f384..fdd6f3ec4be54b 100644
--- a/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
+++ b/llvm/lib/ToolDrivers/llvm-dlltool/DlltoolDriver.cpp
@@ -79,6 +79,7 @@ MachineTypes getEmulation(StringRef S) {
       .Case("arm", IMAGE_FILE_MACHINE_ARMNT)
       .Case("arm64", IMAGE_FILE_MACHINE_ARM64)
       .Case("arm64ec", IMAGE_FILE_MACHINE_ARM64EC)
+      .Case("mips", IMAGE_FILE_MACHINE_R4000)
       .Default(IMAGE_FILE_MACHINE_UNKNOWN);
 }
 
@@ -173,7 +174,7 @@ int llvm::dlltoolDriverMain(llvm::ArrayRef<const char *> ArgsArr) {
       (!Args.hasArgNoClaim(OPT_d) && !Args.hasArgNoClaim(OPT_l))) {
     Table.printHelp(outs(), "llvm-dlltool [options] file...", "llvm-dlltool",
                     false);
-    llvm::outs() << "\nTARGETS: i386, i386:x86-64, arm, arm64, arm64ec\n";
+    llvm::outs() << "\nTARGETS: i386, i386:x86-64, arm, arm64, arm64ec, mips\n";
     return 1;
   }
 
diff --git a/llvm/test/tools/llvm-dlltool/machine-opt.def b/llvm/test/tools/llvm-dlltool/machine-opt.def
index 6dce8255a43db3..37eccec8831fc6 100644
--- a/llvm/test/tools/llvm-dlltool/machine-opt.def
+++ b/llvm/test/tools/llvm-dlltool/machine-opt.def
@@ -6,6 +6,8 @@
 ; RUN: llvm-readobj %t.a | FileCheck --check-prefix=ARM %s
 ; RUN: llvm-dlltool -m arm64 -d %s -l %t.a
 ; RUN: llvm-readobj %t.a | FileCheck --check-prefix=ARM64 %s
+; RUN: llvm-dlltool -m mips -d %s -l %t.a
+; RUN: llvm-readobj %t.a | FileCheck --check-prefix=MIPS %s
 
 LIBRARY test.dll
 EXPORTS
@@ -15,3 +17,4 @@ TestFunction
 ; X86_64: Format: COFF-x86-64
 ; ARM: Format: COFF-ARM{{$}}
 ; ARM64: Format: COFF-ARM64
+; MIPS: Format: COFF-MIPS

[compnerd]

Hmm, we should cross-check this with binutils - if it should be r4000 or mips as there was a MIPS16 and a MIPSv2 machine type that PE/COFF has supported over the years.

[hpoussin]

binutils dlltool only supports i386, i386:x86-64, arm, thumb, arm64, arm-wince, arm_internetwork, mcore-be, mcore-le, mcore-elf-be and mcore-elf-le.
It also supported once ppc (removed), arm-epoc (removed), mcore (renamed to mcore-be) and mcore-elf (renamed to mcore-elf-be)

llvm-binutils currently supports i386, i386:x86-64, arm, arm64 and arm64ec.

mips name may fit in this list, with mips16 and mipsv2 later, or mips-wince for the Windows CE variant.

[compnerd]

What do you think of -m r4000 as the parameter instead of -m mips?

[hpoussin]

I don't care.

[github-actions]

✅ With the latest revision this PR passed the C/C++ code formatter.

[wzssyqa]

What do you think of -m r4000 as the parameter instead of -m mips?

Why r4000 is better than mips here?

[wzssyqa]

Oh, I see: https://learn.microsoft.com/en-us/windows/win32/sysinfo/image-file-machine-constants

IMAGE_FILE_MACHINE_R3000
0x0162
MIPS little-endian, 0x160 big-endian
IMAGE_FILE_MACHINE_R4000
0x0166
MIPS little-endian
IMAGE_FILE_MACHINE_R10000
0x0168
MIPS little-endian
IMAGE_FILE_MACHINE_WCEMIPSV2
0x0169
MIPS little-endian WCE v2