Changeset 558

Timestamp:

02/21/06 07:55:58 (3 years ago)

Author:

jim

Message:

r560@server (orig r558): roliver | 2005-06-03 22:48:58 -0700
Update arm glibc-2.3.4 gcc4 patch
Add fixes for i386 (seen when building 32bit glibc on amd64)
Update glibc-2.3.4-gcc4_elf_fixes.patch to reflect changes

Files:

• cross-lfs/cross-lfs/trunk/patches/glibc-2.3.4-gcc4_elf_fixes.patch (modified) (11 diffs)
• cross-lfs/cross-lfs/trunk/patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_arm_elf_dl-machine.patch (modified) (8 diffs)
• cross-lfs/cross-lfs/trunk/patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_i386_elf_dl-machine.patch (added)

cross-lfs/cross-lfs/trunk/patches/glibc-2.3.4-gcc4_elf_fixes.patch

@@ -1 +1 @@
-Submitted By: Ryan Oliver <ryan.oliver@pha.com.au> 
-
+ (updated 2005-06-03)
-Initial Package Version: 2.3.4
-Origin: glibc cvs
@@ -7 +7 @@
-        libc/sysdeps/arm/dl-machine.h
-         - fix_bad_pc24 fix from Dan Kegel's crosstool
-1
+2
-        libc/sysdeps/generic/dl-machine.h -r1.9
-        libc/sysdeps/mips/dl-machine.h -r1.77
@@ -14 +14 @@
-        libc/sysdeps/powepc/powerpc64/dl-machine.h -r1.23
-        libc/sysdeps/sparc/sparc64/dl-machine.h -r1.48
+        libc/sysdeps/i386/dl-machine.h -r1.134 (except using RESOLVE)
-Upstream Status: See Origin, all except fix_bad_pc24 fixed in glibc cvs
-Description: 
@@ -35 +36 @@
-        elf_machine_rela, elf_machine_rela_relative, elf_machine_lazy_rel):
-        Likewise.
+
+2005-03-05  Jakub Jelinek  <jakub@redhat.com>
+
+        * sysdeps/i386/dl-machine.h (ELF_MACHINE_NO_RELA): Define
+        unconditionally to (defined RTLD_BOOTSTRAP).
+        * sysdeps/arm/dl-machine.h (ELF_MACHINE_NO_RELA): Likewise
+
+2005-03-01  Roland McGrath  <roland@redhat.com>
+
+        [BZ #721]
+        * sysdeps/arm/dl-machine.h (ELF_MACHINE_NO_RELA): Define this outside
+        of [RESOLVE_MAP]
-
-2005-02-16  Roland McGrath  <roland@redhat.com>
@@ -156 +169 @@
- {
---- glibc-2.3.4/sysdeps/arm/dl-machine.h-orig   2004-12-05 08:20:17.000000000 +1100
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 
- /* Deal with an out-of-range PC24 reloc.  */
@@ -167 +192 @@
- {
-   static void *fix_page;
-3
+1
- /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
-    MAP is the object containing the reloc.  */
@@ -177 +202 @@
-                 const Elf32_Sym *sym, const struct r_found_version *version,
-                 void *const reloc_addr_arg)
-9
+7
- }
- 
@@ -187 +212 @@
-                  const Elf32_Sym *sym, const struct r_found_version *version,
-                  void *const reloc_addr_arg)
-600
+598
- }
- # endif
@@ -197 +222 @@
-                          void *const reloc_addr_arg)
- {
-10
+08
- }
- 
@@ -207 +232 @@
-                           void *const reloc_addr_arg)
- {
-20
+18
- }
- # endif
@@ -472 +497 @@
-                      Elf64_Addr l_addr, const Elf64_Rela *reloc)
- {
+--- glibc-2.3.4/sysdeps/i386/dl-machine.h-orig  2004-09-28 14:54:41.000000000 +1000
++++ glibc-2.3.4/sysdeps/i386/dl-machine.h       2005-06-02 19:28:58.000000000 +1000
+@@ -377,13 +377,11 @@
+ 
+ #endif /* !dl_machine_h */
+ 
+-#ifdef RESOLVE
+-
+ /* The i386 never uses Elf32_Rela relocations for the dynamic linker.
+    Prelinked libraries may use Elf32_Rela though.  */
+-#ifdef RTLD_BOOTSTRAP
+-# define ELF_MACHINE_NO_RELA 1
+-#endif
++#define ELF_MACHINE_NO_RELA defined RTLD_BOOTSTRAP
++
++#ifdef RESOLVE
+ 
+ /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
+    MAP is the object containing the reloc.  */

cross-lfs/cross-lfs/trunk/patches/glibc-2.3.4-gcc4_elf_fixes_individual/glibc-2.3.4-gcc4_arm_elf_dl-machine.patch

@@ -1 @@
-
+
+
-Initial Package Version: 2.3.4
-Origin: fix_bad_pc24 from Dan Kegel's crosstool, rest from glibc cvs
@@ -5 +6 @@
-Description: 
-
-y
+ies
-2005-03-15  Jakub Jelinek  <jakub@redhat.com>
-
@@ -12 +13 @@
-        Add inline keyword.
-
+2005-03-05  Jakub Jelinek  <jakub@redhat.com>
+
+        * sysdeps/arm/dl-machine.h (ELF_MACHINE_NO_RELA): Define
+        unconditionally to (defined RTLD_BOOTSTRAP).
+
+2005-03-01  Roland McGrath  <roland@redhat.com>
+
+        [BZ #721]
+        * sysdeps/arm/dl-machine.h (ELF_MACHINE_NO_RELA): Define this outside
+        of [RESOLVE_MAP]
+
-fix_bad_pc24 fix from Dan Kegel's crosstool
-
---- glibc-2.3.4/sysdeps/arm/dl-machine.h-orig   2004-12-05 08:20:17.000000000 +1100
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
- 
- /* Deal with an out-of-range PC24 reloc.  */
@@ -26 +50 @@
- {
-   static void *fix_page;
-3
+1
- /* Perform the relocation specified by RELOC and SYM (which is fully resolved).
-    MAP is the object containing the reloc.  */
@@ -36 +60 @@
-                 const Elf32_Sym *sym, const struct r_found_version *version,
-                 void *const reloc_addr_arg)
-9
+7
- }
- 
@@ -46 +70 @@
-                  const Elf32_Sym *sym, const struct r_found_version *version,
-                  void *const reloc_addr_arg)
-600
+598
- }
- # endif
@@ -56 +80 @@
-                          void *const reloc_addr_arg)
- {
-10
+08
- }
- 
@@ -66 +90 @@
-                           void *const reloc_addr_arg)
- {
-20
+18
- }
- # endif