diff options
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | conform/Makefile | 4 | ||||
| -rw-r--r-- | stdlib/fmtmsg.c | 3 |
4 files changed, 12 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog index d055ea3590..2b516b6a3f 100644 --- 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 0b67fa2c0f..6f3d7d81a0 100644 --- 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 873326b7c6..4bbc1e6cc8 100644 --- 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 6046744523..b8133dca4d 100644 --- 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) |