toolchain/uClibc/uClibc.056-fix-nostdlib-cflags.diff

   1 Index: uClibc/Makerules
   2 ===================================================================
   3 --- uClibc/Makerules    (revision 20365)
   4 +++ uClibc/Makerules    (working copy)
   5 @@ -127,7 +127,7 @@
   6         $(Q)$(RM) $@ $@.$(2) $(dir $@)$(1)
   7         @$(disp_ld)
   8         $(Q)$(CC) $(LDFLAGS-$(notdir $@)) -Wl,-soname=$(notdir $@).$(2) \
   9 -               -nostdlib -o $(dir $@)$(1) $(START_FILE-$(notdir $@)) \
  10 +               $(NOSTDLIB_CFLAGS) -o $(dir $@)$(1) $(START_FILE-$(notdir $@)) \
  11                 -Wl,--whole-archive $(firstword $^) -Wl,--no-whole-archive \
  12                 $(LIBS-$(notdir $@)) $(LIBGCC) $(END_FILE-$(notdir $@))
  13         $(Q)$(LN) -sf $(1) $@.$(2)
  14 @@ -150,7 +150,7 @@
  15         $(Q)$(INSTALL) -d $(dir $@)
  16         $(Q)$(RM) $(1) $@
  17         @$(disp_ld)
  18 -       $(Q)$(CC) $(LDFLAGS-$(notdir $@)) -nostdlib -o $(1) \
  19 +       $(Q)$(CC) $(LDFLAGS-$(notdir $@)) $(NOSTDLIB_CFLAGS) -o $(1) \
  20                 -Wl,-elf2flt -Wl,-shared-lib-id $(2) $(top_builddir)lib/Scrt1.o \
  21                 $(top_builddir)/lib/crti.o -Wl,--whole-archive $(firstword $^) \
  22                 -Wl,--no-whole-archive $(LIBS-$(notdir $@)) $(LIBGCC) \
  23 @@ -162,7 +162,7 @@
  24         $(Q)$(RM) $@ $@.$(2) $(dir $@)$(1)
  25         @$(disp_ld)
  26         $(Q)$(CC) $(LDFLAGS-$(notdir $@)) -Wl,-soname=$(notdir $@).$(2) \
  27 -               -nostdlib -o $(dir $@)$(1) $(START_FILE-$(notdir $@)) $^ \
  28 +               $(NOSTDLIB_CFLAGS) -o $(dir $@)$(1) $(START_FILE-$(notdir $@)) $^ \
  29                 $(LIBS-$(notdir $@)) $(LIBGCC) $(END_FILE-$(notdir $@))
  30         $(Q)$(LN) -sf $(1) $@.$(2)
  31         $(Q)$(LN) -sf $(1) $@
  32 Index: uClibc/Rules.mak
  33 ===================================================================
  34 --- uClibc/Rules.mak    (revision 20365)
  35 +++ uClibc/Rules.mak    (working copy)
  36 @@ -362,6 +362,8 @@
  37  SSP_CFLAGS := $(SSP_DISABLE_FLAGS)
  38  endif
  39
  40 +NOSTDLIB_CFLAGS:=$(if $(call check_gcc,-nostartfiles -nostdlib,),-nostartfiles -nostdlib,$(call check_gcc,-nostdlib,))
  41 +
  42  # Some nice CFLAGS to work with
  43  CFLAGS := -include $(top_builddir)include/libc-symbols.h \
  44         $(XWARNINGS) $(CPU_CFLAGS) $(SSP_CFLAGS) \