diff options
Diffstat (limited to 'sysdeps/unix/sysv')
| -rw-r--r-- | sysdeps/unix/sysv/linux/dl-sysdep.c | 16 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/mips/clone.S | 2 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S | 4 |
3 files changed, 10 insertions, 12 deletions
diff --git a/sysdeps/unix/sysv/linux/dl-sysdep.c b/sysdeps/unix/sysv/linux/dl-sysdep.c index a1abbdcae0..18b989cc74 100644 --- a/sysdeps/unix/sysv/linux/dl-sysdep.c +++ b/sysdeps/unix/sysv/linux/dl-sysdep.c @@ -27,18 +27,16 @@ static inline void frob_brk (void) { + extern size_t _dl_pagesize; extern void _end; __brk (0); /* Initialize the break. */ if (__sbrk (0) == &_end) - { - /* The dynamic linker was run as a program, and so the initial break - starts just after our bss, at &_end. The malloc in dl-minimal.c - will consume the rest of this page, so tell the kernel to move the - break up that far. When the user program examines its break, it - will see this new value and not clobber our data. */ - size_t pg = __getpagesize (); - __sbrk (pg - ((&_end - (void *) 0) & pg)); - } + /* The dynamic linker was run as a program, and so the initial break + starts just after our bss, at &_end. The malloc in dl-minimal.c + will consume the rest of this page, so tell the kernel to move the + break up that far. When the user program examines its break, it + will see this new value and not clobber our data. */ + __sbrk (_dl_pagesize - ((&_end - (void *) 0) & _dl_pagesize)); } #include <sysdeps/generic/dl-sysdep.c> diff --git a/sysdeps/unix/sysv/linux/mips/clone.S b/sysdeps/unix/sysv/linux/mips/clone.S index 357f70e47f..4d6408dc97 100644 --- a/sysdeps/unix/sysv/linux/mips/clone.S +++ b/sysdeps/unix/sysv/linux/mips/clone.S @@ -37,7 +37,7 @@ .text NESTED(__clone,4*SZREG,sp) -#ifdef __PIC__ +#ifdef PIC .set noreorder .cpload $25 .set reorder diff --git a/sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S b/sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S index 2dd13062fc..a639511f3e 100644 --- a/sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S +++ b/sysdeps/unix/sysv/linux/sparc/__sigtrampoline.S @@ -72,7 +72,7 @@ ENTRY(____sparc_signal_trampoline) or %g0,%g0,%g1 /*Call sys_setup */ t 0x10 1: -#ifdef __PIC__ +#ifdef PIC /* Save return address */ mov %o7,%o4 ___sxx: @@ -89,7 +89,7 @@ ___syy: #endif sethi %hi(C_SYMBOL_NAME(____sig_table)),%o5 or %o5,%lo(C_SYMBOL_NAME(____sig_table)),%o5 -#ifdef __PIC__ +#ifdef PIC add %o5,%o4,%o4 ld [%o4],%o5 #endif |