From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1698) id 910363858436; Tue, 17 Aug 2021 19:04:20 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 910363858436 MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Iain D Sandoe To: gcc-cvs@gcc.gnu.org Subject: [gcc r12-2972] Darwin, libcc1: Handle hosts with mdynamic-no-pic support. X-Act-Checkin: gcc X-Git-Author: Iain Sandoe X-Git-Refname: refs/heads/master X-Git-Oldrev: 0edf2e81bb02cba43b649b3f6e7258b68a779ac0 X-Git-Newrev: b240450b630da511fadda98bba4862033ff56950 Message-Id: <20210817190420.910363858436@sourceware.org> Date: Tue, 17 Aug 2021 19:04:20 +0000 (GMT) X-BeenThere: gcc-cvs@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-cvs mailing list List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 17 Aug 2021 19:04:20 -0000 https://gcc.gnu.org/g:b240450b630da511fadda98bba4862033ff56950 commit r12-2972-gb240450b630da511fadda98bba4862033ff56950 Author: Iain Sandoe Date: Sun Jul 4 17:56:05 2021 +0100 Darwin, libcc1: Handle hosts with mdynamic-no-pic support. The default for building host-side binaries for mdynamic-no-pic hosts is to enable this. However, it is not compatible with dynamic libraries, so must be switched off for libcc1. Signed-off-by: Iain Sandoe libcc1/ChangeLog: * Makefile.am: Switch mdynamic-no-pic to fPIC. * Makefile.in: Regenerated. Diff: --- libcc1/Makefile.am | 1 + libcc1/Makefile.in | 1 + 2 files changed, 2 insertions(+) diff --git a/libcc1/Makefile.am b/libcc1/Makefile.am index 9ec021030e2..49a9543ea7d 100644 --- a/libcc1/Makefile.am +++ b/libcc1/Makefile.am @@ -27,6 +27,7 @@ AM_CXXFLAGS = $(WARN_FLAGS) $(WERROR) $(visibility) $(CET_HOST_FLAGS) if DARWIN_DYNAMIC_LOOKUP AM_CXXFLAGS += -Wl,-undefined,dynamic_lookup endif +override CXXFLAGS := $(subst -mdynamic-no-pic,-fPIC,$(CXXFLAGS)) override CXXFLAGS := $(filter-out -fsanitize=address,$(CXXFLAGS)) override LDFLAGS := $(filter-out -fsanitize=address,$(LDFLAGS)) # Can be simplified when libiberty becomes a normal convenience library. diff --git a/libcc1/Makefile.in b/libcc1/Makefile.in index 395f01a9821..f8f590d71e9 100644 --- a/libcc1/Makefile.in +++ b/libcc1/Makefile.in @@ -810,6 +810,7 @@ uninstall-am: uninstall-cc1libLTLIBRARIES uninstall-pluginLTLIBRARIES .PRECIOUS: Makefile +override CXXFLAGS := $(subst -mdynamic-no-pic,-fPIC,$(CXXFLAGS)) override CXXFLAGS := $(filter-out -fsanitize=address,$(CXXFLAGS)) override LDFLAGS := $(filter-out -fsanitize=address,$(LDFLAGS))