X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=elfcpp%2Faarch64.h;h=0fd2d06ce49cc69ab0e2008dc7aaa09bdd54940a;hb=refs%2Fheads%2Fupstream;hp=4d1898f44df36340facd6fd41469298ba1b31749;hpb=053a4d680b6b870079e7ba094b52a12a4861ce9b;p=external%2Fbinutils.git

diff --git a/elfcpp/aarch64.h b/elfcpp/aarch64.h
index 4d1898f..0fd2d06 100644
--- a/elfcpp/aarch64.h
+++ b/elfcpp/aarch64.h
@@ -1,6 +1,6 @@
 // aarch64.h -- ELF definitions specific to AARCH64  -*- C++ -*-
 
-// Copyright (C) 2014 Free Software Foundation, Inc.
+// Copyright (C) 2014-2019 Free Software Foundation, Inc.
 // Written by Jing Yu (jingyu@google.com)
 
 // This file is part of elfcpp.
@@ -46,7 +46,7 @@ enum
 {
   // Null relocation codes
   R_AARCH64_NONE = 0,		// None
-  withdrawn = 256,		// Treat as R_AARCH64_NONE
+  R_AARCH64_withdrawn = 256,	// Treat as R_AARCH64_NONE
 
   // Static relocations
   R_AARCH64_ABS64 = 257,	// S + A
@@ -146,7 +146,7 @@ enum
   R_AARCH64_TLSLE_LDST8_TPREL_LO12 = 552,	// TPREL(S+A)
   R_AARCH64_TLSLE_LDST8_TPREL_LO12_NC = 553,	// TPREL(S+A)
   R_AARCH64_TLSLE_LDST16_TPREL_LO12 = 554,	// TPREL(S+A)
-  R_AARCH64_TLSLE_LSDT16_TPREL_LO12_NC = 555,	// TPREL(S+A)
+  R_AARCH64_TLSLE_LDST16_TPREL_LO12_NC = 555,	// TPREL(S+A)
   R_AARCH64_TLSLE_LDST32_TPREL_LO12 = 556,	// TPREL(S+A)
   R_AARCH64_TLSLE_LDST32_TPREL_LO12_NC = 557,	// TPREL(S+A)
   R_AARCH64_TLSLE_LDST64_TPREL_LO12 = 558,	// TPREL(S+A)
@@ -171,8 +171,12 @@ enum
   R_AARCH64_GLOB_DAT = 1025,		// S + A
   R_AARCH64_JUMP_SLOT = 1026,		// S + A
   R_AARCH64_RELATIVE = 1027,		// Delta(S) + A
-  R_AARCH64_TLS_DTPREL64 = 1028,	// DTPREL(S+A)
-  R_AARCH64_TLS_DTPMOD64 = 1029,	// LDM(S)
+  // Note (shenhan): the following 2 relocs are different from elf spec from
+  // arm.  In elf docs, TLS_DTPMOD64 is defined as 1029, TLS_DTPREL64 1028.
+  // While actually the bfd linker (and the dynamic linker) treates TLS_DTPMOD64
+  // as 1028, TLS_DTPREL64 1029.  See binutils-gdb/include/elf/aarch64.h.
+  R_AARCH64_TLS_DTPMOD64 = 1028,	// LDM(S)
+  R_AARCH64_TLS_DTPREL64 = 1029,	// DTPREL(S+A)
   R_AARCH64_TLS_TPREL64 = 1030,		// TPREL(S+A)
   R_AARCH64_TLSDESC = 1031,		// TLSDESC(S+A)
   R_AARCH64_IRELATIVE = 1032,		// Indirect(Delta(S) + A)