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, master, updated. glibc-2.15-1135-gea32bcd

From: jsm28 at sourceware dot org
To: glibc-cvs at sourceware dot org
Date: 1 Jun 2012 21:19:53 -0000
Subject: GNU C Library master sources branch, master, updated. glibc-2.15-1135-gea32bcd
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  ea32bcdd3d567a61617bbe0ec8099c79c46f2489 (commit)
       via  88a4576f50b0b7f71c28f7e3d37f8ac2016fa132 (commit)
      from  402fe938f60c1f10700c8d0b673bf4a6dc2d1d40 (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=ea32bcdd3d567a61617bbe0ec8099c79c46f2489

commit ea32bcdd3d567a61617bbe0ec8099c79c46f2489
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Fri Jun 1 21:19:28 2012 +0000

    Add default-abi definitions for powerpc, s390 and sparc.

diff --git a/ChangeLog b/ChangeLog
index 09ef682..49daa0e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2012-06-01  Joseph Myers  <joseph@codesourcery.com>
 
+	* sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile
+	(default-abi): New variable.
+	* sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile: New file.
+	* sysdeps/unix/sysv/linux/s390/s390-32/Makefile (default-abi): New
+	variable.
+	* sysdeps/unix/sysv/linux/s390/s390-64/Makefile (default-abi):
+	Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc32/Makefile (default-abi):
+	Likewise.
+	* sysdeps/unix/sysv/linux/sparc/sparc64/Makefile (default-abi):
+	Likewise.
+
 	* Makeconfig [abi-variants && !default-abi] (default-abi): Remove
 	definition.  Document in comment.
 
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile
index 966a768..84324aa 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile
@@ -1,3 +1,6 @@
+# See Makeconfig regarding the use of default-abi.
+default-abi := 32
+
 ifeq ($(subdir),resource)
 sysdep_routines += oldgetrlimit64
 endif
diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile
new file mode 100644
index 0000000..3ba3b1f
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile
@@ -0,0 +1,2 @@
+# See Makeconfig regarding the use of default-abi.
+default-abi := 64
diff --git a/sysdeps/unix/sysv/linux/s390/s390-32/Makefile b/sysdeps/unix/sysv/linux/s390/s390-32/Makefile
index a509c93..3216804 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/Makefile
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/Makefile
@@ -1,3 +1,6 @@
+# See Makeconfig regarding the use of default-abi.
+default-abi := 32
+
 ifeq ($(subdir),login)
 sysdep_routines += utmp32 utmpx32
 libutil-routines += login32
diff --git a/sysdeps/unix/sysv/linux/s390/s390-64/Makefile b/sysdeps/unix/sysv/linux/s390/s390-64/Makefile
index 283361b..1f6ad21 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/Makefile
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/Makefile
@@ -1,3 +1,6 @@
+# See Makeconfig regarding the use of default-abi.
+default-abi := 64
+
 ifeq ($(subdir),misc)
 sysdep_headers += sys/elf.h
 endif
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile b/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile
index 8f7e76b..21c7dc1 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile
@@ -1,3 +1,6 @@
+# See Makeconfig regarding the use of default-abi.
+default-abi := 32
+
 asm-CPPFLAGS = -D__ASSEMBLY__
 ASFLAGS-.os += -fPIC
 LD += -melf32_sparc
diff --git a/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile b/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile
index df4533a..3e29dd8 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile
@@ -1,2 +1,5 @@
+# See Makeconfig regarding the use of default-abi.
+default-abi := 64
+
 sysdep-CFLAGS += -fcall-used-g6
 LD += -melf64_sparc

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

commit 88a4576f50b0b7f71c28f7e3d37f8ac2016fa132
Author: Joseph Myers <joseph@codesourcery.com>
Date:   Fri Jun 1 21:17:36 2012 +0000

    Remove unused default-abi definition in Makeconfig.

diff --git a/ChangeLog b/ChangeLog
index 8895cc1..09ef682 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-06-01  Joseph Myers  <joseph@codesourcery.com>
+
+	* Makeconfig [abi-variants && !default-abi] (default-abi): Remove
+	definition.  Document in comment.
+
 2012-06-01  David S. Miller  <davem@davemloft.net>
 
 	* stdlib/longlong.h: Updated from GCC.
diff --git a/Makeconfig b/Makeconfig
index df7545f..cba5db7 100644
--- a/Makeconfig
+++ b/Makeconfig
@@ -797,13 +797,8 @@ ifeq (yes, $(build-shared))
 # defines abi-$(variant)-condition to be the condition for those options
 # to use in a C #if condition.  abi-includes may be defined to a list of
 # headers to include in the generated header, if the default does not
-# suffice.
-
-ifdef abi-variants
-ifndef default-abi
-default-abi = $(firstword $(abi-variants))
-endif
-endif
+# suffice.  default-abi is defined to be the ABI for the current glibc
+# build.
 
 ifndef abi-includes
 abi-includes := bits/wordsize.h

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

Summary of changes:
 ChangeLog                                          |   17 +++++++++++++++++
 Makeconfig                                         |    9 ++-------
 sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile |    3 +++
 sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile |    2 ++
 sysdeps/unix/sysv/linux/s390/s390-32/Makefile      |    3 +++
 sysdeps/unix/sysv/linux/s390/s390-64/Makefile      |    3 +++
 sysdeps/unix/sysv/linux/sparc/sparc32/Makefile     |    3 +++
 sysdeps/unix/sysv/linux/sparc/sparc64/Makefile     |    3 +++
 8 files changed, 36 insertions(+), 7 deletions(-)
 create mode 100644 sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile


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]