From d0c10785e702f0e56029aee4c4f8f9bfcf03a5e9 Mon Sep 17 00:00:00 2001 From: nico Date: Fri, 24 Apr 2009 02:07:24 +0000 Subject: [toolchain] uClibc cleanup: - use full version string (0.9.30.1), instead of base (0.9.30) + extra (.1) - remove support for 0.9.28 and snapshots (building from SVN to be added later) git-svn-id: svn://svn.openwrt.org/openwrt/trunk@15368 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches-0.9.30.1/110-compat_macros.patch | 51 ++++++++++++++++++++++ .../uClibc/patches-0.9.30.1/120-adjtimex.patch | 14 ++++++ .../130-pthread_weak_binding.patch | 10 +++++ 3 files changed, 75 insertions(+) create mode 100644 toolchain/uClibc/patches-0.9.30.1/110-compat_macros.patch create mode 100644 toolchain/uClibc/patches-0.9.30.1/120-adjtimex.patch create mode 100644 toolchain/uClibc/patches-0.9.30.1/130-pthread_weak_binding.patch (limited to 'toolchain/uClibc/patches-0.9.30.1') diff --git a/toolchain/uClibc/patches-0.9.30.1/110-compat_macros.patch b/toolchain/uClibc/patches-0.9.30.1/110-compat_macros.patch new file mode 100644 index 000000000..7659e465c --- /dev/null +++ b/toolchain/uClibc/patches-0.9.30.1/110-compat_macros.patch @@ -0,0 +1,51 @@ +--- ./include/string.h.orig 2008-06-08 22:38:53.000000000 +0200 ++++ ./include/string.h 2009-01-02 16:09:03.000000000 +0100 +@@ -355,18 +355,40 @@ + /* Find the last occurrence of C in S (same as strrchr). */ + extern char *rindex (__const char *__s, int __c) + __THROW __attribute_pure__ __nonnull ((1)); +-# else +-# ifdef __UCLIBC_SUSV3_LEGACY_MACROS__ ++# elif defined(__UCLIBC_SUSV3_LEGACY_MACROS__) && !defined(_STRINGS_H) + /* bcopy/bzero/bcmp/index/rindex are marked LEGACY in SuSv3. + * They are replaced as proposed by SuSv3. Don't sync this part + * with glibc and keep it in sync with strings.h. */ + +-# define bcopy(src,dest,n) (memmove((dest), (src), (n)), (void) 0) +-# define bzero(s,n) (memset((s), '\0', (n)), (void) 0) +-# define bcmp(s1,s2,n) memcmp((s1), (s2), (size_t)(n)) +-# define index(s,c) strchr((s), (c)) +-# define rindex(s,c) strrchr((s), (c)) +-# endif ++/* Copy N bytes of SRC to DEST (like memmove, but args reversed). */ ++static __inline__ void bcopy (__const void *__src, void *__dest, size_t __n) ++{ ++ memmove(__dest, __src, __n); ++} ++ ++/* Set N bytes of S to 0. */ ++static __inline__ void bzero (void *__s, size_t __n) ++{ ++ memset(__s, 0, __n); ++} ++ ++/* Compare N bytes of S1 and S2 (same as memcmp). */ ++static __inline__ int bcmp (__const void *__s1, __const void *__s2, size_t __n) ++{ ++ return memcmp(__s1, __s2, __n); ++} ++ ++/* Find the first occurrence of C in S (same as strchr). */ ++static __inline__ char *index (__const char *__s, int __c) ++{ ++ return strchr(__s, __c); ++} ++ ++/* Find the last occurrence of C in S (same as strrchr). */ ++static __inline__ char *rindex (__const char *__s, int __c) ++{ ++ return strrchr(__s, __c); ++} + # endif + + /* Return the position of the first bit set in I, or 0 if none are set. diff --git a/toolchain/uClibc/patches-0.9.30.1/120-adjtimex.patch b/toolchain/uClibc/patches-0.9.30.1/120-adjtimex.patch new file mode 100644 index 000000000..5127701df --- /dev/null +++ b/toolchain/uClibc/patches-0.9.30.1/120-adjtimex.patch @@ -0,0 +1,14 @@ +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.1/130-pthread_weak_binding.patch b/toolchain/uClibc/patches-0.9.30.1/130-pthread_weak_binding.patch new file mode 100644 index 000000000..92227cf41 --- /dev/null +++ b/toolchain/uClibc/patches-0.9.30.1/130-pthread_weak_binding.patch @@ -0,0 +1,10 @@ +--- a/libc/unistd/daemon.c ++++ b/libc/unistd/daemon.c +@@ -54,7 +54,6 @@ + libc_hidden_proto(dup2) + libc_hidden_proto(setsid) + libc_hidden_proto(chdir) +-libc_hidden_proto(fork) + + int daemon( int nochdir, int noclose ) + { -- cgit v1.2.3