svn commit: branches/uClibc-nptl: ldso/ldso/cris ldso/ldso/powerpc ldso/ld etc...

sjhill at uclibc.org sjhill at uclibc.org
Mon Aug 21 04:19:37 UTC 2006


Author: sjhill
Date: 2006-08-20 21:19:36 -0700 (Sun, 20 Aug 2006)
New Revision: 15867

Log:
Merge from trunk.


Modified:
   branches/uClibc-nptl/ldso/ldso/cris/dl-sysdep.h
   branches/uClibc-nptl/ldso/ldso/powerpc/dl-sysdep.h
   branches/uClibc-nptl/ldso/ldso/sh64/dl-sysdep.h
   branches/uClibc-nptl/ldso/ldso/x86_64/dl-sysdep.h
   branches/uClibc-nptl/libc/sysdeps/linux/cris/__init_brk.c
   branches/uClibc-nptl/libc/sysdeps/linux/cris/bits/uClibc_arch_features.h
   branches/uClibc-nptl/libc/sysdeps/linux/cris/brk.c
   branches/uClibc-nptl/libc/sysdeps/linux/cris/sbrk.c
   branches/uClibc-nptl/libc/sysdeps/linux/frv/__init_brk.c
   branches/uClibc-nptl/libc/sysdeps/linux/frv/brk.c
   branches/uClibc-nptl/libc/sysdeps/linux/frv/sbrk.c
   branches/uClibc-nptl/libc/sysdeps/linux/h8300/brk.c
   branches/uClibc-nptl/libc/sysdeps/linux/hppa/bits/kernel_sigaction.h
   branches/uClibc-nptl/libc/sysdeps/linux/hppa/brk.c
   branches/uClibc-nptl/libc/sysdeps/linux/i386/bits/uClibc_arch_features.h
   branches/uClibc-nptl/libc/sysdeps/linux/i386/brk.c
   branches/uClibc-nptl/libc/sysdeps/linux/m68k/brk.c
   branches/uClibc-nptl/libc/sysdeps/linux/nios/brk.c
   branches/uClibc-nptl/libc/sysdeps/linux/nios2/brk.c
   branches/uClibc-nptl/libc/sysdeps/linux/powerpc/bits/uClibc_arch_features.h
   branches/uClibc-nptl/libc/sysdeps/linux/powerpc/brk.S
   branches/uClibc-nptl/libc/sysdeps/linux/sh/__init_brk.c
   branches/uClibc-nptl/libc/sysdeps/linux/sh/brk.c
   branches/uClibc-nptl/libc/sysdeps/linux/sh/sbrk.c
   branches/uClibc-nptl/libc/sysdeps/linux/sh64/__init_brk.c
   branches/uClibc-nptl/libc/sysdeps/linux/sh64/brk.c
   branches/uClibc-nptl/libc/sysdeps/linux/sh64/sbrk.c
   branches/uClibc-nptl/libc/sysdeps/linux/sparc/brk.c
   branches/uClibc-nptl/libc/sysdeps/linux/x86_64/bits/wordsize.h
   branches/uClibc-nptl/libc/sysdeps/linux/x86_64/brk.c


Changeset:
Modified: branches/uClibc-nptl/ldso/ldso/cris/dl-sysdep.h
===================================================================
--- branches/uClibc-nptl/ldso/ldso/cris/dl-sysdep.h	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/ldso/ldso/cris/dl-sysdep.h	2006-08-21 04:19:36 UTC (rev 15867)
@@ -18,8 +18,6 @@
 struct elf_resolve;
 extern unsigned long _dl_linux_resolver(struct elf_resolve *tpnt, int reloc_entry);
 
-#define do_rem(result, n, base) ((result) = (n) % (base))
-
 /* 8192 bytes alignment */
 #define PAGE_ALIGN 0xffffe000
 #define ADDR_ALIGN 0x1fff

Modified: branches/uClibc-nptl/ldso/ldso/powerpc/dl-sysdep.h
===================================================================
--- branches/uClibc-nptl/ldso/ldso/powerpc/dl-sysdep.h	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/ldso/ldso/powerpc/dl-sysdep.h	2006-08-21 04:19:36 UTC (rev 15867)
@@ -67,9 +67,6 @@
 extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry);
 void _dl_init_got(unsigned long *lpnt,struct elf_resolve *tpnt);
 
