From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12022 invoked by alias); 1 Jun 2012 14:06:32 -0000 Received: (qmail 11986 invoked by uid 22791); 1 Jun 2012 14:06:30 -0000 X-SWARE-Spam-Status: No, hits=-4.3 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_THREADED,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,TW_FN X-Spam-Check-By: sourceware.org Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 01 Jun 2012 14:06:15 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=EU1-MAIL.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1SaSUX-0003Sw-Nk from joseph_myers@mentor.com ; Fri, 01 Jun 2012 07:06:13 -0700 Received: from digraph.polyomino.org.uk ([172.16.63.104]) by EU1-MAIL.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.1830); Fri, 1 Jun 2012 15:06:11 +0100 Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.74) (envelope-from ) id 1SaSUU-0000wB-LO; Fri, 01 Jun 2012 14:06:10 +0000 Date: Fri, 01 Jun 2012 14:06:00 -0000 From: "Joseph S. Myers" To: "H.J. Lu" cc: GNU C Library , libc-ports@sourceware.org, Thomas Schwinge , Kaz Kojima , Andreas Krebbel , David Miller Subject: Re: RFA: Port maintainers: Convert WORDSIZE[32|64]/ld to abi-variants In-Reply-To: Message-ID: References: <20120526133641.GA9655@intel.com> MIME-Version: 1.0 Content-Type: TEXT/PLAIN; charset=US-ASCII Mailing-List: contact libc-ports-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: libc-ports-owner@sourceware.org X-SW-Source: 2012-06/txt/msg00000.txt.bz2 On Thu, 31 May 2012, H.J. Lu wrote: > On Thu, May 31, 2012 at 8:17 AM, Joseph S. Myers > 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-.h instead of "stubs-.h". 2012-06-01 Joseph Myers * 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