From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-ed1-x532.google.com (mail-ed1-x532.google.com [IPv6:2a00:1450:4864:20::532]) by sourceware.org (Postfix) with ESMTPS id D75B03858D28 for ; Thu, 21 Jul 2022 10:18:54 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org D75B03858D28 Received: by mail-ed1-x532.google.com with SMTP id w12so1520480edd.13 for ; Thu, 21 Jul 2022 03:18:54 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc:content-transfer-encoding; bh=VYCyBCTjIU24+Al9RTTMx3DE/BY9thieLWexJyWMsa0=; b=xmZKMx2DZz1ROvz944JHO2nFIzq/oQxlcyT//ipo6fLg4AzomzQm6vvfuSzfFcOjA1 HrNtspoCfaUulD6EL/TVMzFOTn0F0axsETihzV/vyJ8zfOWCqmn6Rdy0s8NdS/aMbuyk Jbm3tHTbWS2G3DsIcHEDH9mSL9BcCQH9JQiHGtVl8OqKiIwVOCWWJ46g6U0d7dqLk0lR sCDOTPJVgRTg53boIYnen3QJjr1TGAlFE3K/dvDOwdSZ4GkI5uR/bIAi1jPqxLPDjiLV qH1b+9oftupyyqa910cJU0oogDE3yYZJO4CZc8d8XpQfj2zzJW94qK5L6jwIVPQ9PtTq VYOg== X-Gm-Message-State: AJIora/DUok2U0r1t20Mg/RJH8FGwF1oGrwuS8WtYnN9qA5vftLv3LXO bzdMrTcWy1AsGVPnoH2+1zg0T9y/GkKar3jg+oM= X-Google-Smtp-Source: AGRyM1vMGtje6ZR1KMCIFgQG3EwURGnyA6Ci3qqEKQZf2op+VkoQjQDKS9wZrIf3HHFMBVerNxL9cTqg8RpO8/IbA0M= X-Received: by 2002:aa7:dd4b:0:b0:43a:d508:7cb9 with SMTP id o11-20020aa7dd4b000000b0043ad5087cb9mr56952629edw.218.1658398733326; Thu, 21 Jul 2022 03:18:53 -0700 (PDT) MIME-Version: 1.0 References: <7d96af3f-d1d2-6c09-3ddb-41ed51e5f208@suse.cz> In-Reply-To: <7d96af3f-d1d2-6c09-3ddb-41ed51e5f208@suse.cz> From: Richard Biener Date: Thu, 21 Jul 2022 12:18:40 +0200 Message-ID: Subject: Re: [PATCH] libsanitizer: cherry-pick 9cf13067cb5088626ba7 from upstream To: =?UTF-8?Q?Martin_Li=C5=A1ka?= Cc: GCC Patches , Andreas Schwab Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable X-Spam-Status: No, score=-8.1 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Jul 2022 10:18:56 -0000 On Mon, Jul 11, 2022 at 10:05 PM Martin Li=C5=A1ka wrote: > > I'm going to push the following cherry-pick which fixes libasan > build with top-of-tree glibc. Can you also push this to active branches please? > Martin > > 9cf13067cb5088626ba7ee1ec4c42ec59c7995a0 [sanitizer] Remove #include to resolve fsconfig_command/mount_attr conflict with glibc 2.36 > --- > .../sanitizer_platform_limits_posix.cpp | 10 ++++++---- > 1 file changed, 6 insertions(+), 4 deletions(-) > > diff --git a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posi= x.cpp b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp > index 8ed3e92d270..97fd07acf9d 100644 > --- a/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp > +++ b/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cpp > @@ -73,7 +73,9 @@ > #include > #include > #include > +#if SANITIZER_ANDROID > #include > +#endif > #include > #include > #include > @@ -869,10 +871,10 @@ unsigned struct_ElfW_Phdr_sz =3D sizeof(Elf_Phdr); > unsigned IOCTL_EVIOCGPROP =3D IOCTL_NOT_PRESENT; > unsigned IOCTL_EVIOCSKEYCODE_V2 =3D IOCTL_NOT_PRESENT; > #endif > - unsigned IOCTL_FS_IOC_GETFLAGS =3D FS_IOC_GETFLAGS; > - unsigned IOCTL_FS_IOC_GETVERSION =3D FS_IOC_GETVERSION; > - unsigned IOCTL_FS_IOC_SETFLAGS =3D FS_IOC_SETFLAGS; > - unsigned IOCTL_FS_IOC_SETVERSION =3D FS_IOC_SETVERSION; > + unsigned IOCTL_FS_IOC_GETFLAGS =3D _IOR('f', 1, long); > + unsigned IOCTL_FS_IOC_GETVERSION =3D _IOR('v', 1, long); > + unsigned IOCTL_FS_IOC_SETFLAGS =3D _IOW('f', 2, long); > + unsigned IOCTL_FS_IOC_SETVERSION =3D _IOW('v', 2, long); > unsigned IOCTL_GIO_CMAP =3D GIO_CMAP; > unsigned IOCTL_GIO_FONT =3D GIO_FONT; > unsigned IOCTL_GIO_UNIMAP =3D GIO_UNIMAP; > -- > 2.36.1 >