RFA: Port maintainers: Convert WORDSIZE[32|64]/ld to abi-variants

[Joseph S. Myers]

On Thu, 31 May 2012, H.J. Lu wrote:

> On Thu, May 31, 2012 at 8:17 AM, Joseph S. Myers
> <joseph@codesourcery.com> wrote:
> > HJ, I don't see how default-abi gets set for powerpc, s390 or sparc - I
> > think you're missing appropriate settings in six sysdeps makefiles for
> > those.
> >
> > The setting in Makeconfig
> >
> > ifdef abi-variants
> > ifndef default-abi
> > default-abi = $(firstword $(abi-variants))
> > endif
> > endif
> 
> This should be removed then and powerpc, s390 or sparc
> should define default-abi.  But I don't know them well enough
> to add it myself.

Here is the (untested) patch I propose to add the default-abi definitions 
so that these architectures again install the correct stubs-<abi>.h 
instead of "stubs-.h".

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.

diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile
index 966a768..9e25d37 100644
--- a/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc32/Makefile
@@ -1,3 +1,5 @@
+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..c8991d3
--- /dev/null
+++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/Makefile
@@ -0,0 +1 @@
+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..02a5edc 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-32/Makefile
+++ b/sysdeps/unix/sysv/linux/s390/s390-32/Makefile
@@ -1,3 +1,5 @@
+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..413b016 100644
--- a/sysdeps/unix/sysv/linux/s390/s390-64/Makefile
+++ b/sysdeps/unix/sysv/linux/s390/s390-64/Makefile
@@ -1,3 +1,5 @@
+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..95dbb9c 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile
+++ b/sysdeps/unix/sysv/linux/sparc/sparc32/Makefile
@@ -1,3 +1,5 @@
+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..bc36ca4 100644
--- a/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile
+++ b/sysdeps/unix/sysv/linux/sparc/sparc64/Makefile
@@ -1,2 +1,4 @@
+default-abi := 64
+
 sysdep-CFLAGS += -fcall-used-g6
 LD += -melf64_sparc

-- 
Joseph S. Myers
joseph@codesourcery.com