From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 55149 invoked by alias); 24 Nov 2015 11:55:39 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 54157 invoked by uid 89); 24 Nov 2015 11:55:39 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.0 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY,RP_MATCHES_RCVD,SPF_HELO_PASS autolearn=no version=3.3.2 X-HELO: mailout3.w1.samsung.com Received: from mailout3.w1.samsung.com (HELO mailout3.w1.samsung.com) (210.118.77.13) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Tue, 24 Nov 2015 11:55:37 +0000 Received: from eucpsbgm1.samsung.com (unknown [203.254.199.244]) by mailout3.w1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTP id <0NYB00BB2IGLKVA0@mailout3.w1.samsung.com> for gcc-patches@gcc.gnu.org; Tue, 24 Nov 2015 11:55:33 +0000 (GMT) Received: from eusync1.samsung.com ( [203.254.199.211]) by eucpsbgm1.samsung.com (EUCPMTA) with SMTP id C1.7A.16778.43054565; Tue, 24 Nov 2015 11:55:32 +0000 (GMT) Received: from [106.109.128.194] by eusync1.samsung.com (Oracle Communications Messaging Server 7.0.5.31.0 64bit (built May 5 2014)) with ESMTPA id <0NYB006OIIGKKW90@eusync1.samsung.com>; Tue, 24 Nov 2015 11:55:32 +0000 (GMT) Subject: Re: [PATCH 1/2] Libsanitizer merge from upstream r253555. To: Jakub Jelinek , Christophe Lyon References: <20151123132411.GB5675@tucnak.redhat.com> <565416E9.3080905@partner.samsung.com> <20151124082523.GK5675@tucnak.redhat.com> <56542184.5040003@partner.samsung.com> <20151124083833.GL5675@tucnak.redhat.com> <565426A4.1050804@partner.samsung.com> <20151124111210.GO5675@tucnak.redhat.com> <20151124112731.GP5675@tucnak.redhat.com> Cc: Kostya Serebryany , GCC Patches , Yury Gribov , Vyacheslav Barinov , Slava Garbuzov , Adhemerval Zanella From: Maxim Ostapenko Message-id: <5654502E.3010100@partner.samsung.com> Date: Tue, 24 Nov 2015 11:57:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.3.0 MIME-version: 1.0 In-reply-to: <20151124112731.GP5675@tucnak.redhat.com> Content-type: multipart/mixed; boundary=------------080708050608000206070008 X-IsSubscribed: yes X-SW-Source: 2015-11/txt/msg02878.txt.bz2 This is a multi-part message in MIME format. --------------080708050608000206070008 Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 7bit Content-length: 2064 On 24/11/15 14:27, Jakub Jelinek wrote: > On Tue, Nov 24, 2015 at 12:23:05PM +0100, Christophe Lyon wrote: >> On 24 November 2015 at 12:12, Jakub Jelinek wrote: >>> On Tue, Nov 24, 2015 at 12:08:13PM +0100, Christophe Lyon wrote: >>>>> Sure. >>>>> I had a build in progress with your proposed patch, but it didn't >>>>> complete before you committed :-) >>>>> >>>> So... it still does not work for me. I re-tried several times, made sure I had >>>> everything cleanup before starting new builds from scratch, hence the delay. >>>> >>>> I'm still seeing: >>>> /tmp/2050111_1.tmpdir/aci-gcc-fsf/sources/gcc-fsf/gccsrc/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc:326:44: >>>> error: 'ARM_VFPREGS_SIZE' was not declared in this scope >>>> unsigned struct_user_vfpregs_struct_sz = ARM_VFPREGS_SIZE; >>> So cut'n'paste the sanitizer_platform_limits_posix.cc compilation command >>> line and replace -c with -E -dD, then look if the wrapper asm/ptrace.h is >>> included or not and why? >>> >> It pulls the one from the sysroot: >> sysroot-arm-none-linux-gnueabihf/usr/include/asm/ptrace.h >> (I configure GCC --with-sysroot=XXX) > Then you should figure out where the sysroot include dirs are added in the > sanitizer_common/Makefile and make sure -isystem $(top_srcdir)/include/system > comes before that. > > Jakub > It seems that I placed new header into wrong directory, it should be libsanitizer/include/system/asm/ptrace.h instead of libsanitizer/include/system/linux/asm/ptrace.h This should work: $ cat .libs/sanitizer_platform_limits_posix.i ..... # 1 "/home/max/workspace/downloads/gcc/libsanitizer/include/system/asm/ptrace.h" 1 3 4 # 1 "/home/max/install/armv7l-tizen/armv7l-tizen-linux-gnueabi/sys-root/usr/include/asm/ptrace.h" 1 3 4 # 11 "/home/max/install/armv7l-tizen/armv7l-tizen-linux-gnueabi/sys-root/usr/include/asm/ptrace.h" 3 4 #define __ASM_ARM_PTRACE_H~ # 1 "/home/max/install/armv7l-tizen/armv7l-tizen-linux-gnueabi/sys-root/usr/include/asm/hwcap.h" 1 3 4 #define __ASMARM_HWCAP_H~ ..... --------------080708050608000206070008 Content-Type: text/x-patch; name="old-kernels-local-3.diff" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="old-kernels-local-3.diff" Content-length: 1571 diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index c392c57..895d3bd 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,5 +1,10 @@ 2015-11-24 Maxim Ostapenko + * include/system/linux/asm/ptrace.h: Move to ... + * include/system/asm/ptrace.h: ... this. + +2015-11-24 Maxim Ostapenko + * include/system/linux/asm/ptrace.h: New header. 2015-11-23 Maxim Ostapenko diff --git a/libsanitizer/include/system/asm/ptrace.h b/libsanitizer/include/system/asm/ptrace.h new file mode 100644 index 0000000..5d2fe9b --- /dev/null +++ b/libsanitizer/include/system/asm/ptrace.h @@ -0,0 +1,7 @@ +#include_next +/* ARM_VFPREGS_SIZE has been added in 3.0 */ +#if defined(__arm__) && !defined(ARM_VFPREGS_SIZE) +/* The size of the user-visible VFP state as seen by PTRACE_GET/SETVFPREGS + and core dumps. */ +#define ARM_VFPREGS_SIZE ( 32 * 8 /*fpregs*/ + 4 /*fpscr*/ ) +#endif diff --git a/libsanitizer/include/system/linux/asm/ptrace.h b/libsanitizer/include/system/linux/asm/ptrace.h deleted file mode 100644 index d4249fe..0000000 --- a/libsanitizer/include/system/linux/asm/ptrace.h +++ /dev/null @@ -1,7 +0,0 @@ -#include_next -/* ARM_VFPREGS_SIZE has been added in 3.0 */ -#if defined(__arm__) && !defined(ARM_VFPREGS_SIZE) -/* The size of the user-visible VFP state as seen by PTRACE_GET/SETVFPREGS - and core dumps. */ -#define ARM_VFPREGS_SIZE ( 32 * 8 /*fpregs*/ + 4 /*fpscr*/ ) -#endif --------------080708050608000206070008--