diff options
| author | Florian Weimer <fweimer@redhat.com> | 2022-02-11 19:03:04 +0100 |
|---|---|---|
| committer | Florian Weimer <fweimer@redhat.com> | 2022-02-11 19:50:58 +0100 |
| commit | 098c795e85fbd05c5ef59c2d0ce59529331bea27 (patch) | |
| tree | 9b5326969cd71e6d62b8b0c1eeedeea1cb093eae | |
| parent | d96d2995c1121d3310102afda2deb1f35761b5e6 (diff) | |
| download | glibc-098c795e85fbd05c5ef59c2d0ce59529331bea27.tar.gz glibc-098c795e85fbd05c5ef59c2d0ce59529331bea27.tar.xz glibc-098c795e85fbd05c5ef59c2d0ce59529331bea27.zip | |
Linux: Include <dl-auxv.h> in dl-sysdep.c only for SHARED
Otherwise, <dl-auxv.h> on POWER ends up being included twice,
once in dl-sysdep.c, once in dl-support.c. That leads to a linker
failure due to multiple definitions of _dl_cache_line_size.
Fixes commit d96d2995c1121d3310102afda2deb1f35761b5e6
("Revert "Linux: Consolidate auxiliary vector parsing").
| -rw-r--r-- | sysdeps/unix/sysv/linux/dl-sysdep.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c index 5e71704fcf..8ad72c4b7b 100644 --- a/sysdeps/unix/sysv/linux/dl-sysdep.c +++ b/sysdeps/unix/sysv/linux/dl-sysdep.c @@ -18,7 +18,6 @@ #include <_itoa.h> #include <assert.h> -#include <dl-auxv.h> #include <dl-hwcap-check.h> #include <dl-osinfo.h> #include <dl-procinfo.h> @@ -46,6 +45,8 @@ #include <dl-machine.h> #ifdef SHARED +# include <dl-auxv.h> + extern char **_environ attribute_hidden; extern char _end[] attribute_hidden; |