summaryrefslogtreecommitdiff
path: root/libc/sysdeps
diff options
context:
space:
mode:
authorRoman I Khimov <khimov@altell.ru>2010-04-27 15:19:15 +0400
committerAustin Foxley <austinf@cetoncorp.com>2010-04-27 08:41:50 -0700
commit6b5c1209608589b4ac210c6ab46d034bd221a752 (patch)
tree633463490b0bc2ef13981314e56bbcd0c3336dfd /libc/sysdeps
parenta60ebd0f0790b2ce6bff161e0b3bdbca5e491a4b (diff)
libc/x86_64: use ELF-compatible definitions for assembler
Fixes open/read/write/close breakage with NPTL on x86_64 (due to missing '.type' declaration). Done this way because there are already ELF-style definitions in assemebler code for x86_64 and looks like HAVE_ELF is not defined and used this days. Or the other way around, it'd be a bit strange for x86_64 not to have ELF. Signed-off-by: Roman I Khimov <khimov@altell.ru> Signed-off-by: Austin Foxley <austinf@cetoncorp.com>
Diffstat (limited to 'libc/sysdeps')
-rw-r--r--libc/sysdeps/linux/x86_64/sysdep.h18
1 files changed, 1 insertions, 17 deletions
diff --git a/libc/sysdeps/linux/x86_64/sysdep.h b/libc/sysdeps/linux/x86_64/sysdep.h
index 09bb9268b..4440d2be9 100644
--- a/libc/sysdeps/linux/x86_64/sysdep.h
+++ b/libc/sysdeps/linux/x86_64/sysdep.h
@@ -27,8 +27,6 @@
/* Syntactic details of assembler. */
-#ifdef HAVE_ELF
-
/* ELF uses byte-counts for .align, most others use log2 of count of bytes. */
#define ALIGNARG(log2) 1<<log2
/* For ELF we need the `.type' directive to make shared libs work right. */
@@ -39,15 +37,6 @@
#undef NO_UNDERSCORES
#define NO_UNDERSCORES
-#else
-
-#define ALIGNARG(log2) log2
-#define ASM_TYPE_DIRECTIVE(name,type) /* Nothing is specified. */
-#define ASM_SIZE_DIRECTIVE(name) /* Nothing is specified. */
-
-#endif
-
-
/* Define an entry point visible from C. */
#define ENTRY(name) \
ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME(name); \
@@ -107,12 +96,7 @@ lose: \
/* Local label name for asm code. */
#ifndef L
-# ifdef HAVE_ELF
-/* ELF-like local names start with `.L'. */
-# define L(name) .L##name
-# else
-# define L(name) name
-# endif
+#define L(name) .L##name
#endif
#endif /* __ASSEMBLER__ */