[lld] r234745 - ELF/Aarch64: Internal variable cleanup

Adhemerval Zanella azanella at linux.vnet.ibm.com
Mon Apr 13 04:44:44 PDT 2015


Author: azanella
Date: Mon Apr 13 06:44:44 2015
New Revision: 234745

URL: http://llvm.org/viewvc/llvm-project?rev=234745&view=rev
Log:
ELF/Aarch64: Internal variable cleanup

This patch makes the AArch64GotAtomContent, AArch64Plt0AtomContent, and
AArch64PltAtomContent static and also cleanup their formatting.

Modified:
    lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationPass.cpp

Modified: lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationPass.cpp
URL: http://llvm.org/viewvc/llvm-project/lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationPass.cpp?rev=234745&r1=234744&r2=234745&view=diff
==============================================================================
--- lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationPass.cpp (original)
+++ lld/trunk/lib/ReaderWriter/ELF/AArch64/AArch64RelocationPass.cpp Mon Apr 13 06:44:44 2015
@@ -28,42 +28,31 @@ using namespace lld;
 using namespace lld::elf;
 using namespace llvm::ELF;
 
-namespace {
 // .got values
-const uint8_t AArch64GotAtomContent[8] = {0};
+static const uint8_t AArch64GotAtomContent[8] = {0};
 
 // .plt value (entry 0)
-const uint8_t AArch64Plt0AtomContent[32] = {
-    0xf0, 0x7b, 0xbf,
-    0xa9, // stp	x16, x30, [sp,#-16]!
-    0x10, 0x00, 0x00,
-    0x90, // adrp	x16, Page(eh_frame)
-    0x11, 0x02, 0x40,
-    0xf9, // ldr	x17, [x16,#offset]
-    0x10, 0x02, 0x00,
-    0x91, // add	x16, x16, #offset
-    0x20, 0x02, 0x1f,
-    0xd6, // br	x17
-    0x1f, 0x20, 0x03,
-    0xd5, // nop
-    0x1f, 0x20, 0x03,
-    0xd5, // nop
-    0x1f, 0x20, 0x03,
-    0xd5 // nop
+static const uint8_t AArch64Plt0AtomContent[32] = {
+    0xf0, 0x7b, 0xbf, 0xa9, // stp	x16, x30, [sp,#-16]!
+    0x10, 0x00, 0x00, 0x90, // adrp	x16, Page(eh_frame)
+    0x11, 0x02, 0x40, 0xf9, // ldr	x17, [x16,#offset]
+    0x10, 0x02, 0x00, 0x91, // add	x16, x16, #offset
+    0x20, 0x02, 0x1f, 0xd6, // br	x17
+    0x1f, 0x20, 0x03, 0xd5, // nop
+    0x1f, 0x20, 0x03, 0xd5, // nop
+    0x1f, 0x20, 0x03, 0xd5  // nop
 };
 
 // .plt values (other entries)
-const uint8_t AArch64PltAtomContent[16] = {
-    0x10, 0x00, 0x00,
-    0x90, // adrp x16, PAGE(<GLOBAL_OFFSET_TABLE>)
-    0x11, 0x02, 0x40,
-    0xf9, // ldr x17, [x16,#offset]
-    0x10, 0x02, 0x00,
-    0x91, // add x16, x16, #offset
-    0x20, 0x02, 0x1f,
-    0xd6 // br x17
+static const uint8_t AArch64PltAtomContent[16] = {
+    0x10, 0x00, 0x00, 0x90, // adrp x16, PAGE(<GLOBAL_OFFSET_TABLE>)
+    0x11, 0x02, 0x40, 0xf9, // ldr  x17, [x16,#offset]
+    0x10, 0x02, 0x00, 0x91, // add  x16, x16, #offset
+    0x20, 0x02, 0x1f, 0xd6  // br   x17
 };
 
+namespace {
+
 /// \brief Atoms that are used by AArch64 dynamic linking
 class AArch64GOTAtom : public GOTAtom {
 public:





More information about the llvm-commits mailing list