From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 85548 invoked by alias); 19 Jul 2019 08:59:22 -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 85532 invoked by uid 89); 19 Jul 2019 08:59:22 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-16.3 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3 autolearn=ham version=3.3.1 spammy=HContent-Transfer-Encoding:8bit X-HELO: foss.arm.com Received: from foss.arm.com (HELO foss.arm.com) (217.140.110.172) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 19 Jul 2019 08:59:21 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id D150F1516; Fri, 19 Jul 2019 01:59:19 -0700 (PDT) Received: from [10.2.206.47] (e120808-lin.cambridge.arm.com [10.2.206.47]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 7A0863F71A; Fri, 19 Jul 2019 01:59:19 -0700 (PDT) Subject: Re: [ARM/FDPIC v5 19/21] [ARM][testsuite] FDPIC: Adjust pr43698.c to avoid clash with uclibc. To: Christophe Lyon , "gcc-patches@gcc.gnu.org" References: <20190515124006.25840-1-christophe.lyon@st.com> <20190515124006.25840-20-christophe.lyon@st.com> From: Kyrill Tkachov Message-ID: Date: Fri, 19 Jul 2019 09:00:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Thunderbird/60.7.1 MIME-Version: 1.0 In-Reply-To: <20190515124006.25840-20-christophe.lyon@st.com> Content-Type: text/plain; charset=windows-1252; format=flowed Content-Transfer-Encoding: 8bit X-SW-Source: 2019-07/txt/msg01288.txt.bz2 On 5/15/19 1:39 PM, Christophe Lyon wrote: > uclibc defines bswap_32, so use a different name in this test. > > 2019-XX-XX  Christophe Lyon  > >         gcc/testsuite/ >         * gcc.target/arm/pr43698.c (bswap_32): Rename as my_bswap_32. > Ok. This can go in independently of the others. Thanks, Kyrill > Change-Id: I2591bd911030814331cabf97ee5cf6cf8124b4f3 > > diff --git a/gcc/testsuite/gcc.target/arm/pr43698.c > b/gcc/testsuite/gcc.target/arm/pr43698.c > index 1fc497c..3b5dad0 100644 > --- a/gcc/testsuite/gcc.target/arm/pr43698.c > +++ b/gcc/testsuite/gcc.target/arm/pr43698.c > @@ -6,7 +6,7 @@ > >  char do_reverse_endian = 0; > > -#  define bswap_32(x) \ > +#  define my_bswap_32(x) \ >    ((((x) & 0xff000000) >> 24) | \ >     (((x) & 0x00ff0000) >>  8) | \ >     (((x) & 0x0000ff00) <<  8) | \ > @@ -16,7 +16,7 @@ char do_reverse_endian = 0; >    (__extension__ ({ \ >        uint64_t __res; \ >        if (!do_reverse_endian) {    __res = (X); \ > -      } else if (sizeof(X) == 4) { __res = bswap_32((X)); \ > +      } else if (sizeof(X) == 4) { __res = my_bswap_32((X)); \ >        } \ >        __res; \ >      })) > -- > 2.6.3 >