diff mbox

[BZ,#17844] S390: Get rid of linknamespace failures for utmp functions.

Message ID m97r52$qu7$1@ger.gmane.org
State Committed
Headers show

Commit Message

Stefan Liebler Jan. 15, 2015, 7:44 a.m. UTC
On 01/14/2015 06:20 PM, Joseph Myers wrote:
> As usual, if the bug (i.e. the strong references to unreserved symbols)
> was present in a release, a report should be filed in Bugzilla for it, a
> [BZ #N] entry put in the ChangeLog entry and the bug number included in
> the list of fixed bugs in NEWS, and then that bug closed once the fix is
> checked in.
>


Okay. Here is the same patch with the created bug in the Changelog.

Bye

---
2015-01-15  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.

Comments

Joseph Myers Jan. 15, 2015, 8:27 p.m. UTC | #1
On Thu, 15 Jan 2015, Stefan Liebler wrote:

> On 01/14/2015 06:20 PM, Joseph Myers wrote:
> > As usual, if the bug (i.e. the strong references to unreserved symbols)
> > was present in a release, a report should be filed in Bugzilla for it, a
> > [BZ #N] entry put in the ChangeLog entry and the bug number included in
> > the list of fixed bugs in NEWS, and then that bug closed once the fix is
> > checked in.
> > 
> 
> 
> Okay. Here is the same patch with the created bug in the Changelog.

The same of course applies to the mem* patch - a bug number should be 
included at commit time.
Andreas Krebbel Jan. 16, 2015, 8:20 a.m. UTC | #2
On 01/15/2015 08:44 AM, Stefan Liebler wrote:
> 2015-01-15  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.

Applied. Thanks!

-Andreas-
Joseph Myers Jan. 16, 2015, 4:08 p.m. UTC | #3
Please remember when committing a patch that fixes a bug to close the bug 
in Bugzilla.
diff mbox

Patch

diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/getutent.c b/sysdeps/unix/sysv/linux/s390/s390-32/getutent.c
index 9488978..aa94421 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 b34eaff..c00583e 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 bc1a003..88fdf2c 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 ee149d8..20f09cd 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 1511308..125eb7a 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 3a6f653..e9b215e 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 f13a747..4962390 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