[BZ #17250] Fix static dlopen default library search path

Fix a regression introduced with commit 0d23a5c1 [Static dlopen
correction fallout fixes] that caused the default library search path to
be ignored for modules loaded with dlopen from static executables.

	[BZ #17250]
	* elf/dl-support.c (_dl_main_map): Don't initialize l_flags_1
	member.

diff --git a/ChangeLog b/ChangeLog
index 61b2664..45b8f86 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2015-09-25  Maciej W. Rozycki  <macro@imgtec.com>
+
+       [BZ #17250]
+       * elf/dl-support.c (_dl_main_map): Don't initialize l_flags_1
+       member.
+
 2015-09-24  Joseph Myers  <joseph@codesourcery.com>
 
        [BZ #18803]

diff --git a/NEWS b/NEWS
index f67a4cd..6f54409 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -11,12 +11,12 @@ Version 2.23
 
   2542, 2543, 2558, 2898, 4404, 6803, 14341, 14912, 15367, 15384, 15786,
   15918, 16141, 16296, 16415, 16517, 16519, 16520, 16521, 16734, 16973,
-  16985, 17118, 17243, 17244, 17441, 17787, 17886, 17887, 17905, 18084,
-  18086, 18240, 18265, 18370, 18421, 18480, 18525, 18595, 18610, 18618,
-  18647, 18661, 18674, 18675, 18681, 18757, 18778, 18781, 18787, 18789,
-  18790, 18795, 18796, 18803, 18820, 18823, 18824, 18857, 18863, 18870,
-  18872, 18873, 18875, 18887, 18921, 18951, 18952, 18961, 18966, 18967,
-  18970, 18977, 18980, 18981, 19003.
+  16985, 17118, 17243, 17244, 17250, 17441, 17787, 17886, 17887, 17905,
+  18084, 18086, 18240, 18265, 18370, 18421, 18480, 18525, 18595, 18610,
+  18618, 18647, 18661, 18674, 18675, 18681, 18757, 18778, 18781, 18787,
+  18789, 18790, 18795, 18796, 18803, 18820, 18823, 18824, 18857, 18863,
+  18870, 18872, 18873, 18875, 18887, 18921, 18951, 18952, 18961, 18966,
+  18967, 18970, 18977, 18980, 18981, 19003.
 
 * The obsolete header <regexp.h> has been removed.  Programs that require
   this header must be updated to use <regex.h> instead.

diff --git a/elf/dl-support.c b/elf/dl-support.c
index e7b5110..9bbaa5b 100644 (file)
--- a/elf/dl-support.c
+++ b/elf/dl-support.c
@@ -91,7 +91,6 @@ static struct link_map _dl_main_map =
     .l_scope = _dl_main_map.l_scope_mem,
     .l_local_scope = { &_dl_main_map.l_searchlist },
     .l_used = 1,
-    .l_flags_1 = DF_1_NODEFLIB,
     .l_tls_offset = NO_TLS_OFFSET,
     .l_serial = 1,
   };