From patchwork Tue Nov 20 20:57:05 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Miller X-Patchwork-Id: 200518 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) by ozlabs.org (Postfix) with SMTP id A92D42C0098 for ; Wed, 21 Nov 2012 07:57:23 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1354049844; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Date: Message-Id:To:CC:Subject:From:Mime-Version:Content-Type: Content-Transfer-Encoding:Mailing-List:Precedence:List-Id: List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=1+ofiaTC40M2b3697zqZ3l48BhU=; b=fzxeJ+kxWU327ye bQIC+Yz0A39lqfrKCKj3YtbShz8gA1uWpfSn68d3Lzi3KS940UGfK6zcvci/biad ZR/WnieuEwvM0kX6R0bWhtA9LzZbvkNpDYZlQeVeKyHCVuuV8UcOAiCpnFx8QrWR eHR/La4KnZUPgCTlQovcDKE8MhiY= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Date:Message-Id:To:CC:Subject:From:Mime-Version:Content-Type:Content-Transfer-Encoding:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=O6UsGdVq6eYQgI18PTaudeY2e6VV+hj1iZcTf8TxGyNl9Bp5+O9rng6ZyDzOaM dNz8W5NjgLypbrIdcCbQTV6QIEefOcRyoTT9JaHOVWuV3GQuPirLKQsOcKmLh2zi wBvkN0xClkaDcFHaQjLC5Y0WNKMYkmLiHDRFqOSR7C44k=; Received: (qmail 29692 invoked by alias); 20 Nov 2012 20:57:14 -0000 Received: (qmail 29644 invoked by uid 22791); 20 Nov 2012 20:57:13 -0000 X-SWARE-Spam-Status: No, hits=-2.3 required=5.0 tests=AWL,BAYES_00,TW_SV X-Spam-Check-By: sourceware.org Received: from shards.monkeyblade.net (HELO shards.monkeyblade.net) (149.20.54.216) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 20 Nov 2012 20:57:06 +0000 Received: from localhost (cpe-66-108-117-132.nyc.res.rr.com [66.108.117.132]) by shards.monkeyblade.net (Postfix) with ESMTPSA id 813F758433E; Tue, 20 Nov 2012 12:57:08 -0800 (PST) Date: Tue, 20 Nov 2012 15:57:05 -0500 (EST) Message-Id: <20121120.155705.982750470062898456.davem@davemloft.net> To: gcc-patches@gcc.gnu.org CC: konstantin.s.serebryany@gmail.com Subject: [PATCH] Fix sanitizer build on sparc64. From: David Miller Mime-Version: 1.0 X-IsSubscribed: yes Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org [ Sorry, flubbed the gcc-patches address the first time. ] libsanitizer/ * sanitizer_common/sanitizer_linux.cc (SANITIZER_LINUX_USES_64BIT_SYSCALLS): Define. (internal_mmap): Use it. (internal_filesize): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@193676 138bc75d-0d04-0410-961f-82ee72b054a4 --- libsanitizer/ChangeLog | 7 +++++++ libsanitizer/sanitizer_common/sanitizer_linux.cc | 13 +++++++++++-- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 7aade50..22f65b2 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,10 @@ +2012-11-20 Konstantin Serebryany + + * sanitizer_common/sanitizer_linux.cc + (SANITIZER_LINUX_USES_64BIT_SYSCALLS): Define. + (internal_mmap): Use it. + (internal_filesize): Likewise. + 2012-11-16 Tom Tromey * configure.ac: Invoke AM_MAINTAINER_MODE. diff --git a/libsanitizer/sanitizer_common/sanitizer_linux.cc b/libsanitizer/sanitizer_common/sanitizer_linux.cc index e90a68c..f2a0d39 100644 --- a/libsanitizer/sanitizer_common/sanitizer_linux.cc +++ b/libsanitizer/sanitizer_common/sanitizer_linux.cc @@ -29,12 +29,21 @@ #include #include +// Are we using 32-bit or 64-bit syscalls? +// x32 (which defines __x86_64__) has __WORDSIZE == 32 +// but it still needs to use 64-bit syscalls. +#if defined(__x86_64__) || __WORDSIZE == 64 +# define SANITIZER_LINUX_USES_64BIT_SYSCALLS 1 +#else +# define SANITIZER_LINUX_USES_64BIT_SYSCALLS 0 +#endif + namespace __sanitizer { // --------------- sanitizer_libc.h void *internal_mmap(void *addr, uptr length, int prot, int flags, int fd, u64 offset) { -#if defined __x86_64__ +#if SANITIZER_LINUX_USES_64BIT_SYSCALLS return (void *)syscall(__NR_mmap, addr, length, prot, flags, fd, offset); #else return (void *)syscall(__NR_mmap2, addr, length, prot, flags, fd, offset); @@ -67,7 +76,7 @@ uptr internal_write(fd_t fd, const void *buf, uptr count) { } uptr internal_filesize(fd_t fd) { -#if defined __x86_64__ +#if SANITIZER_LINUX_USES_64BIT_SYSCALLS struct stat st; if (syscall(__NR_fstat, fd, &st)) return -1;