commit 5e706b3ee31b4e42a69a184fabc8b8cfbf4677af
author Rui Ueyama <ruiu@google.com> Sat Jul 25 21:54:50 2015 +0000
committer Rui Ueyama <ruiu@google.com> Sat Jul 25 21:54:50 2015 +0000
tree ef6cf8de05beb423368ad50f2db0ebf68a994a93
parent 5c437cd1e98bd72d7cfe411564ca082edd7bb922

COFF: Use short identifiers. NFC.

llvm-svn: 243229

lld/COFF/Chunks.cpp

diff --git a/lld/COFF/Chunks.cpp b/lld/COFF/Chunks.cpp
index 0e14eff..f051b68 100644
--- a/lld/COFF/Chunks.cpp
+++ b/lld/COFF/Chunks.cpp
@@ -126,14 +126,14 @@
     SymbolBody *Body = File->getSymbolBody(Rel.SymbolTableIndex)->repl();
     uint64_t S = cast<Defined>(Body)->getRVA();
     uint64_t P = RVA + Rel.VirtualAddress;
-    switch (Config->MachineType) {
-    case IMAGE_FILE_MACHINE_AMD64:
+    switch (Config->Machine) {
+    case AMD64:
       applyRelX64(Off, Rel.Type, S, P);
       break;
-    case IMAGE_FILE_MACHINE_I386:
+    case I386:
       applyRelX86(Off, Rel.Type, S, P);
       break;
-    case IMAGE_FILE_MACHINE_ARMNT:
+    case ARMNT:
       applyRelARM(Off, Rel.Type, S, P);
       break;
     default:
@@ -150,16 +150,16 @@
 }
 
 static uint8_t getBaserelType(const coff_relocation &Rel) {
-  switch (Config->MachineType) {
-  case IMAGE_FILE_MACHINE_AMD64:
+  switch (Config->Machine) {
+  case AMD64:
     if (Rel.Type == IMAGE_REL_AMD64_ADDR64)
       return IMAGE_REL_BASED_DIR64;
     return IMAGE_REL_BASED_ABSOLUTE;
-  case IMAGE_FILE_MACHINE_I386:
+  case I386:
     if (Rel.Type == IMAGE_REL_I386_DIR32)
       return IMAGE_REL_BASED_HIGHLOW;
     return IMAGE_REL_BASED_ABSOLUTE;
-  case IMAGE_FILE_MACHINE_ARMNT:
+  case ARMNT:
     if (Rel.Type == IMAGE_REL_ARM_ADDR32)
       return IMAGE_REL_BASED_HIGHLOW;
     if (Rel.Type == IMAGE_REL_ARM_MOV32T)
@@ -293,8 +293,7 @@
 ImportThunkChunkX64::ImportThunkChunkX64(Defined *S) : ImpSymbol(S) {
   // Intel Optimization Manual says that all branch targets
   // should be 16-byte aligned. MSVC linker does this too.
-  if (Config->MachineType == AMD64)
-      Align = 16;
+  Align = 16;
 }
 
 void ImportThunkChunkX64::writeTo(uint8_t *Buf) {
@@ -368,10 +367,10 @@
 }
 
 uint8_t Baserel::getDefaultType() {
-  switch (Config->MachineType) {
-  case IMAGE_FILE_MACHINE_AMD64:
+  switch (Config->Machine) {
+  case AMD64:
     return IMAGE_REL_BASED_DIR64;
-  case IMAGE_FILE_MACHINE_I386:
+  case I386:
     return IMAGE_REL_BASED_HIGHLOW;
   default:
     llvm_unreachable("unknown machine type");