From: Siva Chandra Reddy <sivachandra@google.com>
Date: Tue, 9 Apr 2019 18:57:19 +0000 (-0700)
Subject: Include STATIC_PIE_BOOTSTRAP with !NESTING in powerpc64/dl-machine.h
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=038be62f9669046c852101862b3f871bee540c77;p=thirdparty%2Fglibc.git

Include STATIC_PIE_BOOTSTRAP with !NESTING in powerpc64/dl-machine.h
---

diff --git a/sysdeps/powerpc/powerpc64/dl-machine.h b/sysdeps/powerpc/powerpc64/dl-machine.h
index da076097782..dfac4794c95 100644
--- a/sysdeps/powerpc/powerpc64/dl-machine.h
+++ b/sysdeps/powerpc/powerpc64/dl-machine.h
@@ -711,7 +711,7 @@ elf_machine_rela (struct link_map *map,
 
   /* We need SYM_MAP even in the absence of TLS, for elf_machine_fixup_plt
      and STT_GNU_IFUNC.  */
-#if !defined NESTING && defined RTLD_BOOTSTRAP
+#if !defined NESTING && (defined RTLD_BOOTSTRAP || defined STATIC_PIE_BOOTSTRAP)
   struct link_map *sym_map = boot_map;
 #else
   struct link_map *sym_map = RESOLVE_MAP (&sym, version, r_type);