From 026eb207eda8cc93f6f7f0980f0a8e51587d8011 Mon Sep 17 00:00:00 2001 From: Stefan Liebler Date: Fri, 16 Jan 2015 09:18:58 +0100 Subject: S390: Get rid of linknamespace failures for utmp functions. --- ChangeLog | 19 +++++++++++++++++++ NEWS | 2 +- sysdeps/unix/sysv/linux/s390/s390-32/getutent.c | 8 ++++++-- sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c | 8 ++++++-- sysdeps/unix/sysv/linux/s390/s390-32/getutid.c | 8 ++++++-- sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c | 8 ++++++-- sysdeps/unix/sysv/linux/s390/s390-32/getutline.c | 8 ++++++-- sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c | 8 ++++++-- sysdeps/unix/sysv/linux/s390/s390-32/updwtmp.c | 8 ++++++-- 9 files changed, 62 insertions(+), 15 deletions(-) diff --git a/ChangeLog b/ChangeLog index 15e004f7ac..d3b6b448ac 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,22 @@ +2015-01-16 Stefan Liebler + + [BZ #17844] + * sysdeps/unix/sysv/linux/s390/s390-32/getutent.c + (getutent): Use weak_alias in non SHARED case + and default_symbol_version in SHARED case. + * sysdeps/unix/sysv/linux/s390/s390-32/getutent_r.c + (getutent_r, pututline): Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/getutid.c + (getutid): Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/getutid_r.c + (getutid_r): Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/getutline.c + (getutline): Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/getutline_r.c + (getutline_r): Likewise. + * sysdeps/unix/sysv/linux/s390/s390-32/updwtmp.c + (updwtmp): Likewise. + 2015-01-16 Stefan Liebler [BZ #17848] diff --git a/NEWS b/NEWS index d908425e6c..6fdb27db21 100644 --- a/NEWS +++ b/NEWS @@ -17,7 +17,7 @@ Version 2.21 17630, 17633, 17634, 17635, 17647, 17653, 17657, 17658, 17664, 17665, 17668, 17682, 17717, 17719, 17722, 17723, 17724, 17725, 17732, 17733, 17744, 17745, 17746, 17747, 17748, 17775, 17777, 17780, 17781, 17782, - 17791, 17793, 17796, 17797, 17803, 17806, 17834, 17848 + 17791, 17793, 17796, 17797, 17803, 17806, 17834, 17844, 17848 * Optimized strcpy, stpcpy, strncpy, stpncpy, strcmp, and strncmp implementations for powerpc64/powerpc64le. 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 -- cgit v1.2.1