PERFORCE change 52941 for review

[Peter Wemm]

http://perforce.freebsd.org/chv.cgi?CH=52941

Change 52941 by peter at peter_hammer on 2004/05/17 12:55:01

	deal with REL records which have variable old-value sizes

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#25 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/elf_machdep.c#25 (text+ko) ====

@@ -119,9 +119,18 @@
 	case ELF_RELOC_REL:
 		rel = (const Elf_Rel *)data;
 		where = (Elf_Addr *) (relocbase + rel->r_offset);
-		addend = *where;
 		rtype = ELF_R_TYPE(rel->r_info);
 		symidx = ELF_R_SYM(rel->r_info);
+		/* Addend is 32 bit on 32 bit relocs */
+		switch (rtype) {
+		case R_X86_64_PC32:
+		case R_X86_64_32S:
+			addend = *(Elf32_Addr *)where;
+			break;
+		default:
+			addend = *where;
+			break;
+		}
 		break;
 	case ELF_RELOC_RELA:
 		rela = (const Elf_Rela *)data;
@@ -136,7 +145,6 @@
 
 	switch (rtype) {
 
-
 		case R_X86_64_NONE:	/* none */
 			break;