From: "Joseph S. Myers" <joseph@codesourcery.com>
To: "H.J. Lu" <hjl.tools@gmail.com>
Cc: GNU C Library <libc-alpha@sourceware.org>,
libc-ports@sourceware.org,
Thomas Schwinge <thomas@codesourcery.com>,
Kaz Kojima <kkojima@rr.iij4u.or.jp>,
Andreas Krebbel <Andreas.Krebbel@de.ibm.com>,
David Miller <davem@davemloft.net>
Subject: Re: RFA: Port maintainers: Convert WORDSIZE[32|64]/ld to abi-variants
Date: Fri, 01 Jun 2012 14:06:00 -0000 [thread overview]
Message-ID: <Pine.LNX.4.64.1206011404100.2129@digraph.polyomino.org.uk> (raw)
In-Reply-To: <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
next prev parent reply other threads:[~2012-06-01 14:06 UTC|newest]
Thread overview: 21+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-26 13:37 H.J. Lu
2012-05-26 17:03 ` Joseph S. Myers
2012-05-26 17:51 ` H.J. Lu
2012-05-26 19:22 ` Joseph S. Myers
2012-05-26 20:42 ` H.J. Lu
2012-05-30 0:29 ` H.J. Lu
2012-05-30 0:39 ` David Miller
2012-05-30 3:15 ` David Miller
2012-05-30 3:27 ` H.J. Lu
2012-05-30 8:49 ` Andreas Krebbel
2012-05-30 13:00 ` H.J. Lu
2012-05-31 15:17 ` Joseph S. Myers
2012-05-31 15:32 ` H.J. Lu
2012-06-01 14:06 ` Joseph S. Myers [this message]
2012-06-01 14:21 ` H.J. Lu
2012-06-01 15:07 ` Joseph S. Myers
2012-06-01 15:27 ` H.J. Lu
2012-06-01 20:16 ` Joseph S. Myers
2012-06-01 20:32 ` Roland McGrath
2012-05-30 18:58 ` Thomas Schwinge
2012-05-30 19:00 ` H.J. Lu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=Pine.LNX.4.64.1206011404100.2129@digraph.polyomino.org.uk \
--to=joseph@codesourcery.com \
--cc=Andreas.Krebbel@de.ibm.com \
--cc=davem@davemloft.net \
--cc=hjl.tools@gmail.com \
--cc=kkojima@rr.iij4u.or.jp \
--cc=libc-alpha@sourceware.org \
--cc=libc-ports@sourceware.org \
--cc=thomas@codesourcery.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).