summaryrefslogtreecommitdiffstats
path: root/toolchain/uClibc/patches-nptl
diff options
context:
space:
mode:
authornico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-04-24 02:07:24 +0000
committernico <nico@3c298f89-4303-0410-b956-a3cf2f4a3e73>2009-04-24 02:07:24 +0000
commitd0c10785e702f0e56029aee4c4f8f9bfcf03a5e9 (patch)
tree9d6f7295056441b2f0941d9807b9d01c92c9dad9 /toolchain/uClibc/patches-nptl
parent89167b9397299681674c890d68559b4390dec3ad (diff)
[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
Diffstat (limited to 'toolchain/uClibc/patches-nptl')
-rw-r--r--toolchain/uClibc/patches-nptl/110-compat_macros.patch51
-rw-r--r--toolchain/uClibc/patches-nptl/120-adjtimex.patch14
-rw-r--r--toolchain/uClibc/patches-nptl/130-compile_fix.patch36
3 files changed, 0 insertions, 101 deletions
diff --git a/toolchain/uClibc/patches-nptl/110-compat_macros.patch b/toolchain/uClibc/patches-nptl/110-compat_macros.patch
deleted file mode 100644
index 7659e465c..000000000
--- a/toolchain/uClibc/patches-nptl/110-compat_macros.patch
+++ /dev/null
@@ -1,51 +0,0 @@
---- ./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-nptl/120-adjtimex.patch b/toolchain/uClibc/patches-nptl/120-adjtimex.patch
deleted file mode 100644
index 5127701df..000000000
--- a/toolchain/uClibc/patches-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-nptl/130-compile_fix.patch b/toolchain/uClibc/patches-nptl/130-compile_fix.patch
deleted file mode 100644
index ed3812a8e..000000000
--- a/toolchain/uClibc/patches-nptl/130-compile_fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
---- a/librt/mq_receive.c
-+++ b/librt/mq_receive.c
-@@ -6,7 +6,8 @@
- #include <stddef.h>
- #include <sys/syscall.h>
- #include <mqueue.h>
--#warning FIXME: hard dependency on ADVANCED REALTIME feature
-+
-+#ifdef __UCLIBC_HAS_ADVANCED_REALTIME__
-
- librt_hidden_proto(mq_timedreceive)
-
-@@ -44,3 +45,5 @@ ssize_t mq_receive(mqd_t mqdes, char *ms
- {
- return mq_timedreceive(mqdes, msg_ptr, msg_len, msg_prio, NULL);
- }
-+
-+#endif /* __UCLIBC_HAS_ADVANCED_REALTIME__ */
---- a/librt/mq_send.c
-+++ b/librt/mq_send.c
-@@ -6,7 +6,8 @@
- #include <stddef.h>
- #include <sys/syscall.h>
- #include <mqueue.h>
--#warning FIXME: hard dependency on ADVANCED REALTIME feature
-+
-+#ifdef __UCLIBC_HAS_ADVANCED_REALTIME__
-
- librt_hidden_proto(mq_timedsend)
-
-@@ -43,3 +44,5 @@ int mq_send(mqd_t mqdes, const char *msg
- {
- return mq_timedsend(mqdes, msg_ptr, msg_len, msg_prio, NULL);
- }
-+
-+#endif /* __UCLIBC_HAS_ADVANCED_REALTIME__ */