Better ARM64X handling and tests

Author: cjacek

lld/COFF/SymbolTable.cpp

@@ -79,8 +79,8 @@ void SymbolTable::addFile(InputFile *file) {
   // The ARM64EC target must be explicitly specified and cannot be inferred.
   if (mt == ARM64EC &&
       (ctx.config.machine == IMAGE_FILE_MACHINE_UNKNOWN ||
-       (ctx.config.machineInferred && (COFF::isAnyArm64(ctx.config.machine) ||
-                                       ctx.config.machine == AMD64)))) {
+       (ctx.config.machineInferred &&
+        (ctx.config.machine == ARM64 || ctx.config.machine == AMD64)))) {
     error(toString(file) + ": machine type arm64ec is ambiguous and cannot be "
                            "inferred, use /machine:arm64ec or /machine:arm64x");
     return;
@@ -93,7 +93,7 @@ void SymbolTable::addFile(InputFile *file) {
   if (ctx.config.machine == IMAGE_FILE_MACHINE_UNKNOWN &&
       mt != IMAGE_FILE_MACHINE_UNKNOWN) {
     ctx.config.machineInferred = true;
-    ctx.config.machine = mt == ARM64X ? ARM64 : mt;
+    ctx.config.machine = mt;
     ctx.driver.addWinSysRootLibSearchPaths();
   }
 

lld/test/COFF/arm64ec.test

@@ -37,7 +37,7 @@ ARM64X-DATA: 03030303 01010101 02020202
 
 RUN: not lld-link -out:test.dll -machine:arm64 arm64-data-sym.obj arm64ec-data-sym.obj \
 RUN:              -dll -noentry 2>&1 | FileCheck -check-prefix=INCOMPAT1 %s
-INCOMPAT1: arm64ec-data-sym.obj: machine type arm64ec conflicts with arm64
+INCOMPAT1: lld-link: error: arm64ec-data-sym.obj: machine type arm64ec conflicts with arm64
 
 RUN: not lld-link -out:test.dll -machine:arm64ec arm64ec-data-sym.obj arm64-data-sym.obj \
 RUN:              -dll -noentry 2>&1 | FileCheck -check-prefix=INCOMPAT2 %s
@@ -55,17 +55,17 @@ INCOMPAT4: lld-link: error: arm64ec-data-sym.obj: machine type arm64ec is ambigu
 RUN: not lld-link -out:test.dll x86_64-data-sym.obj arm64ec-data-sym.obj \
 RUN:              -dll -noentry 2>&1 | FileCheck -check-prefix=INCOMPAT4 %s
 
-RUN: not lld-link -out:test.dll aarch64-data-sym.obj arm64ec-data-sym.obj \
+RUN: not lld-link -out:test.dll arm64-data-sym.obj arm64ec-data-sym.obj \
 RUN:              -dll -noentry 2>&1 | FileCheck -check-prefix=INCOMPAT4 %s
 
 RUN: not lld-link -out:test.dll i686-data-sym.obj arm64ec-data-sym.obj \
 RUN:              -dll -noentry 2>&1 | FileCheck -check-prefix=INCOMPAT5 %s
-INCOMPAT5: arm64ec-data-sym.obj: machine type arm64ec conflicts with x86
+INCOMPAT5: lld-link: error: arm64ec-data-sym.obj: machine type arm64ec conflicts with x86
 
-arm64x input implies arm64 target
-RUN: lld-link -out:test.dll -machine:arm64 arm64x-resource.obj -dll -noentry
-RUN: llvm-readobj --file-headers test.dll | FileCheck -check-prefix=ARM64-HEADER %s
-ARM64-HEADER:      Machine: IMAGE_FILE_MACHINE_ARM64 (0xAA64)
+arm64x can be inferred and when mixed with ARM64, the first one wins
+RUN: lld-link -out:test.dll -dll -noentry arm64x-resource.obj arm64-data-sym.obj x86_64-data-sym.obj arm64ec-data-sym.obj
+RUN: not lld-link -out:test.dll -dll -noentry arm64-data-sym.obj arm64x-resource.obj x86_64-data-sym.obj 2>&1 | FileCheck -check-prefix=INCOMPAT3 %s
+RUN: not lld-link -out:test.dll -dll -noentry arm64-data-sym.obj arm64x-resource.obj arm64ec-data-sym.obj 2>&1 | FileCheck -check-prefix=INCOMPAT4 %s
 
 #--- arm64ec-data-sym.s
     .data