Skip to content

Commit a147b6d

Browse files
committed
Makefile.in (fixed-funcs,fixed-conv-funcs): filter-out LIB2FUNCS_EXCLUDE before adding them to libgcc-objects, libgcc-s-objects.
* 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. From-SVN: r190624
1 parent c583af7 commit a147b6d

File tree

3 files changed

+14
-4
lines changed

3 files changed

+14
-4
lines changed

libgcc/ChangeLog

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,11 @@
1+
2012-08-22 Georg-Johann Lay <[email protected]>
2+
3+
* Makefile.in (fixed-funcs,fixed-conv-funcs): filter-out
4+
LIB2FUNCS_EXCLUDE before adding them to libgcc-objects,
5+
libgcc-s-objects.
6+
* fixed-obj.mk: Only expand dependency if $o is not in
7+
LIB2FUNCS_EXCLUDE.
8+
19
2012-08-22 H.J. Lu <[email protected]>
210

311
* config/i386/t-linux (HOST_LIBGCC2_CFLAGS): New.

libgcc/Makefile.in

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -763,9 +763,9 @@ iter-to := $(fixed-modes)
763763
include $(srcdir)/empty.mk $(patsubst %,$(srcdir)/fixed-obj.mk,$(iter-items))
764764

765765
# Add arithmetic functions to list of objects to be built
766-
libgcc-objects += $(patsubst %,%$(objext),$(fixed-funcs))
766+
libgcc-objects += $(patsubst %,%$(objext),$(filter-out $(LIB2FUNCS_EXCLUDE),$(fixed-funcs)))
767767
ifeq ($(enable_shared),yes)
768-
libgcc-s-objects += $(patsubst %,%_s$(objext),$(fixed-funcs))
768+
libgcc-s-objects += $(patsubst %,%_s$(objext),$(filter-out $(LIB2FUNCS_EXCLUDE),$(fixed-funcs)))
769769
endif
770770

771771
# Convert from or to fractional
@@ -782,9 +782,9 @@ iter-to := $(fixed-conv-to)
782782
include $(srcdir)/empty.mk $(patsubst %,$(srcdir)/fixed-obj.mk,$(iter-items))
783783

784784
# Add conversion functions to list of objects to be built
785-
libgcc-objects += $(patsubst %,%$(objext),$(fixed-conv-funcs))
785+
libgcc-objects += $(patsubst %,%$(objext),$(filter-out $(LIB2FUNCS_EXCLUDE),$(fixed-conv-funcs)))
786786
ifeq ($(enable_shared),yes)
787-
libgcc-s-objects += $(patsubst %,%_s$(objext),$(fixed-conv-funcs))
787+
libgcc-s-objects += $(patsubst %,%_s$(objext),$(filter-out $(LIB2FUNCS_EXCLUDE),$(fixed-conv-funcs)))
788788
endif
789789

790790
endif

libgcc/fixed-obj.mk

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,12 @@ endif
2222

2323
#$(info $o$(objext): -DL$($o-label) $($o-opt))
2424

25+
ifneq ($o,$(filter $o,$(LIB2FUNCS_EXCLUDE)))
2526
$o$(objext): %$(objext): $(srcdir)/fixed-bit.c
2627
$(gcc_compile) -DL$($*-label) $($*-opt) -c $(srcdir)/fixed-bit.c $(vis_hide)
2728

2829
ifeq ($(enable_shared),yes)
2930
$(o)_s$(objext): %_s$(objext): $(srcdir)/fixed-bit.c
3031
$(gcc_s_compile) -DL$($*-label) $($*-opt) -c $(srcdir)/fixed-bit.c
3132
endif
33+
endif

0 commit comments

Comments
 (0)