-
-#define do_rem(result, n, base) ((result) = (n) % (base))
-
 /* 4096 bytes alignment */
 #define PAGE_ALIGN 0xfffff000
 #define ADDR_ALIGN 0xfff

Modified: branches/uClibc-nptl/ldso/ldso/sh64/dl-sysdep.h
===================================================================
--- branches/uClibc-nptl/ldso/ldso/sh64/dl-sysdep.h	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/ldso/ldso/sh64/dl-sysdep.h	2006-08-21 04:19:36 UTC (rev 15867)
@@ -25,8 +25,6 @@
 struct elf_resolve;
 extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry);
 
-#define do_rem(result, n, base) ((result) = (n) % (base))
-
 /* 4096 bytes alignment */
 #define PAGE_ALIGN 0xfffff000
 #define ADDR_ALIGN 0xfff

Modified: branches/uClibc-nptl/ldso/ldso/x86_64/dl-sysdep.h
===================================================================
--- branches/uClibc-nptl/ldso/ldso/x86_64/dl-sysdep.h	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/ldso/ldso/x86_64/dl-sysdep.h	2006-08-21 04:19:36 UTC (rev 15867)
@@ -41,8 +41,6 @@
 struct elf_resolve;
 extern unsigned long _dl_linux_resolver(struct elf_resolve * tpnt, int reloc_entry);
 
-#define do_rem(result, n, base) ((result) = (n) % (base))
-
 /* 4096 bytes alignment */
 #define PAGE_ALIGN 0xfffff000
 #define ADDR_ALIGN 0xfff

Modified: branches/uClibc-nptl/libc/sysdeps/linux/cris/__init_brk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/cris/__init_brk.c	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/cris/__init_brk.c	2006-08-21 04:19:36 UTC (rev 15867)
@@ -5,10 +5,7 @@
 #include <errno.h>
 #include "sysdep.h"
 
-extern void *__curbrk;
-libc_hidden_proto(__curbrk)
 void * __curbrk = 0;
-libc_hidden_data_def(__curbrk)
 
 extern int __init_brk (void);
 libc_hidden_proto(__init_brk)

Modified: branches/uClibc-nptl/libc/sysdeps/linux/cris/bits/uClibc_arch_features.h
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/cris/bits/uClibc_arch_features.h	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/cris/bits/uClibc_arch_features.h	2006-08-21 04:19:36 UTC (rev 15867)
@@ -40,6 +40,6 @@
 #define __UCLIBC_HAVE_SIGNED_ZERO__
 
 /* lovely */
-#define ASM_LINE_SEP @
+#define __UCLIBC_ASM_LINE_SEP__ @
 
 #endif /* _BITS_UCLIBC_ARCH_FEATURES_H */

Modified: branches/uClibc-nptl/libc/sysdeps/linux/cris/brk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/cris/brk.c	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/cris/brk.c	2006-08-21 04:19:36 UTC (rev 15867)
@@ -12,7 +12,6 @@
 libc_hidden_proto(brk)
 
 extern void * __curbrk;
-libc_hidden_proto(__curbrk)
 
 extern int __init_brk (void);
 libc_hidden_proto(__init_brk)

Modified: branches/uClibc-nptl/libc/sysdeps/linux/cris/sbrk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/cris/sbrk.c	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/cris/sbrk.c	2006-08-21 04:19:36 UTC (rev 15867)
@@ -13,7 +13,6 @@
 libc_hidden_proto(sbrk)
 
 extern void * __curbrk;
-libc_hidden_proto(__curbrk)
 
 extern int __init_brk (void);
 libc_hidden_proto(__init_brk)

Modified: branches/uClibc-nptl/libc/sysdeps/linux/frv/__init_brk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/frv/__init_brk.c	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/frv/__init_brk.c	2006-08-21 04:19:36 UTC (rev 15867)
@@ -4,10 +4,7 @@
 #include <unistd.h>
 #include <sys/syscall.h>
 
-extern void * __curbrk;
-libc_hidden_proto(__curbrk)
 void * __curbrk = 0;
