[git commit ldso-future] add CFLAGS-ldso-extra and use that everywhere

Peter S. Mazinger ps.m at gmx.net
Wed Mar 30 11:53:36 UTC 2011


commit: http://git.uclibc.org/uClibc/commit/?id=aea4d630f878efb033063a6729d5044b12d57df9
branch: http://git.uclibc.org/uClibc/commit/?id=refs/heads/ldso-future

Signed-off-by: Peter S. Mazinger <ps.m at gmx.net>
---
 Rules.mak                      |    5 +++--
 ldso/ldso/Makefile.in          |    2 +-
 ldso/libdl/Makefile.in         |    2 +-
 libc/misc/elf/Makefile.in      |    4 ++--
 libpthread/nptl_db/Makefile.in |    2 +-
 utils/Makefile.in              |    9 +++------
 6 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/Rules.mak b/Rules.mak
index f971055..4846be4 100644
--- a/Rules.mak
+++ b/Rules.mak
@@ -581,14 +581,15 @@ endif
 
 NOSTDLIB_CFLAGS:=$(call check_gcc,-nostdlib,)
 
+CFLAGS-ldso-extra := -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) -I$(top_srcdir)ldso/include
+
 # Collect all CFLAGS components
 CFLAGS := $(XWARNINGS) $(CPU_CFLAGS) $(SSP_CFLAGS) \
 	-nostdinc -I$(top_builddir)include \
 	-I$(top_srcdir)include -include libc-symbols.h \
 	-I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH) \
 	-I$(top_srcdir)libc/sysdeps/linux \
-	-I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) \
-	-I$(top_srcdir)ldso/include -I.
+	$(CFLAGS-ldso-extra) -I.
 ifneq ($(strip $(UCLIBC_EXTRA_CFLAGS)),"")
 CFLAGS += $(call qstrip,$(UCLIBC_EXTRA_CFLAGS))
 endif
diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in
index 7a9ffa6..1d94aeb 100644
--- a/ldso/ldso/Makefile.in
+++ b/ldso/ldso/Makefile.in
@@ -12,7 +12,7 @@ CFLAGS-ldso := -DNOT_IN_libc -DIS_IN_rtld $(SSP_DISABLE_FLAGS)
 # This stuff will not work with -fomit-frame-pointer
 CFLAGS-ldso += -fno-omit-frame-pointer
 
-CFLAGS-ldso += -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) -I$(top_srcdir)ldso/include -I$(top_srcdir)ldso/ldso
+CFLAGS-ldso += $(CFLAGS-ldso-extra)
 CFLAGS-ldso += -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\"
 
 ifeq ($(DODEBUG),y)
diff --git a/ldso/libdl/Makefile.in b/ldso/libdl/Makefile.in
index ad2392f..7f71df9 100644
--- a/ldso/libdl/Makefile.in
+++ b/ldso/libdl/Makefile.in
@@ -9,7 +9,7 @@ subdirs += ldso/libdl
 
 CFLAGS-libdl := -DNOT_IN_libc -DIS_IN_libdl $(SSP_ALL_CFLAGS)
 
-CFLAGS-libdl += -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) -I$(top_srcdir)ldso/include -I$(top_srcdir)ldso/ldso
+CFLAGS-libdl += $(CFLAGS-ldso-extra) -I$(top_srcdir)ldso/ldso
 
 CFLAGS-libdl += -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\"
 
diff --git a/libc/misc/elf/Makefile.in b/libc/misc/elf/Makefile.in
index 1b4bd8b..d1e0be6 100644
--- a/libc/misc/elf/Makefile.in
+++ b/libc/misc/elf/Makefile.in
@@ -7,8 +7,8 @@
 subdirs += libc/misc/elf
 
 libc_a_CSRC = dl-support.c dl-core.c dl-iterate-phdr.c
-CFLAGS-dl-iterate-phdr.c=-D_GNU_SOURCE -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) -I$(top_srcdir)ldso/include
-CFLAGS-dl-core.c=-I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) -I$(top_srcdir)ldso/include
+CFLAGS-dl-iterate-phdr.c = -D_GNU_SOURCE $(CFLAGS-ldso-extra)
+CFLAGS-dl-core.c = $(CFLAGS-ldso-extra)
 
 MISC_ELF_OUT:=$(top_builddir)libc/misc/elf
 MISC_ELF_OBJ:=$(patsubst %.c,$(MISC_ELF_OUT)/%.o,$(libc_a_CSRC))
diff --git a/libpthread/nptl_db/Makefile.in b/libpthread/nptl_db/Makefile.in
index a3fc1cd..2a556e0 100644
--- a/libpthread/nptl_db/Makefile.in
+++ b/libpthread/nptl_db/Makefile.in
@@ -10,7 +10,7 @@ subdirs += libpthread/nptl_db
 # Get the thread include dependencies and shared object name
 CFLAGS-nptl_db := -DLIBPTHREAD_SO="\"libpthread.so.$(ABI_VERSION)\""
 CFLAGS-nptl_db += -I$(top_srcdir)libpthread/nptl -D_GNU_SOURCE
-CFLAGS-nptl_db += -DIS_IN_libthread_db=1 -DNOT_IN_libc -std=gnu99 -I$(top_srcdir)ldso/include
+CFLAGS-nptl_db += -DIS_IN_libthread_db=1 -DNOT_IN_libc -std=gnu99 $(CFLAGS-ldso-extra)
 
 LDFLAGS-libthread_db.so := $(LDFLAGS_NOSTRIP) $(if $(call check_ld,--warn-unresolved-symbols),-Wl$(comma)--warn-unresolved-symbols)
 LIBS-libthread_db.so := $(LIBS)
diff --git a/utils/Makefile.in b/utils/Makefile.in
index 085ee01..04ea15e 100644
--- a/utils/Makefile.in
+++ b/utils/Makefile.in
@@ -10,8 +10,7 @@ subdirs += utils
 
 CFLAGS-utils := \
     $(SSP_ALL_CFLAGS) \
-    -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) \
-    -I$(top_srcdir)ldso/include \
+    $(CFLAGS-ldso-extra) \
     -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" \
     -DUCLIBC_LDSO=$(UCLIBC_LDSO) \
     -I$(top_srcdir)/$(KERNEL_HEADERS) \
@@ -55,12 +54,10 @@ BUILD_CFLAGS-utils := \
     $(LDSO_CACHE_SUPPORT)
 BUILD_CFLAGS-ldconfig.host := $(BUILD_CFLAGS-utils) \
 				-DBUILDING_LINKAGE \
-				-I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) \
-				-I$(top_srcdir)ldso/include
+				$(CFLAGS-ldso-extra)
 BUILD_CFLAGS-ldd.host      := $(BUILD_CFLAGS-utils) \
 				-DBUILDING_LINKAGE \
-				-I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) \
-				-I$(top_srcdir)ldso/include \
+				$(CFLAGS-ldso-extra) \
 				-include $(top_srcdir)include/elf.h
 BUILD_CFLAGS-locale.host   := $(BUILD_CFLAGS-utils) \
 				-DNOT_IN_libc \
-- 
1.7.3.4



More information about the uClibc-cvs mailing list