about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNix <nix@esperi.org.uk>2012-04-21 07:12:50 +0200
committerAndreas Jaeger <aj@suse.de>2012-04-21 07:12:50 +0200
commitb8e337281141f8a6f6c2b2c6b336b999945bbad9 (patch)
tree61a0132865c798ace412448048f86847f43d79c6
parenta90f3bcb472a2327aa78af42c2ed7c780687284c (diff)
downloadglibc-b8e337281141f8a6f6c2b2c6b336b999945bbad9.tar.gz
glibc-b8e337281141f8a6f6c2b2c6b336b999945bbad9.tar.xz
glibc-b8e337281141f8a6f6c2b2c6b336b999945bbad9.zip
Put vm86 into libc.a
[BZ #7064]
vm86 was not included in libc.a at all due to the default symbol
explicitely added to the weak symbol.
-rw-r--r--ChangeLog6
-rw-r--r--NEWS20
-rw-r--r--sysdeps/unix/sysv/linux/i386/syscalls.list2
3 files changed, 17 insertions, 11 deletions
diff --git a/ChangeLog b/ChangeLog
index e682561773..4ed5c43e20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2012-04-21  Nix  <nix@esperi.org.uk>
+
+	[BZ #7064]
+	* sysdeps/unix/sysv/linux/i386/syscalls.list: Omit explicit
+	version	from __vm86.
+
 2012-04-20  Joseph Myers  <joseph@codesourcery.com>
 
 	* sysdeps/unix/common/lxstat.c: Remove file.
diff --git a/NEWS b/NEWS
index 7ccb50b848..83276f7c30 100644
--- a/NEWS
+++ b/NEWS
@@ -12,16 +12,16 @@ Version 2.16
   174, 350, 369, 411, 706, 2074, 2541, 2547, 2548, 2551, 2552, 2553, 2554,
   2562, 2563, 2565, 2566, 2576, 2636, 2678, 3335, 3768, 3866, 3868, 3976,
   3992, 4026, 4108, 4596, 4822, 5077, 5461, 5805, 5993, 6471, 6486, 6578,
-  6649, 6730, 6770, 6794, 6884, 6890, 6894, 6895, 6907, 6911, 9739, 9902,
-  10110, 10135, 10140, 10153, 10210, 10254, 10346, 10545, 10716, 11174,
-  11322, 11365, 11451, 11494, 11521, 11959, 12047, 12340, 13058, 13525,
-  13526, 13527, 13528, 13529, 13530, 13531, 13532, 13533, 13547, 13551,
-  13552, 13553, 13555, 13559, 13566, 13583, 13592, 13618, 13637, 13656,
-  13658, 13673, 13691, 13695, 13704, 13705, 13706, 13726, 13738, 13760,
-  13761, 13786, 13792, 13806, 13824, 13840, 13841, 13844, 13846, 13851,
-  13852, 13854, 13871, 13872, 13873, 13879, 13883, 13892, 13895, 13908,
-  13910, 13911, 13912, 13913, 13915, 13916, 13917, 13918, 13919, 13920,
-  13921, 13926, 13928, 13938, 13963, 13967, 13973
+  6649, 6730, 6770, 6794, 6884, 6890, 6894, 6895, 6907, 6911, 7064, 9739,
+  9902, 10110, 10135, 10140, 10153, 10210, 10254, 10346, 10545, 10716,
+  11174, 11322, 11365, 11451, 11494, 11521, 11959, 12047, 12340, 13058,
+  13525, 13526, 13527, 13528, 13529, 13530, 13531, 13532, 13533, 13547,
+  13551, 13552, 13553, 13555, 13559, 13566, 13583, 13592, 13618, 13637,
+  13656, 13658, 13673, 13691, 13695, 13704, 13705, 13706, 13726, 13738,
+  13760, 13761, 13786, 13792, 13806, 13824, 13840, 13841, 13844, 13846,
+  13851, 13852, 13854, 13871, 13872, 13873, 13879, 13883, 13892, 13895,
+  13908, 13910, 13911, 13912, 13913, 13915, 13916, 13917, 13918, 13919,
+  13920, 13921, 13926, 13928, 13938, 13963, 13967, 13973
 
 * ISO C11 support:
 
diff --git a/sysdeps/unix/sysv/linux/i386/syscalls.list b/sysdeps/unix/sysv/linux/i386/syscalls.list
index 149d432347..e3bcabac10 100644
--- a/sysdeps/unix/sysv/linux/i386/syscalls.list
+++ b/sysdeps/unix/sysv/linux/i386/syscalls.list
@@ -2,7 +2,7 @@
 
 modify_ldt	EXTRA	modify_ldt	i:ipi	__modify_ldt	modify_ldt
 vm86old		EXTRA	vm86old		i:p	__vm86old	vm86@GLIBC_2.0
-vm86		-	vm86		i:ip	__vm86		vm86@@GLIBC_2.3.4
+vm86		-	vm86		i:ip	__vm86		vm86
 oldgetrlimit	EXTRA	getrlimit	i:ip	__old_getrlimit	getrlimit@GLIBC_2.0
 oldsetrlimit	EXTRA	setrlimit	i:ip	__old_setrlimit	setrlimit@GLIBC_2.0
 waitpid		-	waitpid		Ci:ipi	__waitpid	waitpid	__libc_waitpid