From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 1251 invoked by alias); 23 May 2012 15:47:20 -0000 Received: (qmail 1238 invoked by uid 22791); 23 May 2012 15:47:20 -0000 X-SWARE-Spam-Status: No, hits=-2.9 required=5.0 tests=AWL,BAYES_00,KHOP_THREADED,T_RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from dns0.mips.com (HELO dns0.mips.com) (12.201.5.70) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 23 May 2012 15:47:07 +0000 Received: from exchdb01.mips.com (exchhub01.mips.com [192.168.36.84]) by dns0.mips.com (8.13.8/8.13.8) with ESMTP id q4NFl3Pq017762; Wed, 23 May 2012 08:47:03 -0700 Received: from [192.168.65.53] (192.168.65.53) by exchhub01.mips.com (192.168.36.84) with Microsoft SMTP Server id 14.1.270.1; Wed, 23 May 2012 08:47:01 -0700 Subject: Re: Building syscall.h on mips From: Steve Ellcey To: "Joseph S. Myers" CC: In-Reply-To: References: <7875050d-c4de-4bc2-8c4e-3295cc003761@EXCHHUB01.MIPS.com> <1337726427.21213.155.camel@ubuntu-sellcey> Content-Type: text/plain; charset="UTF-8" Date: Wed, 23 May 2012 15:47:00 -0000 Message-ID: <1337788020.21213.162.camel@ubuntu-sellcey> MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-EMS-Proccessed: 6LP3oGfGVdcdb8o1aBnt6w== X-EMS-STAMP: 8xtg+Hv8AMGSkbumQB0aTg== 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/msg00141.txt.bz2 On Wed, 2012-05-23 at 00:06 +0000, Joseph S. Myers wrote: > On Tue, 22 May 2012, Steve Ellcey wrote: > > > Ok, I think I have it now. With these -D flags, I get similar but not > > identical sets for the three ifdef's. I would have liked to use > > _MIPS_SIM_ABI32, etc in the -D instead of 1,2,3 but that did not seem to > > work. > > > > How does this patch look? > > It looks good but appears to have a line wrapped so it doesn't apply > cleanly - could you send a patch with whitespace preserved, and a > ChangeLog entry to go in ChangeLog.mips? Here is a ChangeLog Entry: 2012-05-23 Steve Ellcey * sysdeps/unix/sysv/linux/mips/Makefile: Modify syscall-list-*-options to use -D flags. And here is the (hopefully unwrapped) diff: diff --git a/sysdeps/unix/sysv/linux/mips/Makefile b/sysdeps/unix/sysv/linux/mips/Makefile index 41e9258..2aaf63c 100644 --- a/sysdeps/unix/sysv/linux/mips/Makefile +++ b/sysdeps/unix/sysv/linux/mips/Makefile @@ -7,13 +7,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 := -mabi=32 +syscall-list-o32-options := -D_MIPS_SIM=1 syscall-list-o32-condition := _MIPS_SIM == _MIPS_SIM_ABI32 -syscall-list-n32-options := -mabi=n32 +syscall-list-n32-options := -D_MIPS_SIM=2 syscall-list-n32-condition := _MIPS_SIM == _MIPS_SIM_ABIN32 -syscall-list-n64-options := -mabi=64 +syscall-list-n64-options := -D_MIPS_SIM=3 syscall-list-n64-condition := _MIPS_SIM == _MIPS_SIM_ABI64 endif