generic-library/bionic
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge "Simplify _ALIGN_TEXT."

Browse Source
This commit is contained in:
Elliott Hughes 2014-08-20 20:36:04 +00:00 committed by Gerrit Code Review
commit b6ed54076a
8 changed files with 7 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libc/arch-arm/bionic/sigsetjmp.S
View File

@ -33,8 +33,6 @@
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
#define _ALIGN_TEXT .align 0
#include <private/bionic_asm.h> #include <private/bionic_asm.h>
#include <machine/setjmp.h> #include <machine/setjmp.h>

4
libc/arch-arm/include/machine/asm.h
View File

@ -38,9 +38,7 @@
#ifndef _ARM32_ASM_H_ #ifndef _ARM32_ASM_H_
#define _ARM32_ASM_H_ #define _ARM32_ASM_H_
#ifndef _ALIGN_TEXT #define __bionic_asm_align 0
# define _ALIGN_TEXT .align 0
#endif
#undef __bionic_asm_custom_entry #undef __bionic_asm_custom_entry
#undef __bionic_asm_custom_end #undef __bionic_asm_custom_end

4
libc/arch-arm64/include/machine/asm.h
View File

@ -38,9 +38,7 @@
#ifndef _AARCH64_ASM_H_ #ifndef _AARCH64_ASM_H_
#define _AARCH64_ASM_H_ #define _AARCH64_ASM_H_
#ifndef _ALIGN_TEXT #define __bionic_asm_align 0
# define _ALIGN_TEXT .align 0
#endif
#undef __bionic_asm_function_type #undef __bionic_asm_function_type
#define __bionic_asm_function_type %function #define __bionic_asm_function_type %function

4
libc/arch-mips/include/machine/asm.h
View File

@ -28,9 +28,7 @@
#ifndef _MIPS64_ASM_H #ifndef _MIPS64_ASM_H
#define _MIPS64_ASM_H #define _MIPS64_ASM_H
#ifndef _ALIGN_TEXT #define __bionic_asm_align 4
# define _ALIGN_TEXT .align 4
#endif
#undef __bionic_asm_custom_entry #undef __bionic_asm_custom_entry
#undef __bionic_asm_custom_end #undef __bionic_asm_custom_end

4
libc/arch-mips64/include/machine/asm.h
View File

@ -28,9 +28,7 @@
#ifndef _MIPS64_ASM_H #ifndef _MIPS64_ASM_H
#define _MIPS64_ASM_H #define _MIPS64_ASM_H
#ifndef _ALIGN_TEXT #define __bionic_asm_align 4
# define _ALIGN_TEXT .align 4
#endif
#undef __bionic_asm_custom_entry #undef __bionic_asm_custom_entry
#undef __bionic_asm_custom_end #undef __bionic_asm_custom_end

11
libc/arch-x86/include/machine/asm.h
View File

@ -49,15 +49,6 @@
#define PIC_GOT(x) x@GOT(%ebx) #define PIC_GOT(x) x@GOT(%ebx)
#define PIC_GOTOFF(x) x@GOTOFF(%ebx) #define PIC_GOTOFF(x) x@GOTOFF(%ebx)
/* let kernels and others override entrypoint alignment */ #define __bionic_asm_align 16
#if !defined(_ALIGN_TEXT) && !defined(_KERNEL)
# ifdef _STANDALONE
# define _ALIGN_TEXT .align 1
# elif defined __ELF__
# define _ALIGN_TEXT .align 16
# else
# define _ALIGN_TEXT .align 4
# endif
#endif
#endif /* !_I386_ASM_H_ */ #endif /* !_I386_ASM_H_ */

9
libc/arch-x86_64/include/machine/asm.h
View File

@ -40,13 +40,6 @@
#define PIC_PLT(x) x@PLT #define PIC_PLT(x) x@PLT
#define PIC_GOT(x) x@GOTPCREL(%rip) #define PIC_GOT(x) x@GOTPCREL(%rip)
/* let kernels and others override entrypoint alignment */ #define __bionic_asm_align 16
#ifndef _ALIGN_TEXT
# ifdef _STANDALONE
# define _ALIGN_TEXT .align 4
# else
# define _ALIGN_TEXT .align 16
# endif
#endif
#endif /* !_AMD64_ASM_H_ */ #endif /* !_AMD64_ASM_H_ */

2
libc/private/bionic_asm.h
View File

@ -41,7 +41,7 @@
#define ENTRY(f) \ #define ENTRY(f) \
.text; \ .text; \
.globl f; \ .globl f; \
_ALIGN_TEXT; \ .align __bionic_asm_align; \
.type f, __bionic_asm_function_type; \ .type f, __bionic_asm_function_type; \
f: \ f: \
__bionic_asm_custom_entry(f); \ __bionic_asm_custom_entry(f); \