From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 20845 invoked by alias); 3 Jul 2013 22:02:54 -0000 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 Received: (qmail 20834 invoked by uid 89); 3 Jul 2013 22:02:54 -0000 X-Spam-SWARE-Status: No, score=-3.0 required=5.0 tests=AWL,BAYES_20,KHOP_RCVD_UNTRUST,RCVD_IN_HOSTKARMA_W,RCVD_IN_HOSTKARMA_WL autolearn=ham version=3.3.1 Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Wed, 03 Jul 2013 22:02:53 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1UuV8V-0000Zi-Bw from joseph_myers@mentor.com for libc-ports@sourceware.org; Wed, 03 Jul 2013 15:02:51 -0700 Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Wed, 3 Jul 2013 15:02:51 -0700 Received: from digraph.polyomino.org.uk (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.2.247.3; Wed, 3 Jul 2013 23:02:49 +0100 Received: from jsm28 (helo=localhost) by digraph.polyomino.org.uk with local-esmtp (Exim 4.76) (envelope-from ) id 1UuV8S-0007s6-In for libc-ports@sourceware.org; Wed, 03 Jul 2013 22:02:48 +0000 Date: Wed, 03 Jul 2013 22:02:00 -0000 From: "Joseph S. Myers" To: Subject: Condition sysdeps/arm/include/bits/setjmp.h contents on _ISOMAC Message-ID: MIME-Version: 1.0 Content-Type: text/plain; charset="US-ASCII" X-SW-Source: 2013-07/txt/msg00022.txt.bz2 Testing for ARM in preparation for the 2.18 release showed up stdlib/isomac failing because of the JMP_BUF_REGLIST macro in the internal bits/setjmp.h wrapper. Of course in principle these internal headers shouldn't be used for most testing, but the established practice for now in glibc is that they disable problematic internal definitions if _ISOMAC is defined to avoid these header namespace tests failing; I've applied this patch to do so in this header. diff --git a/ports/ChangeLog.arm b/ports/ChangeLog.arm index 73f3213..1e7a35c 100644 --- a/ports/ChangeLog.arm +++ b/ports/ChangeLog.arm @@ -1,3 +1,9 @@ +2013-07-03 Joseph Myers + + * sysdeps/arm/include/bits/setjmp.h [_ISOMAC] (JMP_BUF_REGLIST): + Do not define. + [_ISOMAC] (__JMP_BUF_SP): Likewise. + 2013-07-02 Joseph Myers * sysdeps/arm/libm-test-ulps: Regenerated. diff --git a/ports/sysdeps/arm/include/bits/setjmp.h b/ports/sysdeps/arm/include/bits/setjmp.h index 23d8f75..1559d7b 100644 --- a/ports/sysdeps/arm/include/bits/setjmp.h +++ b/ports/sysdeps/arm/include/bits/setjmp.h @@ -24,11 +24,13 @@ # include #endif +#ifndef _ISOMAC /* Register list for a ldm/stm instruction to load/store the general registers from a __jmp_buf. */ -#define JMP_BUF_REGLIST {v1-v6, sl, fp, sp, lr} +# define JMP_BUF_REGLIST {v1-v6, sl, fp, sp, lr} /* Index of __jmp_buf where the sp register resides. */ -#define __JMP_BUF_SP 8 +# define __JMP_BUF_SP 8 +#endif #endif /* include/bits/setjmp.h */ -- Joseph S. Myers joseph@codesourcery.com