libgloss: bfin: fix local header usage after automake move
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>
This commit is contained in:
parent
bf167aade1
commit
395ce0f4c0
|
@ -560,13 +560,14 @@ MULTISUBDIR =
|
||||||
MULTIDO = true
|
MULTIDO = true
|
||||||
MULTICLEAN = true
|
MULTICLEAN = true
|
||||||
TEXINFO_TEX = ../texinfo/texinfo.tex
|
TEXINFO_TEX = ../texinfo/texinfo.tex
|
||||||
|
@CONFIG_BFIN_TRUE@bfin_CPPFLAGS = -I$(srcdir)/bfin/include
|
||||||
@CONFIG_BFIN_TRUE@bfin_libsim_a_SOURCES = \
|
@CONFIG_BFIN_TRUE@bfin_libsim_a_SOURCES = \
|
||||||
@CONFIG_BFIN_TRUE@ bfin/clear_cache_range.c \
|
@CONFIG_BFIN_TRUE@ bfin/clear_cache_range.c \
|
||||||
@CONFIG_BFIN_TRUE@ bfin/syscalls.c
|
@CONFIG_BFIN_TRUE@ bfin/syscalls.c
|
||||||
|
|
||||||
@CONFIG_BFIN_TRUE@bfin_libsim_a_CPPFLAGS = \
|
@CONFIG_BFIN_TRUE@bfin_libsim_a_CPPFLAGS = \
|
||||||
@CONFIG_BFIN_TRUE@ $(AM_CPPFLAGS) \
|
@CONFIG_BFIN_TRUE@ $(AM_CPPFLAGS) \
|
||||||
@CONFIG_BFIN_TRUE@ -I$(srcdir)/%D/include
|
@CONFIG_BFIN_TRUE@ $(bfin_CPPFLAGS)
|
||||||
|
|
||||||
@CONFIG_BFIN_TRUE@bfin_libbfinbsp_a_SOURCES = \
|
@CONFIG_BFIN_TRUE@bfin_libbfinbsp_a_SOURCES = \
|
||||||
@CONFIG_BFIN_TRUE@ bfin/clear_cache_range.c \
|
@CONFIG_BFIN_TRUE@ bfin/clear_cache_range.c \
|
||||||
|
@ -574,7 +575,7 @@ TEXINFO_TEX = ../texinfo/texinfo.tex
|
||||||
|
|
||||||
@CONFIG_BFIN_TRUE@bfin_libbfinbsp_a_CPPFLAGS = \
|
@CONFIG_BFIN_TRUE@bfin_libbfinbsp_a_CPPFLAGS = \
|
||||||
@CONFIG_BFIN_TRUE@ $(AM_CPPFLAGS) \
|
@CONFIG_BFIN_TRUE@ $(AM_CPPFLAGS) \
|
||||||
@CONFIG_BFIN_TRUE@ -I$(srcdir)/%D/include
|
@CONFIG_BFIN_TRUE@ $(bfin_CPPFLAGS)
|
||||||
|
|
||||||
@CONFIG_IQ2000_TRUE@iq2000_libeval_a_SOURCES = \
|
@CONFIG_IQ2000_TRUE@iq2000_libeval_a_SOURCES = \
|
||||||
@CONFIG_IQ2000_TRUE@ iq2000/_exit.c iq2000/access.c iq2000/chmod.c iq2000/close.c iq2000/crt1.c \
|
@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
|
maintainer-clean-local: maintainer-clean-multi
|
||||||
|
|
||||||
@CONFIG_BFIN_TRUE@bfin/basiccrt.$(OBJEXT): bfin/basiccrt.S
|
@CONFIG_BFIN_TRUE@bfin/basiccrt.$(OBJEXT): bfin/basiccrt.S
|
||||||
@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),,-mcpu=bf532-any)
|
@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) $(bfin_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),,-mcpu=bf532-any)
|
||||||
@CONFIG_BFIN_TRUE@bfin/basiccrts.$(OBJEXT): bfin/basiccrt.S
|
@CONFIG_BFIN_TRUE@bfin/basiccrts.$(OBJEXT): bfin/basiccrt.S
|
||||||
@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),,-mcpu=bf532-any) -D__BFIN_SDRAM
|
@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) $(bfin_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),,-mcpu=bf532-any) -D__BFIN_SDRAM
|
||||||
@CONFIG_BFIN_TRUE@bfin/basiccrt561.$(OBJEXT): bfin/basiccrt.S
|
@CONFIG_BFIN_TRUE@bfin/basiccrt561.$(OBJEXT): bfin/basiccrt.S
|
||||||
@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf561-any,-mcpu=bf561-none)
|
@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) $(bfin_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf561-any,-mcpu=bf561-none)
|
||||||
@CONFIG_BFIN_TRUE@bfin/basiccrt561s.$(OBJEXT): bfin/basiccrt.S
|
@CONFIG_BFIN_TRUE@bfin/basiccrt561s.$(OBJEXT): bfin/basiccrt.S
|
||||||
@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf561-any,-mcpu=bf561-none) -D__BFIN_SDRAM
|
@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) $(bfin_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf561-any,-mcpu=bf561-none) -D__BFIN_SDRAM
|
||||||
@CONFIG_BFIN_TRUE@bfin/basiccrt561b.$(OBJEXT): bfin/basiccrt.S
|
@CONFIG_BFIN_TRUE@bfin/basiccrt561b.$(OBJEXT): bfin/basiccrt.S
|
||||||
@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf561-any,-mcpu=bf561-none) -D__ADSPBF561_COREB__
|
@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) $(bfin_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf561-any,-mcpu=bf561-none) -D__ADSPBF561_COREB__
|
||||||
@CONFIG_BFIN_TRUE@bfin/basiccrt60x.$(OBJEXT): bfin/basiccrt.S
|
@CONFIG_BFIN_TRUE@bfin/basiccrt60x.$(OBJEXT): bfin/basiccrt.S
|
||||||
@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf608-any,-mcpu=bf608-none)
|
@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) $(bfin_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf608-any,-mcpu=bf608-none)
|
||||||
@CONFIG_BFIN_TRUE@bfin/basiccrt60xs.$(OBJEXT): bfin/basiccrt.S
|
@CONFIG_BFIN_TRUE@bfin/basiccrt60xs.$(OBJEXT): bfin/basiccrt.S
|
||||||
@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf608-any,-mcpu=bf608-none) -D__BFIN_SDRAM
|
@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) $(bfin_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf608-any,-mcpu=bf608-none) -D__BFIN_SDRAM
|
||||||
@CONFIG_BFIN_TRUE@bfin/basiccrt60xc1.$(OBJEXT): bfin/basiccrt.S
|
@CONFIG_BFIN_TRUE@bfin/basiccrt60xc1.$(OBJEXT): bfin/basiccrt.S
|
||||||
@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf608-any,-mcpu=bf608-none) -D__ADSPBF60x_CORE1__
|
@CONFIG_BFIN_TRUE@ $(AM_V_CC)$(COMPILE) $(bfin_CPPFLAGS) -o $@ -c $< $(if $(findstring mcpu=,$(CFLAGS)),-mcpu=bf608-any,-mcpu=bf608-none) -D__ADSPBF60x_CORE1__
|
||||||
|
|
||||||
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
# 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.
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||||
|
|
|
@ -1,3 +1,5 @@
|
||||||
|
%C%_CPPFLAGS = -I$(srcdir)/%D%/include
|
||||||
|
|
||||||
# Here is all of the simulator stuff.
|
# Here is all of the simulator stuff.
|
||||||
multilibtool_LIBRARIES += %D%/libsim.a
|
multilibtool_LIBRARIES += %D%/libsim.a
|
||||||
%C%_libsim_a_SOURCES = \
|
%C%_libsim_a_SOURCES = \
|
||||||
|
@ -5,7 +7,7 @@ multilibtool_LIBRARIES += %D%/libsim.a
|
||||||
%D%/syscalls.c
|
%D%/syscalls.c
|
||||||
%C%_libsim_a_CPPFLAGS = \
|
%C%_libsim_a_CPPFLAGS = \
|
||||||
$(AM_CPPFLAGS) \
|
$(AM_CPPFLAGS) \
|
||||||
-I$(srcdir)/%D/include
|
$(%C%_CPPFLAGS)
|
||||||
|
|
||||||
check_PROGRAMS += %D%/sim-test
|
check_PROGRAMS += %D%/sim-test
|
||||||
|
|
||||||
|
@ -51,21 +53,21 @@ multilibtool_LIBRARIES += %D%/libbfinbsp.a
|
||||||
%D%/_exit.c
|
%D%/_exit.c
|
||||||
%C%_libbfinbsp_a_CPPFLAGS = \
|
%C%_libbfinbsp_a_CPPFLAGS = \
|
||||||
$(AM_CPPFLAGS) \
|
$(AM_CPPFLAGS) \
|
||||||
-I$(srcdir)/%D/include
|
$(%C%_CPPFLAGS)
|
||||||
|
|
||||||
%D%/basiccrt.$(OBJEXT): %D%/basiccrt.S
|
%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
|
%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
|
%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
|
%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
|
%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
|
%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
|
%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
|
%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__
|
||||||
|
|
Loading…
Reference in New Issue