This is the mail archive of the glibc-cvs@sourceware.org mailing list for the glibc project.
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]
Other format:	[Raw text]
GNU C Library master sources branch, hjl/abi, updated. glibc-2.15-1037-g27abd41

From: hjl at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 23 May 2012 23:18:37 -0000
Subject: GNU C Library master sources branch, hjl/abi, updated. glibc-2.15-1037-g27abd41
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, hjl/abi has been updated
       via  27abd41bd4e51384f53da893be85604f4d58e5ca (commit)
       via  926f42ac038f9a41c67b5737e5d9186a23b3395e (commit)
      from  27195a4ed7e30d314c6106555f6b382dc0674de5 (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=27abd41bd4e51384f53da893be85604f4d58e5ca

commit 27abd41bd4e51384f53da893be85604f4d58e5ca
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Wed May 23 16:18:26 2012 -0700

    Remove default-abi

diff --git a/ChangeLog.abi b/ChangeLog.abi
index 3be6a90..0722db8 100644
--- a/ChangeLog.abi
+++ b/ChangeLog.abi
@@ -1,5 +1,19 @@
 2012-05-23  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* Makefile (installed-stubs): Check abi-list-variants instead
+	of default-abi.
+	* sysdeps/unix/sysv/linux/i386/Makefile (default-abi): Removed.
+	* sysdeps/unix/sysv/linux/x86_64/Makefile (abi-list-variants):
+	Likewise.
+	* sysdeps/unix/sysv/linux/x86_64/64/Makefile (default-abi):
+	Likewise.
+	(abi-list-variants): New macro.
+	* sysdeps/unix/sysv/linux/x86_64/x32/Makefile (default-abi):
+	Removed.
+	(abi-list-variants): New macro.
+
+2012-05-23  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* Makeconfig ($(common-objpfx)gnu/lib-names.stmp): Support
 	empty abi-list-variants.
 
diff --git a/Makefile b/Makefile
index e1a1995..1da598f 100644
--- a/Makefile
+++ b/Makefile
@@ -170,10 +170,10 @@ others: $(common-objpfx)testrun.sh
 
 subdir-stubs := $(foreach dir,$(subdirs),$(common-objpfx)$(dir)/stubs)
 
-ifeq ($(default-abi),)
+ifndef abi-list-variants
 installed-stubs = $(inst_includedir)/gnu/stubs.h
 else
-installed-stubs = $(inst_includedir)/gnu/stubs-$(default-abi).h
+installed-stubs = $(inst_includedir)/gnu/stubs-$(firstword $(abi-list-variants)).h
 
 $(inst_includedir)/gnu/stubs.h: $(common-objpfx)soversions.mk $(+force)
 	$(make-target-directory)
diff --git a/sysdeps/unix/sysv/linux/i386/Makefile b/sysdeps/unix/sysv/linux/i386/Makefile
index 7077d6d..1cc8098 100644
--- a/sysdeps/unix/sysv/linux/i386/Makefile
+++ b/sysdeps/unix/sysv/linux/i386/Makefile
@@ -1,9 +1,9 @@
-default-abi := 32
-
 # We don't need any header files.
 abi-list-includes :=
 
+# The default ABI is 32.
 abi-list-variants := 32 64 x32
+
 abi-list-32-options := -D__i386__ -U__x86_64__
 abi-list-32-condition := !defined __x86_64__
 abi-list-32-ld-soname := ld-linux.so.2
diff --git a/sysdeps/unix/sysv/linux/x86_64/64/Makefile b/sysdeps/unix/sysv/linux/x86_64/64/Makefile
index c8991d3..d4e49dd 100644
--- a/sysdeps/unix/sysv/linux/x86_64/64/Makefile
+++ b/sysdeps/unix/sysv/linux/x86_64/64/Makefile
@@ -1 +1,2 @@
-default-abi := 64
+# The default ABI is 64.
+abi-list-variants := 64 32 x32
diff --git a/sysdeps/unix/sysv/linux/x86_64/Makefile b/sysdeps/unix/sysv/linux/x86_64/Makefile
index fbd1df9..a33e945 100644
--- a/sysdeps/unix/sysv/linux/x86_64/Makefile
+++ b/sysdeps/unix/sysv/linux/x86_64/Makefile
@@ -1,7 +1,7 @@
 # We don't need any header files.
 abi-list-includes :=
 
-abi-list-variants := 32 64 x32
+abi-list-variants := 64 32 x32
 abi-list-32-options := -D__i386__ -U__x86_64__
 abi-list-32-condition := !defined __x86_64__
 abi-list-32-ld-soname := ld-linux.so.2
diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/Makefile b/sysdeps/unix/sysv/linux/x86_64/x32/Makefile
index 992e543..71dfa08 100644
--- a/sysdeps/unix/sysv/linux/x86_64/x32/Makefile
+++ b/sysdeps/unix/sysv/linux/x86_64/x32/Makefile
@@ -1,4 +1,5 @@
-default-abi := x32
+# The default ABI is x32.
+abi-list-variants := x32 64 32
 
 ifeq ($(subdir),misc)
 sysdep_routines += arch_prctl

http://sources.redhat.com/git/gitweb.cgi?p=glibc.git;a=commitdiff;h=926f42ac038f9a41c67b5737e5d9186a23b3395e

commit 926f42ac038f9a41c67b5737e5d9186a23b3395e
Author: H.J. Lu <hjl.tools@gmail.com>
Date:   Wed May 23 16:08:01 2012 -0700

    Support empty abi-list-variants

diff --git a/ChangeLog.abi b/ChangeLog.abi
index aaf7b2f..3be6a90 100644
--- a/ChangeLog.abi
+++ b/ChangeLog.abi
@@ -1,5 +1,10 @@
 2012-05-23  H.J. Lu  <hongjiu.lu@intel.com>
 
+	* Makeconfig ($(common-objpfx)gnu/lib-names.stmp): Support
+	empty abi-list-variants.
+
+2012-05-23  H.J. Lu  <hongjiu.lu@intel.com>
+
 	* Makeconfig (abi-list-includes): Moved to ...
 	* sysdeps/unix/sysv/linux/Makefile: Here.
 	* Makeconfig ($(common-objpfx)gnu/lib-names.stmp): Include
diff --git a/Makeconfig b/Makeconfig
index c8b6d48..4f9b9cf 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -864,6 +864,7 @@ $(common-objpfx)gnu/lib-names.stmp: $(..)scripts/lib-names.awk \
 	 $(if $(abi-list-includes), \
 	  $(foreach h,$(abi-list-includes), echo '#include <$(h)>';) \
 	  echo '';) \
+	 $(if $(abi-list-variants), \
 	 $(foreach v,$(abi-list-variants),\
 	 $(if $(abi-list-$(v)-condition),\
 	 echo '#if $(abi-list-$(v)-condition)'; \
@@ -872,9 +873,9 @@ $(common-objpfx)gnu/lib-names.stmp: $(..)scripts/lib-names.awk \
 	     echo $(firstword $(subst =, ,$(s)))=$(abi-list-$(v)-$(firstword $(subst =, ,$(s)))-soname);, \
 	     echo $(s);))) \
 	 | LC_ALL=C $(AWK) -v multi=1 -f $(firstword $^) | LC_ALL=C sort;) \
