diff options
| author | Austin Foxley <austinf@cetoncorp.com> | 2010-02-19 02:05:52 -0800 |
|---|---|---|
| committer | Austin Foxley <austinf@cetoncorp.com> | 2010-02-19 02:05:52 -0800 |
| commit | 8826c1e4573c68200092074ede1afdddd4b3e115 (patch) | |
| tree | ebf52e4e5d44c055ba435d7b06af66bd85f322b2 /libc/sysdeps | |
| parent | 536a9d8a04dc75246d7ad70c9372064c41a43467 (diff) | |
fixes to get nptl compiling for x86_64
Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libc/sysdeps')
| -rw-r--r-- | libc/sysdeps/linux/common/Makefile.in | 2 | ||||
| -rw-r--r-- | libc/sysdeps/linux/x86_64/sysdep.h | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/libc/sysdeps/linux/common/Makefile.in b/libc/sysdeps/linux/common/Makefile.in index 45c70baf6..e86dc0c0d 100644 --- a/libc/sysdeps/linux/common/Makefile.in +++ b/libc/sysdeps/linux/common/Makefile.in @@ -39,7 +39,7 @@ CSRC := $(filter-out fork.c getpid.c raise.c open.c close.c read.c write.c, $(CS ifeq ($(TARGET_ARCH),arm) CSRC := $(filter-out vfork.c, $(CSRC)) else ifeq ($(TARGET_ARCH),x86_64) -#do nothing +CSRC := $(filter-out vfork.c, $(CSRC)) else CSRC := $(filter-out waitpid.c, $(CSRC)) endif diff --git a/libc/sysdeps/linux/x86_64/sysdep.h b/libc/sysdeps/linux/x86_64/sysdep.h index 2bd644f62..09bb9268b 100644 --- a/libc/sysdeps/linux/x86_64/sysdep.h +++ b/libc/sysdeps/linux/x86_64/sysdep.h @@ -116,9 +116,6 @@ lose: \ #endif #endif /* __ASSEMBLER__ */ -#ifdef IS_IN_rtld -# include <dl-sysdep.h> /* Defines RTLD_PRIVATE_ERRNO. */ -#endif /* For Linux we can use the system call table in the header file /usr/include/asm/unistd.h @@ -320,10 +317,10 @@ lose: \ # define PTR_DEMANGLE(reg) rorq $17, reg; \ xorq __pointer_chk_guard_local(%rip), reg # else -# define PTR_MANGLE(reg) asm ("xorq __pointer_chk_guard_local(%%rip), %0\n" \ +# define PTR_MANGLE(reg) __asm__ ("xorq __pointer_chk_guard_local(%%rip), %0\n" \ "rolq $17, %0" \ : "=r" (reg) : "0" (reg)) -# define PTR_DEMANGLE(reg) asm ("rorq $17, %0\n" \ +# define PTR_DEMANGLE(reg) __asm__ ("rorq $17, %0\n" \ "xorq __pointer_chk_guard_local(%%rip), %0" \ : "=r" (reg) : "0" (reg)) # endif @@ -334,13 +331,13 @@ lose: \ # define PTR_DEMANGLE(reg) rorq $17, reg; \ xorq %fs:POINTER_GUARD, reg # else -# define PTR_MANGLE(var) asm ("xorq %%fs:%c2, %0\n" \ +# define PTR_MANGLE(var) __asm__ ("xorq %%fs:%c2, %0\n" \ "rolq $17, %0" \ : "=r" (var) \ : "0" (var), \ "i" (offsetof (tcbhead_t, \ pointer_guard))) -# define PTR_DEMANGLE(var) asm ("rorq $17, %0\n" \ +# define PTR_DEMANGLE(var) __asm__ ("rorq $17, %0\n" \ "xorq %%fs:%c2, %0" \ : "=r" (var) \ : "0" (var), \ |