S390: Get rid of linknamespace failures for utmp functions.

diff --git a/ChangeLog b/ChangeLog
index 15e004f7accb6544664a016da44f8f9e8dcfdff2..d3b6b448acb0a1c406694a10263f32469a9c6ab9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2015-01-16  Stefan Liebler  <stli@linux.vnet.ibm.com>
+
+       [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  <stli@linux.vnet.ibm.com>
 
        [BZ #17848]

diff --git a/NEWS b/NEWS
index d908425e6ca62df6205a179492d37575ac31c8b5..6fdb27db211881ad249823bbd61a9db17d901cda 100644 (file)
--- 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 9488978895a9eec29e4a7d21e264ef33ca8762e4..aa9442102874679b7b93432e38197d08ab76bc2c 100644 (file)
--- 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 b34eaffc977ccd979f6242fca02b47cad34c8e99..c00583ed0b676e107e2ecd35e64f64fe0eddc75a 100644 (file)
--- 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 bc1a0030713fd1e26ebc641fd13b6769ebec32ef..88fdf2c62e1d72488b3ec7b2e5ceb50a59c4c46a 100644 (file)
--- 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 ee149d8f06d2d6d20aa88dff43a3f04352cf705a..20f09cdef268d29101c96c6526b106a6853bf28b 100644 (file)
--- 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 151130850e4b0d6254e3966606976f959ed33f08..125eb7a666629faf158abc46a8cb998eb06ded73 100644 (file)
--- 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 3a6f653b9d16b277187bc8ff6563e3c6144e2f9d..e9b215e5e5c9fe232294331a170b41269741d2a5 100644 (file)
--- 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 f13a7477763a965e809f90ca77f2c2ea22a0c91e..4962390029e93e3b06e05173fc3afbe4dda43f8b 100644 (file)
--- 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