diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2004-12-15 09:35:48 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2004-12-15 09:35:48 +0000 |
| commit | befe97e0d0e019ed913a2dddee77c62662349aec (patch) | |
| tree | b97e4ff16e871dcb80f09cda0bb861243e0a95ab /sysdeps | |
| parent | 0d60d7de5db10af7b1c1574520d3ab3c0f64d530 (diff) | |
| download | glibc-befe97e0d0e019ed913a2dddee77c62662349aec.tar glibc-befe97e0d0e019ed913a2dddee77c62662349aec.tar.gz glibc-befe97e0d0e019ed913a2dddee77c62662349aec.tar.bz2 glibc-befe97e0d0e019ed913a2dddee77c62662349aec.zip | |
Sync from HEAD once again.
Diffstat (limited to 'sysdeps')
| -rw-r--r-- | sysdeps/ia64/dl-machine.h | 9 | ||||
| -rw-r--r-- | sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S | 4 |
2 files changed, 8 insertions, 5 deletions
diff --git a/sysdeps/ia64/dl-machine.h b/sysdeps/ia64/dl-machine.h index 8714c016e9..3108047869 100644 --- a/sysdeps/ia64/dl-machine.h +++ b/sysdeps/ia64/dl-machine.h @@ -499,7 +499,8 @@ elf_machine_plt_value (struct link_map *map, const Elf64_Rela *reloc, /* Perform the relocation specified by RELOC and SYM (which is fully resolved). MAP is the object containing the reloc. */ -static inline void +auto inline void +__attribute ((always_inline)) elf_machine_rela (struct link_map *map, const Elf64_Rela *reloc, const Elf64_Sym *sym, @@ -603,7 +604,8 @@ elf_machine_rela (struct link_map *map, can be skipped. */ #define ELF_MACHINE_REL_RELATIVE 1 -static inline void +auto inline void +__attribute ((always_inline)) elf_machine_rela_relative (Elf64_Addr l_addr, const Elf64_Rela *reloc, void *const reloc_addr_arg) { @@ -615,7 +617,8 @@ elf_machine_rela_relative (Elf64_Addr l_addr, const Elf64_Rela *reloc, } /* Perform a RELATIVE reloc on the .got entry that transfers to the .plt. */ -static inline void +auto inline void +__attribute ((always_inline)) elf_machine_lazy_rel (struct link_map *map, Elf64_Addr l_addr, const Elf64_Rela *reloc) { diff --git a/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S b/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S index be069c90c8..61a35a2f79 100644 --- a/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S +++ b/sysdeps/unix/sysv/linux/powerpc/powerpc64/clone.S @@ -92,9 +92,9 @@ ENTRY (BP_SYM (__clone)) mr r1,r30 #ifdef RESET_PID - andis. r0,r28,1 /* This is & CLONE_THREAD */ + rldicl. r0,r28,48,63 /* This is & CLONE_THREAD */ bne+ r0,L(oldpid) - andi. r0,r28,CLONE_VM + rldicl. r0,r28,56,63 /* This is & CLONE_VM */ li r3,-1 bne- r0,L(nomoregetpid) DO_CALL(SYS_ify(getpid)) |