Re: FWD: Re: [Linux-ia64] latest glibc snapshot does not build on ia64?

[Randolph Chung <tausq@debian.org>]

In reference to a message from Randolph Chung, dated Sep 03:
> i'll try this later....

well, the lazy answer is that this patch works... replaces the existing
ia64-reloc-none patch

i'll try to spend some more time to track down where the reloc is coming
from so we can try to fix this in binutils, if it's indeed a bug
there...

randolph


#! /bin/sh -e

# DP: Fix R_IA64_NONE relocs.
# DP: From: Andreas Schwab <schwab@suse.de>

if [ $# -ne 2 ]; then
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
    exit 1
fi
case "$1" in
    -patch) patch -d "$2" -f --no-backup-if-mismatch -p0 < $0;;
    -unpatch) patch -d "$2" -f --no-backup-if-mismatch -R -p0 < $0;;
    *)
	echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
	exit 1
esac
exit 0

--- sysdeps/ia64/dl-machine.h~	Sun Mar 24 16:11:20 2002
+++ sysdeps/ia64/dl-machine.h	Sun Mar 24 16:14:21 2002
@@ -546,12 +546,11 @@ elf_machine_rela (struct link_map *map,
 # endif
         value += map->l_addr;
     }
-# ifndef RTLD_BOOTSTRAP
-  else if (r_type == R_IA64_NONE)
-    return;
-# endif
   else
 #endif
+  if (r_type == R_IA64_NONE)
+    return;
+  else
     {
       struct link_map *sym_map;