diff options
| author | Imre Kaloz <kaloz@openwrt.org> | 2010-02-26 11:03:59 +0000 |
|---|---|---|
| committer | Imre Kaloz <kaloz@openwrt.org> | 2010-02-26 11:03:59 +0000 |
| commit | d2bf3771edd13922630a5a50c7da3997fd0ae667 (patch) | |
| tree | 74de173ad6fa392c5183775eab324a100bff97f1 /toolchain/uClibc/patches-0.9.30+nptl | |
| parent | c354852432bf7e439f45004d837f429540c15904 (diff) | |
| download | upstream-d2bf3771edd13922630a5a50c7da3997fd0ae667.tar.gz upstream-d2bf3771edd13922630a5a50c7da3997fd0ae667.tar.bz2 upstream-d2bf3771edd13922630a5a50c7da3997fd0ae667.zip | |
upgrade and fixup support for the uclibc nptl branch
SVN-Revision: 19871
Diffstat (limited to 'toolchain/uClibc/patches-0.9.30+nptl')
| -rw-r--r-- | toolchain/uClibc/patches-0.9.30+nptl/120-adjtimex.patch | 14 | ||||
| -rw-r--r-- | toolchain/uClibc/patches-0.9.30+nptl/150-use_gnu99.patch | 33 |
2 files changed, 33 insertions, 14 deletions
diff --git a/toolchain/uClibc/patches-0.9.30+nptl/120-adjtimex.patch b/toolchain/uClibc/patches-0.9.30+nptl/120-adjtimex.patch deleted file mode 100644 index 5127701dfc..0000000000 --- a/toolchain/uClibc/patches-0.9.30+nptl/120-adjtimex.patch +++ /dev/null @@ -1,14 +0,0 @@ -Index: uClibc-0.9.29/include/sys/timex.h -=================================================================== ---- uClibc-0.9.29.orig/include/sys/timex.h 2007-12-30 17:34:21.983513096 +0100 -+++ uClibc-0.9.29/include/sys/timex.h 2007-12-30 17:34:32.180094169 +0100 -@@ -116,7 +116,8 @@ - - __BEGIN_DECLS - --extern int __adjtimex (struct timex *__ntx) __THROW; -+#undef __adjtimex -+#define __adjtimex adjtimex - extern int adjtimex (struct timex *__ntx) __THROW; - - extern int ntp_gettime (struct ntptimeval *__ntv) __THROW; diff --git a/toolchain/uClibc/patches-0.9.30+nptl/150-use_gnu99.patch b/toolchain/uClibc/patches-0.9.30+nptl/150-use_gnu99.patch new file mode 100644 index 0000000000..bfa55583d8 --- /dev/null +++ b/toolchain/uClibc/patches-0.9.30+nptl/150-use_gnu99.patch @@ -0,0 +1,33 @@ +--- a/libpthread/nptl/Makefile.in ++++ b/libpthread/nptl/Makefile.in +@@ -174,7 +174,7 @@ + CFLAGS-pthread_barrierattr_setpshared.c = -D_GNU_SOURCE + CFLAGS-sem_open.c = -D_GNU_SOURCE + +-CFLAGS-nptl = -DNOT_IN_libc=1 -DIS_IN_libpthread=1 $(SSP_ALL_CFLAGS) ++CFLAGS-nptl = -DNOT_IN_libc=1 -DIS_IN_libpthread=1 -std=gnu99 $(SSP_ALL_CFLAGS) + + CFLAGS-OMIT-alloca_cutoff.c = -DNOT_IN_libc=1 -DIS_IN_libpthread=1 + CFLAGS-OMIT-forward.c = -DNOT_IN_libc=1 -DIS_IN_libpthread=1 +--- a/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in ++++ b/libpthread/nptl/sysdeps/unix/sysv/linux/Makefile.in +@@ -82,7 +82,7 @@ + CFLAGS-timer_routines.c = -I$(top_srcdir)librt -DIS_IN_librt=1 + CFLAGS-timer_settime.c = -I$(top_srcdir)librt -DIS_IN_librt=1 + +-CFLAGS-linux = -DNOT_IN_libc=1 -DIS_IN_libpthread=1 $(SSP_ALL_CFLAGS) ++CFLAGS-linux = -DNOT_IN_libc=1 -DIS_IN_libpthread=1 -std=gnu99 $(SSP_ALL_CFLAGS) + #CFLAGS:=$(CFLAGS:-O1=-O2) + + CFLAGS-OMIT-libc_pthread_init.c = -DNOT_IN_libc=1 -DIS_IN_libpthread=1 +--- a/ldso/ldso/Makefile.in ++++ b/ldso/ldso/Makefile.in +@@ -13,7 +13,7 @@ + CFLAGS-ldso += -fno-omit-frame-pointer + + CFLAGS-ldso += -I$(top_srcdir)ldso/ldso/$(TARGET_ARCH) -I$(top_srcdir)ldso/include -I$(top_srcdir)ldso/ldso +-CFLAGS-ldso += -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" ++CFLAGS-ldso += -DUCLIBC_RUNTIME_PREFIX=\"$(RUNTIME_PREFIX)\" -DUCLIBC_LDSO=\"$(UCLIBC_LDSO)\" -std=gnu99 + + ifeq ($(DODEBUG),y) + # Not really much point in including debugging info, since gdb |