SVN-Revision: 133
This commit is contained in:
Mike Baker 2004-08-09 04:48:20 +00:00
parent 399d197536
commit 687dd472af
2 changed files with 0 additions and 119 deletions

View File

@ -1,49 +0,0 @@
diff -urN dnsmasq-2.6/src/config.h dnsmasq-2.6-new/src/config.h
--- dnsmasq-2.6/src/config.h 2004-04-03 14:03:39.000000000 -0600
+++ dnsmasq-2.6-new/src/config.h 2004-04-03 19:56:01.000000000 -0600
@@ -74,6 +74,11 @@
/* We assume that systems which don't have IPv6
headers don't have ntop and pton either */
+#if defined(__UCLIBC__) && !defined(__UCLIBC_HAS_IPV6__)
+# undef NO_IPV6
+# define NO_IPV6
+#endif
+
#if defined(INET6_ADDRSTRLEN) && !defined(NO_IPV6)
# define HAVE_IPV6
# define ADDRSTRLEN INET6_ADDRSTRLEN
@@ -191,7 +196,7 @@
/* platform dependent options. */
/* Must preceed __linux__ since uClinux defines __linux__ too. */
-#if defined(__uClinux__) || defined(__UCLIBC__)
+#if defined(__uClinux__)
#undef HAVE_LINUX_IPV6_PROC
#define HAVE_GETOPT_LONG
#undef HAVE_ARC4RANDOM
@@ -205,6 +210,24 @@
# define NO_FORK
#endif
+#elif defined(__linux__) && defined(__UCLIBC__)
+# define HAVE_LINUX_IPV6_PROC
+# if defined(__UCLIBC_HAS_GNU_GETOPT__) || \
+ ((__UCLIBC_MAJOR__==0) && (__UCLIBC_MINOR__==9) && (__UCLIBC_SUBLEVEL__<21))
+# define HAVE_GETOPT_LONG
+# else
+# undef HAVE_GETOPT_LONG
+# endif
+#undef HAVE_ARC4RANDOM
+#define HAVE_RANDOM
+#define HAVE_DEV_URANDOM
+#define HAVE_DEV_RANDOM
+#undef HAVE_SOCKADDR_SA_LEN
+#undef HAVE_PSELECT
+#if !defined(__ARCH_HAS_MMU__)
+# define NO_FORK
+#endif
+
/* libc5 - must precede __linux__ too */
/* Note to build a libc5 binary on a modern Debian system:
install the packages altgcc libc5 and libc5-altdev

View File

@ -1,70 +0,0 @@
--- uClibc/libc/sysdeps/linux/common/ftruncate64.c 17 Nov 2003 01:24:07 -0000 1.10
+++ uClibc/libc/sysdeps/linux/common/ftruncate64.c 21 Jul 2004 07:13:38 -0000
@@ -23,7 +23,7 @@
#if defined __NR_ftruncate64
-#if __WORDSIZE == 64 || (defined(__powerpc__) && defined (__UCLIBC_HAS_LFS__))
+#if __WORDSIZE == 64
/* For a 64 bit machine, life is simple... */
_syscall2(int, ftruncate64, int, fd, __off64_t, length);
@@ -33,15 +33,25 @@
#ifndef INLINE_SYSCALL
#define INLINE_SYSCALL(name, nr, args...) __syscall_ftruncate64 (args)
#define __NR___syscall_ftruncate64 __NR_ftruncate64
+#if defined(__powerpc__) || defined(__mips__)
+static inline _syscall4(int, __syscall_ftruncate64, int, fd, int, pad, int, high_length, int, low_length);
+#else
static inline _syscall3(int, __syscall_ftruncate64, int, fd, int, high_length, int, low_length);
#endif
+#endif
/* The exported ftruncate64 function. */
int ftruncate64 (int fd, __off64_t length)
{
uint32_t low = length & 0xffffffff;
uint32_t high = length >> 32;
- return INLINE_SYSCALL(ftruncate64, 3, fd, __LONG_LONG_PAIR (high, low));
+ return INLINE_SYSCALL(ftruncate64,
+#if defined(__powerpc__) || defined(__mips__)
+ 4, fd, 0,
+#else
+ 3, fd,
+#endif
+ __LONG_LONG_PAIR (high, low));
}
#else /* __WORDSIZE */
--- uClibc/libc/sysdeps/linux/common/truncate64.c 15 Nov 2002 14:06:44 -0000 1.8
+++ uClibc/libc/sysdeps/linux/common/truncate64.c 21 Jul 2004 07:13:38 -0000
@@ -33,7 +33,13 @@
#ifndef INLINE_SYSCALL
#define INLINE_SYSCALL(name, nr, args...) __syscall_truncate64 (args)
#define __NR___syscall_truncate64 __NR_truncate64
-static inline _syscall3(int, __syscall_truncate64, const char *, path, int, high_length, int, low_length);
+#if defined(__powerpc__) || defined(__mips__)
+static inline _syscall4(int, __syscall_truncate64, const char *, path,
+ int, pad, int, high_length, int, low_length);
+#else
+static inline _syscall3(int, __syscall_truncate64, const char *, path,
+ int, high_length, int, low_length);
+#endif
#endif
@@ -42,7 +48,13 @@
{
uint32_t low = length & 0xffffffff;
uint32_t high = length >> 32;
- return INLINE_SYSCALL(truncate64, 3, path, __LONG_LONG_PAIR (high, low));
+ return INLINE_SYSCALL(truncate64,
+#if defined(__powerpc__) || defined(__mips__)
+ 4, path, 0,
+#else
+ 3, path,
+#endif
+ __LONG_LONG_PAIR (high, low));
}
#endif /* __UCLIBC_HAS_LFS__ */