-libc_hidden_data_def(__curbrk)
 
 #define __NR__brk __NR_brk
 attribute_hidden _syscall1(void *, _brk, void *, ptr);

Modified: branches/uClibc-nptl/libc/sysdeps/linux/frv/brk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/frv/brk.c	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/frv/brk.c	2006-08-21 04:19:36 UTC (rev 15867)
@@ -12,7 +12,6 @@
 libc_hidden_proto(brk)
 
 extern void * __curbrk;
-libc_hidden_proto(__curbrk)
 
 extern int __init_brk (void);
 libc_hidden_proto(__init_brk)

Modified: branches/uClibc-nptl/libc/sysdeps/linux/frv/sbrk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/frv/sbrk.c	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/frv/sbrk.c	2006-08-21 04:19:36 UTC (rev 15867)
@@ -7,7 +7,6 @@
 libc_hidden_proto(sbrk)
 
 extern void * __curbrk;
-libc_hidden_proto(__curbrk)
 
 extern int __init_brk (void);
 libc_hidden_proto(__init_brk)

Modified: branches/uClibc-nptl/libc/sysdeps/linux/h8300/brk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/h8300/brk.c	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/h8300/brk.c	2006-08-21 04:19:36 UTC (rev 15867)
@@ -12,10 +12,7 @@
 libc_hidden_proto(brk)
 
 /* This must be initialized data because commons can't have aliases.  */
-extern void *__curbrk;
-libc_hidden_proto(__curbrk)
 void *__curbrk = 0;
-libc_hidden_data_def(__curbrk)
 
 int brk (void *addr)
 {

Modified: branches/uClibc-nptl/libc/sysdeps/linux/hppa/bits/kernel_sigaction.h
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/hppa/bits/kernel_sigaction.h	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/hppa/bits/kernel_sigaction.h	2006-08-21 04:19:36 UTC (rev 15867)
@@ -1,3 +1,6 @@
+#ifndef _BITS_SIGACTION_STRUCT_H
+#define _BITS_SIGACTION_STRUCT_H
+
 /* We have a separate header file here because we do not support
    SA_RESTORER on hppa. */
 
@@ -18,4 +21,6 @@
 };
 
 extern int __syscall_rt_sigaction (int, const struct kernel_sigaction *__unbounded,
-	struct kernel_sigaction *__unbounded, size_t);
+	struct kernel_sigaction *__unbounded, size_t) attribute_hidden;
+
+#endif

Modified: branches/uClibc-nptl/libc/sysdeps/linux/hppa/brk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/hppa/brk.c	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/hppa/brk.c	2006-08-21 04:19:36 UTC (rev 15867)
@@ -24,10 +24,7 @@
 libc_hidden_proto(brk)
 
 /* This must be initialized data because commons can't have aliases.  */
-extern void *__curbrk;
-libc_hidden_proto(__curbrk)
 void *__curbrk = 0;
-libc_hidden_data_def(__curbrk)
 
 int
 brk (void *addr)

Modified: branches/uClibc-nptl/libc/sysdeps/linux/i386/bits/uClibc_arch_features.h
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/i386/bits/uClibc_arch_features.h	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/i386/bits/uClibc_arch_features.h	2006-08-21 04:19:36 UTC (rev 15867)
@@ -18,7 +18,8 @@
 #define __UCLIBC_BROKEN_CREATE_MODULE__
 
 /* does your target have to worry about older [gs]etrlimit() ? */
-#define __UCLIBC_HANDLE_OLDER_RLIMIT__
+/* this is only an issue on i386 where linux < 2.3.25, so we just assume it works ... */
+#undef __UCLIBC_HANDLE_OLDER_RLIMIT__
 
 /* does your target prefix all symbols with an _ ? */
 #define __UCLIBC_NO_UNDERSCORES__

Modified: branches/uClibc-nptl/libc/sysdeps/linux/i386/brk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/i386/brk.c	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/i386/brk.c	2006-08-21 04:19:36 UTC (rev 15867)
@@ -24,10 +24,7 @@
 libc_hidden_proto(brk)
 
 /* This must be initialized data because commons can't have aliases.  */
-extern void *__curbrk;
-libc_hidden_proto(__curbrk)
 void *__curbrk = 0;
