1.1 --- a/config/libc/uClibc.in Mon Jun 27 12:44:45 2011 -0700
1.2 +++ b/config/libc/uClibc.in Mon Jun 27 00:12:29 2011 +0200
1.3 @@ -16,6 +16,11 @@
1.4 # Don't remove next line
1.5 # CT_INSERT_VERSION_BELOW
1.6
1.7 +config LIBC_UCLIBC_V_0_9_32
1.8 + bool
1.9 + prompt "0.9.32"
1.10 + select LIBC_UCLIBC_0_9_30_or_later
1.11 +
1.12 config LIBC_UCLIBC_V_0_9_31
1.13 bool
1.14 prompt "0.9.31 (EXPERIMENTAL)"
1.15 @@ -76,6 +81,7 @@
1.16 prompt "Enter date (YYYYMMDD)" if LIBC_UCLIBC_V_specific_date
1.17 # Don't remove next line
1.18 # CT_INSERT_VERSION_STRING_BELOW
1.19 + default "0.9.32" if LIBC_UCLIBC_V_0_9_32
1.20 default "0.9.31" if LIBC_UCLIBC_V_0_9_31
1.21 default "0.9.30.3" if LIBC_UCLIBC_V_0_9_30_3
1.22 default "0.9.30.2" if LIBC_UCLIBC_V_0_9_30_2
2.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
2.2 +++ b/patches/uClibc/0.9.32/100-bump-version-to-0.9.32.1-git.patch Mon Jun 27 00:12:29 2011 +0200
2.3 @@ -0,0 +1,21 @@
2.4 +commit 608e138586993d3c59c65c2958d9a98cf0d4d1eb
2.5 +Author: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
2.6 +Date: Wed Jun 8 21:47:42 2011 +0200
2.7 +
2.8 + bump version to 0.9.32.1-git
2.9 +
2.10 + Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
2.11 +
2.12 +diff --git a/Rules.mak b/Rules.mak
2.13 +index fe06c24..a00deea 100644
2.14 +--- a/Rules.mak
2.15 ++++ b/Rules.mak
2.16 +@@ -106,7 +106,7 @@ export RUNTIME_PREFIX DEVEL_PREFIX KERNEL_HEADERS MULTILIB_DIR
2.17 + MAJOR_VERSION := 0
2.18 + MINOR_VERSION := 9
2.19 + SUBLEVEL := 32
2.20 +-EXTRAVERSION :=
2.21 ++EXTRAVERSION :=.1-git
2.22 + VERSION := $(MAJOR_VERSION).$(MINOR_VERSION).$(SUBLEVEL)
2.23 + ABI_VERSION := $(MAJOR_VERSION)
2.24 + ifneq ($(EXTRAVERSION),)
3.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
3.2 +++ b/patches/uClibc/0.9.32/110-nptl-Makefile.in-Fix-the-build-break-caused-by-UCLIBC_CTOR_DTOR-enabling.patch Mon Jun 27 00:12:29 2011 +0200
3.3 @@ -0,0 +1,28 @@
3.4 +commit fc643f77a3abc8743620445f47b1bade9862d45a
3.5 +Author: Khem Raj <raj.khem@gmail.com>
3.6 +Date: Fri Jun 10 13:05:34 2011 -0700
3.7 +
3.8 + nptl/Makefile.in: Fix the build break caused by UCLIBC_CTOR_DTOR enabling
3.9 +
3.10 + Extra / somehow does not match the target and complains that
3.11 + $(top_builddir)libpthread/nptl/sysdeps/pthread/crti.o has no rules to
3.12 + build
3.13 +
3.14 + Signed-off-by: Khem Raj <raj.khem@gmail.com>
3.15 + Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
3.16 +
3.17 +diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in
3.18 +index 70616a1..92d72a6 100644
3.19 +--- a/libpthread/nptl/Makefile.in
3.20 ++++ b/libpthread/nptl/Makefile.in
3.21 +@@ -64,8 +64,8 @@ endif
3.22 + librt-so-y += $(librt_OBJS:.o=.oS) $(librt-pt-shared-only-routines-y:.o=.oS)
3.23 +
3.24 + ifeq ($(UCLIBC_CTOR_DTOR),y)
3.25 +-START_FILE-libpthread.so := $(top_builddir)/libpthread/nptl/sysdeps/pthread/crti.o
3.26 +-END_FILE-libpthread.so := $(top_builddir)/libpthread/nptl/sysdeps/pthread/crtn.o
3.27 ++START_FILE-libpthread.so := $(top_builddir)libpthread/nptl/sysdeps/pthread/crti.o
3.28 ++END_FILE-libpthread.so := $(top_builddir)libpthread/nptl/sysdeps/pthread/crtn.o
3.29 + LDFLAGS-libpthread.so += -nostartfiles
3.30 + $(top_builddir)lib/libpthread.so: | $(START_FILE-libpthread.so) $(END_FILE-libpthread.so)
3.31 + endif
4.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
4.2 +++ b/patches/uClibc/0.9.32/120-ctor-dtor-nptl-Fix-init-and-fini-function-compilation.patch Mon Jun 27 00:12:29 2011 +0200
4.3 @@ -0,0 +1,182 @@
4.4 +commit f9e311d11c374e68736c741ede1845bdc8091627
4.5 +Author: Khem Raj <raj.khem@gmail.com>
4.6 +Date: Mon Jun 13 16:30:55 2011 -0700
4.7 +
4.8 + ctor/dtor nptl: Fix init and fini function compilation
4.9 +
4.10 + We need to define the rules for .S files so it
4.11 + gets the include paths some architectures like mips
4.12 + include headers
4.13 +
4.14 + Some architectures e.g. SH have their own version
4.15 + of pt-initfini.c so look for that first before resorting
4.16 + to generic version of pt-initfini.c
4.17 +
4.18 + Signed-off-by: Khem Raj <raj.khem@gmail.com>
4.19 + Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
4.20 +
4.21 +diff --git a/libc/sysdeps/linux/mips/crtn.S b/libc/sysdeps/linux/mips/crtn.S
4.22 +index cedd593..f3756a2 100644
4.23 +--- a/libc/sysdeps/linux/mips/crtn.S
4.24 ++++ b/libc/sysdeps/linux/mips/crtn.S
4.25 +@@ -10,7 +10,6 @@
4.26 + #NO_APP
4.27 + .align 2
4.28 + .globl _init
4.29 +- .ent _init
4.30 + .type _init, @function
4.31 + #NO_APP
4.32 + lw $31,28($sp)
4.33 +@@ -22,14 +21,12 @@
4.34 + .set macro
4.35 + .set reorder
4.36 +
4.37 +- .end _init
4.38 + #APP
4.39 +
4.40 + .section .fini
4.41 + #NO_APP
4.42 + .align 2
4.43 + .globl _fini
4.44 +- .ent _fini
4.45 + .type _fini, @function
4.46 + #NO_APP
4.47 + lw $31,28($sp)
4.48 +@@ -41,7 +38,6 @@
4.49 + .set macro
4.50 + .set reorder
4.51 +
4.52 +- .end _fini
4.53 + #APP
4.54 +
4.55 + .ident "GCC: (GNU) 3.3.2"
4.56 +@@ -54,10 +50,8 @@
4.57 +
4.58 + .section .init
4.59 + #NO_APP
4.60 +- .align 2
4.61 + .align 3
4.62 + .globl _init
4.63 +- .ent _init
4.64 + .type _init, @function
4.65 + #NO_APP
4.66 + ld $31,8($sp)
4.67 +@@ -68,16 +62,12 @@
4.68 + addiu $sp,$sp,16
4.69 + .set macro
4.70 + .set reorder
4.71 +-
4.72 +- .end _init
4.73 + #APP
4.74 +
4.75 + .section .fini
4.76 + #NO_APP
4.77 +- .align 2
4.78 + .align 3
4.79 + .globl _fini
4.80 +- .ent _fini
4.81 + .type _fini, @function
4.82 + #NO_APP
4.83 + ld $31,8($sp)
4.84 +@@ -89,7 +79,6 @@
4.85 + .set macro
4.86 + .set reorder
4.87 +
4.88 +- .end _fini
4.89 + #APP
4.90 +
4.91 + .ident "GCC: (GNU) 3.4.3"
4.92 +@@ -105,7 +94,6 @@
4.93 + #NO_APP
4.94 + .align 2
4.95 + .globl _init
4.96 +- .ent _init
4.97 + .type _init, @function
4.98 + #NO_APP
4.99 + ld $31,24($sp)
4.100 +@@ -118,14 +106,12 @@
4.101 + .set macro
4.102 + .set reorder
4.103 +
4.104 +- .end _init
4.105 + #APP
4.106 +
4.107 + .section .fini
4.108 + #NO_APP
4.109 + .align 2
4.110 + .globl _fini
4.111 +- .ent _fini
4.112 + .type _fini, @function
4.113 + #NO_APP
4.114 + ld $31,24($sp)
4.115 +@@ -138,7 +124,6 @@
4.116 + .set macro
4.117 + .set reorder
4.118 +
4.119 +- .end _fini
4.120 + #APP
4.121 +
4.122 + .ident "GCC: (GNU) 3.3.2"
4.123 +diff --git a/libpthread/nptl/Makefile.in b/libpthread/nptl/Makefile.in
4.124 +index 92d72a6..849bd59 100644
4.125 +--- a/libpthread/nptl/Makefile.in
4.126 ++++ b/libpthread/nptl/Makefile.in
4.127 +@@ -64,8 +64,8 @@ endif
4.128 + librt-so-y += $(librt_OBJS:.o=.oS) $(librt-pt-shared-only-routines-y:.o=.oS)
4.129 +
4.130 + ifeq ($(UCLIBC_CTOR_DTOR),y)
4.131 +-START_FILE-libpthread.so := $(top_builddir)libpthread/nptl/sysdeps/pthread/crti.o
4.132 +-END_FILE-libpthread.so := $(top_builddir)libpthread/nptl/sysdeps/pthread/crtn.o
4.133 ++START_FILE-libpthread.so := $(top_builddir)libpthread/nptl/sysdeps/pthread/pt-crti.o
4.134 ++END_FILE-libpthread.so := $(top_builddir)libpthread/nptl/sysdeps/pthread/pt-crtn.o
4.135 + LDFLAGS-libpthread.so += -nostartfiles
4.136 + $(top_builddir)lib/libpthread.so: | $(START_FILE-libpthread.so) $(END_FILE-libpthread.so)
4.137 + endif
4.138 +diff --git a/libpthread/nptl/sysdeps/pthread/Makefile.in b/libpthread/nptl/sysdeps/pthread/Makefile.in
4.139 +index d93b3a5..398eaea 100644
4.140 +--- a/libpthread/nptl/sysdeps/pthread/Makefile.in
4.141 ++++ b/libpthread/nptl/sysdeps/pthread/Makefile.in
4.142 +@@ -73,23 +73,37 @@ CFLAGS-pt-initfini.c = -S -g0 $(PICFLAG) -fno-inline-functions \
4.143 + -finhibit-size-directive \
4.144 + -fno-asynchronous-unwind-tables -fno-unwind-tables \
4.145 + $(patsubst -f%,-fno-%,$(call check_gcc,-fexceptions,))
4.146 +-ASFLAGS-crti.S = -g0
4.147 +-ASFLAGS-crtn.S = -g0
4.148 +
4.149 +-$(libpthread_pthread_OUT)/pt-initfini.s: $(libpthread_pthread_DIR)/pt-initfini.c
4.150 ++#ASFLAGS += $(PICFLAG) -I$(top_srcdir)include -I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)
4.151 ++ifneq ($(wildcard $(libpthread_DIR)/sysdeps/linux/$(TARGET_ARCH)/pt-initfini.c),)
4.152 ++PTHREAD_INITFINI := $(libpthread_DIR)/sysdeps/linux/$(TARGET_ARCH)/pt-initfini.c
4.153 ++else
4.154 ++PTHREAD_INITFINI := $(libpthread_pthread_DIR)/pt-initfini.c
4.155 ++endif
4.156 ++
4.157 ++ASFLAGS-pt-crti.S = $(PICFLAG)
4.158 ++ASFLAGS-pt-crtn.S = $(PICFLAG)
4.159 ++
4.160 ++$(libpthread_pthread_OUT)/pt-crti.o: $(libpthread_pthread_OUT)/pt-crti.S
4.161 ++ $(compile.S)
4.162 ++
4.163 ++$(libpthread_pthread_OUT)/pt-crtn.o: $(libpthread_pthread_OUT)/pt-crtn.S
4.164 ++ $(compile.S)
4.165 ++
4.166 ++$(libpthread_pthread_OUT)/pt-initfini.s: $(PTHREAD_INITFINI)
4.167 + $(compile.c)
4.168 +-$(libpthread_pthread_OUT)/defs.h: $(libpthread_pthread_DIR)/pt-initfini.c
4.169 ++$(libpthread_pthread_OUT)/defs.h: $(PTHREAD_INITFINI)
4.170 + $(do_sed) -n -e '/@TESTS_BEGIN/,/@TESTS_END/p' $< | \
4.171 + $(AWK) -f $(top_srcdir)extra/scripts/defs.awk > $@.tmp
4.172 + $(Q)mv $@.tmp $@
4.173 +
4.174 +-$(libpthread_pthread_OUT)/crti.S: $(libpthread_pthread_OUT)/pt-initfini.s $(libpthread_pthread_OUT)/defs.h
4.175 ++$(libpthread_pthread_OUT)/pt-crti.S: $(libpthread_pthread_OUT)/pt-initfini.s $(libpthread_pthread_OUT)/defs.h
4.176 + $(do_sed) -n -e '/[ ]*\.file/d' \
4.177 + -e '1,/@HEADER_ENDS/p' \
4.178 + -e '/@_.*_PROLOG_BEGINS/,/@_.*_PROLOG_ENDS/p' \
4.179 + -e '/@TRAILER_BEGINS/,$$p' $< > $@.tmp
4.180 + $(Q)mv $@.tmp $@
4.181 +-$(libpthread_pthread_OUT)/crtn.S: $(libpthread_pthread_OUT)/pt-initfini.s $(libpthread_pthread_OUT)/defs.h
4.182 ++$(libpthread_pthread_OUT)/pt-crtn.S: $(libpthread_pthread_OUT)/pt-initfini.s $(libpthread_pthread_OUT)/defs.h
4.183 + $(do_sed) -n -e '/[ ]*\.file/d' \
4.184 + -e '1,/@HEADER_ENDS/p' \
4.185 + -e '/@_.*_EPILOG_BEGINS/,/@_.*_EPILOG_ENDS/p' \
5.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
5.2 +++ b/patches/uClibc/0.9.32/130-nptl-pthread-Correct-path-for-machine-specific-pt-initfini.c.patch Mon Jun 27 00:12:29 2011 +0200
5.3 @@ -0,0 +1,24 @@
5.4 +commit ebe6c38d7e60e8a43d8b926c17a561a5a3e06a22
5.5 +Author: Khem Raj <raj.khem@gmail.com>
5.6 +Date: Mon Jun 13 17:13:52 2011 -0700
5.7 +
5.8 + nptl/pthread: Correct path for machine specific pt-initfini.c
5.9 +
5.10 + Signed-off-by: Khem Raj <raj.khem@gmail.com>
5.11 + Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
5.12 +
5.13 +diff --git a/libpthread/nptl/sysdeps/pthread/Makefile.in b/libpthread/nptl/sysdeps/pthread/Makefile.in
5.14 +index 398eaea..ca84642 100644
5.15 +--- a/libpthread/nptl/sysdeps/pthread/Makefile.in
5.16 ++++ b/libpthread/nptl/sysdeps/pthread/Makefile.in
5.17 +@@ -75,8 +75,8 @@ CFLAGS-pt-initfini.c = -S -g0 $(PICFLAG) -fno-inline-functions \
5.18 + $(patsubst -f%,-fno-%,$(call check_gcc,-fexceptions,))
5.19 +
5.20 + #ASFLAGS += $(PICFLAG) -I$(top_srcdir)include -I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)
5.21 +-ifneq ($(wildcard $(libpthread_DIR)/sysdeps/linux/$(TARGET_ARCH)/pt-initfini.c),)
5.22 +-PTHREAD_INITFINI := $(libpthread_DIR)/sysdeps/linux/$(TARGET_ARCH)/pt-initfini.c
5.23 ++ifneq ($(wildcard $(libpthread_pthread_DIR)/../unix/sysv/linux/$(TARGET_ARCH)/pt-initfini.c),)
5.24 ++PTHREAD_INITFINI := $(libpthread_pthread_DIR)/../unix/sysv/linux/$(TARGET_ARCH)/pt-initfini.c
5.25 + else
5.26 + PTHREAD_INITFINI := $(libpthread_pthread_DIR)/pt-initfini.c
5.27 + endif
6.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
6.2 +++ b/patches/uClibc/0.9.32/140-ARM-reorder-Use-BX-option.patch Mon Jun 27 00:12:29 2011 +0200
6.3 @@ -0,0 +1,48 @@
6.4 +commit d64b91a6d4fa1a3ac1d01fa7593d67c5e5ed5101
6.5 +Author: Yann E. MORIN <yann.morin.1998@anciens.enib.fr>
6.6 +Date: Sun Jan 9 01:45:04 2011 +0100
6.7 +
6.8 + ARM: reorder "Use BX" option
6.9 +
6.10 + "Use BX" is not available on all CPUs, so the option depends on
6.11 + a correct CPU to be chosen . It is weird that e BX" then appears
6.12 + _above_ the CPU selection, not below.
6.13 +
6.14 + Move the "Use BX" after the CPU selection.
6.15 +
6.16 + Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
6.17 + Cc: Khem Raj <raj.khem@gmail.com>
6.18 + Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
6.19 + Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
6.20 + Signed-off-by: Khem Raj <raj.khem@gmail.com>
6.21 + Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
6.22 +
6.23 +diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
6.24 +index eb27a33..dd63b80 100644
6.25 +--- a/extra/Configs/Config.arm
6.26 ++++ b/extra/Configs/Config.arm
6.27 +@@ -30,13 +30,6 @@ config CONFIG_ARM_EABI
6.28 +
6.29 + endchoice
6.30 +
6.31 +-config USE_BX
6.32 +- bool "Use BX in function return"
6.33 +- default y
6.34 +- depends on !CONFIG_GENERIC_ARM && !CONFIG_ARM610 && !CONFIG_ARM710
6.35 +- help
6.36 +- Use BX instruction for THUMB aware architectures.
6.37 +-
6.38 + choice
6.39 + prompt "Target Processor Type"
6.40 + default CONFIG_GENERIC_ARM
6.41 +@@ -131,3 +124,10 @@ config CONFIG_ARM_IWMMXT
6.42 + select ARCH_HAS_MMU
6.43 +
6.44 + endchoice
6.45 ++
6.46 ++config USE_BX
6.47 ++ bool "Use BX in function return"
6.48 ++ default y
6.49 ++ depends on !CONFIG_GENERIC_ARM && !CONFIG_ARM610 && !CONFIG_ARM710
6.50 ++ help
6.51 ++ Use BX instruction for THUMB aware architectures.
7.1 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
7.2 +++ b/patches/uClibc/0.9.32/150-Rules.mak-Rearrange-appending-UCLIBC_EXTRA_CFLAGS-to-CFLAGS.patch Mon Jun 27 00:12:29 2011 +0200
7.3 @@ -0,0 +1,38 @@
7.4 +commit 4642f4eead07080bf46b6d67b873d303eda9fb48
7.5 +Author: Khem Raj <raj.khem@gmail.com>
7.6 +Date: Sat Jun 11 00:15:02 2011 -0700
7.7 +
7.8 + Rules.mak: Rearrange appending UCLIBC_EXTRA_CFLAGS to CFLAGS
7.9 +
7.10 + UCLIBC_EXTRA_CFLAGS is currently added before the OPTIMIZATION flags
7.11 + and OPTIMIZATION is chosen to be Os by default. But in OE we pass the optimisation
7.12 + flags through UCLIBC_EXTRA_CFLAGS but they are not effective since -Os is
7.13 + specified at last. So we need to change the order of these option flags
7.14 +
7.15 + Signed-off-by: Khem Raj <raj.khem@gmail.com>
7.16 + Signed-off-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
7.17 +
7.18 +diff --git a/Rules.mak b/Rules.mak
7.19 +index a00deea..6b8f5b2 100644
7.20 +--- a/Rules.mak
7.21 ++++ b/Rules.mak
7.22 +@@ -585,9 +585,6 @@ CFLAGS := -include $(top_srcdir)include/libc-symbols.h \
7.23 + -nostdinc -I$(top_builddir)include -I$(top_srcdir)include -I. \
7.24 + -I$(top_srcdir)libc/sysdeps/linux \
7.25 + -I$(top_srcdir)libc/sysdeps/linux/$(TARGET_ARCH)
7.26 +-ifneq ($(strip $(UCLIBC_EXTRA_CFLAGS)),"")
7.27 +-CFLAGS += $(call qstrip,$(UCLIBC_EXTRA_CFLAGS))
7.28 +-endif
7.29 +
7.30 + # We need this to be checked within libc-symbols.h
7.31 + ifneq ($(HAVE_SHARED),y)
7.32 +@@ -633,6 +630,9 @@ LDFLAGS += -Wl,-s
7.33 + else
7.34 + STRIPTOOL := true -Stripping_disabled
7.35 + endif
7.36 ++ifneq ($(strip $(UCLIBC_EXTRA_CFLAGS)),"")
7.37 ++CFLAGS += $(call qstrip,$(UCLIBC_EXTRA_CFLAGS))
7.38 ++endif
7.39 +
7.40 + ifeq ($(DOMULTI),y)
7.41 + # we try to compile all sources at once into an object (IMA), but