From: Joseph Myers <joseph@codesourcery.com>
Date: Sat, 21 Apr 2012 13:18:11 +0000 (+0000)
Subject: Merge sysdeps/unix/sysv/Versions into sysdeps/unix/sysv/linux/Versions.
X-Git-Tag: glibc-2.16-tps~575
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b0fe253f8dfb9436c8a23aba998efadb9fe84f7b;p=platform%2Fupstream%2Fglibc.git

Merge sysdeps/unix/sysv/Versions into sysdeps/unix/sysv/linux/Versions.
---

diff --git a/ChangeLog b/ChangeLog
index 53d1751..26352f2 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 bdb8ba8..0000000
--- 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 f9647be..16bb281 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;