From: Mike Frysinger <vapier@gentoo.org>
To: newlib@sourceware.org
Cc: Jeff Law <jeffreyalaw@gmail.com>
Subject: [PATCH/committed] libgloss: bfin: fix local header usage after automake move
Date: Sat, 12 Feb 2022 01:36:25 -0500 [thread overview]
Message-ID: <20220212063625.23103-1-vapier@gentoo.org> (raw)
In-Reply-To: <35cc6015-d380-be7a-6441-d787d06ceec3@gmail.com>
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 <jeffreyalaw@gmail.com>
---
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
prev parent reply other threads:[~2022-02-12 6:36 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-02-11 16:06 Recent change broke bfin-elf Jeff Law
2022-02-11 22:43 ` Mike Frysinger
2022-02-11 22:46 ` Jeff Law
2022-02-12 6:36 ` Mike Frysinger [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20220212063625.23103-1-vapier@gentoo.org \
--to=vapier@gentoo.org \
--cc=jeffreyalaw@gmail.com \
--cc=newlib@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).