This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
Re: RFA: Port maintainers: Convert WORDSIZE[32|64]/ld to abi-variants
- From: "Joseph S. Myers" <joseph at codesourcery dot com>
- To: "H.J. Lu" <hjl dot tools at gmail dot com>
- Cc: GNU C Library <libc-alpha at sourceware dot org>, libc-ports at sourceware dot org, Thomas Schwinge <thomas at codesourcery dot com>, Kaz Kojima <kkojima at rr dot iij4u dot or dot jp>, Andreas Krebbel <Andreas dot Krebbel at de dot ibm dot com>, David Miller <davem at davemloft dot net>
- Date: Fri, 1 Jun 2012 14:06:10 +0000 (UTC)
- Subject: Re: RFA: Port maintainers: Convert WORDSIZE[32|64]/ld to abi-variants
- References: <20120526133641.GA9655@intel.com><Pine.LNX.4.64.1205261648450.16948@digraph.polyomino.org.uk><CAMe9rOouyXcgkBAkRF+XV2m2icHh3tAWOkMCLLd5LA8=qQkqMw@mail.gmail.com><Pine.LNX.4.64.1205261919230.16948@digraph.polyomino.org.uk><CAMe9rOpV=AgDvj91D06Bgr4Q_k5B1PGFDN4LK1OquVkx+b0yUw@mail.gmail.com><Pine.LNX.4.64.1205311513500.7338@digraph.polyomino.org.uk><CAMe9rOpUEDRrvh1hXQJqut_uvyitfUs7sn+72fQ5W=fdE2GP3g@mail.gmail.com>
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