diff --git a/libgcc/ChangeLog b/libgcc/ChangeLog
index d59a455e54a..33ad5185479 100644
--- a/libgcc/ChangeLog
+++ b/libgcc/ChangeLog
@@ -1,3 +1,11 @@
+2012-08-22  Georg-Johann Lay  <avr@gjlay.de>
+
+	* Makefile.in (fixed-funcs,fixed-conv-funcs): filter-out
+	LIB2FUNCS_EXCLUDE before adding them to libgcc-objects,
+	libgcc-s-objects.
+	* fixed-obj.mk: Only expand dependency if $o is not in
+	LIB2FUNCS_EXCLUDE.
+
 2012-08-22  H.J. Lu  <hongjiu.lu@intel.com>
 
 	* config/i386/t-linux (HOST_LIBGCC2_CFLAGS): New.
diff --git a/libgcc/Makefile.in b/libgcc/Makefile.in
index b37fdb90e0a..1de1b8e5a48 100644
--- a/libgcc/Makefile.in
+++ b/libgcc/Makefile.in
@@ -763,9 +763,9 @@ iter-to := $(fixed-modes)
 include $(srcdir)/empty.mk $(patsubst %,$(srcdir)/fixed-obj.mk,$(iter-items))
 
 # Add arithmetic functions to list of objects to be built
-libgcc-objects += $(patsubst %,%$(objext),$(fixed-funcs))
+libgcc-objects += $(patsubst %,%$(objext),$(filter-out $(LIB2FUNCS_EXCLUDE),$(fixed-funcs)))
 ifeq ($(enable_shared),yes)
-libgcc-s-objects += $(patsubst %,%_s$(objext),$(fixed-funcs))
+libgcc-s-objects += $(patsubst %,%_s$(objext),$(filter-out $(LIB2FUNCS_EXCLUDE),$(fixed-funcs)))
 endif
 
 # Convert from or to fractional
@@ -782,9 +782,9 @@ iter-to := $(fixed-conv-to)
 include $(srcdir)/empty.mk $(patsubst %,$(srcdir)/fixed-obj.mk,$(iter-items))
 
 # Add conversion functions to list of objects to be built
-libgcc-objects += $(patsubst %,%$(objext),$(fixed-conv-funcs))
+libgcc-objects += $(patsubst %,%$(objext),$(filter-out $(LIB2FUNCS_EXCLUDE),$(fixed-conv-funcs)))
 ifeq ($(enable_shared),yes)
-libgcc-s-objects += $(patsubst %,%_s$(objext),$(fixed-conv-funcs))
+libgcc-s-objects += $(patsubst %,%_s$(objext),$(filter-out $(LIB2FUNCS_EXCLUDE),$(fixed-conv-funcs)))
 endif
 
 endif
diff --git a/libgcc/fixed-obj.mk b/libgcc/fixed-obj.mk
index ac699d2f9e3..4db7a5792c7 100644
--- a/libgcc/fixed-obj.mk
+++ b/libgcc/fixed-obj.mk
@@ -22,6 +22,7 @@ endif
 
 #$(info $o$(objext): -DL$($o-label) $($o-opt))
 
+ifneq ($o,$(filter $o,$(LIB2FUNCS_EXCLUDE)))
 $o$(objext): %$(objext): $(srcdir)/fixed-bit.c
 	$(gcc_compile) -DL$($*-label) $($*-opt) -c $(srcdir)/fixed-bit.c $(vis_hide)
 
@@ -29,3 +30,4 @@ ifeq ($(enable_shared),yes)
 $(o)_s$(objext): %_s$(objext): $(srcdir)/fixed-bit.c
 	$(gcc_s_compile) -DL$($*-label) $($*-opt) -c $(srcdir)/fixed-bit.c
 endif
+endif