From: Jakub Jelinek <jakub@redhat.com>
Date: Wed, 15 Dec 2004 09:35:48 +0000 (+0000)
Subject: Sync from HEAD once again.
X-Git-Tag: cvs/fedora-glibc-2_3_3-93~5
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=befe97e0d0e019ed913a2dddee77c62662349aec;p=thirdparty%2Fglibc.git

Sync from HEAD once again.
---

diff --git a/ChangeLog b/ChangeLog
index 00f512d7ef5..d08630ecafa 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2004-12-15  Andreas Jaeger  <aj@suse.de>
+
+	* sysdeps/ia64/dl-machine.h (elf_machine_rela): Mark auto instead
+	of static, add always_inline attribute.
+	(elf_machine_rela_relative): Likewise.
+	(elf_machine_lazy_rel): Likewise.
+
 2004-12-15  Ulrich Drepper  <drepper@redhat.com>
 
 	* sysdeps/unix/sysv/linux/powerpc/powerpc32/clone.S: Add support
diff --git a/sysdeps/ia64/dl-machine.h b/sysdeps/ia64/dl-machine.h
index 8714c016e91..31080478695 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 be069c90c81..61a35a2f792 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))