hide __dl_ldso__

Peter S. Mazinger ps.m at gmx.net
Tue Aug 22 18:42:09 UTC 2006


hide __dl_ldso__ and correct CFLAGS-OMIT- support for files not living in 
the same dir as the lib produced (for ex. files from libpthread go to librt)

Peter

-- 
Peter S. Mazinger <ps dot m at gmx dot net>           ID: 0xA5F059F2
Key fingerprint = 92A4 31E1 56BC 3D5A 2D08  BB6E C389 975E A5F0 59F2
-------------- next part --------------
diff -urN --exclude .svn --exclude CVS --exclude .cvsignore --exclude libpthread --exclude test uClibc.orig/Makerules uClibc/Makerules
--- uClibc.orig/Makerules	2006-06-12 17:44:06 +0200
+++ uClibc/Makerules	2006-06-07 13:47:48 +0200
@@ -92,7 +93,7 @@
 disp_ar        = $($(DISP)_disp_ar)
 disp_ld        = $($(DISP)_disp_ld)
 
-cmd_compile.c = $(CC) -c $< -o $@ $(CFLAGS) $(ARCH_CFLAGS) $(CFLAGS-$(suffix $@)) $(filter-out $(CFLAGS-OMIT-$(notdir $<)),$(CFLAGS-$(notdir $(^D)))) $(CFLAGS-$(subst $(top_srcdir),,$(dir $<))) $(CFLAGS-$(notdir $<)) $(CFLAGS-$(notdir $@))
+cmd_compile.c = $(CC) -c $< -o $@ $(CFLAGS) $(ARCH_CFLAGS) $(CFLAGS-$(suffix $@)) $(filter-out $(CFLAGS-OMIT-$(notdir $<)),$(CFLAGS-$(notdir $(^D)))) $(filter-out $(CFLAGS-OMIT-$(notdir $<)),$(CFLAGS-$(subst $(top_srcdir),,$(dir $<)))) $(CFLAGS-$(notdir $<)) $(CFLAGS-$(notdir $@))
 cmd_compile.S = $(cmd_compile.c) -D__ASSEMBLER__ $(ASFLAGS) $(ARCH_ASFLAGS) $(ASFLAGS-$(suffix $@)) $(ASFLAGS-$(notdir $<)) $(ASFLAGS-$(notdir $@))
 cmd_compile.m = $(cmd_compile.c) -DL_$(patsubst %$(suffix $(notdir $@)),%,$(notdir $@))
 cmd_compile-m = $(CC) $^ -c -o $@ $(CFLAGS) $(ARCH_CFLAGS) $(CFLAGS-$(suffix $@)) $(CFLAGS-$(notdir $(@D))) $(CFLAGS-$(notdir $@))
@@ -161,15 +162,15 @@
 %.s:  %.c ; $(compile.s)
 %.s:  %.S ; $(compile.s)
 
-$(top_builddir)lib/interp.c: | $(sub_headers)
+$(top_builddir)lib/interp.c:
 	$(Q)$(INSTALL) -d $(dir $@)
 	$(Q)echo "/* Force shared libraries to know about the correct library loader */" > $@
 	$(Q)echo "#include <features.h>" >> $@
-	$(Q)echo "const char __dl_ldso__[] __attribute__ ((section " \
+	$(Q)echo "const char __dl_ldso__[] attribute_hidden __attribute__ ((weak)) __attribute__ ((section " \
 		"(\".interp\"))) =\""$(SHARED_LIB_LOADER_PREFIX)/$(UCLIBC_LDSO)"\";" >> $@
 
 $(interp): $(top_builddir)lib/interp.c
-	$(compile.c)
+	$(compile.c) -DNOT_IN_libc $(SSP_DISABLE_FLAGS)
 	$(Q)$(STRIPTOOL) -x -R .note -R .comment $@
 
 $(ldso):


More information about the uClibc mailing list