diff mbox

[3/4] Miscellaneous 'safe' testsuite changes.

Message ID 3ad5454a-1d0a-f39d-b8aa-225e5f7c2e49@redhat.com
State New
Headers show

Commit Message

Florian Weimer March 2, 2017, 7:02 p.m. UTC 
On 03/02/2017 02:56 PM, Andreas Schwab wrote:
>> +
>> +#endif /* get-dynamic-info.h */
> This is bogus.  The file must be included multiple times, depending on
> the definition of RESOLVE_MAP.
>
> This breaks powerpc
> <https://build.opensuse.org/package/live_build_log/home:Andreas_Schwab:glibc/glibc/p/ppc>.

Thanks for identifying the root cause.

I've tested the attached patch on ppc64, ppc64le, ppc, aarch64, and 
s390x, and committed it.

Thanks,
Florian
diff mbox

Patch

Remove header file inclusion guard from elf/get-dynamic-info.h

This file is included multiple times, so the guard is harmful.
Fixes commit 9090848d0607e93fb08a1d68d9f263846ee33f02.

2017-03-02  Florian Weimer  <fweimer@redhat.com>

	* elf/get-dynamic-info.h: Remove header file inclusion guard.

diff --git a/elf/get-dynamic-info.h b/elf/get-dynamic-info.h
index 6413558..7525c3a 100644
--- a/elf/get-dynamic-info.h
+++ b/elf/get-dynamic-info.h
@@ -16,8 +16,8 @@ 
    License along with the GNU C Library; if not, see
    <http://www.gnu.org/licenses/>.  */
 
-#ifndef _GET_DYNAMIC_INFO_H
-#define _GET_DYNAMIC_INFO_H 1
+/* This file is included multiple times and therefore lacks a header
+   file inclusion guard.  */
 
 #include <assert.h>
 #include <libc-diag.h>
@@ -182,5 +182,3 @@  elf_get_dynamic_info (struct link_map *l, ElfW(Dyn) *temp)
     info[DT_RPATH] = NULL;
 #endif
 }
-
-#endif /* get-dynamic-info.h */