diff options
| author |   Khem Raj <raj.khem@gmail.com> | 2010-07-22 23:01:29 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2010-07-23 14:28:09 -0700 |
| commit | 797299e77105cd88ef440c6fc36a39325bb54688 (patch) | |
| tree | e5f061e5c3fa6dc3b31143b4284f8fbb0b9eeda3 /recipes/uclibc | |
| parent | 2b91503b34942bed0646d1124114eceddba3361b (diff) | |
| download | openembedded-797299e77105cd88ef440c6fc36a39325bb54688.tar.gz | |
uclibc-git: Bump SRCREV
* Remove upstream patch.
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Diffstat (limited to 'recipes/uclibc')
| -rw-r--r-- | recipes/uclibc/uclibc-git/fix-thumb1-PIE.patch | 58 | ||||
| -rw-r--r-- | recipes/uclibc/uclibc_git.bb | 3 |
2 files changed, 1 insertions, 60 deletions
diff --git a/recipes/uclibc/uclibc-git/fix-thumb1-PIE.patch b/recipes/uclibc/uclibc-git/fix-thumb1-PIE.patch deleted file mode 100644 index 3bb88891df..0000000000 --- a/recipes/uclibc/uclibc-git/fix-thumb1-PIE.patch +++ /dev/null @@ -1,58 +0,0 @@ -diff --git a/Rules.mak b/Rules.mak -index f6fa818..fe03c81 100644 ---- a/Rules.mak -+++ b/Rules.mak -@@ -339,7 +339,7 @@ ifeq ($(TARGET_ARCH),arm) - CPU_CFLAGS-$(CONFIG_ARM720T)+=-mtune=arm7tdmi -march=armv4t - CPU_CFLAGS-$(CONFIG_ARM920T)+=-mtune=arm9tdmi -march=armv4t - CPU_CFLAGS-$(CONFIG_ARM922T)+=-mtune=arm9tdmi -march=armv4t -- CPU_CFLAGS-$(CONFIG_ARM926T)+=-mtune=arm9tdmi -march=armv5t -+ CPU_CFLAGS-$(CONFIG_ARM926T)+=-mtune=arm9e -march=armv5te - CPU_CFLAGS-$(CONFIG_ARM10T)+=-mtune=arm10tdmi -march=armv5t - CPU_CFLAGS-$(CONFIG_ARM1136JF_S)+=-mtune=arm1136jf-s -march=armv6 - CPU_CFLAGS-$(CONFIG_ARM1176JZ_S)+=-mtune=arm1176jz-s -march=armv6 -@@ -598,7 +598,7 @@ endif - - LDFLAGS:=$(LDFLAGS_NOSTRIP) -Wl,-z,defs - ifeq ($(DODEBUG),y) --CFLAGS += -O0 -g3 -DDEBUG -+CFLAGS += -O0 -g -DDEBUG - else - CFLAGS += $(OPTIMIZATION) - endif -diff --git a/libc/sysdeps/linux/arm/crt1.S b/libc/sysdeps/linux/arm/crt1.S -index 18e3686..f2d9507 100644 ---- a/libc/sysdeps/linux/arm/crt1.S -+++ b/libc/sysdeps/linux/arm/crt1.S -@@ -133,7 +133,6 @@ _start: - - #ifdef __PIC__ - ldr r4, .L_GOT --.L_GOT_OFF: - adr r5, .L_GOT - add r4, r5, r4 - -@@ -201,8 +200,8 @@ _start: - - #ifdef __PIC__ - ldr sl, .L_GOT --.L_GOT_OFF: -- add sl, pc, sl -+ adr a4, .L_GOT -+ add sl, sl, a4 - - ldr ip, .L_GOT+4 /* _fini */ - ldr a1, [sl, ip] -@@ -238,11 +237,7 @@ _start: - - #ifdef __PIC__ - .L_GOT: --#ifdef __thumb__ -- .word _GLOBAL_OFFSET_TABLE_-(.L_GOT_OFF+4) --#else /* __thumb2__ */ -- .word _GLOBAL_OFFSET_TABLE_-(.L_GOT_OFF+8) --#endif -+ .word _GLOBAL_OFFSET_TABLE_ - .L_GOT - .word _fini(GOT) - .word _init(GOT) - .word main(GOT) diff --git a/recipes/uclibc/uclibc_git.bb b/recipes/uclibc/uclibc_git.bb index b2c91244be..23982cd098 100644 --- a/recipes/uclibc/uclibc_git.bb +++ b/recipes/uclibc/uclibc_git.bb @@ -7,7 +7,7 @@ # on whether the base patches apply to the selected (SRCDATE) svn release. # UCLIBC_BASE ?= "0.9.31" -SRCREV="fb6ca14d4d53657a4cde0d3f881f02c0d54fe17b" +SRCREV="37aec506502e14dcddd6ca190929bbc8d33d8e07" PR_append = "+gitr${SRCPV}" DEFAULT_PREFERENCE = "-1" #DEFAULT_PREFERENCE is 0 (empty), releases have a preference of 1 so take @@ -31,6 +31,5 @@ SRC_URI = "git://uclibc.org/uClibc.git;branch=master;protocol=git \ file://uclibc-arm-ftruncate64.patch \ file://uclibc_enable_log2_test.patch \ file://ldso_use_arm_dl_linux_resolve_in_thumb_mode.patch \ - file://fix-thumb1-PIE.patch \ " S = "${WORKDIR}/git" |