diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2014-11-25 03:50:31 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2014-11-25 03:50:31 +0000 |
| commit | 294246bb7db1fb65230d917c401271c4b0e7c672 (patch) | |
| tree | 8af8a3fb8f37ea396b60dd6e474d26d3b108cc1a /sys | |
| parent | f386f04f11679fd31731bce42208bb4363b79e75 (diff) | |
| download | src-294246bb7db1fb65230d917c401271c4b0e7c672.tar.gz src-294246bb7db1fb65230d917c401271c4b0e7c672.zip | |
Revert r274772: it is not valid on MIPS
Reported by: sbruno
Notes
Notes:
svn path=/head/; revision=275004
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/amd64/include/asm.h | 2 | ||||
| -rw-r--r-- | sys/arm/include/asm.h | 4 | ||||
| -rw-r--r-- | sys/i386/include/asm.h | 2 | ||||
| -rw-r--r-- | sys/powerpc/include/asm.h | 2 | ||||
| -rw-r--r-- | sys/powerpc/include/profile.h | 2 | ||||
| -rw-r--r-- | sys/sparc64/include/asm.h | 2 |
6 files changed, 7 insertions, 7 deletions
diff --git a/sys/amd64/include/asm.h b/sys/amd64/include/asm.h index 429c6a989b27..87272f76fdde 100644 --- a/sys/amd64/include/asm.h +++ b/sys/amd64/include/asm.h @@ -38,7 +38,7 @@ #include <sys/cdefs.h> -#ifdef __PIC__ +#ifdef PIC #define PIC_PLT(x) x@PLT #define PIC_GOT(x) x@GOTPCREL(%rip) #else diff --git a/sys/arm/include/asm.h b/sys/arm/include/asm.h index c7188487d0e0..9577001917b2 100644 --- a/sys/arm/include/asm.h +++ b/sys/arm/include/asm.h @@ -104,7 +104,7 @@ #define ASMSTR .asciz -#if defined(__PIC__) +#if defined(PIC) #define PLT_SYM(x) PIC_SYM(x, PLT) #define GOT_SYM(x) PIC_SYM(x, GOT) #define GOT_GET(x,got,sym) \ @@ -131,7 +131,7 @@ #define GOT_INIT(got,gotsym,pclabel) #define GOT_INITSYM(gotsym,pclabel) #define PIC_SYM(x,y) x -#endif /* __PIC__ */ +#endif /* PIC */ #undef __FBSDID #if !defined(lint) && !defined(STRIP_FBSDID) diff --git a/sys/i386/include/asm.h b/sys/i386/include/asm.h index 378a58549ff7..b2d4a6b28902 100644 --- a/sys/i386/include/asm.h +++ b/sys/i386/include/asm.h @@ -38,7 +38,7 @@ #include <sys/cdefs.h> -#ifdef __PIC__ +#ifdef PIC #define PIC_PROLOGUE \ pushl %ebx; \ call 1f; \ diff --git a/sys/powerpc/include/asm.h b/sys/powerpc/include/asm.h index 6b0ec1acfb1d..e571316d15ea 100644 --- a/sys/powerpc/include/asm.h +++ b/sys/powerpc/include/asm.h @@ -37,7 +37,7 @@ #include <sys/cdefs.h> -#if defined(__PIC__) && !defined(__powerpc64__) +#if defined(PIC) && !defined(__powerpc64__) #define PIC_PROLOGUE XXX #define PIC_EPILOGUE XXX #define PIC_PLT(x) x@plt diff --git a/sys/powerpc/include/profile.h b/sys/powerpc/include/profile.h index 5c578c48c8af..eb11fc96d38d 100644 --- a/sys/powerpc/include/profile.h +++ b/sys/powerpc/include/profile.h @@ -119,7 +119,7 @@ __asm( " .text \n" \ " blr \n"); #else -#ifdef __PIC__ +#ifdef PIC #define _PLT "@plt" #else #define _PLT diff --git a/sys/sparc64/include/asm.h b/sys/sparc64/include/asm.h index 8a9f3548517d..dea06c547f9e 100644 --- a/sys/sparc64/include/asm.h +++ b/sys/sparc64/include/asm.h @@ -41,7 +41,7 @@ #include <sys/cdefs.h> -#ifdef __PIC__ +#ifdef PIC #define PIC_PROLOGUE(r1, r2) \ sethi %hi(_GLOBAL_OFFSET_TABLE_-4), r1 ; \ rd %pc, r2 ; \ |