From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) by sourceware.org (Postfix) with ESMTP id 4A71F3858D37 for ; Sat, 12 Feb 2022 06:36:25 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4A71F3858D37 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gentoo.org Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gentoo.org Received: by smtp.gentoo.org (Postfix, from userid 559) id C0932342E00; Sat, 12 Feb 2022 06:36:24 +0000 (UTC) From: Mike Frysinger To: newlib@sourceware.org Cc: Jeff Law Subject: [PATCH/committed] libgloss: bfin: fix local header usage after automake move Date: Sat, 12 Feb 2022 01:36:25 -0500 Message-Id: <20220212063625.23103-1-vapier@gentoo.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <35cc6015-d380-be7a-6441-d787d06ceec3@gmail.com> References: <35cc6015-d380-be7a-6441-d787d06ceec3@gmail.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE 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: newlib@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Feb 2022 06:36:27 -0000 Compiling the basiccrt .S files missed an include to the local bfin/ headers causing the build to break when installing anew. Reported-by: Jeff Law --- libgloss/Makefile.in | 21 +++++++++++---------- libgloss/bfin/Makefile.inc | 22 ++++++++++++---------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/libgloss/bfin/Makefile.inc b/libgloss/bfin/Makefile.inc index 35e880809a0e..47ba12c064ca 100644 --- a/libgloss/bfin/Makefile.inc +++ b/libgloss/bfin/Makefile.inc @@ -1,3 +1,5 @@ +%C%_CPPFLAGS = -I$(srcdir)/%D%/include + # Here is all of the simulator stuff. multilibtool_LIBRARIES += %D%/libsim.a %C%_libsim_a_SOURCES = \ @@ -5,7 +7,7 @@ multilibtool_LIBRARIES += %D%/libsim.a %D%/syscalls.c %C%_libsim_a_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -I$(srcdir)/%D/include + $(%C%_CPPFLAGS) check_PROGRAMS += %D%/sim-test @@ -51,21 +53,21 @@ multilibtool_LIBRARIES += %D%/libbfinbsp.a %D%/_exit.c %C%_libbfinbsp_a_CPPFLAGS = \ $(AM_CPPFLAGS) \ - -I$(srcdir)/%D/include + $(%C%_CPPFLAGS) %D%/basiccrt.$(OBJEXT): %D%/basiccrt.S - $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),,-mcpu=bf532-any) + $(AM_V_CC)$(COMPILE) $(%C%_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),,-mcpu=bf532-any) %D%/basiccrts.$(OBJEXT): %D%/basiccrt.S - $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),,-mcpu=bf532-any) -D__BFIN_SDRAM + $(AM_V_CC)$(COMPILE) $(%C%_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),,-mcpu=bf532-any) -D__BFIN_SDRAM %D%/basiccrt561.$(OBJEXT): %D%/basiccrt.S - $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf561-any,-mcpu=bf561-none) + $(AM_V_CC)$(COMPILE) $(%C%_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf561-any,-mcpu=bf561-none) %D%/basiccrt561s.$(OBJEXT): %D%/basiccrt.S - $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf561-any,-mcpu=bf561-none) -D__BFIN_SDRAM + $(AM_V_CC)$(COMPILE) $(%C%_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf561-any,-mcpu=bf561-none) -D__BFIN_SDRAM %D%/basiccrt561b.$(OBJEXT): %D%/basiccrt.S - $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf561-any,-mcpu=bf561-none) -D__ADSPBF561_COREB__ + $(AM_V_CC)$(COMPILE) $(%C%_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf561-any,-mcpu=bf561-none) -D__ADSPBF561_COREB__ %D%/basiccrt60x.$(OBJEXT): %D%/basiccrt.S - $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf608-any,-mcpu=bf608-none) + $(AM_V_CC)$(COMPILE) $(%C%_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf608-any,-mcpu=bf608-none) %D%/basiccrt60xs.$(OBJEXT): %D%/basiccrt.S - $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf608-any,-mcpu=bf608-none) -D__BFIN_SDRAM + $(AM_V_CC)$(COMPILE) $(%C%_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf608-any,-mcpu=bf608-none) -D__BFIN_SDRAM %D%/basiccrt60xc1.$(OBJEXT): %D%/basiccrt.S - $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf608-any,-mcpu=bf608-none) -D__ADSPBF60x_CORE1__ + $(AM_V_CC)$(COMPILE) $(%C%_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf608-any,-mcpu=bf608-none) -D__ADSPBF60x_CORE1__ -- 2.34.1