about summary refs log tree commit diff
diff options
context:
space:
mode:
authorStan Shebs <stanshebs@google.com>2016-09-29 12:10:48 -0700
committerStan Shebs <stanshebs@google.com>2016-09-29 12:10:48 -0700
commit74b27c48cba48d5fad9cf500e1965ac64692c091 (patch)
treeeb0562b3f40c096df3d37451b092587f682ed93a
parentf01f990def48b88d819221907fee42308ad44520 (diff)
downloadglibc-74b27c48cba48d5fad9cf500e1965ac64692c091.tar.gz
glibc-74b27c48cba48d5fad9cf500e1965ac64692c091.tar.xz
glibc-74b27c48cba48d5fad9cf500e1965ac64692c091.zip
Revert the fix to the value of DT_PPC64_NUM.
-rw-r--r--README.google4
-rw-r--r--elf/elf.h5
2 files changed, 8 insertions, 1 deletions
diff --git a/README.google b/README.google
index b8d22bc81a..2b24beb850 100644
--- a/README.google
+++ b/README.google
@@ -607,3 +607,7 @@ posix/Makefile
 posix/tst-getaddrinfo6.c
   For b/29615899, fix error handling in getaddrinfo.
   (stanshebs, google-local)
+
+elf/elf.h
+  For b/31273149, revert the value of DT_PPC64_NUM from 4 to 3.
+  (stanshebs, google-local)
diff --git a/elf/elf.h b/elf/elf.h
index 78815e8655..e6974b90bf 100644
--- a/elf/elf.h
+++ b/elf/elf.h
@@ -2283,7 +2283,10 @@ typedef Elf32_Addr Elf32_Conflict;
 #define DT_PPC64_OPD	(DT_LOPROC + 1)
 #define DT_PPC64_OPDSZ	(DT_LOPROC + 2)
 #define DT_PPC64_OPT	(DT_LOPROC + 3)
-#define DT_PPC64_NUM    4
+/* This should have the value 4, to match with the four tag values
+   above, but the change needs to be coordinated with an update to
+   L_INFO_ELEMENTS in libunwind/google_link.h.  */
+#define DT_PPC64_NUM    3
 
 /* PowerPC64 specific values for the DT_PPC64_OPT Dyn entry.  */
 #define PPC64_OPT_TLS		1