mirror of
https://github.com/openwrt/openwrt.git
synced 2024-12-23 23:42:43 +00:00
upgrade to latest git snapshot
SVN-Revision: 24889
This commit is contained in:
parent
e303b6e46a
commit
5428a58287
@ -14,10 +14,10 @@ PKG_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION))
|
|||||||
ifeq ($(CONFIG_UCLIBC_VERSION_0_9_32),y)
|
ifeq ($(CONFIG_UCLIBC_VERSION_0_9_32),y)
|
||||||
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:=e2903ddb06b1f50cb4ac9af0b035c74ed6b9d30f
|
PKG_SOURCE_VERSION:=4ac7ad3543dd6d7780e71af80fa5c45414451719
|
||||||
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)-git
|
LIBC_SO_VERSION:=$(PKG_VERSION)-rc1-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
|
||||||
|
@ -1,67 +0,0 @@
|
|||||||
From 1f674977c0f3ea1e67deea93fa8f4e795cc869ad Mon Sep 17 00:00:00 2001
|
|
||||||
From: Timo Teräs <timo.teras@iki.fi>
|
|
||||||
Date: Tue, 07 Dec 2010 09:27:29 +0000
|
|
||||||
Subject: nptl: fix Unwind_Resume PLT calls
|
|
||||||
|
|
||||||
My change a49b3a18e463cbe8c94c41501e386e7f4c61609e fixed two
|
|
||||||
Unwind_Resume calls to go via PLT to avoid text relocations for PIC
|
|
||||||
builds. However, it looks the reason for upstream not using PLT calls
|
|
||||||
is that ebx gets clobbered. So we need to reload it.
|
|
||||||
|
|
||||||
Signed-off-by: Timo Teräs <timo.teras@iki.fi>
|
|
||||||
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
|
|
||||||
---
|
|
||||||
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
|
|
||||||
index ac7983c..3b61367 100644
|
|
||||||
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
|
|
||||||
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_timedwait.S
|
|
||||||
@@ -648,6 +648,10 @@ __condvar_tw_cleanup:
|
|
||||||
|
|
||||||
movl %esi, (%esp)
|
|
||||||
.LcallUR:
|
|
||||||
+#ifdef __PIC__
|
|
||||||
+ call __i686.get_pc_thunk.bx
|
|
||||||
+ addl $_GLOBAL_OFFSET_TABLE_, %ebx
|
|
||||||
+#endif
|
|
||||||
call _Unwind_Resume@PLT
|
|
||||||
hlt
|
|
||||||
.LENDCODE:
|
|
||||||
diff --git a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
|
|
||||||
index abc963f..a1294c5 100644
|
|
||||||
--- a/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
|
|
||||||
+++ b/libpthread/nptl/sysdeps/unix/sysv/linux/i386/i486/pthread_cond_wait.S
|
|
||||||
@@ -535,6 +535,10 @@ __condvar_w_cleanup:
|
|
||||||
|
|
||||||
movl %esi, (%esp)
|
|
||||||
.LcallUR:
|
|
||||||
+#ifdef __PIC__
|
|
||||||
+ call __i686.get_pc_thunk.bx
|
|
||||||
+ addl $_GLOBAL_OFFSET_TABLE_, %ebx
|
|
||||||
+#endif
|
|
||||||
call _Unwind_Resume@PLT
|
|
||||||
hlt
|
|
||||||
.LENDCODE:
|
|
||||||
@@ -569,14 +573,14 @@ __condvar_w_cleanup:
|
|
||||||
.Lcstend:
|
|
||||||
|
|
||||||
#ifdef __PIC__
|
|
||||||
- .section .gnu.linkonce.t.__i686.get_pc_thunk.cx,"ax",@progbits
|
|
||||||
- .globl __i686.get_pc_thunk.cx
|
|
||||||
- .hidden __i686.get_pc_thunk.cx
|
|
||||||
- .type __i686.get_pc_thunk.cx,@function
|
|
||||||
-__i686.get_pc_thunk.cx:
|
|
||||||
- movl (%esp), %ecx;
|
|
||||||
+ .section .gnu.linkonce.t.__i686.get_pc_thunk.bx,"ax",@progbits
|
|
||||||
+ .globl __i686.get_pc_thunk.bx
|
|
||||||
+ .hidden __i686.get_pc_thunk.bx
|
|
||||||
+ .type __i686.get_pc_thunk.bx,@function
|
|
||||||
+__i686.get_pc_thunk.bx:
|
|
||||||
+ movl (%esp), %ebx;
|
|
||||||
ret
|
|
||||||
- .size __i686.get_pc_thunk.cx,.-__i686.get_pc_thunk.cx
|
|
||||||
+ .size __i686.get_pc_thunk.bx,.-__i686.get_pc_thunk.bx
|
|
||||||
#endif
|
|
||||||
|
|
||||||
#ifdef SHARED
|
|
||||||
--
|
|
||||||
cgit v0.8.2.1
|
|
@ -1,17 +0,0 @@
|
|||||||
--- a/libc/inet/netlinkaccess.h
|
|
||||||
+++ b/libc/inet/netlinkaccess.h
|
|
||||||
@@ -25,12 +25,8 @@
|
|
||||||
#include <sys/types.h>
|
|
||||||
|
|
||||||
#if defined __ASSUME_NETLINK_SUPPORT || defined __UCLIBC_USE_NETLINK__
|
|
||||||
-#define _LINUX_TYPES_H
|
|
||||||
-typedef uint8_t __u8;
|
|
||||||
-typedef uint16_t __u16;
|
|
||||||
-typedef uint32_t __u32;
|
|
||||||
-typedef uint64_t __u64;
|
|
||||||
-typedef int32_t __s32;
|
|
||||||
+
|
|
||||||
+#include <linux/types.h>
|
|
||||||
#include <linux/rtnetlink.h>
|
|
||||||
#include <linux/netlink.h>
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user