Module Name: src Committed By: macallan Date: Sun May 24 02:33:11 UTC 2020
Modified Files: src/libexec/ld.elf_so/arch/powerpc: ppc_reloc.c Log Message: new binutils/gcc started emitting R_PPC_UADDR32 reloc entries, so for now treat them like R_PPC_ADDR32 XXX these relocs have been observed in the xf86-video-radeon driver, but only in the AtomBios support code, which is unused on PowerPC. This allows the driver to load but it's not clear if the affected parts would actually function. To generate a diff of this commit: cvs rdiff -u -r1.60 -r1.61 src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c diff -u src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.60 src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.61 --- src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c:1.60 Sun Dec 8 23:49:16 2019 +++ src/libexec/ld.elf_so/arch/powerpc/ppc_reloc.c Sun May 24 02:33:11 2020 @@ -1,4 +1,4 @@ -/* $NetBSD: ppc_reloc.c,v 1.60 2019/12/08 23:49:16 uwe Exp $ */ +/* $NetBSD: ppc_reloc.c,v 1.61 2020/05/24 02:33:11 macallan Exp $ */ /*- * Copyright (C) 1998 Tsubai Masanari @@ -30,7 +30,7 @@ #include <sys/cdefs.h> #ifndef lint -__RCSID("$NetBSD: ppc_reloc.c,v 1.60 2019/12/08 23:49:16 uwe Exp $"); +__RCSID("$NetBSD: ppc_reloc.c,v 1.61 2020/05/24 02:33:11 macallan Exp $"); #endif /* not lint */ #include <stdarg.h> @@ -195,6 +195,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry case R_TYPE(ADDR64): /* <address> S + A */ #else case R_TYPE(ADDR32): /* <address> S + A */ + case R_TYPE(UADDR32): /* <address> S + A */ #endif case R_TYPE(GLOB_DAT): /* <address> S + A */ case R_TYPE(ADDR16_LO): @@ -226,6 +227,7 @@ _rtld_relocate_nonplt_objects(Obj_Entry case R_TYPE(ADDR64): /* <address> S + A */ #else case R_TYPE(ADDR32): /* <address> S + A */ + case R_TYPE(UADDR32): /* <address> S + A */ #endif case R_TYPE(GLOB_DAT): /* <address> S + A */ tmp = (Elf_Addr)(defobj->relocbase + def->st_value +