Changeset 18322

Timestamp:

01/26/12 13:23:06 (16 months ago)

Author:

BrainSlayer

Message:

latest makefile

File:

• src/router/Makefile.laguna (modified) (6 diffs)

src/router/Makefile.laguna

@@ -86 +86 @@
 #endif
 
-export BASEOPT:=-Os
+export BASEOPT:=-O2
 #export ARCH:= mipsel
 
@@ -96 +96 @@
 endif
 ifeq ($(ARCH),arm)
-export COPTS:=$(BASEOPT) -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp -funit-at-a-time 
+export COPTS:=$(BASEOPT) -pipe -march=armv6k -mtune=mpcore -mfloat-abi=softfp -mfpu=vfp -fno-caller-saves
 #-D_FILE_OFFSET_BITS=64
 endif
@@ -106 +106 @@
 endif
 
-export CC := $(CROSS_COMPILE)gcc
-export CXX := $(CROSS_COMPILE)g++
+export CC := ccache $(CROSS_COMPILE)gcc
+export CXX := ccache $(CROSS_COMPILE)g++
 export AR := $(CROSS_COMPILE)ar
 export AS := $(CROSS_COMPILE)as
@@ -155 +155 @@
         # Also build kernel
 ifeq ($(CONFIG_LAGUNA),y)
-        cp $(LINUXDIR)/.config_laguna $(LINUXDIR)/.config
+ifeq ($(CONFIG_LAGUNA_NOSMP),y)
+        cp $(LINUXDIR)/.config_laguna_nosmp $(LINUXDIR)/.config
+else
+        cp $(LINUXDIR)/.config_laguna$(DD_LAGUNA_NOSMP) $(LINUXDIR)/.config
+endif
 endif
 ifeq ($(CONFIG_EOP_TUNNEL),y)
@@ -165 +169 @@
 
         if ! grep -q "CONFIG_EMBEDDED_RAMDISK=y" $(LINUXDIR)/.config ; then \
-            $(MAKE) -j 4 -C $(LINUXDIR) uImage CROSS_COMPILE=$(ARCH)-linux-uclibc- ; \
+            $(MAKE) -j 4 -C $(LINUXDIR) uImage ; \
         fi
         if grep -q "CONFIG_MODULES=y" $(LINUXDIR)/.config ; then \
-            $(MAKE) -j 4 -C $(LINUXDIR) modules CROSS_COMPILE=$(ARCH)-linux-uclibc- ; \
+            $(MAKE) -j 4 -C $(LINUXDIR) modules ; \
         fi
 
@@ -203 +207 @@
 
 optimize-lib:
-#       ../../tools/optimize_lib.sh shared/ libshared.so libshared.a libshared_min.so $(TARGETDIR) $(TARGETDIR)/usr/lib/libshared.so
-#       ../../tools/optimize_lib.sh lib.$(ARCH)/ libpthread.so libpthread.a libphread_min.so $(TARGETDIR) $(TARGETDIR)/lib/libpthread.so.0
+        make -f Makefile.laguna lib.$(ARCH)-install
+        cp lib.$(ARCH)/pics/* $(TARGETDIR)/lib
+        cp lib.$(ARCH)/libgcc_s.so.1 $(TARGETDIR)/lib
+
+
+        relink-lib.sh \
+                "$(ARCH)-linux-" \
+                "lib.$(ARCH)/libc_so.a" \
+                "lib.$(ARCH)/libc_so.a" \
+                "$(ARCH)-uclibc/target/lib/libc.so.0" \
+                -Wl,-init,__uClibc_init -Wl,-soname=libc.so.0 \
+                lib.$(ARCH)/libgcc_s.so.*
+
+        relink-lib.sh \
+                "$(ARCH)-linux-" \
+                "$(wildcard lib.$(ARCH)/libcrypt-*.so)" \
+                "lib.$(ARCH)/libcrypt_pic.a" \
+                "$(ARCH)-uclibc/target/lib/libcrypt.so.0" \
+                lib.$(ARCH)/libgcc_s.so.* \
+                -Wl,-soname=libcrypt.so.0
+
+        relink-lib.sh \
+                "$(ARCH)-linux-" \
+                "$(wildcard lib.$(ARCH)/libm-*.so)" \
+                "lib.$(ARCH)/libm_pic.a" \
+                "$(ARCH)-uclibc/target/lib/libm.so.0" \
+                lib.$(ARCH)/libgcc_s.so.* \
+                -Wl,-soname=libm.so.0
+
+        relink-lib.sh \
+                "$(ARCH)-linux-" \
+                "$(wildcard lib.$(ARCH)/libpthread-*.so)" \
+                "lib.$(ARCH)/libpthread_so.a" \
+                "$(ARCH)-uclibc/target/lib/libpthread.so.0" \
+                -Wl,-z,nodelete,-z,initfirst,-init=__pthread_initialize_minimal_internal \
+                lib.$(ARCH)/libgcc_s.so.* \
+                -Wl,-soname=libpthread.so.0
+
+ifneq ($(CONFIG_NOOPT),y)
+        rm -rf /tmp/mklibs-out
+        rm -f /tmp/mklibs-progs
+        find $(TARGETDIR) -type f -perm +100 -exec \
+                file -r -N -F '' {} + | \
+                awk ' /executable.*dynamically/ { print $$1 }' > /tmp/mklibs-progs
+
+        find $(TARGETDIR) -type f -name \*.so\* -exec \
+                file -r -N -F '' {} + | \
+                awk ' /shared object/ { print $$1 }' >> /tmp/mklibs-progs
+
+        mkdir -p /tmp/mklibs-out
+        mklibs.py -D \
+                -d /tmp/mklibs-out \
+                --sysroot $(TARGETDIR) \
+                -L /lib \
+                -L /usr/lib \
+                --ldlib /lib/ld-uClibc.so.0 \
+                --target $(ARCH)-linux-uclibc \
+                `cat /tmp/mklibs-progs` 2>&1
+        cp /tmp/mklibs-out/* $(TARGETDIR)/lib
+endif
+        rm -f $(TARGETDIR)/lib/*.a
+        rm -f $(TARGETDIR)/lib/*.map
+#       cp lib.$(ARCH)/libresolv.so.0 $(TARGETDIR)/lib
+#       cp lib.$(ARCH)/libgcc_s.so.1 $(TARGETDIR)/lib