From patchwork Fri Dec 10 23:23:29 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Iain Sandoe X-Patchwork-Id: 48813 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 4DF833857C7A for ; Fri, 10 Dec 2021 23:24:06 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 4DF833857C7A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1639178646; bh=k/o9Cufy6+GEGCvd+ZnJ/JhMx9oMpjWUTUN4iNqCZOs=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=pzPBZkTrhu1rgtZOVswaNKeDs7JxzZqdosU83+Iy6zZmwP7DFf8rH7apu+3Ih+DRz 8wX9ATMjcl6TLojLdTOxLd6BWBPOBWp4BuFaO9afq5O0n0DyN2VOomasv4etx8qzzO MJBJTbIMF+TlHWVH4eYKYpgGAxTFqowvuuLbWP2c= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x330.google.com (mail-wm1-x330.google.com [IPv6:2a00:1450:4864:20::330]) by sourceware.org (Postfix) with ESMTPS id 62A263858405 for ; Fri, 10 Dec 2021 23:23:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 62A263858405 Received: by mail-wm1-x330.google.com with SMTP id p3-20020a05600c1d8300b003334fab53afso10124300wms.3 for ; Fri, 10 Dec 2021 15:23:36 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:reply-to :mime-version:content-transfer-encoding; bh=k/o9Cufy6+GEGCvd+ZnJ/JhMx9oMpjWUTUN4iNqCZOs=; b=QLwJLWx+9LxIYDBXBk1uOOYN3ytHULGKN63XiL0bB9X23K2jtNNHdvTWa09teTOqe2 uOS/dgZf2ZY/YxnszD/Kkrgmr+FzvS+8uh59rP65Gph0AtW0qrm//YT2kkUmmag0HVUx 9yXKK2jXDAosAACanq/iwpd2ViGAkGZRuFzRbfh4Y6sMcXMJC5gRaTd3CxwSuzx762EC D/Wo94ys79I7pIjDb/sPDRBR00cN0loayEUqKscW3jK7V68BNtKOsD/POOK32fNHjg+V /4v0wyi4ROunGzH/ExMQl/ZCwxB7U21KKYvLT6/n0QwK6ZhfeJh22F0y1A+xZvBa8DC8 rkZw== X-Gm-Message-State: AOAM533vabjGIj4qOjyo2iXL6xuhSJSSY+KWi1dehNgWsI33BYslGK8X uFAPwoRZ698w9o0maLyrINhfXN+5Cms= X-Google-Smtp-Source: ABdhPJxPGPOjfUqPr0dM5SPeD2TbEDOhC+zoBueZY7eOsbz+9T4DPZ36jNqpmgTS9GiD2pSFUZnkZQ== X-Received: by 2002:a1c:e918:: with SMTP id q24mr20889087wmc.108.1639178615443; Fri, 10 Dec 2021 15:23:35 -0800 (PST) Received: from localhost.localdomain (host81-138-1-83.in-addr.btopenworld.com. [81.138.1.83]) by smtp.gmail.com with ESMTPSA id o9sm3607531wrs.4.2021.12.10.15.23.34 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Fri, 10 Dec 2021 15:23:35 -0800 (PST) X-Google-Original-From: Iain Sandoe To: gcc-patches@gcc.gnu.org Subject: [PATCH] configure: Account CXXFLAGS in gcc-plugin.m4. Date: Fri, 10 Dec 2021 23:23:29 +0000 Message-Id: <20211210232329.9649-1-iain@sandoe.co.uk> X-Mailer: git-send-email 2.24.3 (Apple Git-128) MIME-Version: 1.0 X-Spam-Status: No, score=-8.5 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.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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-Patchwork-Original-From: Iain Sandoe via Gcc-patches From: Iain Sandoe Reply-To: iain@sandoe.co.uk Cc: Iain Sandoe Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" While doing tests of the PCH changes, I noticed that all the plugin tests were being omitted from m32 Darwin under some permutations of flags. It turned out to be a broken config test - it was not removing -mdynamic-no-pic properly. We now use a C++ compiler so that we need to process CXXFLAGS as well as CFLAGS in the gcc-plugin config fragment. Tested on i686, x86_64-darwin, x86_64, powerpc64le-linux OK for master? backports? Signed-off-by: Iain Sandoe config/ChangeLog: * gcc-plugin.m4: Save and process CXXFLAGS. gcc/ChangeLog: * configure: Regenerate. libcc1/ChangeLog: * configure: Regenerate. --- config/gcc-plugin.m4 | 5 +++++ gcc/configure | 5 +++++ libcc1/configure | 5 +++++ 3 files changed, 15 insertions(+) diff --git a/config/gcc-plugin.m4 b/config/gcc-plugin.m4 index 8f278719118..7ee342fe5fe 100644 --- a/config/gcc-plugin.m4 +++ b/config/gcc-plugin.m4 @@ -91,14 +91,18 @@ AC_DEFUN([GCC_ENABLE_PLUGINS], # Check that we can build shared objects with -fPIC -shared saved_LDFLAGS="$LDFLAGS" saved_CFLAGS="$CFLAGS" + saved_CXXFLAGS="$CXXFLAGS" case "${host}" in *-*-darwin*) CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g` CFLAGS="$CFLAGS -fPIC" + CXXFLAGS=`echo $CXXFLAGS | sed s/-mdynamic-no-pic//g` + CXXFLAGS="$CXXFLAGS -fPIC" LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup" ;; *) CFLAGS="$CFLAGS -fPIC" + CXXFLAGS="$CXXFLAGS -fPIC" LDFLAGS="$LDFLAGS -fPIC -shared" ;; esac @@ -113,6 +117,7 @@ AC_DEFUN([GCC_ENABLE_PLUGINS], fi LDFLAGS="$saved_LDFLAGS" CFLAGS="$saved_CFLAGS" + CXXFLAGS="$saved_CXXFLAGS" # If plugin support had been requested but not available, fail. if test x"$enable_plugin" = x"no" ; then diff --git a/gcc/configure b/gcc/configure index de20e5d2629..5470987b62f 100755 --- a/gcc/configure +++ b/gcc/configure @@ -32038,14 +32038,18 @@ fi # Check that we can build shared objects with -fPIC -shared saved_LDFLAGS="$LDFLAGS" saved_CFLAGS="$CFLAGS" + saved_CXXFLAGS="$CXXFLAGS" case "${host}" in *-*-darwin*) CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g` CFLAGS="$CFLAGS -fPIC" + CXXFLAGS=`echo $CXXFLAGS | sed s/-mdynamic-no-pic//g` + CXXFLAGS="$CXXFLAGS -fPIC" LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup" ;; *) CFLAGS="$CFLAGS -fPIC" + CXXFLAGS="$CXXFLAGS -fPIC" LDFLAGS="$LDFLAGS -fPIC -shared" ;; esac @@ -32077,6 +32081,7 @@ rm -f core conftest.err conftest.$ac_objext \ fi LDFLAGS="$saved_LDFLAGS" CFLAGS="$saved_CFLAGS" + CXXFLAGS="$saved_CXXFLAGS" # If plugin support had been requested but not available, fail. if test x"$enable_plugin" = x"no" ; then diff --git a/libcc1/configure b/libcc1/configure index b198b0b9074..01cfb2806da 100755 --- a/libcc1/configure +++ b/libcc1/configure @@ -15141,14 +15141,18 @@ fi # Check that we can build shared objects with -fPIC -shared saved_LDFLAGS="$LDFLAGS" saved_CFLAGS="$CFLAGS" + saved_CXXFLAGS="$CXXFLAGS" case "${host}" in *-*-darwin*) CFLAGS=`echo $CFLAGS | sed s/-mdynamic-no-pic//g` CFLAGS="$CFLAGS -fPIC" + CXXFLAGS=`echo $CXXFLAGS | sed s/-mdynamic-no-pic//g` + CXXFLAGS="$CXXFLAGS -fPIC" LDFLAGS="$LDFLAGS -shared -undefined dynamic_lookup" ;; *) CFLAGS="$CFLAGS -fPIC" + CXXFLAGS="$CXXFLAGS -fPIC" LDFLAGS="$LDFLAGS -fPIC -shared" ;; esac @@ -15180,6 +15184,7 @@ rm -f core conftest.err conftest.$ac_objext \ fi LDFLAGS="$saved_LDFLAGS" CFLAGS="$saved_CFLAGS" + CXXFLAGS="$saved_CXXFLAGS" # If plugin support had been requested but not available, fail. if test x"$enable_plugin" = x"no" ; then