This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: [PATCH 3/4] Miscellaneous 'safe' testsuite changes.
- From: Florian Weimer <fweimer at redhat dot com>
- To: Andreas Schwab <schwab at linux-m68k dot org>
- Cc: libc-alpha at sourceware dot org, "Carlos O'Donell" <carlos at redhat dot com>, Zack Weinberg <zackw at panix dot com>, joseph at codesourcery dot com, adhemerval dot zanella at linaro dot org, libc-alpha at sourceware dot org
- Date: Thu, 2 Mar 2017 20:02:22 +0100
- Subject: Re: [PATCH 3/4] Miscellaneous 'safe' testsuite changes.
- Authentication-results: sourceware.org; auth=none
- References: <20170220130342.6373-1-zackw@panix.com> <20170220130342.6373-2-zackw@panix.com> <20170220130342.6373-3-zackw@panix.com> <20170220130342.6373-4-zackw@panix.com> <8c498c93-b2cf-a2af-a741-bc721ac47f6e@redhat.com> <f37b8c3f-5994-102f-219a-8a4dffafbd16@panix.com> <87k28eugjp.fsf@mid.deneb.enyo.de> <CAKCAbMgjBQwhebioj4my9kQ4zVkwnzDupzhV79gzPBnZ4ha0Aw@mail.gmail.com> <87innrwzmf.fsf@linux-m68k.org>
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
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 */