GNU C Library master sources branch, master, updated. glibc-2.15-1132-g3bd872c

[hjl at sourceware dot org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU C Library master sources".

The branch, master has been updated
       via  3bd872c4c481664542c6c5797730f3830e827b92 (commit)
      from  3553723f3ccc7571764b06d63a8c6e4a8f2c55bc (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=3bd872c4c481664542c6c5797730f3830e827b92

commit 3bd872c4c481664542c6c5797730f3830e827b92
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Fri Jun 1 13:22:46 2012 -0700

    Use i386 sys/elf.h and sys/vm86.h for i386 and x86-64

diff --git a/ChangeLog b/ChangeLog
index e5f68f3..470aa85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,19 @@
 2012-06-01  H.J. Lu  <hongjiu.lu@intel.com>
 
 	[BZ #14117]
+	* sysdeps/unix/sysv/linux/i386/Makefile (sysdep_headers):
+	Don't add sys/elf.h sys/perm.h sys/reg.h sys/vm86.h
+	sys/debugreg.h sys/io.h here.
+	* sysdeps/unix/sysv/linux/x86/Makefile (sysdep_headers): Add
+	sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h
+	sys/io.h.
+	* sysdeps/unix/sysv/linux/x86_64/Makefile (sysdep_headers):
+	Don't add sys/perm.h sys/reg.h sys/debugreg.h sys/io.h here.
+	* sysdeps/unix/sysv/linux/i386/sys/elf.h: Renamed to ...
+	* sysdeps/unix/sysv/linux/x86/sys/elf.h: This.
+	* sysdeps/unix/sysv/linux/i386/sys/vm86.h: Renamed to ...
+	* sysdeps/unix/sysv/linux/x86/sys/vm86.h: This.
+
 	* sysdeps/unix/sysv/linux/x86_64/sys/debugreg.h (DR_LEN_8):
 	Define only if __x86_64__ is defined.
 
diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile
index f4585d7..acc3021 100644
--- a/sysdeps/unix/sysv/linux/i386/Makefile
+++ b/sysdeps/unix/sysv/linux/i386/Makefile
@@ -3,7 +3,6 @@ default-abi := 32
 
 ifeq ($(subdir),misc)
 sysdep_routines += ioperm iopl vm86 call_pselect6 call_fallocate
-sysdep_headers += sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h sys/io.h
 endif
 
 ifeq ($(subdir),elf)
diff --git a/sysdeps/unix/sysv/linux/x86/Makefile b/sysdeps/unix/sysv/linux/x86/Makefile
index cf4a55c..6412a9e 100644
--- a/sysdeps/unix/sysv/linux/x86/Makefile
+++ b/sysdeps/unix/sysv/linux/x86/Makefile
@@ -12,3 +12,7 @@ abi-64-ld-soname := ld-linux-x86-64.so.2
 abi-x32-options := -U__i386__ -D__x86_64__ -D__ILP32__ -U__LP64__
 abi-x32-condition := defined __x86_64__ && defined __ILP32__
 abi-x32-ld-soname := ld-linux-x32.so.2
+
+ifeq ($(subdir),misc)
+sysdep_headers += sys/elf.h sys/perm.h sys/reg.h sys/vm86.h sys/debugreg.h sys/io.h
+endif
diff --git a/sysdeps/unix/sysv/linux/i386/sys/elf.h b/sysdeps/unix/sysv/linux/x86/sys/elf.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/i386/sys/elf.h
rename to sysdeps/unix/sysv/linux/x86/sys/elf.h
diff --git a/sysdeps/unix/sysv/linux/i386/sys/vm86.h b/sysdeps/unix/sysv/linux/x86/sys/vm86.h
similarity index 100%
rename from sysdeps/unix/sysv/linux/i386/sys/vm86.h
rename to sysdeps/unix/sysv/linux/x86/sys/vm86.h
diff --git a/sysdeps/unix/sysv/linux/x86_64/Makefile b/sysdeps/unix/sysv/linux/x86_64/Makefile
index dd4ab59..d6a9d36 100644
--- a/sysdeps/unix/sysv/linux/x86_64/Makefile
+++ b/sysdeps/unix/sysv/linux/x86_64/Makefile
@@ -1,6 +1,5 @@
 ifeq ($(subdir),misc)
 sysdep_routines += ioperm iopl
-sysdep_headers += sys/perm.h sys/reg.h sys/debugreg.h sys/io.h
 endif
 
 ifeq ($(subdir),stdlib)

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                                        |   13 +++++++++++++
 sysdeps/unix/sysv/linux/i386/Makefile            |    1 -
 sysdeps/unix/sysv/linux/x86/Makefile             |    4 ++++
 sysdeps/unix/sysv/linux/{i386 => x86}/sys/elf.h  |    0
 sysdeps/unix/sysv/linux/{i386 => x86}/sys/vm86.h |    0
 sysdeps/unix/sysv/linux/x86_64/Makefile          |    1 -
 6 files changed, 17 insertions(+), 2 deletions(-)
 rename sysdeps/unix/sysv/linux/{i386 => x86}/sys/elf.h (100%)
 rename sysdeps/unix/sysv/linux/{i386 => x86}/sys/vm86.h (100%)


hooks/post-receive
-- 
GNU C Library master sources