diff options
| author | H.J. Lu <hjl.tools@gmail.com> | 2017-11-01 05:37:10 -0700 |
|---|---|---|
| committer | H.J. Lu <hjl.tools@gmail.com> | 2017-11-01 05:37:26 -0700 |
| commit | 95b93c6e0d7bf0321f265cf6e85c7fb4417cbda6 (patch) | |
| tree | f43d997aba07996bd5f6b7ed8035920dcc4c2d0f /sysdeps/x86_64 | |
| parent | 1bb3653925eae1226cd18a3d700371291850b20f (diff) | |
| download | glibc-95b93c6e0d7bf0321f265cf6e85c7fb4417cbda6.zip glibc-95b93c6e0d7bf0321f265cf6e85c7fb4417cbda6.tar.gz glibc-95b93c6e0d7bf0321f265cf6e85c7fb4417cbda6.tar.bz2 | |
x86: Add sysdeps/x86/sysdep.h
Add a new header file, sysdeps/x86/sysdep.h, for common assembly code
macros between i386 and x86-64. Tested on i686 and x86-64. There are
no differences in outputs of "readelf -a" and "objdump -dw" on all glibc
shared objects before and after the patch.
* sysdeps/i386/sysdep.h: Include <sysdeps/x86/sysdep.h> instead
of <sysdeps/generic/sysdep.h>.
(ALIGNARG): Removed.
(ASM_SIZE_DIRECTIVE): Likewise.
(ENTRY): Likewise.
(END): Likewise.
(ENTRY_CHK): Likewise.
(END_CHK): Likewise.
(syscall_error): Likewise.
(mcount): Likewise.
(PSEUDO_END): Likewise.
(L): Likewise.
(atom_text_section): Likewise.
* sysdeps/x86/sysdep.h: New file.
* sysdeps/x86_64/sysdep.h: Include <sysdeps/x86/sysdep.h> instead
of <sysdeps/generic/sysdep.h>.
(ALIGNARG): Removed.
(ASM_SIZE_DIRECTIVE): Likewise.
(ENTRY): Likewise.
(END): Likewise.
(ENTRY_CHK): Likewise.
(END_CHK): Likewise.
(syscall_error): Likewise.
(mcount): Likewise.
(PSEUDO_END): Likewise.
(L): Likewise.
(atom_text_section): Likewise.
Diffstat (limited to 'sysdeps/x86_64')
| -rw-r--r-- | sysdeps/x86_64/sysdep.h | 42 |
1 files changed, 1 insertions, 41 deletions
diff --git a/sysdeps/x86_64/sysdep.h b/sysdeps/x86_64/sysdep.h index 1c52544..4b85475 100644 --- a/sysdeps/x86_64/sysdep.h +++ b/sysdeps/x86_64/sysdep.h @@ -19,7 +19,7 @@ #ifndef _X86_64_SYSDEP_H #define _X86_64_SYSDEP_H 1 -#include <sysdeps/generic/sysdep.h> +#include <sysdeps/x86/sysdep.h> #ifdef __ASSEMBLER__ @@ -32,28 +32,6 @@ #define cfi_offset_rel_rsp(regn, off) .cfi_escape 0x10, regn, 0x4, 0x13, \ 0x77, off & 0x7F | 0x80, off >> 7 -/* ELF uses byte-counts for .align, most others use log2 of count of bytes. */ -#define ALIGNARG(log2) 1<<log2 -#define ASM_SIZE_DIRECTIVE(name) .size name,.-name; - - -/* Define an entry point visible from C. */ -#define ENTRY(name) \ - .globl C_SYMBOL_NAME(name); \ - .type C_SYMBOL_NAME(name),@function; \ - .align ALIGNARG(4); \ - C_LABEL(name) \ - cfi_startproc; \ - CALL_MCOUNT - -#undef END -#define END(name) \ - cfi_endproc; \ - ASM_SIZE_DIRECTIVE(name) - -#define ENTRY_CHK(name) ENTRY (name) -#define END_CHK(name) END (name) - /* If compiled for profiling, call `mcount' at the start of each function. */ #ifdef PROF /* The mcount code relies on a normal frame pointer being on the stack @@ -70,12 +48,6 @@ #define CALL_MCOUNT /* Do nothing. */ #endif -/* 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 - #define PSEUDO(name, syscall_name, args) \ lose: \ jmp JUMPTARGET(syscall_error) \ @@ -84,10 +56,6 @@ lose: \ DO_CALL (syscall_name, args); \ jb lose -#undef PSEUDO_END -#define PSEUDO_END(name) \ - END (name) - #undef JUMPTARGET #ifdef SHARED # ifdef BIND_NOW @@ -100,14 +68,6 @@ lose: \ # define JUMPTARGET(name) name #endif -/* Local label name for asm code. */ -#ifndef L -/* ELF-like local names start with `.L'. */ -# define L(name) .L##name -#endif - -#define atom_text_section .section ".text.atom", "ax" - /* Long and pointer size in bytes. */ #define LP_SIZE 8 |