From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 18601 invoked by alias); 30 May 2012 23:46:04 -0000 Received: (qmail 18593 invoked by uid 22791); 30 May 2012 23:46:03 -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 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 23:45:50 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=EU1-MAIL.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1SZsaL-0007YP-Sa from joseph_myers@mentor.com ; Wed, 30 May 2012 16:45:50 -0700 Received: from digraph.polyomino.org.uk ([172.16.63.104]) by EU1-MAIL.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.1830); Thu, 31 May 2012 00:45:48 +0100 Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.74) (envelope-from ) id 1SZsaJ-0004nQ-1l; Wed, 30 May 2012 23:45:47 +0000 Date: Wed, 30 May 2012 23:46:00 -0000 From: "Joseph S. Myers" To: Chris Metcalf cc: libc-ports@sourceware.org Subject: Re: [PATCH] tile: don't guard setting abi- variables with ifeq ($(subdir),misc) In-Reply-To: <201205302334.q4UNYJGl011555@farm-0002.internal.tilera.com> Message-ID: References: <201205302334.q4UNYJGl011555@farm-0002.internal.tilera.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-05/txt/msg00203.txt.bz2 On Wed, 30 May 2012, Chris Metcalf wrote: > Joseph, you may want to check how mips is doing this, since I originally > copied the "make" support from mips. It worked fine to create syscall.h, > but it was missing out on creating the multiple versions of stub.h, > until I removed the $(subdir) guard, which presumably is somewhat pointless > when we're just setting some variables anyway. I note that the new arm > support doesn't use a $(subdir) guard either. Thanks for pointing this out; I've applied this patch. I was following HJ's instructions, which didn't mention anything about moving things out of conditionals. diff --git a/ChangeLog.mips b/ChangeLog.mips index ced2d36..6243cfc 100644 --- a/ChangeLog.mips +++ b/ChangeLog.mips @@ -1,5 +1,8 @@ 2012-05-30 Joseph Myers + * sysdeps/unix/sysv/linux/mips/Makefile [subdir = misc]: Move ABI + settings out of conditional. + * sysdeps/unix/sysv/linux/mips/syscalls.list: Remove __connect_internal alias. diff --git a/sysdeps/unix/sysv/linux/mips/Makefile b/sysdeps/unix/sysv/linux/mips/Makefile index fd6e3e0..2bbc9a4 100644 --- a/sysdeps/unix/sysv/linux/mips/Makefile +++ b/sysdeps/unix/sysv/linux/mips/Makefile @@ -6,6 +6,7 @@ ifeq ($(subdir),misc) sysdep_routines += cachectl cacheflush sysmips _test_and_set sysdep_headers += sys/cachectl.h sys/sysmips.h sys/tas.h +endif # _MIPS_SIM_ABI32 == 1, _MIPS_SIM_ABIN32 == 2, _MIPS_SIM_ABI64 == 3 abi-variants := o32 n32 n64 @@ -16,7 +17,6 @@ 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) ifeq ($(build-shared),yes) -- Joseph S. Myers joseph@codesourcery.com