From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mail-wm1-x329.google.com (mail-wm1-x329.google.com [IPv6:2a00:1450:4864:20::329]) by sourceware.org (Postfix) with ESMTPS id 4A3E73858D1E for ; Fri, 30 Sep 2022 16:35:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4A3E73858D1E Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=adacore.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=adacore.com Received: by mail-wm1-x329.google.com with SMTP id n40-20020a05600c3ba800b003b49aefc35fso2481725wms.5 for ; Fri, 30 Sep 2022 09:35:16 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adacore.com; s=google; h=to:cc:date:message-id:subject:mime-version:from:from:to:cc:subject :date; bh=iIVLtdDe1Umt8w+SSddziuQ5GgBWNoHrKmU8hZhd0C8=; b=eDeS12KLQi5sgf4uuqE56bTDxvACRMqYiTdN7enxkHk+Flfl8RO0wOOBHo87CUuoXm aeqRhh3cEbIYOKVKiTqwyHyFT5VaCkuA0i0qKC8CcvWDWaSVyFNpZfAaILSKpOzFWOP5 rSMCKxh1sPiZBiGTg7kzLc3URPRDe67AEEeBEwuLjyJbvicBNVeRjIwzr3wY4nn8N61J pUqFfs5/ntr4BB4MwztkRk3qNzR+OsFJkw8ens7xCETvaIfsKXigUBjpyIHxJ0Kv++HR 96SqGYmXqvbVNiC1/aDKX7z33aaSDjtQdUBoMo+hRZ4CprnsYO6QHGJw9FLweaywH8vn 2EDA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:cc:date:message-id:subject:mime-version:from:x-gm-message-state :from:to:cc:subject:date; bh=iIVLtdDe1Umt8w+SSddziuQ5GgBWNoHrKmU8hZhd0C8=; b=g62M2IWwbZRU8PdCvvWLopMYDKy5kIF+l+ausz6Pocsnrn3NC4HsnaFcZL82ypyrEi dSIApb9dLRGKEhE5P1+KDaatb9czcHvjRFYgaA7Blo29Y/4ZjKIqXCBdkcw79O46dvpu J0xZbLUQm0m+m1VJtUpk87lVJVhwWg+f9Cla0A7W4AGVfoS9wHfAowfN9sNbYvtuoBjM lXv92HmX2DEGBjtL3EsHKRlKb3jPUhwAXawP5EFcUMgnBzTXvzA+hJ7cY6H8CkpKFLvc FeLAR8IwJB+gK4EgdebEX3po1TEn+9cq2IiAAzVP4AmsR98qqtyU7d6ClZ5lix9KbHWY JvRw== X-Gm-Message-State: ACrzQf39wvx7OqUplgPHLPdmNa4EYV6y9/dIWHZVkaqUXxVHc2jmP/jq nQ/li/3sSrHHZZWJNcbMqvpNQ37zjCgCTw== X-Google-Smtp-Source: AMsMyM5depL7SEfpWqqG6fvv+zaK1rchOAFpJqjw/U2LYDpV1YF0IXAJ142LS4ELO5kdeX1jPB96Wg== X-Received: by 2002:a1c:7c12:0:b0:3b4:73e1:bdd7 with SMTP id x18-20020a1c7c12000000b003b473e1bdd7mr15253674wmc.32.1664555715078; Fri, 30 Sep 2022 09:35:15 -0700 (PDT) Received: from smtpclient.apple ([45.147.211.82]) by smtp.gmail.com with ESMTPSA id v14-20020a5d678e000000b0022cc85140d9sm2496869wru.117.2022.09.30.09.35.14 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 30 Sep 2022 09:35:14 -0700 (PDT) From: Olivier Hainque Content-Type: multipart/mixed; boundary="Apple-Mail=_C384B9F0-E315-4D9A-9D39-6105B470872C" Mime-Version: 1.0 (Mac OS X Mail 14.0 \(3654.120.0.1.13\)) Subject: [PATCH] undef offsetof before defining it in stddef.h Message-Id: <3AFBDBC2-8140-4068-A595-8B1ED5C3CE4A@adacore.com> Date: Fri, 30 Sep 2022 18:35:14 +0200 Cc: Olivier Hainque To: gcc-patches X-Mailer: Apple Mail (2.3654.120.0.1.13) X-Spam-Status: No, score=-4.2 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,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 List-Id: --Apple-Mail=_C384B9F0-E315-4D9A-9D39-6105B470872C Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii Hello, The attached patch is a proposal to #undef offsetof before the #define we do in ginclude/stddef.h, which prevents redefinition warnings from dg tests passing -Wsystem-headers on systems which provide a definition in system headers, such as VxWorks. We have been using this for a while with gcc-11 based toolchains for a wide range of configurations (linux and windows hosts, native and cross, bare board or VxWorks for a range of CPUs). This also passes build + sanity test with gcc-12 for powerpc64-vxworks7r2, then full bootstrap + regression testing for mainline on x86_64-linux. Ok to commit? Thanks in advance! With Kind Regards, Olivier 2022-09-30 Olivier Hainque gcc/ * ginclude/stddef.h: #undef offsetof before #define. --Apple-Mail=_C384B9F0-E315-4D9A-9D39-6105B470872C Content-Disposition: attachment; filename=0003-undef-offsetof-before-defining-it-in-stddef.h.patch Content-Type: application/octet-stream; x-unix-mode=0640; name="0003-undef-offsetof-before-defining-it-in-stddef.h.patch" Content-Transfer-Encoding: quoted-printable =46rom=20365b8343d8f882926d817b81243990ff66945d7c=20Mon=20Sep=2017=20= 00:00:00=202001=0AFrom:=20Olivier=20Hainque=20=0A= Date:=20Fri,=2028=20Jan=202022=2016:34:50=20+0000=0ASubject:=20[PATCH=20= 03/18]=20undef=20offsetof=20before=20defining=20it=20in=20stddef.h=0A=0A= This=20prevents=20redefinition=20warnings=20by=20-Wsystem-headers=20on=0A= OSses=20where=20system=20headers=20happen=20to=20provide=20a=20= definition=20of=0Atheir=20own,=20such=20as=20VxWorks.=0A=0A2022-02-15=20=20= Olivier=20Hainque=20=20=0A=0Agcc/=0A=09*=20= ginclude/stddef.h:=20#undef=20offsetof=20before=20#define.=0A---=0A=20= gcc/ginclude/stddef.h=20|=201=20+=0A=201=20file=20changed,=201=20= insertion(+)=0A=0Adiff=20--git=20a/gcc/ginclude/stddef.h=20= b/gcc/ginclude/stddef.h=0Aindex=203d29213e8f1..2767edf51de=20100644=0A= ---=20a/gcc/ginclude/stddef.h=0A+++=20b/gcc/ginclude/stddef.h=0A@@=20= -412,6=20+412,7=20@@=20typedef=20__WINT_TYPE__=20wint_t;=0A=20#ifdef=20= _STDDEF_H=0A=20=0A=20/*=20Offset=20of=20member=20MEMBER=20in=20a=20= struct=20of=20type=20TYPE.=20*/=0A+#undef=20offsetof=09=09/*=20in=20case=20= a=20system=20header=20has=20defined=20it.=20*/=0A=20#define=20= offsetof(TYPE,=20MEMBER)=20__builtin_offsetof=20(TYPE,=20MEMBER)=0A=20=0A= =20#if=20(defined=20(__STDC_VERSION__)=20&&=20__STDC_VERSION__=20>=3D=20= 201112L)=20\=0A--=20=0A2.25.1=0A=0A= --Apple-Mail=_C384B9F0-E315-4D9A-9D39-6105B470872C Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset=us-ascii --Apple-Mail=_C384B9F0-E315-4D9A-9D39-6105B470872C--