File fix-ld-mingw-gc-sections.patch of Package mingw32-binutils

Overview Repositories Revisions Requests Users Attributes Meta

File fix-ld-mingw-gc-sections.patch of Package mingw32-binutils (Revision de3e9de69d2269a19d1fbe353789fbb6)

Currently displaying revision de3e9de69d2269a19d1fbe353789fbb6 , Show latest

From 6ab34c0d75b7f8d01b48bd1cd2af198c45e0662f Mon Sep 17 00:00:00 2001
From: Martin Koegler <martin.koegler@chello.at>
Date: Fri, 18 Mar 2016 18:56:40 +0000
Subject: [PATCH] Fix GC sections

https://sourceware.org/bugzilla/show_bug.cgi?id=19803
---
 ld/ldlang.c                  | 49 +++++++++++++++++++++++++++++---------------
 ld/ldlang.h                  |  3 +++
 ld/pe-dll.c                  | 22 ++++++++++++--------
 ld/testsuite/ld-pe/pe.exp    | 14 +++++++++++++
 ld/testsuite/ld-pe/pr19803.d | 17 +++++++++++++++
 ld/testsuite/ld-pe/pr19803.e |  3 +++
 ld/testsuite/ld-pe/pr19803.s | 14 +++++++++++++
 7 files changed, 97 insertions(+), 25 deletions(-)
 create mode 100644 ld/testsuite/ld-pe/pr19803.d
 create mode 100644 ld/testsuite/ld-pe/pr19803.e
 create mode 100644 ld/testsuite/ld-pe/pr19803.s

