Make _LIB_VERSION a weak symbol

System Internals / glibc - Siddhesh Poyarekar [redhat.com] - 13 May 2013 01:16 UTC

That way it can live alongside _LIB_VERSION in libieee.a for statically compiled programs.

Resolves #14582.

###

diff --git a/ChangeLog b/ChangeLog
index 3ce6aa5..8a12bf9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2013-05-13 Siddhesh Poyarekar
+
+ [BZ #14582]
+ * sysdeps/ieee754/s_lib_version.c (_LIB_VERSION_INTERNAL):
+ Renamed from _LIB_VERSION.
+ (_LIB_VERSION): Set as weak alias of _LIB_VERSION_INTERNAL.
+
2013-05-12 Joseph Myers

* math/libm-test.inc (struct test_fff_f_data): New type.
diff --git a/NEWS b/NEWS
index 7abab0c..027ceab 100644
--- a/NEWS
+++ b/NEWS
@@ -11,13 +11,13 @@ Version 2.18

2546, 2560, 5159, 6809, 10060, 10062, 10357, 11120, 11561, 12387, 12723,
13550, 13889, 13951, 13988, 14142, 14176, 14200, 14280, 14293, 14317,
- 14327, 14478, 14496, 14686, 14812, 14888, 14920, 14952, 14964, 14981,
- 14982, 14985, 14994, 14996, 15003, 15006, 15007, 15020, 15023, 15036,
- 15054, 15055, 15062, 15078, 15084, 15085, 15086, 15160, 15214, 15221,
- 15232, 15234, 15283, 15285, 15287, 15304, 15305, 15307, 15309, 15327,
- 15330, 15335, 15336, 15337, 15342, 15346, 15359, 15361, 15366, 15380,
- 15394, 15395, 15405, 15406, 15409, 15416, 15418, 15419, 15423, 15426,
- 15429, 15448.
+ 14327, 14478, 14496, 14582, 14686, 14812, 14888, 14920, 14952, 14964,
+ 14981, 14982, 14985, 14994, 14996, 15003, 15006, 15007, 15020, 15023,
+ 15036, 15054, 15055, 15062, 15078, 15084, 15085, 15086, 15160, 15214,
+ 15221, 15232, 15234, 15283, 15285, 15287, 15304, 15305, 15307, 15309,
+ 15327, 15330, 15335, 15336, 15337, 15342, 15346, 15359, 15361, 15366,
+ 15380, 15394, 15395, 15405, 15406, 15409, 15416, 15418, 15419, 15423,
+ 15426, 15429, 15448.

* CVE-2013-0242 Buffer overrun in regexp matcher has been fixed (Bugzilla
#15078).
diff --git a/sysdeps/ieee754/s_lib_version.c b/sysdeps/ieee754/s_lib_version.c
index a377ab1..7abb3e0 100644
--- a/sysdeps/ieee754/s_lib_version.c
+++ b/sysdeps/ieee754/s_lib_version.c
@@ -25,16 +25,17 @@ static char rcsid[] = "$NetBSD: s_lib_version.c,v 1.6 1995/05/10 20:47:44 jtc Ex
* define and initialize _LIB_VERSION
*/
#ifdef _POSIX_MODE
-_LIB_VERSION_TYPE _LIB_VERSION = _POSIX_;
+_LIB_VERSION_TYPE _LIB_VERSION_INTERNAL = _POSIX_;
#else
#ifdef _XOPEN_MODE
-_LIB_VERSION_TYPE _LIB_VERSION = _XOPEN_;
+_LIB_VERSION_TYPE _LIB_VERSION_INTERNAL = _XOPEN_;
#else
#ifdef _SVID3_MODE
-_LIB_VERSION_TYPE _LIB_VERSION = _SVID_;
+_LIB_VERSION_TYPE _LIB_VERSION_INTERNAL = _SVID_;
#else /* default _IEEE_MODE */
-_LIB_VERSION_TYPE _LIB_VERSION = _IEEE_;
+_LIB_VERSION_TYPE _LIB_VERSION_INTERNAL = _IEEE_;
#endif
#endif
#endif

+weak_alias (_LIB_VERSION_INTERNAL, _LIB_VERSION)

0f7d347 Make _LIB_VERSION a weak symbol
ChangeLog | 7 +++++++
NEWS | 14 +++++++-------
sysdeps/ieee754/s_lib_version.c | 9 +++++----
3 files changed, 19 insertions(+), 11 deletions(-)

Upstream: sourceware.org

  • Share