diff options
author | David Edelsohn <dje.gcc@gmail.com> | 2020-06-23 10:03:40 -0400 |
---|---|---|
committer | David Edelsohn <dje.gcc@gmail.com> | 2020-06-23 17:28:09 +0000 |
commit | 17964eb3a054c634b743aae9d1d9414e1bf21885 (patch) | |
tree | d2a54a775f5fa36e4e4a8c60bde22d5ad2ea7e1c /libgcc/Makefile.in | |
parent | aec24341d0aac1ca57031d066503c420fb850023 (diff) | |
download | gcc-17964eb3a054c634b743aae9d1d9414e1bf21885.tar.gz |
build: Change conditional include and empty.mk to -include in Makefiles
GNU Make supports "-include" keyword to prevent warnings and errors due to
inclusion of non-existent files. This patch changes gcc/ and libgcc/ to use
"-include" in place of the historical conditional inclusion and use of
empty.mk work-arounds.
gcc/ChangeLog
2020-06-23 David Edelsohn <dje.gcc@gmail.com>
* Makefile.in (LANG_MAKEFRAGS): Same.
(tmake_file): Use -include.
(xmake_file): Same.
libgcc/ChangeLog
2020-06-23 David Edelsohn <dje.gcc@gmail.com>
* Makefile.in: Remove uses of empty.mk. Use -include.
* config/avr/t-avr: Use -include.
* empty.mk: Delete.
libgcc/config/avr/libf7/ChangeLog
2020-06-23 David Edelsohn <dje.gcc@gmail.com>
* t-libf7: Same.
Diffstat (limited to 'libgcc/Makefile.in')
-rw-r--r-- | libgcc/Makefile.in | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in index 5c50f9fe4df..d6075d32bd4 100644 --- a/libgcc/Makefile.in +++ b/libgcc/Makefile.in @@ -373,7 +373,7 @@ gthr-default.h: $(srcdir)/$(thread_header) -$(LN_S) $< $@ tmake_file = @tmake_file@ -include $(srcdir)/empty.mk $(tmake_file) +-include $(tmake_file) # Collect target defines and headers from config.host. libgcc_tm_defines = @tm_defines@ @@ -393,7 +393,7 @@ ifeq ($(SHLIB_LINK),) endif ifeq ($(enable_shared),yes) - iterator = $(srcdir)/empty.mk $(patsubst %,$(srcdir)/shared-object.mk,$(iter-items)) + iterator = $(patsubst %,$(srcdir)/shared-object.mk,$(iter-items)) install-shared = install-shared @@ -425,7 +425,7 @@ gen-hide-list = echo > $@ endif ifneq ($(enable_shared),yes) -iterator = $(srcdir)/empty.mk $(patsubst %,$(srcdir)/static-object.mk,$(iter-items)) +iterator = $(patsubst %,$(srcdir)/static-object.mk,$(iter-items)) endif LIB2ADD += enable-execute-stack.c @@ -522,7 +522,7 @@ iter-items := $(sifuncs) $(difuncs) $(tifuncs) iter-labels := $(sifuncs) $(difuncs) $(difuncs) iter-sizes := $(patsubst %,4,$(sifuncs) $(difuncs)) $(patsubst %,8,$(tifuncs)) -include $(srcdir)/empty.mk $(patsubst %,$(srcdir)/siditi-object.mk,$(iter-items)) +-include $(patsubst %,$(srcdir)/siditi-object.mk,$(iter-items)) libgcc-objects += $(patsubst %,%$(objext),$(sifuncs) $(difuncs) $(tifuncs)) ifeq ($(enable_shared),yes) @@ -805,7 +805,7 @@ iter-items := $(fixed-funcs) iter-labels := $(fixed-labels) iter-from := $(fixed-modes) iter-to := $(fixed-modes) -include $(srcdir)/empty.mk $(patsubst %,$(srcdir)/fixed-obj.mk,$(iter-items)) +-include $(patsubst %,$(srcdir)/fixed-obj.mk,$(iter-items)) # Add arithmetic functions to list of objects to be built libgcc-objects += $(patsubst %,%$(objext),$(filter-out $(LIB2FUNCS_EXCLUDE),$(fixed-funcs))) @@ -824,7 +824,7 @@ iter-items := $(fixed-conv-funcs) iter-labels := $(fixed-conv-labels) iter-from := $(fixed-conv-from) iter-to := $(fixed-conv-to) -include $(srcdir)/empty.mk $(patsubst %,$(srcdir)/fixed-obj.mk,$(iter-items)) +-include $(patsubst %,$(srcdir)/fixed-obj.mk,$(iter-items)) # Add conversion functions to list of objects to be built libgcc-objects += $(patsubst %,%$(objext),$(filter-out $(LIB2FUNCS_EXCLUDE),$(fixed-conv-funcs))) @@ -844,7 +844,7 @@ libgcc-objects += $(addsuffix $(objext),$(basename $(notdir $(LIB2ADD_ST)))) c_flags := iter-items := $(LIB2ADD) $(LIB2ADD_ST) -include $(iterator) +-include $(iterator) ifeq ($(enable_shared),yes) libgcc-s-objects += $(addsuffix _s$(objext),$(basename $(notdir $(LIB2ADD)))) @@ -862,7 +862,7 @@ libgcc-eh-objects += $(addsuffix $(objext),$(basename $(notdir $(LIB2ADDEHSTATIC libgcc-s-objects += $(addsuffix _s$(objext),$(basename $(notdir $(LIB2ADDEHSHARED)))) iter-items := $(sort $(LIB2ADDEHSTATIC) $(LIB2ADDEHSHARED)) -include $(iterator) +-include $(iterator) else # Not shared. LIB2ADDEH are added to libgcc.a. @@ -870,7 +870,7 @@ else libgcc-objects += $(addsuffix $(objext),$(basename $(notdir $(LIB2ADDEH)))) iter-items := $(LIB2ADDEH) -include $(iterator) +-include $(iterator) endif @@ -886,7 +886,7 @@ libunwind-s-objects += $(addsuffix _s$(objext),$(basename $(notdir $(LIBUNWIND)) endif iter-items := $(LIBUNWIND) -include $(iterator) +-include $(iterator) # Build libgcov components. @@ -1203,4 +1203,4 @@ install-strip: install # configure. .NOEXPORT: -include $(srcdir)/empty.mk $(wildcard *.dep) +-include $(wildcard *.dep) |