From: Ulrich Drepper <drepper@redhat.com>
Date: Fri, 29 Sep 2000 06:52:39 +0000 (+0000)
Subject: Update.
X-Git-Tag: cvs/libc-2_1_95~50
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7c81011531448a126a640b45547abab2b1195465;p=platform%2Fupstream%2Fglibc.git

Update.

2000-09-28  Ulrich Drepper  <drepper@redhat.com>

	* sysdeps/alpha/dl-machine.h (elf_machine_rela): Handle unaligned
	relocation also for R_ALPHA_RELATIVE.
	Reported by Ivan Kokshaysky <ink@jurassic.park.msu.ru>.
---

diff --git a/ChangeLog b/ChangeLog
index b341887..77f9f6b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2000-09-28  Ulrich Drepper  <drepper@redhat.com>
+
+	* sysdeps/alpha/dl-machine.h (elf_machine_rela): Handle unaligned
+	relocation also for R_ALPHA_RELATIVE.
+	Reported by Ivan Kokshaysky <ink@jurassic.park.msu.ru>.
+
 2000-09-18  Bruno Haible  <haible@clisp.cons.org>
 
 	* intl/dcigettext.c: Outside libc, use local variable names that don't
diff --git a/sysdeps/alpha/dl-machine.h b/sysdeps/alpha/dl-machine.h
index 33c32fa..69845b4 100644
--- a/sysdeps/alpha/dl-machine.h
+++ b/sysdeps/alpha/dl-machine.h
@@ -482,7 +482,19 @@ elf_machine_rela (struct link_map *map,
       /* Already done in dynamic linker.  */
       if (map != &_dl_rtld_map)
 #endif
-	*reloc_addr += map->l_addr;
+	{
+	  /* XXX Make some timings.  Maybe it's preverable to test for
+	     unaligned access and only do it the complex way if necessary.  */
+	  void *reloc_addr_1 = reloc_addr;
+	  Elf64_Addr reloc_addr_val;
+
+	  /* Load value without causing unaligned trap. */
+	  memcpy (&reloc_addr_val, reloc_addr_1, 8);
+	  reloc_addr_val += map->l_addr;
+
+	  /* Store value without causing unaligned trap. */
+	  memcpy (reloc_addr_1, &reloc_addr_val, 8);
+	}
     }
   else if (r_type == R_ALPHA_NONE)
     return;