Merge from trunk revision e109f6e438b72ef3e403162971068d28d09b82f5

3 files changed, 11 insertions, 7 deletions

diff --git a/libgcc/config/avr/libf7/ChangeLog b/libgcc/config/avr/libf7/ChangeLog
index 1ec4735..d24215e 100644
--- a/libgcc/config/avr/libf7/ChangeLog
+++ b/libgcc/config/avr/libf7/ChangeLog
@@ -1,3 +1,7 @@
+2020-06-23  David Edelsohn  <dje.gcc@gmail.com>
+
+	* t-libf7: Use -include.
+
 2020-01-08  Georg-Johann Lay  <avr@gjlay.de>
 
 	Implement 64-bit double functions.
diff --git a/libgcc/config/avr/libf7/t-libf7 b/libgcc/config/avr/libf7/t-libf7
index 92a27eb..30aa280 100644
--- a/libgcc/config/avr/libf7/t-libf7
+++ b/libgcc/config/avr/libf7/t-libf7
@@ -125,7 +125,7 @@ f7_parts := $(F7_C_PARTS)
 iter-items  := $(f7_parts)
 iter-labels := $(f7_parts)
 
-include $(srcdir)/empty.mk $(patsubst %,$(libf7)/libf7-c-object.mk,$(iter-items))
+-include $(patsubst %,$(libf7)/libf7-c-object.mk,$(iter-items))
 
 libgcc-objects += $(patsubst %,f7_c_%$(objext),$(F7_C_PARTS))
 
@@ -136,7 +136,7 @@ f7_parts := $(F7_ASM_PARTS)
 iter-items  := $(f7_parts)
 iter-labels := $(f7_parts)
 
-include $(srcdir)/empty.mk $(patsubst %,$(libf7)/libf7-asm-object.mk,$(iter-items))
+-include $(patsubst %,$(libf7)/libf7-asm-object.mk,$(iter-items))
 
 libgcc-objects += $(patsubst %,f7_asm_%$(objext),$(F7_ASM_PARTS))
 
diff --git a/libgcc/config/avr/t-avr b/libgcc/config/avr/t-avr
index e4f867b..ed84b3f 100644
--- a/libgcc/config/avr/t-avr
+++ b/libgcc/config/avr/t-avr
@@ -132,7 +132,7 @@ iter-labels := $(siintfuncs16)
 iter-sizes := $(patsubst %,2,$(siintfuncs16)) $(patsubst %,2,$(hiintfuncs16))
 
 
-include $(srcdir)/empty.mk $(patsubst %,$(srcdir)/siditi-object.mk,$(iter-items))
+-include $(patsubst %,$(srcdir)/siditi-object.mk,$(iter-items))
 libgcc-objects += $(patsubst %,%$(objext),$(hiintfuncs16))
 
 ifeq ($(enable_shared),yes)
@@ -167,7 +167,7 @@ iter-items  := $(round_funcs)
 iter-labels := $(round_suffix)
 iter-flags  := $(patsubst %,-DL_round,$(iter-items))
 
-include $(srcdir)/empty.mk $(patsubst %,$(srcdir)/config/avr/lib2-object.mk,$(iter-items))
+-include $(patsubst %,$(srcdir)/config/avr/lib2-object.mk,$(iter-items))
 
 libgcc-objects += $(patsubst %,%$(objext),$(round_funcs))
 
@@ -181,7 +181,7 @@ iter-items  := $(clrsb_funcs)
 iter-labels := $(clrsb_funcs)
 iter-flags  := $(patsubst %,-DL_clrsb,$(iter-items))
 
-include $(srcdir)/empty.mk $(patsubst %,$(srcdir)/config/avr/lib2-object.mk,$(iter-items))
+-include $(patsubst %,$(srcdir)/config/avr/lib2-object.mk,$(iter-items))
 
 libgcc-objects += $(patsubst %,%$(objext),$(clrsb_funcs))
 
@@ -195,7 +195,7 @@ iter-items  := $(countls_funcs)
 iter-labels := $(countls_modes)
 iter-flags  := $(patsubst %,-DL_countls,$(iter-items))
 
-include $(srcdir)/empty.mk $(patsubst %,$(srcdir)/config/avr/lib2-object.mk,$(iter-items))
+-include $(patsubst %,$(srcdir)/config/avr/lib2-object.mk,$(iter-items))
 
 libgcc-objects += $(patsubst %,%$(objext),$(countls_funcs))
 
@@ -209,7 +209,7 @@ iter-items  := $(countlsu_funcs)
 iter-labels := $(countlsu_modes)
 iter-flags  := $(patsubst %,-DL_countlsu,$(iter-items))
 
-include $(srcdir)/empty.mk $(patsubst %,$(srcdir)/config/avr/lib2-object.mk,$(iter-items))
+-include $(patsubst %,$(srcdir)/config/avr/lib2-object.mk,$(iter-items))
 
 libgcc-objects += $(patsubst %,%$(objext),$(countlsu_funcs))