From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1521) id DA9623858D37; Sat, 12 Feb 2022 06:35:32 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org DA9623858D37 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Michael Frysinger To: newlib-cvs@sourceware.org Subject: [newlib-cygwin] libgloss: bfin: fix local header usage after automake move X-Act-Checkin: newlib-cygwin X-Git-Author: Mike Frysinger X-Git-Refname: refs/heads/master X-Git-Oldrev: bf167aade1febc18159edeadf5a0a23fb0af9ea8 X-Git-Newrev: 395ce0f4c072feb23e6747b4852eca16b2cc87be Message-Id: <20220212063532.DA9623858D37@sourceware.org> Date: Sat, 12 Feb 2022 06:35:32 +0000 (GMT) X-BeenThere: newlib-cvs@sourceware.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Newlib GIT logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 12 Feb 2022 06:35:33 -0000 https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D395ce0f4c07= 2feb23e6747b4852eca16b2cc87be commit 395ce0f4c072feb23e6747b4852eca16b2cc87be Author: Mike Frysinger Date: Sat Feb 12 01:29:33 2022 -0500 libgloss: bfin: fix local header usage after automake move =20 Compiling the basiccrt .S files missed an include to the local bfin/ headers causing the build to break when installing anew. =20 Reported-by: Jeff Law Diff: --- libgloss/Makefile.in | 21 +++++++++++---------- libgloss/bfin/Makefile.inc | 22 ++++++++++++---------- 2 files changed, 23 insertions(+), 20 deletions(-) diff --git a/libgloss/Makefile.in b/libgloss/Makefile.in index 42a835338..0fca662f6 100644 --- a/libgloss/Makefile.in +++ b/libgloss/Makefile.in @@ -560,13 +560,14 @@ MULTISUBDIR =3D MULTIDO =3D true MULTICLEAN =3D true TEXINFO_TEX =3D ../texinfo/texinfo.tex +@CONFIG_BFIN_TRUE@bfin_CPPFLAGS =3D -I$(srcdir)/bfin/include @CONFIG_BFIN_TRUE@bfin_libsim_a_SOURCES =3D \ @CONFIG_BFIN_TRUE@ bfin/clear_cache_range.c \ @CONFIG_BFIN_TRUE@ bfin/syscalls.c =20 @CONFIG_BFIN_TRUE@bfin_libsim_a_CPPFLAGS =3D \ @CONFIG_BFIN_TRUE@ $(AM_CPPFLAGS) \ -@CONFIG_BFIN_TRUE@ -I$(srcdir)/%D/include +@CONFIG_BFIN_TRUE@ $(bfin_CPPFLAGS) =20 @CONFIG_BFIN_TRUE@bfin_libbfinbsp_a_SOURCES =3D \ @CONFIG_BFIN_TRUE@ bfin/clear_cache_range.c \ @@ -574,7 +575,7 @@ TEXINFO_TEX =3D ../texinfo/texinfo.tex =20 @CONFIG_BFIN_TRUE@bfin_libbfinbsp_a_CPPFLAGS =3D \ @CONFIG_BFIN_TRUE@ $(AM_CPPFLAGS) \ -@CONFIG_BFIN_TRUE@ -I$(srcdir)/%D/include +@CONFIG_BFIN_TRUE@ $(bfin_CPPFLAGS) =20 @CONFIG_IQ2000_TRUE@iq2000_libeval_a_SOURCES =3D \ @CONFIG_IQ2000_TRUE@ iq2000/_exit.c iq2000/access.c iq2000/chmod.c iq2000/= close.c iq2000/crt1.c \ @@ -1663,21 +1664,21 @@ distclean-local: distclean-multi maintainer-clean-local: maintainer-clean-multi =20 @CONFIG_BFIN_TRUE@bfin/basiccrt.$(OBJEXT): bfin/basiccrt.S -@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu= =3D,$(CFLAGS)),,-mcpu=3Dbf532-any) +@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) $(bfin_CPPFLAGS) -o $@ -c $< $(if = $(findstring mcpu=3D,$(CFLAGS)),,-mcpu=3Dbf532-any) @CONFIG_BFIN_TRUE@bfin/basiccrts.$(OBJEXT): bfin/basiccrt.S -@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu= =3D,$(CFLAGS)),,-mcpu=3Dbf532-any) -D__BFIN_SDRAM +@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) $(bfin_CPPFLAGS) -o $@ -c $< $(if = $(findstring mcpu=3D,$(CFLAGS)),,-mcpu=3Dbf532-any) -D__BFIN_SDRAM @CONFIG_BFIN_TRUE@bfin/basiccrt561.$(OBJEXT): bfin/basiccrt.S -@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu= =3D,$(CFLAGS)),-mcpu=3Dbf561-any,-mcpu=3Dbf561-none) +@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) $(bfin_CPPFLAGS) -o $@ -c $< $(if = $(findstring mcpu=3D,$(CFLAGS)),-mcpu=3Dbf561-any,-mcpu=3Dbf561-none) @CONFIG_BFIN_TRUE@bfin/basiccrt561s.$(OBJEXT): bfin/basiccrt.S -@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu= =3D,$(CFLAGS)),-mcpu=3Dbf561-any,-mcpu=3Dbf561-none) -D__BFIN_SDRAM +@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) $(bfin_CPPFLAGS) -o $@ -c $< $(if = $(findstring mcpu=3D,$(CFLAGS)),-mcpu=3Dbf561-any,-mcpu=3Dbf561-none) -D__B= FIN_SDRAM @CONFIG_BFIN_TRUE@bfin/basiccrt561b.$(OBJEXT): bfin/basiccrt.S -@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu= =3D,$(CFLAGS)),-mcpu=3Dbf561-any,-mcpu=3Dbf561-none) -D__ADSPBF561_COREB__ +@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) $(bfin_CPPFLAGS) -o $@ -c $< $(if = $(findstring mcpu=3D,$(CFLAGS)),-mcpu=3Dbf561-any,-mcpu=3Dbf561-none) -D__A= DSPBF561_COREB__ @CONFIG_BFIN_TRUE@bfin/basiccrt60x.$(OBJEXT): bfin/basiccrt.S -@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu= =3D,$(CFLAGS)),-mcpu=3Dbf608-any,-mcpu=3Dbf608-none) +@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) $(bfin_CPPFLAGS) -o $@ -c $< $(if = $(findstring mcpu=3D,$(CFLAGS)),-mcpu=3Dbf608-any,-mcpu=3Dbf608-none) @CONFIG_BFIN_TRUE@bfin/basiccrt60xs.$(OBJEXT): bfin/basiccrt.S -@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu= =3D,$(CFLAGS)),-mcpu=3Dbf608-any,-mcpu=3Dbf608-none) -D__BFIN_SDRAM +@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) $(bfin_CPPFLAGS) -o $@ -c $< $(if = $(findstring mcpu=3D,$(CFLAGS)),-mcpu=3Dbf608-any,-mcpu=3Dbf608-none) -D__B= FIN_SDRAM @CONFIG_BFIN_TRUE@bfin/basiccrt60xc1.$(OBJEXT): bfin/basiccrt.S -@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu= =3D,$(CFLAGS)),-mcpu=3Dbf608-any,-mcpu=3Dbf608-none) -D__ADSPBF60x_CORE1__ +@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) $(bfin_CPPFLAGS) -o $@ -c $< $(if = $(findstring mcpu=3D,$(CFLAGS)),-mcpu=3Dbf608-any,-mcpu=3Dbf608-none) -D__A= DSPBF60x_CORE1__ =20 # Tell versions [3.59,3.63) of GNU make to not export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. diff --git a/libgloss/bfin/Makefile.inc b/libgloss/bfin/Makefile.inc index 35e880809..47ba12c06 100644 --- a/libgloss/bfin/Makefile.inc +++ b/libgloss/bfin/Makefile.inc @@ -1,3 +1,5 @@ +%C%_CPPFLAGS =3D -I$(srcdir)/%D%/include + # Here is all of the simulator stuff. multilibtool_LIBRARIES +=3D %D%/libsim.a %C%_libsim_a_SOURCES =3D \ @@ -5,7 +7,7 @@ multilibtool_LIBRARIES +=3D %D%/libsim.a %D%/syscalls.c %C%_libsim_a_CPPFLAGS =3D \ $(AM_CPPFLAGS) \ - -I$(srcdir)/%D/include + $(%C%_CPPFLAGS) =20 check_PROGRAMS +=3D %D%/sim-test =20 @@ -51,21 +53,21 @@ multilibtool_LIBRARIES +=3D %D%/libbfinbsp.a %D%/_exit.c %C%_libbfinbsp_a_CPPFLAGS =3D \ $(AM_CPPFLAGS) \ - -I$(srcdir)/%D/include + $(%C%_CPPFLAGS) =20 %D%/basiccrt.$(OBJEXT): %D%/basiccrt.S - $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=3D,$(CFLAGS)),,-m= cpu=3Dbf532-any) + $(AM_V_CC)$(COMPILE) $(%C%_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu= =3D,$(CFLAGS)),,-mcpu=3Dbf532-any) %D%/basiccrts.$(OBJEXT): %D%/basiccrt.S - $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=3D,$(CFLAGS)),,-m= cpu=3Dbf532-any) -D__BFIN_SDRAM + $(AM_V_CC)$(COMPILE) $(%C%_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu= =3D,$(CFLAGS)),,-mcpu=3Dbf532-any) -D__BFIN_SDRAM %D%/basiccrt561.$(OBJEXT): %D%/basiccrt.S - $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=3D,$(CFLAGS)),-mc= pu=3Dbf561-any,-mcpu=3Dbf561-none) + $(AM_V_CC)$(COMPILE) $(%C%_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu= =3D,$(CFLAGS)),-mcpu=3Dbf561-any,-mcpu=3Dbf561-none) %D%/basiccrt561s.$(OBJEXT): %D%/basiccrt.S - $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=3D,$(CFLAGS)),-mc= pu=3Dbf561-any,-mcpu=3Dbf561-none) -D__BFIN_SDRAM + $(AM_V_CC)$(COMPILE) $(%C%_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu= =3D,$(CFLAGS)),-mcpu=3Dbf561-any,-mcpu=3Dbf561-none) -D__BFIN_SDRAM %D%/basiccrt561b.$(OBJEXT): %D%/basiccrt.S - $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=3D,$(CFLAGS)),-mc= pu=3Dbf561-any,-mcpu=3Dbf561-none) -D__ADSPBF561_COREB__ + $(AM_V_CC)$(COMPILE) $(%C%_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu= =3D,$(CFLAGS)),-mcpu=3Dbf561-any,-mcpu=3Dbf561-none) -D__ADSPBF561_COREB__ %D%/basiccrt60x.$(OBJEXT): %D%/basiccrt.S - $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=3D,$(CFLAGS)),-mc= pu=3Dbf608-any,-mcpu=3Dbf608-none) + $(AM_V_CC)$(COMPILE) $(%C%_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu= =3D,$(CFLAGS)),-mcpu=3Dbf608-any,-mcpu=3Dbf608-none) %D%/basiccrt60xs.$(OBJEXT): %D%/basiccrt.S - $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=3D,$(CFLAGS)),-mc= pu=3Dbf608-any,-mcpu=3Dbf608-none) -D__BFIN_SDRAM + $(AM_V_CC)$(COMPILE) $(%C%_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu= =3D,$(CFLAGS)),-mcpu=3Dbf608-any,-mcpu=3Dbf608-none) -D__BFIN_SDRAM %D%/basiccrt60xc1.$(OBJEXT): %D%/basiccrt.S - $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=3D,$(CFLAGS)),-mc= pu=3Dbf608-any,-mcpu=3Dbf608-none) -D__ADSPBF60x_CORE1__ + $(AM_V_CC)$(COMPILE) $(%C%_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu= =3D,$(CFLAGS)),-mcpu=3Dbf608-any,-mcpu=3Dbf608-none) -D__ADSPBF60x_CORE1__