mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-11-19 04:18:26 +02:00
uClibc: update to latest 0.9.32.1 git
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@27772 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
parent
aeb70915fb
commit
f8277b14ea
@ -12,10 +12,11 @@ PKG_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION))
|
|||||||
ifeq ($(PKG_VERSION),0.9.32)
|
ifeq ($(PKG_VERSION),0.9.32)
|
||||||
PKG_SOURCE_URL:=git://git.busybox.net/uClibc
|
PKG_SOURCE_URL:=git://git.busybox.net/uClibc
|
||||||
PKG_SOURCE_PROTO:=git
|
PKG_SOURCE_PROTO:=git
|
||||||
PKG_SOURCE_VERSION:=f6450b67cc92027352367be299cc28dd29cd8486
|
PKG_SOURCE_VERSION:=9152c4d67c763fde5712e2d181d92c0d7e1e2ab9
|
||||||
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
|
||||||
LIBC_SO_VERSION:=$(PKG_VERSION)-rc3-git
|
PKG_MIRROR_MD5SUM:=723dfa4f1f766cbd675d2c9a8238abb0
|
||||||
|
LIBC_SO_VERSION:=$(PKG_VERSION).1-git
|
||||||
else
|
else
|
||||||
PKG_SOURCE_URL:=http://www.uclibc.org/downloads
|
PKG_SOURCE_URL:=http://www.uclibc.org/downloads
|
||||||
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
|
||||||
|
@ -38,6 +38,7 @@ LDSO_RUNPATH=y
|
|||||||
# LDSO_SEARCH_INTERP_PATH is not set
|
# LDSO_SEARCH_INTERP_PATH is not set
|
||||||
# LINUXTHREADS_NEW is not set
|
# LINUXTHREADS_NEW is not set
|
||||||
# LINUXTHREADS_OLD is not set
|
# LINUXTHREADS_OLD is not set
|
||||||
|
# UCLIBC_HAS_BACKTRACE is not set
|
||||||
UCLIBC_HAS_THREADS_NATIVE=y
|
UCLIBC_HAS_THREADS_NATIVE=y
|
||||||
# MALLOC is not set
|
# MALLOC is not set
|
||||||
MALLOC_GLIBC_COMPAT=y
|
MALLOC_GLIBC_COMPAT=y
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/Rules.mak
|
--- a/Rules.mak
|
||||||
+++ b/Rules.mak
|
+++ b/Rules.mak
|
||||||
@@ -658,7 +658,6 @@ endif
|
@@ -656,7 +656,6 @@ endif
|
||||||
ifeq ($(UCLIBC_HAS_THREADS),y)
|
ifeq ($(UCLIBC_HAS_THREADS),y)
|
||||||
ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
|
ifeq ($(UCLIBC_HAS_THREADS_NATIVE),y)
|
||||||
PTNAME := nptl
|
PTNAME := nptl
|
||||||
|
@ -1,13 +0,0 @@
|
|||||||
--- a/ldso/ldso/mips/elfinterp.c
|
|
||||||
+++ b/ldso/ldso/mips/elfinterp.c
|
|
||||||
@@ -378,8 +378,9 @@ void _dl_perform_mips_global_got_relocat
|
|
||||||
*got_entry += (unsigned long) tpnt->loadaddr;
|
|
||||||
}
|
|
||||||
else {
|
|
||||||
+ struct symbol_ref sym_ref = { sym, NULL };
|
|
||||||
*got_entry = (unsigned long) _dl_find_hash(strtab +
|
|
||||||
- sym->st_name, tpnt->symbol_scope, tpnt, ELF_RTYPE_CLASS_PLT, NULL);
|
|
||||||
+ sym->st_name, tpnt->symbol_scope, tpnt, ELF_RTYPE_CLASS_PLT, &sym_ref);
|
|
||||||
}
|
|
||||||
|
|
||||||
got_entry++;
|
|
@ -6,11 +6,9 @@ Date: Tue May 24 14:36:42 2011 +0200
|
|||||||
|
|
||||||
this eliminates a source of reproduceable freezes
|
this eliminates a source of reproduceable freezes
|
||||||
|
|
||||||
diff --git a/libc/stdio/_vfprintf.c b/libc/stdio/_vfprintf.c
|
|
||||||
index 3db8cdf..069db16 100644
|
|
||||||
--- a/libc/stdio/_vfprintf.c
|
--- a/libc/stdio/_vfprintf.c
|
||||||
+++ b/libc/stdio/_vfprintf.c
|
+++ b/libc/stdio/_vfprintf.c
|
||||||
@@ -1229,7 +1229,7 @@ static size_t _fp_out_narrow(FILE *fp, intptr_t type, intptr_t len, intptr_t buf
|
@@ -1229,7 +1229,7 @@ static size_t _fp_out_narrow(FILE *fp, i
|
||||||
#define STRLEN wcslen
|
#define STRLEN wcslen
|
||||||
#define _PPFS_init _ppwfs_init
|
#define _PPFS_init _ppwfs_init
|
||||||
/* Pulls in fseek: */
|
/* Pulls in fseek: */
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
--- a/Rules.mak
|
--- a/Rules.mak
|
||||||
+++ b/Rules.mak
|
+++ b/Rules.mak
|
||||||
@@ -484,6 +484,17 @@ ifeq ($(TARGET_ARCH),i960)
|
@@ -482,6 +482,17 @@ ifeq ($(TARGET_ARCH),i960)
|
||||||
SYMBOL_PREFIX=_
|
SYMBOL_PREFIX=_
|
||||||
endif
|
endif
|
||||||
|
|
||||||
|
@ -1,41 +0,0 @@
|
|||||||
"Use BX" is not available on all CPUs, so the option depends on
|
|
||||||
a correct CPU to be chosen . It is weird that e BX" then appears
|
|
||||||
_above_ the CPU selection, not below.
|
|
||||||
|
|
||||||
Move the "Use BX" after the CPU selection.
|
|
||||||
|
|
||||||
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@anciens.enib.fr>
|
|
||||||
Cc: Khem Raj <raj.khem@gmail.com>
|
|
||||||
Cc: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
|
|
||||||
Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
|
|
||||||
---
|
|
||||||
extra/Configs/Config.arm | 14 +++++++-------
|
|
||||||
1 files changed, 7 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
--- a/extra/Configs/Config.arm
|
|
||||||
+++ b/extra/Configs/Config.arm
|
|
||||||
@@ -30,13 +30,6 @@ config CONFIG_ARM_EABI
|
|
||||||
|
|
||||||
endchoice
|
|
||||||
|
|
||||||
-config USE_BX
|
|
||||||
- bool "Use BX in function return"
|
|
||||||
- default y
|
|
||||||
- depends on !CONFIG_GENERIC_ARM && !CONFIG_ARM610 && !CONFIG_ARM710
|
|
||||||
- help
|
|
||||||
- Use BX instruction for THUMB aware architectures.
|
|
||||||
-
|
|
||||||
choice
|
|
||||||
prompt "Target Processor Type"
|
|
||||||
default CONFIG_GENERIC_ARM
|
|
||||||
@@ -131,3 +124,10 @@ config CONFIG_ARM_IWMMXT
|
|
||||||
select ARCH_HAS_MMU
|
|
||||||
|
|
||||||
endchoice
|
|
||||||
+
|
|
||||||
+config USE_BX
|
|
||||||
+ bool "Use BX in function return"
|
|
||||||
+ default y
|
|
||||||
+ depends on !CONFIG_GENERIC_ARM && !CONFIG_ARM610 && !CONFIG_ARM710
|
|
||||||
+ help
|
|
||||||
+ Use BX instruction for THUMB aware architectures.
|
|
@ -17,8 +17,8 @@ Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
|
|||||||
|
|
||||||
--- a/Rules.mak
|
--- a/Rules.mak
|
||||||
+++ b/Rules.mak
|
+++ b/Rules.mak
|
||||||
@@ -335,25 +335,6 @@ ifeq ($(TARGET_ARCH),arm)
|
@@ -335,25 +335,6 @@ endif
|
||||||
OPTIMIZATION+=-fstrict-aliasing
|
ifeq ($(TARGET_ARCH),arm)
|
||||||
CPU_CFLAGS-$(ARCH_LITTLE_ENDIAN)+=-mlittle-endian
|
CPU_CFLAGS-$(ARCH_LITTLE_ENDIAN)+=-mlittle-endian
|
||||||
CPU_CFLAGS-$(ARCH_BIG_ENDIAN)+=-mbig-endian
|
CPU_CFLAGS-$(ARCH_BIG_ENDIAN)+=-mbig-endian
|
||||||
- CPU_CFLAGS-$(CONFIG_GENERIC_ARM)+=
|
- CPU_CFLAGS-$(CONFIG_GENERIC_ARM)+=
|
||||||
|
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user