From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 24517 invoked by alias); 30 May 2012 16:03:14 -0000 Received: (qmail 24508 invoked by uid 22791); 30 May 2012 16:03:13 -0000 X-SWARE-Spam-Status: No, hits=-3.4 required=5.0 tests=AWL,BAYES_00,FROM_12LTRDOM,KHOP_RCVD_UNTRUST,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL,TW_EG 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; Wed, 30 May 2012 16:03:00 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=EU1-MAIL.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1SZlMR-0007Ao-64 from joseph_myers@mentor.com ; Wed, 30 May 2012 09:02:59 -0700 Received: from digraph.polyomino.org.uk ([172.16.63.104]) by EU1-MAIL.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.1830); Wed, 30 May 2012 17:02:57 +0100 Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.74) (envelope-from ) id 1SZlMO-0001D0-CT; Wed, 30 May 2012 16:02:56 +0000 Date: Wed, 30 May 2012 16:03:00 -0000 From: "Joseph S. Myers" To: libc-ports@sourceware.org cc: Chris Metcalf Subject: Update MIPS for syscall-list changes Message-ID: 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-05/txt/msg00183.txt.bz2 I've applied this patch to update the MIPS port for the syscall-list changes in libc, so that triarch headers are still generated correctly after those changes. I think tilegx should properly be updated to have the right definitions as a biarch port - even if there are no differences for lib-names.h or syscall.h between the 32-bit and 64-bit cases, each should still get its own stubs.h generated. diff --git a/ChangeLog.mips b/ChangeLog.mips index d058589..7d07aa6 100644 --- a/ChangeLog.mips +++ b/ChangeLog.mips @@ -1,5 +1,18 @@ 2012-05-30 Joseph Myers + * sysdeps/unix/sysv/linux/mips/Makefile (syscall-list-variants): + Rename to abi-variants. + (syscall-list-includes): Rename to abi-includes. + (syscall-list-o32-options): Rename to abi-o32-options. + (syscall-list-o32-condition): Rename to abi-o32-condition. + (syscall-list-n32-options): Rename to abi-n32-options. + (syscall-list-n32-condition): Rename to abi-n32-condition. + (syscall-list-n64-options): Rename to abi-n64-options. + (syscall-list-n64-condition): Rename to abi-n64-condition. + * sysdeps/unix/sysv/linux/mips/mips32/Makefile: New file. + * sysdeps/unix/sysv/linux/mips/mips64/n32/Makefile: Likewise. + * sysdeps/unix/sysv/linux/mips/mips64/n64/Makefile: Likewise. + * sysdeps/unix/sysv/linux/mips/nptl/pthread_once.c: Replace _internal alias by hidden_def. diff --git a/sysdeps/unix/sysv/linux/mips/Makefile b/sysdeps/unix/sysv/linux/mips/Makefile index 2aaf63c..fd6e3e0 100644 --- a/sysdeps/unix/sysv/linux/mips/Makefile +++ b/sysdeps/unix/sysv/linux/mips/Makefile @@ -8,14 +8,14 @@ sysdep_routines += cachectl cacheflush sysmips _test_and_set sysdep_headers += sys/cachectl.h sys/sysmips.h sys/tas.h # _MIPS_SIM_ABI32 == 1, _MIPS_SIM_ABIN32 == 2, _MIPS_SIM_ABI64 == 3 -syscall-list-variants := o32 n32 n64 -syscall-list-includes := sgidefs.h -syscall-list-o32-options := -D_MIPS_SIM=1 -syscall-list-o32-condition := _MIPS_SIM == _MIPS_SIM_ABI32 -syscall-list-n32-options := -D_MIPS_SIM=2 -syscall-list-n32-condition := _MIPS_SIM == _MIPS_SIM_ABIN32 -syscall-list-n64-options := -D_MIPS_SIM=3 -syscall-list-n64-condition := _MIPS_SIM == _MIPS_SIM_ABI64 +abi-variants := o32 n32 n64 +abi-includes := sgidefs.h +abi-o32-options := -D_MIPS_SIM=1 +abi-o32-condition := _MIPS_SIM == _MIPS_SIM_ABI32 +abi-n32-options := -D_MIPS_SIM=2 +abi-n32-condition := _MIPS_SIM == _MIPS_SIM_ABIN32 +abi-n64-options := -D_MIPS_SIM=3 +abi-n64-condition := _MIPS_SIM == _MIPS_SIM_ABI64 endif ifeq ($(subdir),elf) diff --git a/sysdeps/unix/sysv/linux/mips/mips32/Makefile b/sysdeps/unix/sysv/linux/mips/mips32/Makefile new file mode 100644 index 0000000..77e9121 --- /dev/null +++ b/sysdeps/unix/sysv/linux/mips/mips32/Makefile @@ -0,0 +1 @@ +default-abi := o32 diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n32/Makefile b/sysdeps/unix/sysv/linux/mips/mips64/n32/Makefile new file mode 100644 index 0000000..2368c40 --- /dev/null +++ b/sysdeps/unix/sysv/linux/mips/mips64/n32/Makefile @@ -0,0 +1 @@ +default-abi := n32 diff --git a/sysdeps/unix/sysv/linux/mips/mips64/n64/Makefile b/sysdeps/unix/sysv/linux/mips/mips64/n64/Makefile new file mode 100644 index 0000000..fed17ba --- /dev/null +++ b/sysdeps/unix/sysv/linux/mips/mips64/n64/Makefile @@ -0,0 +1 @@ +default-abi := n64 -- Joseph S. Myers joseph@codesourcery.com