diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2012-02-11 10:00:36 -0800 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2012-02-11 10:00:36 -0800 |
| commit | b382aea8ecdf8f0c4b4a76bc70b8e98c9c94e516 (patch) | |
| tree | 2470bf72db1e81cd3eb2a4be69d7e45be3013b2b /sysdeps/x86_64/sysdep.h | |
| parent | 3c2a153c2bc1add2f50caabf5eb610253def6ce3 (diff) | |
| parent | bdb6de1d6d5d2a538e34fd453331acd0f664f6ed (diff) | |
| download | glibc-b382aea8ecdf8f0c4b4a76bc70b8e98c9c94e516.tar.gz glibc-b382aea8ecdf8f0c4b4a76bc70b8e98c9c94e516.tar.xz glibc-b382aea8ecdf8f0c4b4a76bc70b8e98c9c94e516.zip | |
Merge remote-tracking branch 'origin/master' into hjl/x32/master
Conflicts: configure shlib-versions
Diffstat (limited to 'sysdeps/x86_64/sysdep.h')
| -rw-r--r-- | sysdeps/x86_64/sysdep.h | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/sysdeps/x86_64/sysdep.h b/sysdeps/x86_64/sysdep.h index b9da91591f..4b85ccce5b 100644 --- a/sysdeps/x86_64/sysdep.h +++ b/sysdeps/x86_64/sysdep.h @@ -1,5 +1,5 @@ /* Assembler macros for x86-64. - Copyright (C) 2001, 2002, 2003, 2011 Free Software Foundation, Inc. + Copyright (C) 2001, 2002, 2003, 2011, 2012 Free Software Foundation, Inc. This file is part of the GNU C Library. The GNU C Library is free software; you can redistribute it and/or @@ -23,26 +23,12 @@ /* 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. */ #define ASM_TYPE_DIRECTIVE(name,typearg) .type name,typearg; #define ASM_SIZE_DIRECTIVE(name) .size name,.-name; -/* In ELF C symbols are asm symbols. */ -#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) \ @@ -77,13 +63,11 @@ #define CALL_MCOUNT /* Do nothing. */ #endif -#ifdef NO_UNDERSCORES /* Since C identifiers are not normally prefixed with an underscore on this system, the asm identifier `syscall_error' intrudes on the C name space. Make sure we use an innocuous name. */ #define syscall_error __syscall_error #define mcount _mcount -#endif #define PSEUDO(name, syscall_name, args) \ lose: \ @@ -106,12 +90,8 @@ 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 #define atom_text_section .section ".text.atom", "ax" |