Просмотр исходного кода

Fixes to get nptl compiling for x86

Signed-off-by: Khem Raj <raj.khem@gmail.com>
Khem Raj 15 лет назад
Родитель
Сommit
323bc3be3b

+ 2 - 2
libpthread/nptl/pthread_atfork.c

@@ -38,8 +38,8 @@
 #include <fork.h>
 
 /* This is defined by newer gcc version unique for each module.  */
-extern void *__dso_handle __attribute__ ((__weak__,
-					  __visibility__ ("hidden")));
+extern void *__dso_handle __attribute__ ((__weak__));
+					  //,__visibility__ ("hidden")));
 
 
 /* Hide the symbol so that no definition but the one locally in the

+ 1 - 0
libpthread/nptl/sysdeps/unix/sysv/linux/i386/Makefile.arch

@@ -24,6 +24,7 @@ libc_a_SSRC += i486/libc-lowlevellock.S
 
 
 CFLAGS-OMIT-fork.c = -DNOT_IN_libc=1 -DIS_IN_libpthread=1
+CFLAGS-pt-__syscall_error.c =  -DNOT_IN_libc=1 -DIS_IN_libpthread=1
 
 ifeq ($(UCLIBC_HAS_STDIO_FUTEXES),y)
 CFLAGS-fork.c = -D__USE_STDIO_FUTEXES__

+ 1 - 1
libpthread/nptl/sysdeps/unix/sysv/linux/i386/pt-vfork.S

@@ -61,7 +61,7 @@ ENTRY (__vfork)
 
 	cmpl	$-4095, %eax
 	jae	SYSCALL_ERROR_LABEL	/* Branch forward if it failed.  */
-.Lpseudo_end:
+L(pseudo_end):
 	ret
 PSEUDO_END (__vfork)