Fix fmtmsg addseverity namespace (bug 18539).

Use of fmtmsg (XSI POSIX) brings in addseverity (non-POSIX).  This
patch fixes this by making addseverity into a weak alias for
__addseverity.

Tested for x86_64 and x86 (testsuite, and that disassembly of
installed shared libraries is unchanged by the patch).

	[BZ #18539]
	* stdlib/fmtmsg.c (addseverity): Rename to __addseverity and
	define as weak alias of __addseverity.
	* conform/Makefile (test-xfail-XPG4/fmtmsg.h/linknamespace):
	Remove variable.
	(test-xfail-UNIX98/fmtmsg.h/linknamespace): Likewise.
	(test-xfail-XOPEN2K/fmtmsg.h/linknamespace): Likewise.
	(test-xfail-XOPEN2K8/fmtmsg.h/linknamespace): Likewise.

diff --git a/ChangeLog b/ChangeLog
index d055ea3590555677c68a8372a7ddee5a009d6297..2b516b6a3fd01045ea5a597ddf5278a24a581400 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
 2015-06-17  Joseph Myers  <joseph@codesourcery.com>
 
+       [BZ #18539]
+       * stdlib/fmtmsg.c (addseverity): Rename to __addseverity and
+       define as weak alias of __addseverity.
+       * conform/Makefile (test-xfail-XPG4/fmtmsg.h/linknamespace):
+       Remove variable.
+       (test-xfail-UNIX98/fmtmsg.h/linknamespace): Likewise.
+       (test-xfail-XOPEN2K/fmtmsg.h/linknamespace): Likewise.
+       (test-xfail-XOPEN2K8/fmtmsg.h/linknamespace): Likewise.
+
        [BZ #18536]
        * misc/tsearch.c (__tsearch): Use libc_hidden_def.
        (__tfind): Likewise.

diff --git a/NEWS b/NEWS
index 0b67fa2c0fb9aee26ccbf88101d7b45b82d7c6fb..6f3d7d81a07df6306913ebaf753d8a2bc7f56624 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -22,7 +22,7 @@ Version 2.22
   18324, 18333, 18346, 18397, 18409, 18410, 18412, 18418, 18422, 18434,
   18444, 18468, 18469, 18470, 18479, 18483, 18495, 18496, 18497, 18498,
   18507, 18512, 18519, 18520, 18522, 18527, 18528, 18529, 18530, 18532,
-  18533, 18534, 18536.
+  18533, 18534, 18536, 18539.
 
 * Cache information can be queried via sysconf() function on s390 e.g. with
   _SC_LEVEL1_ICACHE_SIZE as argument.

diff --git a/conform/Makefile b/conform/Makefile
index 873326b7c68296a1da98467fc603b6a28da52a25..4bbc1e6cc829d831b0f8f0b3def49e513f0fe941 100644 (file)
--- a/conform/Makefile
+++ b/conform/Makefile
@@ -345,12 +345,8 @@ test-xfail-XOPEN2K8/ndbm.h/linknamespace = yes
 
 # Unsorted expected failures.
 test-xfail-XPG3/unistd.h/linknamespace = yes
-test-xfail-XPG4/fmtmsg.h/linknamespace = yes
 test-xfail-XPG4/unistd.h/linknamespace = yes
 test-xfail-POSIX/mqueue.h/linknamespace = yes
-test-xfail-UNIX98/fmtmsg.h/linknamespace = yes
 test-xfail-UNIX98/mqueue.h/linknamespace = yes
 test-xfail-UNIX98/unistd.h/linknamespace = yes
 test-xfail-UNIX98/wchar.h/linknamespace = yes
-test-xfail-XOPEN2K/fmtmsg.h/linknamespace = yes
-test-xfail-XOPEN2K8/fmtmsg.h/linknamespace = yes

diff --git a/stdlib/fmtmsg.c b/stdlib/fmtmsg.c
index 60467445235551c7b54fa768f78f69ecec22e1a6..b8133dca4d359586392c917f48cc8960ff3d2518 100644 (file)
--- a/stdlib/fmtmsg.c
+++ b/stdlib/fmtmsg.c
@@ -347,7 +347,7 @@ internal_addseverity (int severity, const char *string)
 
 /* Add new severity level or remove old one.  */
 int
-addseverity (int severity, const char *string)
+__addseverity (int severity, const char *string)
 {
   int result;
 
@@ -366,6 +366,7 @@ addseverity (int severity, const char *string)
 
   return result;
 }
+weak_alias (__addseverity, addseverity)
 
 
 libc_freeres_fn (free_mem)