diff options
| author | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-05-27 16:32:40 +0000 |
|---|---|---|
| committer | Theo de Raadt <deraadt@cvs.openbsd.org> | 2016-05-27 16:32:40 +0000 |
| commit | d85559504400d249c46879ea158daacf28616728 (patch) | |
| tree | 1dff3419f9cb598e708fc810be5abf82bd2cac99 /sys/arch/arm | |
| parent | b5c5454e41bb5eaa91271df5170ed85310b8992b (diff) | |
Remove the non ELF macros
ok millert
Diffstat (limited to 'sys/arch/arm')
| -rw-r--r-- | sys/arch/arm/include/asm.h | 31 | ||||
| -rw-r--r-- | sys/arch/arm/include/profile.h | 6 |
2 files changed, 5 insertions, 32 deletions
diff --git a/sys/arch/arm/include/asm.h b/sys/arch/arm/include/asm.h index 07fa1a8b07b..e9963628fc7 100644 --- a/sys/arch/arm/include/asm.h +++ b/sys/arch/arm/include/asm.h @@ -1,4 +1,4 @@ -/* $OpenBSD: asm.h,v 1.5 2015/08/30 10:19:49 guenther Exp $ */ +/* $OpenBSD: asm.h,v 1.6 2016/05/27 16:32:38 deraadt Exp $ */ /* $NetBSD: asm.h,v 1.4 2001/07/16 05:43:32 matt Exp $ */ /* @@ -38,15 +38,7 @@ #ifndef _ARM_ASM_H_ #define _ARM_ASM_H_ -#ifdef __ELF__ -# define _C_LABEL(x) x -#else -# ifdef __STDC__ -# define _C_LABEL(x) _ ## x -# else -# define _C_LABEL(x) _/**/x -# endif -#endif +#define _C_LABEL(x) x #define _ASM_LABEL(x) x #ifdef __STDC__ @@ -73,13 +65,8 @@ .text; _ALIGN_TEXT; .globl x; .type x,_ASM_TYPE_FUNCTION; x: #ifdef GPROF -# ifdef __ELF__ -# define _PROF_PROLOGUE \ +# define _PROF_PROLOGUE \ mov ip, lr; bl __mcount -# else -# define _PROF_PROLOGUE \ - mov ip,lr; bl mcount -# endif #else # define _PROF_PROLOGUE #endif @@ -92,7 +79,7 @@ #define ASMSTR .asciz -#if defined(__ELF__) && defined(__PIC__) +#if defined(__PIC__) #ifdef __STDC__ #define PIC_SYM(x,y) x ## ( ## y ## ) #else @@ -102,29 +89,19 @@ #define PIC_SYM(x,y) x #endif -#ifdef __ELF__ #define RCSID(x) .section ".ident"; .asciz x -#else -#define RCSID(x) .text; .asciz x -#endif -#ifdef __ELF__ #define STRONG_ALIAS(alias,sym) \ .global alias; \ alias = sym #define WEAK_ALIAS(alias,sym) \ .weak alias; \ alias = sym -#endif #ifdef __STDC__ #define WARN_REFERENCES(sym,msg) \ .stabs msg ## ,30,0,0,0 ; \ .stabs __STRING(_C_LABEL(sym)) ## ,1,0,0,0 -#elif defined(__ELF__) -#define WARN_REFERENCES(sym,msg) \ - .stabs msg,30,0,0,0 ; \ - .stabs __STRING(sym),1,0,0,0 #else #define WARN_REFERENCES(sym,msg) \ .stabs msg,30,0,0,0 ; \ diff --git a/sys/arch/arm/include/profile.h b/sys/arch/arm/include/profile.h index 41c90f83dd2..ecb61a95d89 100644 --- a/sys/arch/arm/include/profile.h +++ b/sys/arch/arm/include/profile.h @@ -1,4 +1,4 @@ -/* $OpenBSD: profile.h,v 1.3 2012/08/22 17:19:35 pascal Exp $ */ +/* $OpenBSD: profile.h,v 1.4 2016/05/27 16:32:38 deraadt Exp $ */ /* $NetBSD: profile.h,v 1.5 2002/03/24 15:49:40 bjh21 Exp $ */ /* @@ -39,14 +39,10 @@ * prologue. */ -#ifdef __ELF__ #define MCOUNT_ASM_NAME "__mcount" #ifdef __PIC__ #define PLTSYM "(PLT)" #endif -#else -#define MCOUNT_ASM_NAME "mcount" -#endif #ifndef PLTSYM #define PLTSYM |