diff options
| author | Marek Polacek <polacek@redhat.com> | 2012-07-10 14:30:24 +0200 |
|---|---|---|
| committer | Marek Polacek <polacek@redhat.com> | 2012-07-10 14:30:24 +0200 |
| commit | 7b8e0d49cbfd8a911978d4b72f3d97e11a6d34ec (patch) | |
| tree | b6e8d0b491e2e4e78d1e4b41d3edadeb04392395 /include | |
| parent | c1d00790348352d9bd342b9cebe70cb416f63798 (diff) | |
| download | glibc-7b8e0d49cbfd8a911978d4b72f3d97e11a6d34ec.tar.gz glibc-7b8e0d49cbfd8a911978d4b72f3d97e11a6d34ec.tar.xz glibc-7b8e0d49cbfd8a911978d4b72f3d97e11a6d34ec.zip | |
Get rid of ASM_GLOBAL_DIRECTIVE.
Diffstat (limited to 'include')
| -rw-r--r-- | include/libc-symbols.h | 26 |
1 files changed, 11 insertions, 15 deletions
diff --git a/include/libc-symbols.h b/include/libc-symbols.h index 12b3639647..da8730d2bc 100644 --- a/include/libc-symbols.h +++ b/include/libc-symbols.h @@ -27,7 +27,6 @@ It should define for us the following symbols: * HAVE_ASM_SET_DIRECTIVE if we have `.set B, A' instead of `A = B'. - * ASM_GLOBAL_DIRECTIVE with `.globl' or `.global'. * ASM_TYPE_DIRECTIVE_PREFIX with `@' or `#' or whatever for .type, or leave it undefined if there is no .type directive. * HAVE_ASM_WEAK_DIRECTIVE if we have weak symbols using `.weak'. @@ -117,32 +116,32 @@ # ifdef HAVE_ASM_SET_DIRECTIVE # ifdef HAVE_ASM_GLOBAL_DOT_NAME # define strong_alias(original, alias) \ - ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME (alias) ASM_LINE_SEP \ + .globl C_SYMBOL_NAME (alias) ASM_LINE_SEP \ .set C_SYMBOL_NAME (alias),C_SYMBOL_NAME (original) ASM_LINE_SEP \ - ASM_GLOBAL_DIRECTIVE C_SYMBOL_DOT_NAME (alias) ASM_LINE_SEP \ + .globl C_SYMBOL_DOT_NAME (alias) ASM_LINE_SEP \ .set C_SYMBOL_DOT_NAME (alias),C_SYMBOL_DOT_NAME (original) # define strong_data_alias(original, alias) \ - ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME (alias) ASM_LINE_SEP \ + .globl C_SYMBOL_NAME (alias) ASM_LINE_SEP \ .set C_SYMBOL_NAME (alias),C_SYMBOL_NAME (original) # else # define strong_alias(original, alias) \ - ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME (alias) ASM_LINE_SEP \ + .globl C_SYMBOL_NAME (alias) ASM_LINE_SEP \ .set C_SYMBOL_NAME (alias),C_SYMBOL_NAME (original) # define strong_data_alias(original, alias) strong_alias(original, alias) # endif # else # ifdef HAVE_ASM_GLOBAL_DOT_NAME # define strong_alias(original, alias) \ - ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME (alias) ASM_LINE_SEP \ + .globl C_SYMBOL_NAME (alias) ASM_LINE_SEP \ C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original) ASM_LINE_SEP \ - ASM_GLOBAL_DIRECTIVE C_SYMBOL_DOT_NAME (alias) ASM_LINE_SEP \ + .globl C_SYMBOL_DOT_NAME (alias) ASM_LINE_SEP \ C_SYMBOL_DOT_NAME (alias) = C_SYMBOL_DOT_NAME (original) # define strong_data_alias(original, alias) \ - ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME (alias) ASM_LINE_SEP \ + .globl C_SYMBOL_NAME (alias) ASM_LINE_SEP \ C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original) # else # define strong_alias(original, alias) \ - ASM_GLOBAL_DIRECTIVE C_SYMBOL_NAME (alias) ASM_LINE_SEP \ + .globl C_SYMBOL_NAME (alias) ASM_LINE_SEP \ C_SYMBOL_NAME (alias) = C_SYMBOL_NAME (original) # define strong_data_alias(original, alias) strong_alias(original, alias) # endif @@ -265,8 +264,7 @@ for linking") # define declare_symbol_alias_1_paste_1(a,b) a##b # else /* Not __ASSEMBLER__. */ # define declare_symbol_alias_1(symbol, original, type, size) \ - asm (declare_symbol_alias_1_stringify (ASM_GLOBAL_DIRECTIVE) \ - " " __SYMBOL_PREFIX #symbol \ + asm (".globl " __SYMBOL_PREFIX #symbol \ "\n\t" declare_symbol_alias_1_alias (symbol, original) \ "\n\t.type " __SYMBOL_PREFIX #symbol ", " \ declare_symbol_alias_1_stringify (ASM_TYPE_DIRECTIVE_PREFIX) #type \ @@ -785,14 +783,12 @@ for linking") #ifdef HAVE_ASM_SET_DIRECTIVE # define libc_ifunc_hidden_def1(local, name) \ - __asm__ (declare_symbol_alias_1_stringify (ASM_GLOBAL_DIRECTIVE) \ - " " #local "\n\t" \ + __asm__ (".globl " #local "\n\t" \ ".hidden " #local "\n\t" \ ".set " #local ", " #name); #else # define libc_ifunc_hidden_def1(local, name) \ - __asm__ (declare_symbol_alias_1_stringify (ASM_GLOBAL_DIRECTIVE) \ - " " #local "\n\t" \ + __asm__ (".globl " #local "\n\t" \ ".hidden " #local "\n\t" \ #local " = " #name); #endif |