summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-06-17 14:20:36 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2008-06-17 14:20:36 +0000
commit63abaebc01df9185aa1a044611296d626a9eca1a (patch)
treea8151d5c8715eb96e15fe8281dbb98e2058a9946
parent0fcbbcc67b38fb70de492a2244ae033add69c0d7 (diff)
- move stripping into do_ar resp compile-m for the sake of simplicity
-rw-r--r--Makerules30
-rw-r--r--ldso/ldso/Makefile.in1
-rw-r--r--ldso/libdl/Makefile.in2
-rw-r--r--libc/Makefile.in3
-rw-r--r--libcrypt/Makefile.in3
-rw-r--r--libintl/Makefile.in3
-rw-r--r--libm/Makefile.in3
-rw-r--r--libnsl/Makefile.in2
-rw-r--r--libpthread/linuxthreads.old/Makefile.in3
-rw-r--r--libpthread/linuxthreads.old_db/Makefile.in3
-rw-r--r--libpthread/linuxthreads/Makefile.in3
-rw-r--r--libpthread/linuxthreads_db/Makefile.in3
-rw-r--r--libresolv/Makefile.in2
-rw-r--r--librt/Makefile.in2
-rw-r--r--libutil/Makefile.in3
15 files changed, 20 insertions, 46 deletions
diff --git a/Makerules b/Makerules
index 6a18d1c8b..2074562fb 100644
--- a/Makerules
+++ b/Makerules
@@ -25,14 +25,22 @@ libs: $(lib-a-y)
endif
objs: all_objs
-shared_objs = $(ldso-y) $(libc-y:.o=.os) $(libc-shared-y) $(libc-nonshared-y) $(libdl-so-y)
-shared_objs += $(libcrypt-so-y) $(libintl-so-y) $(libm-so-y) $(libnsl-so-y) $(libpthread-so-y) $(libpthread-nonshared-y)
-shared_objs += $(libthread_db-so-y) $(libresolv-so-y) $(librt-so-y) $(libutil-so-y)
-ar_objs = $(libc-y) $(libc-static-y) $(libdl-a-y) $(libcrypt-a-y) $(libintl-a-y) $(libm-a-y) $(libnsl-a-y)
-ar_objs += $(libpthread-a-y) $(libthread_db-a-y) $(libresolv-a-y) $(librt-a-y) $(libutil-a-y)
+shared_objs = $(libc-y:.o=.os) $(libc-shared-y) $(libc-nonshared-y) \
+ $(libcrypt-so-y) $(libdl-so-y) \
+ $(libintl-so-y) $(libm-so-y) $(libnsl-so-y) \
+ $(libpthread-so-y) $(libpthread-nonshared-y) $(libthread_db-so-y) \
+ $(libresolv-so-y) $(librt-so-y) \
+ $(ldso-y) \
+ $(libutil-so-y)
+
+ar_objs = $(libc-y) $(libc-static-y) $(libcrypt-a-y) \
+ $(libdl-a-y) $(libintl-a-y) $(libm-a-y) $(libnsl-a-y) \
+ $(libpthread-a-y) $(libthread_db-a-y) \
+ $(libresolv-a-y) $(librt-a-y) $(libutil-a-y)
ifeq ($(DOPIC),y)
ar_objs := $(ar_objs:.o=.os)
endif
+flat_objs = $(lib-gdb-y)
ifeq ($(HAVE_SHARED),y)
all_objs: $(sort $(shared_objs) $(ar_objs))
@@ -185,12 +193,15 @@ compile.i = $(call maybe_exec,compile.i)
compile.s = $(call maybe_exec,compile.s)
compile.S = @$(call maybe_exec,compile.S)
compile.m = @$(call maybe_exec,compile.m)
-compile-m = @$(disp_compile-m) ; $(cmd_compile-m)
+compile-m = @$(disp_compile-m) ; $(cmd_compile-m) ; $(do_t_strip)
do_strip = @$(disp_strip) ; $(cmd_strip)
do_t_strip= @$(disp_t_strip) ; $(cmd_t_strip)
-do_ar = @$(disp_ar) ; $(cmd_ar)
do_unifdef= @$(disp_unifdef) ; $(cmd_unifdef)
+define do_ar
+ $(do_strip)
+ @$(disp_ar) ; $(cmd_ar)
+endef
define compile.u
@$(disp_compile.u) ; $(cmd_compile.u)
@$(disp_t_strip)
@@ -239,6 +250,7 @@ endef
define linkm.so
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@ $@.$(2) $(dir $@)$(1)
+ $(do_strip)
@$(disp_ld)
$(Q)$(CC) $(LDFLAGS-$(notdir $@)) -Wl,-soname=$(notdir $@).$(2) \
$(NOSTDLIB_CFLAGS) -o $(dir $@)$(1) $(START_FILE-$(notdir $@)) \
@@ -348,19 +360,17 @@ CRTS_COMPAT :=
#endif
$(crt-y): $(CRTS) $(CTOR_TARGETS) $(CRTS_COMPAT) $(CRTRELOC)
-$(CRTS) $(CTOR_TARGETS) $(CRTS_COMPAT) $(CRTRELOC): | headers
+$(CRTS) $(CTOR_TARGETS) $(CRTS_COMPAT) $(CRTRELOC): | $(headers-y)
$(top_builddir)lib/$(NONSHARED_LIBNAME): $(libc-nonshared-y)
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
$(top_builddir)lib/libpthread_nonshared.a: $(libpthread-nonshared-y)
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
files.dep := $(libc-a-y) $(libc-so-y) $(libc-nonshared-y) \
$(libm-a-y) $(libm-so-y) \
diff --git a/ldso/ldso/Makefile.in b/ldso/ldso/Makefile.in
index 23dafc7a1..88b254c27 100644
--- a/ldso/ldso/Makefile.in
+++ b/ldso/ldso/Makefile.in
@@ -56,7 +56,6 @@ $(ldso:.$(MAJOR_VERSION)=): $($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a
$($(UCLIBC_LDSO_NAME)_OUT)/$(UCLIBC_LDSO_NAME)_so.a: $(ldso-y)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
$(UCLIBC_LDSO_NAME)_clean:
$(RM) $($(UCLIBC_LDSO_NAME)_OUT)/*.{o,os,oS,a} $($(UCLIBC_LDSO_NAME)_OUT)/*/*.{o,os,oS}
diff --git a/ldso/libdl/Makefile.in b/ldso/libdl/Makefile.in
index cf21f7b96..41cec858f 100644
--- a/ldso/libdl/Makefile.in
+++ b/ldso/libdl/Makefile.in
@@ -47,13 +47,11 @@ $(top_builddir)lib/libdl.so: $(libdl_OUT)/libdl_so.a $(libc.depend)
$(libdl_OUT)/libdl_so.a: $(libdl-so-y)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
$(top_builddir)lib/libdl.a: $(libdl-a-y)
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
libdl_clean:
$(RM) $(libdl_OUT)/*.{o,os,a,oS}
diff --git a/libc/Makefile.in b/libc/Makefile.in
index db02bd7fe..be5046da8 100644
--- a/libc/Makefile.in
+++ b/libc/Makefile.in
@@ -61,7 +61,6 @@ $(libc.depend): $(libc_OUT)/libc_so.a $(LIBS-libc.so)
$(call link.so,$(libc_FULL_NAME),$(MAJOR_VERSION))
else
$(libc.depend): $(libc_OUT)/libc.oS $(libc-nomulti-y:.o=.oS) | $(LIBS-libc.so)
- $(do_strip)
$(call linkm.so,$(libc_FULL_NAME),$(MAJOR_VERSION))
endif
$(Q)$(RM) $@
@@ -85,13 +84,11 @@ endif
$(libc_OUT)/libc.oS: $(libc-multi-y) | $(top_builddir)lib/libc.a $(top_builddir)lib/$(NONSHARED_LIBNAME)
$(Q)$(RM) $@
$(compile-m)
- #(do_t_strip)
$(top_builddir)lib/libc.a: $(libc-a-y) | $(crt-y)
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
# We use libc_so.a so that we can compile the shared library with special
# flags - i.e. -mleaf-id-shared-library. The static libc.a needs to be
diff --git a/libcrypt/Makefile.in b/libcrypt/Makefile.in
index d93e6abab..a74e4ec0c 100644
--- a/libcrypt/Makefile.in
+++ b/libcrypt/Makefile.in
@@ -54,18 +54,15 @@ endif
$(libcrypt_OUT)/libcrypt_so.a: $(libcrypt-so-y)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
$(libcrypt_OUT)/libcrypt.oS: $(libcrypt_SRC)
$(Q)$(RM) $@
$(compile-m)
- $(do_t_strip)
$(top_builddir)lib/libcrypt.a: $(libcrypt-a-y)
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
libcrypt_clean:
$(RM) $(libcrypt_OUT)/*.{o,os,oS,a}
diff --git a/libintl/Makefile.in b/libintl/Makefile.in
index 1c594c8fc..238ad4466 100644
--- a/libintl/Makefile.in
+++ b/libintl/Makefile.in
@@ -54,18 +54,15 @@ endif
$(libintl_OUT)/libintl_so.a: $(libintl-so-y)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
$(libintl_OUT)/libintl.oS: $(libintl_MSRC)
$(Q)$(RM) $@
$(compile-m)
- $(do_t_strip)
$(top_builddir)lib/libintl.a: $(libintl-a-y)
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
$(libintl_MOBJ): $(libintl_MSRC)
$(compile.m)
diff --git a/libm/Makefile.in b/libm/Makefile.in
index ae591ebfb..f3768d38e 100644
--- a/libm/Makefile.in
+++ b/libm/Makefile.in
@@ -165,18 +165,15 @@ endif
$(libm_OUT)/libm_so.a: $(libm-so-y)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
$(libm_OUT)/libm.oS: $(libm_SRC) $(libm_MSRC) $(libm_ARCH_SRC)
$(Q)$(RM) $@
$(compile-m)
- $(do_t_strip)
$(top_builddir)lib/libm.a: $(libm-a-y)
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
$(libm_MOBJ): $(libm_MSRC)
$(compile.m)
diff --git a/libnsl/Makefile.in b/libnsl/Makefile.in
index 0707a6547..a66b90c6f 100644
--- a/libnsl/Makefile.in
+++ b/libnsl/Makefile.in
@@ -40,13 +40,11 @@ endif
$(libnsl_OUT)/libnsl_so.a: $(libnsl-so-y)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
$(top_builddir)lib/libnsl.a: $(libnsl-a-y)
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
libnsl_clean:
$(RM) $(libnsl_OUT)/*.{o,os,a}
diff --git a/libpthread/linuxthreads.old/Makefile.in b/libpthread/linuxthreads.old/Makefile.in
index 2608599ca..fe29f2cd1 100644
--- a/libpthread/linuxthreads.old/Makefile.in
+++ b/libpthread/linuxthreads.old/Makefile.in
@@ -89,7 +89,6 @@ endif
$(libpthread_OUT)/libpthread_so.a: $(libpthread-so-y)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
$(libpthread_OUT)/libpthread.oS: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
@@ -97,7 +96,6 @@ endif
$(libpthread_OUT)/libpthread.oS: $(libpthread_SRC) $(libpthread_SPEC_SRC)
$(Q)$(RM) $@
$(compile-m)
- $(do_t_strip)
ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
$(top_builddir)lib/libpthread.a: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
@@ -106,7 +104,6 @@ $(top_builddir)lib/libpthread.a: $(libpthread-a-y)
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
include/pthread.h:
$(do_ln) ../$(PTDIR)/sysdeps/pthread/$(@F) $(top_builddir)$@
diff --git a/libpthread/linuxthreads.old_db/Makefile.in b/libpthread/linuxthreads.old_db/Makefile.in
index 996ef2fb2..e99d4ddfc 100644
--- a/libpthread/linuxthreads.old_db/Makefile.in
+++ b/libpthread/linuxthreads.old_db/Makefile.in
@@ -52,18 +52,15 @@ endif
$(libthread_db_OUT)/libthread_db_so.a: $(libthread_db-so-y)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
$(libthread_db_OUT)/libthread_db.oS: $(libthread_db_SRC)
$(Q)$(RM) $@
$(compile-m)
- $(do_t_strip)
$(top_builddir)lib/libthread_db.a: $(libthread_db-a-y)
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
linuxthreads_db_headers:
$(Q)$(LN) -sf ../$(PTDIR)_db/thread_db.h $(top_builddir)include/
diff --git a/libpthread/linuxthreads/Makefile.in b/libpthread/linuxthreads/Makefile.in
index 5508847c2..b7c8914f5 100644
--- a/libpthread/linuxthreads/Makefile.in
+++ b/libpthread/linuxthreads/Makefile.in
@@ -102,7 +102,6 @@ endif
$(libpthread_OUT)/libpthread_so.a: $(libpthread-so-y)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
$(libpthread_OUT)/libpthread.oS: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
@@ -110,7 +109,6 @@ endif
$(libpthread_OUT)/libpthread.oS: $(libpthread_SRC)
$(Q)$(RM) $@
$(compile-m)
- $(do_t_strip)
ifeq ($(PTHREADS_DEBUG_SUPPORT),y)
$(top_builddir)lib/libpthread.a: STRIP_FLAGS:=$(STRIP_FLAGS:-x=-X --strip-debug)
@@ -119,7 +117,6 @@ $(top_builddir)lib/libpthread.a: $(libpthread-a-y)
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
include/pthread.h:
$(do_ln) ../$(PTDIR)/sysdeps/pthread/$(@F) $(top_builddir)$@
diff --git a/libpthread/linuxthreads_db/Makefile.in b/libpthread/linuxthreads_db/Makefile.in
index 3a93d58d4..a611c6ee0 100644
--- a/libpthread/linuxthreads_db/Makefile.in
+++ b/libpthread/linuxthreads_db/Makefile.in
@@ -52,18 +52,15 @@ endif
$(libthread_db_OUT)/libthread_db_so.a: $(libthread_db-so-y)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
$(libthread_db_OUT)/libthread_db.oS: $(libthread_db_SRC)
$(Q)$(RM) $@
$(compile-m)
- $(do_t_strip)
$(top_builddir)lib/libthread_db.a: $(libthread_db-a-y)
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
linuxthreads_db_headers:
$(Q)$(LN) -sf ../$(PTDIR)_db/thread_db.h $(top_builddir)include/
diff --git a/libresolv/Makefile.in b/libresolv/Makefile.in
index e86af747d..cfcb9d78b 100644
--- a/libresolv/Makefile.in
+++ b/libresolv/Makefile.in
@@ -40,13 +40,11 @@ endif
$(libresolv_OUT)/libresolv_so.a: $(libresolv-so-y)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
$(top_builddir)lib/libresolv.a: $(libresolv-a-y)
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
libresolv_clean:
$(RM) $(libresolv_OUT)/*.{o,os,a}
diff --git a/librt/Makefile.in b/librt/Makefile.in
index 14bff70ef..19b779551 100644
--- a/librt/Makefile.in
+++ b/librt/Makefile.in
@@ -41,13 +41,11 @@ endif
$(librt_OUT)/librt_so.a: $(librt-so-y)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
$(top_builddir)lib/librt.a: $(librt-a-y)
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
objclean-y += librt_clean
diff --git a/libutil/Makefile.in b/libutil/Makefile.in
index f96d079b7..ef3169906 100644
--- a/libutil/Makefile.in
+++ b/libutil/Makefile.in
@@ -52,18 +52,15 @@ endif
$(libutil_OUT)/libutil_so.a: $(libutil-so-y)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
$(libutil_OUT)/libutil.oS: $(libutil_SRC)
$(Q)$(RM) $@
$(compile-m)
- $(do_t_strip)
$(top_builddir)lib/libutil.a: $(libutil-a-y)
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
libutil_clean:
$(RM) $(libutil_OUT)/*.{o,os,oS,a}