about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoseph Myers <joseph@codesourcery.com>2012-04-21 13:18:11 +0000
committerJoseph Myers <joseph@codesourcery.com>2012-04-21 13:18:11 +0000
commitb0fe253f8dfb9436c8a23aba998efadb9fe84f7b (patch)
tree82d29af0ab9100a4ad71d4245af339ce9ab8118c
parent8280f22d30e167c621a460538d83a77515827b52 (diff)
downloadglibc-b0fe253f8dfb9436c8a23aba998efadb9fe84f7b.tar.gz
glibc-b0fe253f8dfb9436c8a23aba998efadb9fe84f7b.tar.xz
glibc-b0fe253f8dfb9436c8a23aba998efadb9fe84f7b.zip
Merge sysdeps/unix/sysv/Versions into sysdeps/unix/sysv/linux/Versions.
-rw-r--r--ChangeLog5
-rw-r--r--sysdeps/unix/sysv/Versions5
-rw-r--r--sysdeps/unix/sysv/linux/Versions2
3 files changed, 6 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 53d17518a5..26352f2ba4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-21  Joseph Myers  <joseph@codesourcery.com>
+
+	* sysdeps/unix/sysv/linux/Versions (GLIBC_2.0): Add sysinfo.
+	* sysdeps/unix/sysv/Versions: Remove file.
+
 2012-04-21  Markus Trippelsdorf  <markus@trippelsdorf.de>
 
 	[BZ #13927]
diff --git a/sysdeps/unix/sysv/Versions b/sysdeps/unix/sysv/Versions
deleted file mode 100644
index bdb8ba836c..0000000000
--- a/sysdeps/unix/sysv/Versions
+++ /dev/null
@@ -1,5 +0,0 @@
-libc {
-  GLIBC_2.0 {
-    sysinfo;
-  }
-}
diff --git a/sysdeps/unix/sysv/linux/Versions b/sysdeps/unix/sysv/linux/Versions
index f9647be1bc..16bb281590 100644
--- a/sysdeps/unix/sysv/linux/Versions
+++ b/sysdeps/unix/sysv/linux/Versions
@@ -51,7 +51,7 @@ libc {
     setfsgid; setfsuid;
 
     # s*
-    setresgid; setresuid; swapoff; swapon; sysctl;
+    setresgid; setresuid; swapoff; swapon; sysctl; sysinfo;
 
     # u*
     umount; uselib;