Module Name: src
Committed By: christos
Date: Tue Aug 26 15:06:50 UTC 2014
Modified Files:
src/libexec/ld.elf_so: headers.c
Log Message:
fix set but not used.
To generate a diff of this commit:
cvs rdiff -u -r1.57 -r1.58 src/libexec/ld.elf_so/headers.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/headers.c
diff -u src/libexec/ld.elf_so/headers.c:1.57 src/libexec/ld.elf_so/headers.c:1.58
--- src/libexec/ld.elf_so/headers.c:1.57 Tue Aug 26 08:14:14 2014
+++ src/libexec/ld.elf_so/headers.c Tue Aug 26 11:06:50 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: headers.c,v 1.57 2014/08/26 12:14:14 joerg Exp $ */
+/* $NetBSD: headers.c,v 1.58 2014/08/26 15:06:50 christos Exp $ */
/*
* Copyright 1996 John D. Polstra.
@@ -40,7 +40,7 @@
#include <sys/cdefs.h>
#ifndef lint
-__RCSID("$NetBSD: headers.c,v 1.57 2014/08/26 12:14:14 joerg Exp $");
+__RCSID("$NetBSD: headers.c,v 1.58 2014/08/26 15:06:50 christos Exp $");
#endif /* not lint */
#include <err.h>
@@ -74,7 +74,9 @@ _rtld_digest_dynamic(const char *execnam
bool use_pltrela = false;
Elf_Addr relsz = 0, relasz = 0;
Elf_Addr pltrel = 0, pltrelsz = 0;
+#ifdef RTLD_LOADER
Elf_Addr init = 0, fini = 0;
+#endif
dbg(("headers: digesting PT_DYNAMIC at %p", obj->dynamic));
for (dynp = obj->dynamic; dynp->d_tag != DT_NULL; ++dynp) {
@@ -227,7 +229,9 @@ _rtld_digest_dynamic(const char *execnam
break;
case DT_INIT:
+#ifdef RTLD_LOADER
init = dynp->d_un.d_ptr;
+#endif
break;
#ifdef HAVE_INITFINI_ARRAY
@@ -245,7 +249,9 @@ _rtld_digest_dynamic(const char *execnam
#endif
case DT_FINI:
+#ifdef RTLD_LOADER
fini = dynp->d_un.d_ptr;
+#endif
break;
#ifdef HAVE_INITFINI_ARRAY