-	 $(if $(abi-list-$(v)-condition),echo '#endif';) \
-	 rm -f $(@:.d=.h).new$(v); \
-	 ) \
+	 $(if $(abi-list-$(v)-condition),echo '#endif';)), \
+	 ($(foreach s,$(all-sonames), echo $(s);)) \
+	 | LC_ALL=C $(AWK) -f $(firstword $^) | LC_ALL=C sort;) \
 	 echo ''; \
 	 echo '#endif	/* gnu/lib-names.h */'; \
 	} >  ${@:stmp=T}

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

Summary of changes:
 ChangeLog.abi                               |   19 +++++++++++++++++++
 Makeconfig                                  |    7 ++++---
 Makefile                                    |    4 ++--
 sysdeps/unix/sysv/linux/i386/Makefile       |    4 ++--
 sysdeps/unix/sysv/linux/x86_64/64/Makefile  |    3 ++-
 sysdeps/unix/sysv/linux/x86_64/Makefile     |    2 +-
 sysdeps/unix/sysv/linux/x86_64/x32/Makefile |    3 ++-
 7 files changed, 32 insertions(+), 10 deletions(-)


hooks/post-receive
-- 
GNU C Library master sources
Index Nav:	[Date Index] [Subject Index] [Author Index] [Thread Index]
Message Nav:	[Date Prev] [Date Next]	[Thread Prev] [Thread Next]