Module Name: src
Committed By: bouyer
Date: Fri Mar 30 19:23:35 UTC 2012
Modified Files:
src/libexec/ld.elf_so/arch/alpha [netbsd-5]: alpha_reloc.c
src/libexec/ld.elf_so/arch/arm [netbsd-5]: mdreloc.c
src/libexec/ld.elf_so/arch/hppa [netbsd-5]: hppa_reloc.c
Log Message:
Apply patch, requested by skrll in ticket #1724
src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c patch
src/libexec/ld.elf_so/arch/arm/mdreloc.c patch
src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c patch
Fix gcc uninitialized variable warning.
To generate a diff of this commit:
cvs rdiff -u -r1.31.4.1 -r1.31.4.2 \
src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c
cvs rdiff -u -r1.28.4.1 -r1.28.4.2 src/libexec/ld.elf_so/arch/arm/mdreloc.c
cvs rdiff -u -r1.27.4.1 -r1.27.4.2 \
src/libexec/ld.elf_so/arch/hppa/hppa_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/alpha/alpha_reloc.c
diff -u src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.31.4.1 src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.31.4.2
--- src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c:1.31.4.1 Sat Mar 17 18:28:36 2012
+++ src/libexec/ld.elf_so/arch/alpha/alpha_reloc.c Fri Mar 30 19:23:34 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: alpha_reloc.c,v 1.31.4.1 2012/03/17 18:28:36 bouyer Exp $ */
+/* $NetBSD: alpha_reloc.c,v 1.31.4.2 2012/03/30 19:23:34 bouyer Exp $ */
/*
* Copyright (c) 2001 Wasabi Systems, Inc.
@@ -62,7 +62,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: alpha_reloc.c,v 1.31.4.1 2012/03/17 18:28:36 bouyer Exp $");
+__RCSID("$NetBSD: alpha_reloc.c,v 1.31.4.2 2012/03/30 19:23:34 bouyer Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -479,7 +479,7 @@ caddr_t
_rtld_bind(const Obj_Entry *obj, Elf_Word reloff)
{
const Elf_Rela *rela = (const Elf_Rela *)((caddr_t)obj->pltrela + reloff);
- Elf_Addr result;
+ Elf_Addr result = 0; /* XXX gcc */
int err;
err = _rtld_relocate_plt_object(obj, rela, &result);
Index: src/libexec/ld.elf_so/arch/arm/mdreloc.c
diff -u src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.28.4.1 src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.28.4.2
--- src/libexec/ld.elf_so/arch/arm/mdreloc.c:1.28.4.1 Sat Mar 17 18:28:37 2012
+++ src/libexec/ld.elf_so/arch/arm/mdreloc.c Fri Mar 30 19:23:35 2012
@@ -1,8 +1,8 @@
-/* $NetBSD: mdreloc.c,v 1.28.4.1 2012/03/17 18:28:37 bouyer Exp $ */
+/* $NetBSD: mdreloc.c,v 1.28.4.2 2012/03/30 19:23:35 bouyer Exp $ */
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: mdreloc.c,v 1.28.4.1 2012/03/17 18:28:37 bouyer Exp $");
+__RCSID("$NetBSD: mdreloc.c,v 1.28.4.2 2012/03/30 19:23:35 bouyer Exp $");
#endif /* not lint */
#include <sys/types.h>
@@ -253,7 +253,7 @@ caddr_t
_rtld_bind(const Obj_Entry *obj, Elf_Word reloff)
{
const Elf_Rel *rel = (const Elf_Rel *)((caddr_t)obj->pltrel + reloff);
- Elf_Addr new_value;
+ Elf_Addr new_value = 0; /* XXX gcc */
int err;
err = _rtld_relocate_plt_object(obj, rel, &new_value);
Index: src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c
diff -u src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.27.4.1 src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.27.4.2
--- src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c:1.27.4.1 Sat Mar 17 18:28:37 2012
+++ src/libexec/ld.elf_so/arch/hppa/hppa_reloc.c Fri Mar 30 19:23:35 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: hppa_reloc.c,v 1.27.4.1 2012/03/17 18:28:37 bouyer Exp $ */
+/* $NetBSD: hppa_reloc.c,v 1.27.4.2 2012/03/30 19:23:35 bouyer Exp $ */
/*-
* Copyright (c) 2002, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: hppa_reloc.c,v 1.27.4.1 2012/03/17 18:28:37 bouyer Exp $");
+__RCSID("$NetBSD: hppa_reloc.c,v 1.27.4.2 2012/03/30 19:23:35 bouyer Exp $");
#endif /* not lint */
#include <stdlib.h>
@@ -590,7 +590,7 @@ caddr_t
_rtld_bind(const Obj_Entry *obj, Elf_Word reloff)
{
const Elf_Rela *rela = (const Elf_Rela *)((caddr_t)obj->pltrela + reloff);
- Elf_Addr new_value;
+ Elf_Addr new_value = 0; /* XXX gcc */
int err;
assert(ELF_R_SYM(rela->r_info) != 0);
