This is the mail archive of the
libc-ports@sources.redhat.com
mailing list for the libc-ports 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 15:06:59 +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> <Pine.LNX.4.64.1206011404100.2129@digraph.polyomino.org.uk> <CAMe9rOr0WQgOFXOac8PzYHZk9DeiZ2OSmJEG7tgq0bJ0CFUQLA@mail.gmail.com>
On Fri, 1 Jun 2012, H.J. Lu wrote:
> > 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".
>
> Can you also remove
>
> ifdef abi-variants
> ifndef default-abi
> default-abi = $(firstword $(abi-variants))
> endif
> endif
>
> in Makeconfig?
Here is a patch for that. Tested x86_64.
2012-06-01 Joseph Myers <joseph@codesourcery.com>
* Makeconfig [abi-variants && !default-abi] (default-abi): Remove
definition. Document in comment.
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
--
Joseph S. Myers
joseph@codesourcery.com