-libc_hidden_data_def(__curbrk)
 
 int brk (void *addr)
 {

Modified: branches/uClibc-nptl/libc/sysdeps/linux/m68k/brk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/m68k/brk.c	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/m68k/brk.c	2006-08-21 04:19:36 UTC (rev 15867)
@@ -12,10 +12,7 @@
 libc_hidden_proto(brk)
 
 /* This must be initialized data because commons can't have aliases.  */
-extern void *__curbrk;
-libc_hidden_proto(__curbrk)
 void * __curbrk = 0;
-libc_hidden_data_def(__curbrk)
 
 int brk (void *addr)
 {

Modified: branches/uClibc-nptl/libc/sysdeps/linux/nios/brk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/nios/brk.c	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/nios/brk.c	2006-08-21 04:19:36 UTC (rev 15867)
@@ -24,10 +24,7 @@
 libc_hidden_proto(brk)
 
 /* This must be initialized data because commons can't have aliases.  */
-extern void *__curbrk;
-libc_hidden_proto(__curbrk)
 void *__curbrk = 0;
-libc_hidden_data_def(__curbrk)
 
 int brk (void *addr)
 {

Modified: branches/uClibc-nptl/libc/sysdeps/linux/nios2/brk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/nios2/brk.c	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/nios2/brk.c	2006-08-21 04:19:36 UTC (rev 15867)
@@ -24,12 +24,8 @@
 libc_hidden_proto(brk)
 
 /* This must be initialized data because commons can't have aliases.  */
-extern void *__curbrk;
-libc_hidden_proto(__curbrk)
 void *__curbrk = 0;
-libc_hidden_data_def(__curbrk)
 
-
 int brk (void *addr)
 {
     void *newbrk;

Modified: branches/uClibc-nptl/libc/sysdeps/linux/powerpc/bits/uClibc_arch_features.h
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/powerpc/bits/uClibc_arch_features.h	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/powerpc/bits/uClibc_arch_features.h	2006-08-21 04:19:36 UTC (rev 15867)
@@ -18,7 +18,8 @@
 #undef __UCLIBC_BROKEN_CREATE_MODULE__
 
 /* does your target have to worry about older [gs]etrlimit() ? */
-#define __UCLIBC_HANDLE_OLDER_RLIMIT__
+/* this is only an issue on i386 where linux < 2.3.35, so we just assume it works ... */
+#undef __UCLIBC_HANDLE_OLDER_RLIMIT__
 
 /* does your target prefix all symbols with an _ ? */
 #define __UCLIBC_NO_UNDERSCORES__

Modified: branches/uClibc-nptl/libc/sysdeps/linux/powerpc/brk.S
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/powerpc/brk.S	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/powerpc/brk.S	2006-08-21 04:19:36 UTC (rev 15867)
@@ -24,7 +24,18 @@
 #include <sys/syscall.h>
 
 #ifdef __NR_brk
-	.comm	__curbrk,4,4
+
+#ifdef __PIC__
+.section .bss
+	.align 4
+	.globl __curbrk
+__curbrk: .skip 4
+	.type __curbrk, at object
+	.size __curbrk,4
+#else
+.comm __curbrk, 4,4
+#endif
+
 	.text
 	.globl	brk
 	.type	brk, at function
@@ -58,6 +69,4 @@
 	.size brk,.-brk
 
 libc_hidden_def(brk)
-/* won't help too much, HIDDEN_JUMPTARGET should be used here as well, now the reloc remains */
-libc_hidden_data_def(__curbrk)
 #endif	

Modified: branches/uClibc-nptl/libc/sysdeps/linux/sh/__init_brk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/sh/__init_brk.c	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/sh/__init_brk.c	2006-08-21 04:19:36 UTC (rev 15867)
@@ -4,10 +4,7 @@
 #include <unistd.h>
 #include <sys/syscall.h>
 
-extern void * __curbrk;
-libc_hidden_proto(__curbrk)
 void * __curbrk = 0;
-libc_hidden_data_def(__curbrk)
 
 #define __NR__brk __NR_brk
 attribute_hidden _syscall1(void *, _brk, void *, ptr);

Modified: branches/uClibc-nptl/libc/sysdeps/linux/sh/brk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/sh/brk.c	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/sh/brk.c	2006-08-21 04:19:36 UTC (rev 15867)
@@ -12,7 +12,6 @@
 libc_hidden_proto(brk)
 
 extern void * __curbrk;
-libc_hidden_proto(__curbrk)
 
 extern int __init_brk (void);
 libc_hidden_proto(__init_brk)

Modified: branches/uClibc-nptl/libc/sysdeps/linux/sh/sbrk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/sh/sbrk.c	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/sh/sbrk.c	2006-08-21 04:19:36 UTC (rev 15867)
@@ -7,7 +7,6 @@
 libc_hidden_proto(sbrk)
 
 extern void * __curbrk;
-libc_hidden_proto(__curbrk)
 
 extern int __init_brk (void);
 libc_hidden_proto(__init_brk)

Modified: branches/uClibc-nptl/libc/sysdeps/linux/sh64/__init_brk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/sh64/__init_brk.c	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/sh64/__init_brk.c	2006-08-21 04:19:36 UTC (rev 15867)
@@ -4,10 +4,7 @@
 #include <unistd.h>
 #include <sys/syscall.h>
 
-extern void * __curbrk;
-libc_hidden_proto(__curbrk)
 void * __curbrk = 0;
-libc_hidden_data_def(__curbrk)
 
 #define __NR__brk __NR_brk
 attribute_hidden _syscall1(void *, _brk, void *, ptr);

Modified: branches/uClibc-nptl/libc/sysdeps/linux/sh64/brk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/sh64/brk.c	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/sh64/brk.c	2006-08-21 04:19:36 UTC (rev 15867)
@@ -12,7 +12,6 @@
 libc_hidden_proto(brk)
 
 extern void * __curbrk;
-libc_hidden_proto(__curbrk)
 
 extern int __init_brk (void);
 libc_hidden_proto(__init_brk)

Modified: branches/uClibc-nptl/libc/sysdeps/linux/sh64/sbrk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/sh64/sbrk.c	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/sh64/sbrk.c	2006-08-21 04:19:36 UTC (rev 15867)
@@ -7,7 +7,6 @@
 libc_hidden_proto(sbrk)
 
 extern void * __curbrk;
-libc_hidden_proto(__curbrk)
 
 extern int __init_brk (void);
 libc_hidden_proto(__init_brk)

Modified: branches/uClibc-nptl/libc/sysdeps/linux/sparc/brk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/sparc/brk.c	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/sparc/brk.c	2006-08-21 04:19:36 UTC (rev 15867)
@@ -24,10 +24,7 @@
 libc_hidden_proto(brk)
 
 /* This must be initialized data because commons can't have aliases.  */
-extern void *__curbrk;
-libc_hidden_proto(__curbrk)
 void *__curbrk = 0;
-libc_hidden_data_def(__curbrk)
 
 int brk (void *addr)
 {

Modified: branches/uClibc-nptl/libc/sysdeps/linux/x86_64/bits/wordsize.h
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/x86_64/bits/wordsize.h	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/x86_64/bits/wordsize.h	2006-08-21 04:19:36 UTC (rev 15867)
@@ -2,6 +2,7 @@
 
 #if defined __x86_64__
 # define __WORDSIZE	64
+/*# define __WORDSIZE_COMPAT32	1*/
 #else
 # define __WORDSIZE	32
 #endif

Modified: branches/uClibc-nptl/libc/sysdeps/linux/x86_64/brk.c
===================================================================
--- branches/uClibc-nptl/libc/sysdeps/linux/x86_64/brk.c	2006-08-21 04:12:27 UTC (rev 15866)
+++ branches/uClibc-nptl/libc/sysdeps/linux/x86_64/brk.c	2006-08-21 04:19:36 UTC (rev 15867)
@@ -24,10 +24,7 @@
 libc_hidden_proto(brk)
 
 /* This must be initialized data because commons can't have aliases.  */
-extern void *__curbrk;
-libc_hidden_proto(__curbrk)
 void *__curbrk = 0;
-libc_hidden_data_def(__curbrk)
 
 int brk (void *addr)
 {




More information about the uClibc-cvs mailing list