PE/COFF: add a check to ensure that we dont mix up architectures

Previously, we would not check the target machine type and the module (object)
machine type.  Add a check to ensure that we do not attempt to use an object
file with a different target architecture.

This change identified a couple of tests which were incorrectly mixing up
architecture types, using x86 input for a x64 target.  Adjust the tests
appropriately.  The renaming of the input and the architectures covers the
changes to the existing tests.

One significant change to the existing tests is that the newly added test input
for x64 uses the correct user label prefix for X64.

llvm-svn: 219093

1 files changed, 2 insertions, 0 deletions

diff --git a/lld/lib/Core/Error.cpp b/lld/lib/Core/Error.cpp
index 3131276a7b3..c336964b432 100644
--- a/lld/lib/Core/Error.cpp
+++ b/lld/lib/Core/Error.cpp
@@ -38,6 +38,8 @@ public:
       return "out of memory";
     case NativeReaderError::unknown_chunk_type:
       return "unknown chunk type";
+    case NativeReaderError::conflicting_target_machine:
+      return "conflicting target machine";
     }
     llvm_unreachable("An enumerator of NativeReaderError does not have a "
                      "message defined.");