From 50463d27cdd5b7a8dd7401ca4850ae3871b9aa78 Mon Sep 17 00:00:00 2001
From: Ulrich Drepper <drepper@redhat.com>
Date: Thu, 19 Nov 1998 17:46:16 +0000
Subject: Update.

1998-11-19  Geoff Keating  <geoffk@ozemail.com.au>

	* elf/rtld.c (_dl_start): Handle weak undefined symbols in ld.so
	correctly.
---
 elf/rtld.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'elf')

diff --git a/elf/rtld.c b/elf/rtld.c
index b88e1e12b0..38c7b051b1 100644
--- a/elf/rtld.c
+++ b/elf/rtld.c
@@ -132,7 +132,8 @@ _dl_start (void *arg)
   /* This #define produces dynamic linking inline functions for
      bootstrap relocation instead of general-purpose relocation.  */
 #define RTLD_BOOTSTRAP
-#define RESOLVE(sym, version, flags) bootstrap_map.l_addr
+#define RESOLVE(sym, version, flags) \
+  ((*(sym))->st_shndx == SHN_UNDEF ? 0 : bootstrap_map.l_addr)
 #include "dynamic-link.h"
 
   /* Figure out the run-time load address of the dynamic linker itself.  */
-- 
cgit v1.2.3