summary refs log tree commit diff
diff options
context:
space:
mode:
authorH.J. Lu <hjl.tools@gmail.com>2012-05-31 16:12:40 -0700
committerH.J. Lu <hjl.tools@gmail.com>2012-05-31 16:12:40 -0700
commit6bd784b66be962a1e4870a69042b7735c7a149e8 (patch)
treea916f8a5f52152e9c8ac780af531c74a8fe5e45e
parent8bca20f013c201778c96df943e1d465971bc695c (diff)
downloadglibc-6bd784b66be962a1e4870a69042b7735c7a149e8.tar.gz
glibc-6bd784b66be962a1e4870a69042b7735c7a149e8.tar.xz
glibc-6bd784b66be962a1e4870a69042b7735c7a149e8.zip
Use x86_64 bits/sysctl.h for x86-64 and i386
-rw-r--r--ChangeLog3
-rw-r--r--sysdeps/unix/sysv/linux/x86/bits/sysctl.h (renamed from sysdeps/unix/sysv/linux/x86_64/bits/sysctl.h)0
2 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index ba887b6a2d..9336ba3f7b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,9 @@
 2012-05-31  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14117]
+	* sysdeps/unix/sysv/linux/x86_64/bits/sysctl.h: Renamed to ...
+	* sysdeps/unix/sysv/linux/x86/bits/sysctl.h: This.
+
 	* sysdeps/unix/sysv/linux/i386/sys/ucontext.h: Removed.
 	* sysdeps/unix/sysv/linux/x86_64/sys/ucontext.h: Renamed to ...
 	* sysdeps/unix/sysv/linux/x86/sys/ucontext.h: This.
diff --git a/sysdeps/unix/sysv/linux/x86_64/bits/sysctl.h b/sysdeps/unix/sysv/linux/x86/bits/sysctl.h
index 520ccb97e6..520ccb97e6 100644
--- a/sysdeps/unix/sysv/linux/x86_64/bits/sysctl.h
+++ b/sysdeps/unix/sysv/linux/x86/bits/sysctl.h