diff --git a/ld/ldlang.c b/ld/ldlang.c
index 7b74e24..9d84eef 100644
--- a/ld/ldlang.c
+++ b/ld/ldlang.c
@@ -6477,7 +6477,6 @@ static void
 lang_gc_sections (void)
 {
   /* Keep all sections so marked in the link script.  */
-
   lang_gc_sections_1 (statement_list.head);
 
   /* SEC_EXCLUDE is ignored when doing a relocatable link, except in
@@ -6700,6 +6699,23 @@ lang_list_remove_tail (lang_statement_list_type *destlist,
 }
 #endif /* ENABLE_PLUGINS */
 
+/* Add NAME to the list of garbage collection entry points.  */
+
+void
+lang_add_gc_name (const char * name)
+{
+  struct bfd_sym_chain *sym;
+
+  if (name == NULL)
+    return;
+
+  sym = (struct bfd_sym_chain *) stat_alloc (sizeof (*sym));
+
+  sym->next = link_info.gc_sym_list;
+  sym->name = name;
+  link_info.gc_sym_list = sym;
+}
+
 void
 lang_process (void)
 {
@@ -6782,26 +6798,27 @@ lang_process (void)
     }
 #endif /* ENABLE_PLUGINS */
 
+  ASSERT (link_info.gc_sym_list == NULL);
   link_info.gc_sym_list = &entry_symbol;
+
   if (entry_symbol.name == NULL)
-    link_info.gc_sym_list = ldlang_undef_chain_list_head;
-  if (link_info.init_function != NULL)
     {
-      struct bfd_sym_chain *sym
-	= (struct bfd_sym_chain *) stat_alloc (sizeof (*sym));
-      sym->next = link_info.gc_sym_list;
-      sym->name = link_info.init_function;
-      link_info.gc_sym_list = sym;
-    }
-  if (link_info.fini_function != NULL)
-    {
-      struct bfd_sym_chain *sym
-	= (struct bfd_sym_chain *) stat_alloc (sizeof (*sym));
-      sym->next = link_info.gc_sym_list;
-      sym->name = link_info.fini_function;
-      link_info.gc_sym_list = sym;
+      link_info.gc_sym_list = ldlang_undef_chain_list_head;
+
+      /* entry_symbol is normally initialied by a ENTRY definition in the
+	 linker script or the -e command line option.  But if neither of
+	 these have been used, the target specific backend may still have
+	 provided an entry symbol via a call to lang_default_entry().
+	 Unfortunately this value will not be processed until lang_end()
+	 is called, long after this function has finished.  So detect this
+	 case here and add the target's entry symbol to the list of starting
+	 points for garbage collection resolution.  */
+      lang_add_gc_name (entry_symbol_default);
     }
 
+  lang_add_gc_name (link_info.init_function);
+  lang_add_gc_name (link_info.fini_function);
+
   ldemul_after_open ();
   if (config.map_file != NULL)
     lang_print_asneeded ();
diff --git a/ld/ldlang.h b/ld/ldlang.h
index c3d1185..65d768b 100644
--- a/ld/ldlang.h
+++ b/ld/ldlang.h
@@ -693,4 +693,7 @@ lang_ld_feature (char *);
 extern void
 lang_print_memory_usage (void);
 
+extern void
+lang_add_gc_name (const char *);
+
 #endif
diff --git a/ld/pe-dll.c b/ld/pe-dll.c
index 14f963b..61c7196 100644
--- a/ld/pe-dll.c
+++ b/ld/pe-dll.c
@@ -894,16 +894,20 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
 
   for (i = 0; i < NE; i++)
     {
+      char *int_name = pe_def_file->exports[i].internal_name;
       char *name;
-      name = xmalloc (strlen (pe_def_file->exports[i].internal_name) + 2);
-      if (pe_details->underscored
- 	  && (*pe_def_file->exports[i].internal_name != '@'))
+
+      /* PR 19803: Make sure that any exported symbol does not get garbage collected.  */
+      lang_add_gc_name (int_name);
+
+      name = xmalloc (strlen (int_name) + 2);
+      if (pe_details->underscored && int_name[0] != '@')
 	{
 	  *name = '_';
-	  strcpy (name + 1, pe_def_file->exports[i].internal_name);
+	  strcpy (name + 1, int_name);
 	}
       else
-	strcpy (name, pe_def_file->exports[i].internal_name);
+	strcpy (name, int_name);
 
       blhe = bfd_link_hash_lookup (info->hash,
 				   name,
@@ -939,7 +943,7 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
 	 but we must take care not to be fooled when the user wants to export
 	 a symbol that actually really has a dot in it, so we only check
 	 for them here, after real defined symbols have already been matched.  */
-      else if (strchr (pe_def_file->exports[i].internal_name, '.'))
+      else if (strchr (int_name, '.'))
 	{
 	  count_exported++;
 	  if (!pe_def_file->exports[i].flag_noname)
@@ -960,20 +964,20 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
 	{
 	  /* xgettext:c-format */
 	  einfo (_("%XCannot export %s: symbol not defined\n"),
-		 pe_def_file->exports[i].internal_name);
+		 int_name);
 	}
       else if (blhe)
 	{
 	  /* xgettext:c-format */
 	  einfo (_("%XCannot export %s: symbol wrong type (%d vs %d)\n"),
-		 pe_def_file->exports[i].internal_name,
+		 int_name,
 		 blhe->type, bfd_link_hash_defined);
 	}
       else
 	{
 	  /* xgettext:c-format */
 	  einfo (_("%XCannot export %s: symbol not found\n"),
-		 pe_def_file->exports[i].internal_name);
+		 int_name);
 	}
       free (name);
     }
diff --git a/ld/testsuite/ld-pe/pe.exp b/ld/testsuite/ld-pe/pe.exp
index 622caed..a31f6e7 100644
--- a/ld/testsuite/ld-pe/pe.exp
+++ b/ld/testsuite/ld-pe/pe.exp
@@ -76,6 +76,20 @@ run_dump_test "longsecn-5"
 run_dump_test "orphan"
 run_dump_test "orphan_nu"
 
+run_dump_test "pr19803"
+set pr19803_dll {
+    {   "PR 19803: not exporting swept symbols"
+	"-shared --out-implib dx.dll --gc-sections"
+	"" "" {pr19803.s}
+	{{objdump "--syms dx.dll" pr19803.e}}
+	"a.exe"}
+}
+# This test is *supposed* to fail.  If the symbol defined in pr19803.e is
+# found then it was not stripped from the export dll, despite the fact that
+# it (should have been) garbage collected from the executable.
+setup_xfail *-*-*
+run_ld_link_tests $pr19803_dll
+
 if {[istarget x86_64-*-mingw*] } {
 	run_dump_test "cfi"
 } elseif {[istarget i*86-*-cygwin*] || [istarget i*86-*-mingw*] } {
diff --git a/ld/testsuite/ld-pe/pr19803.d b/ld/testsuite/ld-pe/pr19803.d
new file mode 100644
index 0000000..1fc6daf
--- /dev/null
+++ b/ld/testsuite/ld-pe/pr19803.d
@@ -0,0 +1,17 @@
+#ld: -shared --out-implib dx.dll.a --gc-sections
+#objdump: --syms
+#notarget: mcore-* arm-epoc-pe
+#
+# Check that the target specific entry symbol _DllMainCRTStartup is still
+# a defined (sec > 0), public (scl == 2) symbol, even after garbage
+# collection.
+#
+# Check that the symbol _testval is undefined (sec == 0) and hidden
+# (scl == 106) in the output.  It should have been changed to this state when
+# garbage collection was performed.
+
+#...
+.*$sec  0$$fl 0x00$$ty   0$$scl 106$ $nx 0$ 0x0+000 _testval
+#...
+.*$sec  1$$fl 0x00$$ty   0$$scl   2$ $nx 0$ 0x0+000 .*Startup.*
+#pass
diff --git a/ld/testsuite/ld-pe/pr19803.e b/ld/testsuite/ld-pe/pr19803.e
new file mode 100644
index 0000000..a2f8162
--- /dev/null
+++ b/ld/testsuite/ld-pe/pr19803.e
@@ -0,0 +1,3 @@
+#...
+.*__imp__testval
+#pass
diff --git a/ld/testsuite/ld-pe/pr19803.s b/ld/testsuite/ld-pe/pr19803.s
new file mode 100644
index 0000000..290a698
--- /dev/null
+++ b/ld/testsuite/ld-pe/pr19803.s
@@ -0,0 +1,14 @@
+       .text
+        .globl  "_DllMainCRTStartup@12"
+"_DllMainCRTStartup@12":
+        .globl  _DllMainCRTStartup
+_DllMainCRTStartup:
+        .globl  DllMainCRTStartup
+DllMainCRTStartup:
+	nop
+
+	.section .rdata,"dr"
+        .globl  _testval
+_testval:
+        .long   1
+        .long   2
-- 
2.6.2

Places

File fix-ld-mingw-gc-sections.patch of Package mingw32-binutils (Revision de3e9de69d2269a19d1fbe353789fbb6)

Places