diff options
| author | Stefan Liebler <stli@linux.vnet.ibm.com> | 2015-01-16 09:18:58 +0100 |
|---|---|---|
| committer | Andreas Krebbel <krebbel@linux.vnet.ibm.com> | 2015-01-16 09:18:58 +0100 |
| commit | 026eb207eda8cc93f6f7f0980f0a8e51587d8011 (patch) | |
| tree | 8866d58b96d07a59286347e262e3104b53bf1e94 /sysdeps | |
| parent | 1d53248326dbd3c620a2bca16d35eff3019d900a (diff) | |
| download | glibc-026eb207eda8cc93f6f7f0980f0a8e51587d8011.tar.gz glibc-026eb207eda8cc93f6f7f0980f0a8e51587d8011.tar.xz glibc-026eb207eda8cc93f6f7f0980f0a8e51587d8011.zip | |
S390: Get rid of linknamespace failures for utmp functions.
Diffstat (limited to 'sysdeps')
7 files changed, 42 insertions, 14 deletions
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/getutent.c b/sysdeps/unix/sysv/linux/s390/s390-32/getutent.c index 9488978895..aa94421028 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/getutent.c +++ b/sysdeps/unix/sysv/linux/s390/s390-32/getutent.c @@ -21,8 +21,12 @@ #include "utmp-compat.h" -#undef weak_alias -#define weak_alias(n,a) +#if defined SHARED +# undef weak_alias +# define weak_alias(n,a) +#endif #include "login/getutent.c" +#if defined SHARED default_symbol_version (__getutent, getutent, UTMP_COMPAT_BASE); +#endif diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c b/sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c index b34eaffc97..c00583ed0b 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c +++ b/sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c @@ -23,12 +23,16 @@ #include "utmp-compat.h" #include "utmp-private.h" +#if defined SHARED weak_alias (__setutent, setutent) weak_alias (__endutent, endutent) -#undef weak_alias -#define weak_alias(n,a) +# undef weak_alias +# define weak_alias(n,a) +#endif #include "login/getutent_r.c" +#if defined SHARED default_symbol_version (__getutent_r, getutent_r, UTMP_COMPAT_BASE); default_symbol_version (__pututline, pututline, UTMP_COMPAT_BASE); +#endif diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/getutid.c b/sysdeps/unix/sysv/linux/s390/s390-32/getutid.c index bc1a003071..88fdf2c62e 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/getutid.c +++ b/sysdeps/unix/sysv/linux/s390/s390-32/getutid.c @@ -21,8 +21,12 @@ #include "utmp-compat.h" -#undef weak_alias -#define weak_alias(n,a) +#if defined SHARED +# undef weak_alias +# define weak_alias(n,a) +#endif #include "login/getutid.c" +#if defined SHARED default_symbol_version (__getutid, getutid, UTMP_COMPAT_BASE); +#endif diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c b/sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c index ee149d8f06..20f09cdef2 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c +++ b/sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c @@ -24,8 +24,12 @@ #include "utmp-compat.h" #include "utmp-private.h" -#undef weak_alias -#define weak_alias(n,a) +#if defined SHARED +# undef weak_alias +# define weak_alias(n,a) +#endif #include "login/getutid_r.c" +#if defined SHARED default_symbol_version (__getutid_r, getutid_r, UTMP_COMPAT_BASE); +#endif diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/getutline.c b/sysdeps/unix/sysv/linux/s390/s390-32/getutline.c index 151130850e..125eb7a666 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/getutline.c +++ b/sysdeps/unix/sysv/linux/s390/s390-32/getutline.c @@ -21,8 +21,12 @@ #include "utmp-compat.h" -#undef weak_alias -#define weak_alias(n,a) +#if defined SHARED +# undef weak_alias +# define weak_alias(n,a) +#endif #include "login/getutline.c" +#if defined SHARED default_symbol_version (__getutline, getutline, UTMP_COMPAT_BASE); +#endif diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c b/sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c index 3a6f653b9d..e9b215e5e5 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c +++ b/sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c @@ -23,8 +23,12 @@ #include "utmp-compat.h" #include "utmp-private.h" -#undef weak_alias -#define weak_alias(n,a) +#if defined SHARED +# undef weak_alias +# define weak_alias(n,a) +#endif #include "login/getutline_r.c" +#if defined SHARED default_symbol_version (__getutline_r, getutline_r, UTMP_COMPAT_BASE);; +#endif diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/updwtmp.c b/sysdeps/unix/sysv/linux/s390/s390-32/updwtmp.c index f13a747776..4962390029 100644 --- a/sysdeps/unix/sysv/linux/s390/s390-32/updwtmp.c +++ b/sysdeps/unix/sysv/linux/s390/s390-32/updwtmp.c @@ -21,8 +21,12 @@ #include "utmp-compat.h" #include "utmp-private.h" -#undef weak_alias -#define weak_alias(n,a) +#if defined SHARED +# undef weak_alias +# define weak_alias(n,a) +#endif #include "sysdeps/gnu/updwtmp.c" +#if defined SHARED default_symbol_version (__updwtmp, updwtmp, UTMP_COMPAT_BASE); +#endif |