svn commit: [25847] branches/uClibc-nptl: include libc/stdlib libc/sysdeps/linux/ etc...

[kraj at uclibc.org]

Author: kraj
Date: 2009-03-28 05:26:39 +0000 (Sat, 28 Mar 2009)
New Revision: 25847

Log:
Merged revisions 25821,25823-25824,25836 via svnmerge from 
svn+ssh://svn.uclibc.org/svn/trunk/uClibc

........
  r25821 | aldot | 2009-03-25 12:27:56 -0700 (Wed, 25 Mar 2009) | 2 lines
  
  - do not pass -Wl with -shared in LDFLAGS_NOSTRIP (Peter S. Mazinger)
........
  r25823 | aldot | 2009-03-25 13:28:19 -0700 (Wed, 25 Mar 2009) | 8 lines
  
  - Add strtouq alias (to strtoul) for 64bit
  
  The strtouq alias was only available on 32bit, breaking compilation of stuff
  using strtouq on 64bit machines. At the same time use the correct return
  type (u_quad_t).
  
  Signed-of-by: Peter Korsgaard <jacmet at sunsite.dk>
........
  r25824 | aldot | 2009-03-26 01:51:47 -0700 (Thu, 26 Mar 2009) | 2 lines
  
  - ignore objects
........
  r25836 | landley | 2009-03-26 21:03:20 -0700 (Thu, 26 Mar 2009) | 3 lines
  
  32/64 bit sparc got unified in 2.6.29 the way x86/x86_64 did in 2.6.28.
  The new guard symbol is "__SPARC_POSIX_TYPES_H".
........


Modified:
   branches/uClibc-nptl/
   branches/uClibc-nptl/include/stdlib.h
   branches/uClibc-nptl/libc/stdlib/stdlib.c
   branches/uClibc-nptl/libc/sysdeps/linux/sparc/bits/kernel_types.h
   branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/unix/sysv/linux/


Changeset:

Property changes on: branches/uClibc-nptl
___________________________________________________________________
Modified: svnmerge-integrated
   - /trunk/uClibc:1-25821
   + /trunk/uClibc:1-25846


Modified: branches/uClibc-nptl/include/stdlib.h
===================================================================
--- branches/uClibc-nptl/include/stdlib.h	2009-03-28 03:22:08 UTC (rev 25846)
+++ branches/uClibc-nptl/include/stdlib.h	2009-03-28 05:26:39 UTC (rev 25847)
@@ -209,6 +209,8 @@
 __END_NAMESPACE_STD
 
 #ifdef __USE_BSD
+#include <sys/types.h> /* for u_quad_t */
+
 /* Convert a string to a quadword integer.  */
 __extension__
 extern long long int strtoq (__const char *__restrict __nptr,
@@ -216,7 +218,7 @@
      __THROW __nonnull ((1)) __wur;
 /* Convert a string to an unsigned quadword integer.  */
 __extension__
-extern unsigned long long int strtouq (__const char *__restrict __nptr,
+extern u_quad_t strtouq (__const char *__restrict __nptr,
 				       char **__restrict __endptr, int __base)
      __THROW __nonnull ((1)) __wur;
 #endif /* GCC and use BSD.  */

Modified: branches/uClibc-nptl/libc/stdlib/stdlib.c
===================================================================
--- branches/uClibc-nptl/libc/stdlib/stdlib.c	2009-03-28 03:22:08 UTC (rev 25846)
+++ branches/uClibc-nptl/libc/stdlib/stdlib.c	2009-03-28 05:26:39 UTC (rev 25847)
@@ -401,7 +401,10 @@
 libc_hidden_proto(__XL_NPP(strtoull))
 strong_alias(__XL_NPP(strtoul),__XL_NPP(strtoull))
 libc_hidden_def(__XL_NPP(strtoull))
+#if !defined(L_strtoul_l)
+strong_alias(strtoul,strtouq)
 #endif
+#endif
 
 
 #endif

Modified: branches/uClibc-nptl/libc/sysdeps/linux/sparc/bits/kernel_types.h
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/sparc/bits/kernel_types.h	2009-03-28 03:22:08 UTC (rev 25846)
+++ branches/uClibc-nptl/libc/sysdeps/linux/sparc/bits/kernel_types.h	2009-03-28 05:26:39 UTC (rev 25847)
@@ -4,9 +4,10 @@
  * our private content, and not the kernel header, will win.
  *  -Erik
  */
-#if ! defined __ARCH_SPARC_POSIX_TYPES_H && ! defined __ARCH_SPARC64_POSIX_TYPES_H
+#if ! defined __ARCH_SPARC_POSIX_TYPES_H && ! defined __ARCH_SPARC64_POSIX_TYPES_H && !defined __SPARC_POSIX_TYPES_H
 #define __ARCH_SPARC_POSIX_TYPES_H
 #define __ARCH_SPARC64_POSIX_TYPES_H
+#define __SPARC_POSIX_TYPES_H
 
 # if __WORDSIZE == 64
 typedef unsigned long          __kernel_size_t;


Property changes on: branches/uClibc-nptl/libpthread/linuxthreads/sysdeps/unix/sysv/linux
___________________________________________________________________
Modified: svn:ignore
   - Implies
Versions

   + Implies
Versions
*.oS