From patchwork Wed Feb 13 16:07:53 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jakub Jelinek X-Patchwork-Id: 220193 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 98FAF2C007C for ; Thu, 14 Feb 2013 03:08:10 +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=1361376490; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: Received:Received:Date:From:To:Cc:Subject:Message-ID:Reply-To: MIME-Version:Content-Type:Content-Disposition:User-Agent: Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:Sender:Delivered-To; bh=GV3+sCw6YYqAOQwxLD2N MVdf60k=; b=hcS/0MJsvXd9nCjwzp/+FJRzaH6habKvqzVbE7DMCX8/H4D/GsSR iXTeK8FWkN/pLBRxwa5bOzq9rzs3YUVs5XAfGoTA88wR4ua2y+AW0G5yvPh+p4st tiGqFz6YA02NgdwT8OcR1WQ/M5uxrzdkPsWc6vBIGd+aWCPdt3PGFSo= 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:Received:Received:Received:Date:From:To:Cc:Subject:Message-ID:Reply-To:MIME-Version:Content-Type:Content-Disposition:User-Agent:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=KfpiDwSdiqp/bFYQFw0NkVyJHq3qBsL5ZCUs4PAd3Nc5rVMnEHQiUoND1Sw61o genzPDPX3Mq4IkbUjgY2aDYiSioWM1q91DVGafrhmXe1BIxEqv9dE8SsDKiWAM9i L729gEA5g4Rnn49yd92+yw/CYGFfJrrBJodkTg4D7Wk8k=; Received: (qmail 26591 invoked by alias); 13 Feb 2013 16:08:05 -0000 Received: (qmail 26580 invoked by uid 22791); 13 Feb 2013 16:08:04 -0000 X-SWARE-Spam-Status: No, hits=-6.3 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_SPAMHAUS_DROP, RCVD_IN_DNSWL_HI, RCVD_IN_HOSTKARMA_W, RP_MATCHES_RCVD, SPF_HELO_PASS X-Spam-Check-By: sourceware.org Received: from mx1.redhat.com (HELO mx1.redhat.com) (209.132.183.28) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 13 Feb 2013 16:07:56 +0000 Received: from int-mx01.intmail.prod.int.phx2.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) by mx1.redhat.com (8.14.4/8.14.4) with ESMTP id r1DG7ube024309 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=OK); Wed, 13 Feb 2013 11:07:56 -0500 Received: from zalov.redhat.com (vpn1-6-84.ams2.redhat.com [10.36.6.84]) by int-mx01.intmail.prod.int.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id r1DG7sJ5004095 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Wed, 13 Feb 2013 11:07:55 -0500 Received: from zalov.cz (localhost [127.0.0.1]) by zalov.redhat.com (8.14.5/8.14.5) with ESMTP id r1DG7rAO032237; Wed, 13 Feb 2013 17:07:53 +0100 Received: (from jakub@localhost) by zalov.cz (8.14.5/8.14.5/Submit) id r1DG7rGF032236; Wed, 13 Feb 2013 17:07:53 +0100 Date: Wed, 13 Feb 2013 17:07:53 +0100 From: Jakub Jelinek To: Konstantin Serebryany Cc: gcc-patches@gcc.gnu.org Subject: [committed] Revert 0x7fff8000 shadow offset for now Message-ID: <20130213160753.GY4385@tucnak.redhat.com> Reply-To: Jakub Jelinek MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) 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 Hi! So that we don't keep GCC trunk in known broken state, I've bootstrapped/regtested this change and installed it. 2013-02-13 Jakub Jelinek * config/i386/i386.c (ix86_asan_shadow_offset): Revert last change. * asan/asan_mapping.h (SHADOW_OFFSET): Set to (1ULL << 44) on x86-64. Jakub --- gcc/config/i386/i386.c.jj 2013-02-13 11:53:42.000000000 +0100 +++ gcc/config/i386/i386.c 2013-02-13 14:15:19.670007874 +0100 @@ -5436,8 +5436,7 @@ ix86_legitimate_combined_insn (rtx insn) static unsigned HOST_WIDE_INT ix86_asan_shadow_offset (void) { - return TARGET_LP64 ? (TARGET_MACHO ? (HOST_WIDE_INT_1 << 44) - : HOST_WIDE_INT_C (0x7fff8000)) + return TARGET_LP64 ? (HOST_WIDE_INT_1 << 44) : (HOST_WIDE_INT_1 << 29); } --- libsanitizer/asan/asan_mapping.h.jj 2013-02-13 11:53:43.000000000 +0100 +++ libsanitizer/asan/asan_mapping.h 2013-02-13 14:20:34.032179688 +0100 @@ -36,11 +36,7 @@ extern SANITIZER_INTERFACE_ATTRIBUTE upt # if defined(__powerpc64__) # define SHADOW_OFFSET (1ULL << 41) # else -# if ASAN_MAC -# define SHADOW_OFFSET (1ULL << 44) -# else -# define SHADOW_OFFSET 0x7fff8000ULL -# endif +# define SHADOW_OFFSET (1ULL << 44) # endif # endif # endif