From patchwork Fri Dec 26 21:22:28 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Chris Metcalf X-Patchwork-Id: 4435 Received: (qmail 22267 invoked by alias); 26 Dec 2014 21:24:36 -0000 Mailing-List: contact libc-alpha-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: libc-alpha-owner@sourceware.org Delivered-To: mailing list libc-alpha@sourceware.org Received: (qmail 22257 invoked by uid 89); 26 Dec 2014 21:24:35 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.6 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.2 X-HELO: emea01-db3-obe.outbound.protection.outlook.com Message-ID: <201412262124.sBQLORk7021794@farm-0002.internal.tilera.com> From: Chris Metcalf Date: Fri, 26 Dec 2014 16:22:28 -0500 Subject: [COMMITTED] tilegx: fix sysdep.h to avoid a redefinition warning To: X-EOPAttributedMessage: 0 Received-SPF: Fail (protection.outlook.com: domain of ezchip.com does not designate 12.216.194.146 as permitted sender) receiver=protection.outlook.com; client-ip=12.216.194.146; helo=farm-0002.internal.tilera.com; Authentication-Results: spf=fail (sender IP is 12.216.194.146) smtp.mailfrom=cmetcalf@ezchip.com; X-Forefront-Antispam-Report: CIP:12.216.194.146; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10009020)(6009001)(339900001)(189002)(199003)(377424004)(21056001)(575784001)(99396003)(105606002)(86362001)(87936001)(50466002)(6806004)(19580405001)(54356999)(107886001)(62966003)(450100001)(68736005)(110136001)(50986999)(229853001)(120916001)(103666002)(104016003)(107046002)(106356001)(47776003)(19580395003)(20776003)(64706001)(106476002)(42186005)(4396001)(48376002)(46102003)(106466001)(77156002)(97736003)(2351001); DIR:OUT; SFP:1101; SCL:1; SRVR:AM2PR02MB306; H:farm-0002.internal.tilera.com; FPR:; SPF:Fail; MLV:sfv; PTR:InfoNoRecords; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Antispam: UriScan:; X-Microsoft-Antispam: BCL:0;PCL:0;RULEID:;SRVR:AM2PR02MB306; X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004); SRVR:AM2PR02MB306; X-Forefront-PRVS: 04371797A5 X-Exchange-Antispam-Report-CFA-Test: BCL:0;PCL:0;RULEID:;SRVR:AM2PR02MB306; X-OriginatorOrg: ezchip.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 Dec 2014 21:24:28.0913 (UTC) X-MS-Exchange-CrossTenant-Id: 0fc16e0a-3cd3-4092-8b2f-0a42cff122c3 X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=0fc16e0a-3cd3-4092-8b2f-0a42cff122c3; Ip=[12.216.194.146] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM2PR02MB306 The symbol for HAVE_CLOCK_GETTIME_VSYSCALL was being only conditionally defined under [SHARED]. However, it turns out this causes a preprocessor symbol redefinition warning when building clock_gettime.o. Move the symbol definition down to make it unconditional, like other platforms do. --- ChangeLog | 4 ++++ sysdeps/unix/sysv/linux/tile/sysdep.h | 6 +++--- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3b01ed88d4da..1dc4798eb034 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,9 @@ 2014-12-26 Chris Metcalf + * sysdeps/unix/sysv/linux/tile/sysdep.h + (HAVE_CLOCK_GETTIME_VSYSCALL): Move definition out of + assembly-specific section to avoid a redefinition warning. + * sysdeps/tile/jmpbuf-unwind.h (_JMPBUF_CFA_UNWINDS_ADJ): Cast to long before casting to pointer to avoid a cast warning. diff --git a/sysdeps/unix/sysv/linux/tile/sysdep.h b/sysdeps/unix/sysv/linux/tile/sysdep.h index d3b98bd359a0..143a0c4cb600 100644 --- a/sysdeps/unix/sysv/linux/tile/sysdep.h +++ b/sysdeps/unix/sysv/linux/tile/sysdep.h @@ -252,9 +252,6 @@ v_ret; \ }) -/* List of system calls which are supported as vsyscalls. */ -# define HAVE_CLOCK_GETTIME_VSYSCALL 1 - # else # define INLINE_VSYSCALL(name, nr, args...) \ INLINE_SYSCALL (name, nr, ##args) @@ -263,6 +260,9 @@ # endif #endif /* not __ASSEMBLER__ */ +/* List of system calls which are supported as vsyscalls. */ +#define HAVE_CLOCK_GETTIME_VSYSCALL 1 + /* Pointer mangling support. */ #if IS_IN (rtld) /* We cannot use the thread descriptor because in ld.so we use setjmp