svn commit: trunk/uClibc: ldso/ldso ldso/libdl libc libcrypt libi etc...
aldot at uclibc.org
aldot at uclibc.org
Tue Jun 17 14:20:36 UTC 2008
Author: aldot
Date: 2008-06-17 07:20:36 -0700 (Tue, 17 Jun 2008)
New Revision: 22403
Log:
- move stripping into do_ar resp compile-m for the sake of simplicity
Modified:
trunk/uClibc/Makerules
trunk/uClibc/ldso/ldso/Makefile.in
trunk/uClibc/ldso/libdl/Makefile.in
trunk/uClibc/libc/Makefile.in
trunk/uClibc/libcrypt/Makefile.in
trunk/uClibc/libintl/Makefile.in
trunk/uClibc/libm/Makefile.in
trunk/uClibc/libnsl/Makefile.in
trunk/uClibc/libpthread/linuxthreads.old/Makefile.in
trunk/uClibc/libpthread/linuxthreads.old_db/Makefile.in
trunk/uClibc/libpthread/linuxthreads/Makefile.in
trunk/uClibc/libpthread/linuxthreads_db/Makefile.in
trunk/uClibc/libresolv/Makefile.in
trunk/uClibc/librt/Makefile.in
trunk/uClibc/libutil/Makefile.in
Changeset:
Modified: trunk/uClibc/Makerules
===================================================================
--- trunk/uClibc/Makerules 2008-06-17 13:33:02 UTC (rev 22402)
+++ trunk/uClibc/Makerules 2008-06-17 14:20:36 UTC (rev 22403)
@@ -25,14 +25,22 @@
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.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 @@
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 @@
#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) \
Modified: trunk/uClibc/ldso/ldso/Makefile.in
===================================================================
--- trunk/uClibc/ldso/ldso/Makefile.in 2008-06-17 13:33:02 UTC (rev 22402)
+++ trunk/uClibc/ldso/ldso/Makefile.in 2008-06-17 14:20:36 UTC (rev 22403)
@@ -56,7 +56,6 @@
$($(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}
Modified: trunk/uClibc/ldso/libdl/Makefile.in
===================================================================
--- trunk/uClibc/ldso/libdl/Makefile.in 2008-06-17 13:33:02 UTC (rev 22402)
+++ trunk/uClibc/ldso/libdl/Makefile.in 2008-06-17 14:20:36 UTC (rev 22403)
@@ -47,13 +47,11 @@
$(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}
Modified: trunk/uClibc/libc/Makefile.in
===================================================================
--- trunk/uClibc/libc/Makefile.in 2008-06-17 13:33:02 UTC (rev 22402)
+++ trunk/uClibc/libc/Makefile.in 2008-06-17 14:20:36 UTC (rev 22403)
@@ -61,7 +61,6 @@
$(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 @@
$(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
Modified: trunk/uClibc/libcrypt/Makefile.in
===================================================================
--- trunk/uClibc/libcrypt/Makefile.in 2008-06-17 13:33:02 UTC (rev 22402)
+++ trunk/uClibc/libcrypt/Makefile.in 2008-06-17 14:20:36 UTC (rev 22403)
@@ -54,18 +54,15 @@
$(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}
Modified: trunk/uClibc/libintl/Makefile.in
===================================================================
--- trunk/uClibc/libintl/Makefile.in 2008-06-17 13:33:02 UTC (rev 22402)
+++ trunk/uClibc/libintl/Makefile.in 2008-06-17 14:20:36 UTC (rev 22403)
@@ -54,18 +54,15 @@
$(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)
Modified: trunk/uClibc/libm/Makefile.in
===================================================================
--- trunk/uClibc/libm/Makefile.in 2008-06-17 13:33:02 UTC (rev 22402)
+++ trunk/uClibc/libm/Makefile.in 2008-06-17 14:20:36 UTC (rev 22403)
@@ -165,18 +165,15 @@
$(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)
Modified: trunk/uClibc/libnsl/Makefile.in
===================================================================
--- trunk/uClibc/libnsl/Makefile.in 2008-06-17 13:33:02 UTC (rev 22402)
+++ trunk/uClibc/libnsl/Makefile.in 2008-06-17 14:20:36 UTC (rev 22403)
@@ -40,13 +40,11 @@
$(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}
Modified: trunk/uClibc/libpthread/linuxthreads/Makefile.in
===================================================================
--- trunk/uClibc/libpthread/linuxthreads/Makefile.in 2008-06-17 13:33:02 UTC (rev 22402)
+++ trunk/uClibc/libpthread/linuxthreads/Makefile.in 2008-06-17 14:20:36 UTC (rev 22403)
@@ -102,7 +102,6 @@
$(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 @@
$(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 @@
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
include/pthread.h:
$(do_ln) ../$(PTDIR)/sysdeps/pthread/$(@F) $(top_builddir)$@
Modified: trunk/uClibc/libpthread/linuxthreads.old/Makefile.in
===================================================================
--- trunk/uClibc/libpthread/linuxthreads.old/Makefile.in 2008-06-17 13:33:02 UTC (rev 22402)
+++ trunk/uClibc/libpthread/linuxthreads.old/Makefile.in 2008-06-17 14:20:36 UTC (rev 22403)
@@ -89,7 +89,6 @@
$(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 @@
$(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 @@
$(Q)$(INSTALL) -d $(dir $@)
$(Q)$(RM) $@
$(do_ar)
- $(do_t_strip)
include/pthread.h:
$(do_ln) ../$(PTDIR)/sysdeps/pthread/$(@F) $(top_builddir)$@
Modified: trunk/uClibc/libpthread/linuxthreads.old_db/Makefile.in
===================================================================
--- trunk/uClibc/libpthread/linuxthreads.old_db/Makefile.in 2008-06-17 13:33:02 UTC (rev 22402)
+++ trunk/uClibc/libpthread/linuxthreads.old_db/Makefile.in 2008-06-17 14:20:36 UTC (rev 22403)
@@ -52,18 +52,15 @@
$(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/
Modified: trunk/uClibc/libpthread/linuxthreads_db/Makefile.in
===================================================================
--- trunk/uClibc/libpthread/linuxthreads_db/Makefile.in 2008-06-17 13:33:02 UTC (rev 22402)
+++ trunk/uClibc/libpthread/linuxthreads_db/Makefile.in 2008-06-17 14:20:36 UTC (rev 22403)
@@ -52,18 +52,15 @@
$(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/
Modified: trunk/uClibc/libresolv/Makefile.in
===================================================================
--- trunk/uClibc/libresolv/Makefile.in 2008-06-17 13:33:02 UTC (rev 22402)
+++ trunk/uClibc/libresolv/Makefile.in 2008-06-17 14:20:36 UTC (rev 22403)
@@ -40,13 +40,11 @@
$(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}
Modified: trunk/uClibc/librt/Makefile.in
===================================================================
--- trunk/uClibc/librt/Makefile.in 2008-06-17 13:33:02 UTC (rev 22402)
+++ trunk/uClibc/librt/Makefile.in 2008-06-17 14:20:36 UTC (rev 22403)
@@ -41,13 +41,11 @@
$(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
Modified: trunk/uClibc/libutil/Makefile.in
===================================================================
--- trunk/uClibc/libutil/Makefile.in 2008-06-17 13:33:02 UTC (rev 22402)
+++ trunk/uClibc/libutil/Makefile.in 2008-06-17 14:20:36 UTC (rev 22403)
@@ -52,18 +52,15 @@
$(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}
More information about the uClibc-cvs
mailing list