Revert the fix to the value of DT_PPC64_NUM.

diff --git a/README.google b/README.google
index b8d22bc81a11000aa2089e54aeec75c1f3e647ca..2b24beb850be9ca5db40d37e02ca301c9c62d55b 100644 (file)
--- 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 78815e8655f07fffad5ac51c221445709d329ccc..e6974b90bfbb7464e531cb49e1f6b17b3602ccd6 100644 (file)
--- 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