[PATCH v3 1/2] ld: Add support for a new option, -exclude-symbols, in COFF object file directives

[PATCH v3 1/2] ld: Add support for a new option, -exclude-symbols, in COFF object file directives

[Martin Storsjo]

This maps to the same as ld's --exclude-symbols command line option,
but allowing specifying the option via directives embedded in the
object files instead of passed manually on the command line.
---
v2: Fixed parsing multiple comma separated symbols. While pe_dll_add_excludes
does tokenize the string, the symbol tokens in deffilep.y don't
include commas, so we need to handle that at that level.

v3: Added an x86_64 testcase too, changed i*86 into i?86 in the testcases.
---
 ld/deffile.h                                  |  6 +++
 ld/deffilep.y                                 | 50 ++++++++++++++++++-
 ld/pe-dll.c                                   | 10 ++++
 .../ld-pe/exclude-symbols-embedded-i386.d     | 10 ++++
 .../ld-pe/exclude-symbols-embedded-i386.s     | 15 ++++++
 .../ld-pe/exclude-symbols-embedded-x86_64.d   | 10 ++++
 .../ld-pe/exclude-symbols-embedded-x86_64.s   | 15 ++++++
 ld/testsuite/ld-pe/pe.exp                     |  3 ++
 8 files changed, 117 insertions(+), 2 deletions(-)
 create mode 100644 ld/testsuite/ld-pe/exclude-symbols-embedded-i386.d
 create mode 100644 ld/testsuite/ld-pe/exclude-symbols-embedded-i386.s
 create mode 100644 ld/testsuite/ld-pe/exclude-symbols-embedded-x86_64.d
 create mode 100644 ld/testsuite/ld-pe/exclude-symbols-embedded-x86_64.s

diff --git a/ld/deffile.h b/ld/deffile.h
index d68fa8c6ba1..306ae3a6f75 100644
--- a/ld/deffile.h
+++ b/ld/deffile.h
@@ -61,6 +61,11 @@ typedef struct def_file_aligncomm {
   unsigned int alignment;	/* log-2 alignment.        */
 } def_file_aligncomm;
 
+typedef struct def_file_exclude_symbol {
+  struct def_file_exclude_symbol *next;	/* Chain pointer.  */
+  char *symbol_name;		/* Name of excluded symbol.  */
+} def_file_exclude_symbol;
+
 typedef struct def_file {
   /* From the NAME or LIBRARY command.  */
   char *name;
@@ -94,6 +99,7 @@ typedef struct def_file {
 
   /* Only expected from .drectve sections, not .DEF files.  */
   def_file_aligncomm *aligncomms;
+  def_file_exclude_symbol *exclude_symbols;
 
 } def_file;
 
diff --git a/ld/deffilep.y b/ld/deffilep.y
index 3f610ddbe14..126f33a1352 100644
--- a/ld/deffilep.y
+++ b/ld/deffilep.y
@@ -101,6 +101,7 @@ static void def_stacksize (int, int);
 static void def_version (int, int);
 static void def_directive (char *);
 static void def_aligncomm (char *str, int align);
+static void def_exclude_symbols (char *str);
 static int def_parse (void);
 static void def_error (const char *);
 static int def_lex (void);
@@ -121,7 +122,7 @@ static const char *lex_parse_string_end = 0;
 
 %token NAME LIBRARY DESCRIPTION STACKSIZE_K HEAPSIZE CODE DATAU DATAL
 %token SECTIONS EXPORTS IMPORTS VERSIONK BASE CONSTANTU CONSTANTL
-%token PRIVATEU PRIVATEL ALIGNCOMM
+%token PRIVATEU PRIVATEL ALIGNCOMM EXCLUDE_SYMBOLS
 %token READ WRITE EXECUTE SHARED_K NONAMEU NONAMEL DIRECTIVE EQUAL
 %token <id> ID
 %token <digits> DIGITS
@@ -131,7 +132,7 @@ static const char *lex_parse_string_end = 0;
 %type  <number> opt_ordinal
 %type  <number> attr attr_list opt_number exp_opt_list exp_opt
 %type  <id> opt_name opt_name2 opt_equal_name anylang_id opt_id
-%type  <id> opt_equalequal_name
+%type  <id> opt_equalequal_name symbol_list
 %type  <id_const> keyword_as_name
 
 %%
@@ -155,6 +156,7 @@ command:
 	|	VERSIONK NUMBER '.' NUMBER { def_version ($2, $4);}
 	|	DIRECTIVE ID { def_directive ($2);}
 	|	ALIGNCOMM anylang_id ',' NUMBER { def_aligncomm ($2, $4);}
+	|	EXCLUDE_SYMBOLS symbol_list
 	;
 
 
@@ -333,6 +335,11 @@ anylang_id: ID		{ $$ = $1; }
 	  }
 	;
 
+symbol_list:
+	anylang_id { def_exclude_symbols ($1); }
+	|	symbol_list ',' anylang_id { def_exclude_symbols ($3); }
+	;
+
 opt_digits: DIGITS	{ $$ = $1; }
 	|		{ $$ = ""; }
 	;
@@ -488,6 +495,15 @@ def_file_free (def_file *fdef)
       free (c);
     }
 
+  while (fdef->exclude_symbols)
+    {
+      def_file_exclude_symbol *e = fdef->exclude_symbols;
+
+      fdef->exclude_symbols = fdef->exclude_symbols->next;
+      free (e->symbol_name);
+      free (e);
+    }
+
   free (fdef);
 }
 
@@ -946,6 +962,7 @@ diropts[] =
   { "-attr", SECTIONS },
   { "-export", EXPORTS },
   { "-aligncomm", ALIGNCOMM },
+  { "-exclude-symbols", EXCLUDE_SYMBOLS },
   { 0, 0 }
 };
 
@@ -1261,6 +1278,35 @@ def_aligncomm (char *str, int align)
     }
 }
 
+static void
+def_exclude_symbols (char *str)
+{
+  def_file_exclude_symbol *c, *p;
+
+  p = NULL;
+  c = def->exclude_symbols;
+  while (c != NULL)
+    {
+      int e = strcmp (c->symbol_name, str);
+      if (!e)
+        return;
+      c = (p = c)->next;
+    }
+
+  c = xmalloc (sizeof (def_file_exclude_symbol));
+  c->symbol_name = xstrdup (str);
+  if (!p)
+    {
+      c->next = def->exclude_symbols;
+      def->exclude_symbols = c;
+    }
+  else
+    {
+      c->next = p->next;
+      p->next = c;
+    }
+}
+
 static void
 def_error (const char *err)
 {
diff --git a/ld/pe-dll.c b/ld/pe-dll.c
index db2c75da9b5..33be53d6164 100644
--- a/ld/pe-dll.c
+++ b/ld/pe-dll.c
@@ -718,6 +718,16 @@ process_def_file_and_drectve (bfd *abfd ATTRIBUTE_UNUSED, struct bfd_link_info *
 	}
     }
 
+  if (pe_def_file->exclude_symbols)
+    {
+      def_file_exclude_symbol *ac = pe_def_file->exclude_symbols;
+      while (ac)
+	{
+	  pe_dll_add_excludes (ac->symbol_name, EXCLUDESYMS);
+	  ac = ac->next;
+	}
+    }
+
   /* If we are building an executable and there is nothing
      to export, we do not build an export table at all.  */
   if (bfd_link_executable (info) && pe_def_file->num_exports == 0
diff --git a/ld/testsuite/ld-pe/exclude-symbols-embedded-i386.d b/ld/testsuite/ld-pe/exclude-symbols-embedded-i386.d
new file mode 100644
index 00000000000..663e6b4dc89
--- /dev/null
+++ b/ld/testsuite/ld-pe/exclude-symbols-embedded-i386.d
@@ -0,0 +1,10 @@
+#source: exclude-symbols-embedded-i386.s
+#target: i?86-*-cygwin* i?86-*-pe i?86-*-mingw*
+#ld: -shared
+#objdump: -p
+
+#...
+.*\[[ 	]*0\] sym1
+.*\[[ 	]*1\] sym3
+.*\[[ 	]*2\] sym5
+#pass
diff --git a/ld/testsuite/ld-pe/exclude-symbols-embedded-i386.s b/ld/testsuite/ld-pe/exclude-symbols-embedded-i386.s
new file mode 100644
index 00000000000..d9da979f9f7
--- /dev/null
+++ b/ld/testsuite/ld-pe/exclude-symbols-embedded-i386.s
@@ -0,0 +1,15 @@
+.global _sym1
+.global _sym2
+.global _sym3
+.global _sym4
+.global _sym5
+_sym1:
+_sym2:
+_sym3:
+_sym4:
+_sym5:
+  ret
+
+.section .drectve,"yn"
+.ascii " -exclude-symbols:sym2,unknownsym"
+.ascii " -exclude-symbols:unknownsym,sym4"
diff --git a/ld/testsuite/ld-pe/exclude-symbols-embedded-x86_64.d b/ld/testsuite/ld-pe/exclude-symbols-embedded-x86_64.d
new file mode 100644
index 00000000000..102569515f7
--- /dev/null
+++ b/ld/testsuite/ld-pe/exclude-symbols-embedded-x86_64.d
@@ -0,0 +1,10 @@
+#source: exclude-symbols-embedded-x86_64.s
+#target: x86_64-*-cygwin* x86_64-*-pe x86_64-*-mingw*
+#ld: -shared
+#objdump: -p
+
+#...
+.*\[[ 	]*0\] sym1
+.*\[[ 	]*1\] sym3
+.*\[[ 	]*2\] sym5
+#pass
diff --git a/ld/testsuite/ld-pe/exclude-symbols-embedded-x86_64.s b/ld/testsuite/ld-pe/exclude-symbols-embedded-x86_64.s
new file mode 100644
index 00000000000..2fb0d2adb74
--- /dev/null
+++ b/ld/testsuite/ld-pe/exclude-symbols-embedded-x86_64.s
@@ -0,0 +1,15 @@
+.global sym1
+.global sym2
+.global sym3
+.global sym4
+.global sym5
+sym1:
+sym2:
+sym3:
+sym4:
+sym5:
+  ret
+
+.section .drectve,"yn"
+.ascii " -exclude-symbols:sym2,unknownsym"
+.ascii " -exclude-symbols:unknownsym,sym4"
diff --git a/ld/testsuite/ld-pe/pe.exp b/ld/testsuite/ld-pe/pe.exp
index 413b316f152..b640b0891f2 100644
--- a/ld/testsuite/ld-pe/pe.exp
+++ b/ld/testsuite/ld-pe/pe.exp
@@ -124,3 +124,6 @@ set foreign_sym_test {
 # MCore rearranges symbol order.
 setup_xfail mcore-*-pe
 run_ld_link_tests $foreign_sym_test
+
+run_dump_test "exclude-symbols-embedded-i386"
+run_dump_test "exclude-symbols-embedded-x86_64"
-- 
2.25.1

[PATCH v3 2/2] ld: Support the -exclude-symbols option via COFF def files, with the EXCLUDE_SYMBOLS keyword

[Martin Storsjo]

This was requested in review.
---
v3: Fixed the testcase to run successfully, added an x86_64 testcase, changed
i*86 into i?86.
---
 ld/deffile.h                                    |  2 ++
 ld/deffilep.y                                   |  3 +++
 ld/testsuite/ld-pe/exclude-symbols-def-i386.d   | 10 ++++++++++
 ld/testsuite/ld-pe/exclude-symbols-def-i386.s   | 11 +++++++++++
 ld/testsuite/ld-pe/exclude-symbols-def-x86_64.d | 10 ++++++++++
 ld/testsuite/ld-pe/exclude-symbols-def-x86_64.s | 11 +++++++++++
 ld/testsuite/ld-pe/exclude-symbols-def.def      |  4 ++++
 ld/testsuite/ld-pe/pe.exp                       |  2 ++
 8 files changed, 53 insertions(+)
 create mode 100644 ld/testsuite/ld-pe/exclude-symbols-def-i386.d
 create mode 100644 ld/testsuite/ld-pe/exclude-symbols-def-i386.s
 create mode 100644 ld/testsuite/ld-pe/exclude-symbols-def-x86_64.d
 create mode 100644 ld/testsuite/ld-pe/exclude-symbols-def-x86_64.s
 create mode 100644 ld/testsuite/ld-pe/exclude-symbols-def.def

diff --git a/ld/deffile.h b/ld/deffile.h
index 306ae3a6f75..a247639628e 100644
--- a/ld/deffile.h
+++ b/ld/deffile.h
@@ -99,6 +99,8 @@ typedef struct def_file {
 
   /* Only expected from .drectve sections, not .DEF files.  */
   def_file_aligncomm *aligncomms;
+
+  /* From EXCLUDE_SYMBOLS or embedded directives. */
   def_file_exclude_symbol *exclude_symbols;
 
 } def_file;
diff --git a/ld/deffilep.y b/ld/deffilep.y
index 126f33a1352..e8d31c6dae7 100644
--- a/ld/deffilep.y
+++ b/ld/deffilep.y
@@ -249,6 +249,7 @@ keyword_as_name: BASE { $$ = "BASE"; }
 	 | DATAL { $$ = "data"; }
 	 | DESCRIPTION { $$ = "DESCRIPTION"; }
 	 | DIRECTIVE { $$ = "DIRECTIVE"; }
+	 | EXCLUDE_SYMBOLS { $$ = "EXCLUDE_SYMBOLS"; }
 	 | EXECUTE { $$ = "EXECUTE"; }
 	 | EXPORTS { $$ = "EXPORTS"; }
 	 | HEAPSIZE { $$ = "HEAPSIZE"; }
@@ -337,6 +338,7 @@ anylang_id: ID		{ $$ = $1; }
 
 symbol_list:
 	anylang_id { def_exclude_symbols ($1); }
+	|	symbol_list anylang_id { def_exclude_symbols ($2); }
 	|	symbol_list ',' anylang_id { def_exclude_symbols ($3); }
 	;
 
@@ -1355,6 +1357,7 @@ tokens[] =
   { "data", DATAL },
   { "DESCRIPTION", DESCRIPTION },
   { "DIRECTIVE", DIRECTIVE },
+  { "EXCLUDE_SYMBOLS", EXCLUDE_SYMBOLS },
   { "EXECUTE", EXECUTE },
   { "EXPORTS", EXPORTS },
   { "HEAPSIZE", HEAPSIZE },
diff --git a/ld/testsuite/ld-pe/exclude-symbols-def-i386.d b/ld/testsuite/ld-pe/exclude-symbols-def-i386.d
new file mode 100644
index 00000000000..1f15c893447
--- /dev/null
+++ b/ld/testsuite/ld-pe/exclude-symbols-def-i386.d
@@ -0,0 +1,10 @@
+#source: exclude-symbols-def-i386.s
+#target: i?86-*-cygwin* i?86-*-pe i?86-*-mingw*
+#ld: -shared ${srcdir}/${subdir}/exclude-symbols-def.def
+#objdump: -p
+
+#...
+.*\[[ 	]*0\] sym1
+.*\[[ 	]*1\] sym3
+.*\[[ 	]*2\] sym5
+#pass
diff --git a/ld/testsuite/ld-pe/exclude-symbols-def-i386.s b/ld/testsuite/ld-pe/exclude-symbols-def-i386.s
new file mode 100644
index 00000000000..fd533bb44c9
--- /dev/null
+++ b/ld/testsuite/ld-pe/exclude-symbols-def-i386.s
@@ -0,0 +1,11 @@
+.global _sym1
+.global _sym2
+.global _sym3
+.global _sym4
+.global _sym5
+_sym1:
+_sym2:
+_sym3:
+_sym4:
+_sym5:
+  ret
diff --git a/ld/testsuite/ld-pe/exclude-symbols-def-x86_64.d b/ld/testsuite/ld-pe/exclude-symbols-def-x86_64.d
new file mode 100644
index 00000000000..39de8813dc5
--- /dev/null
+++ b/ld/testsuite/ld-pe/exclude-symbols-def-x86_64.d
@@ -0,0 +1,10 @@
+#source: exclude-symbols-def-x86_64.s
+#target: x86_64-*-cygwin* x86_64-*-pe x86_64-*-mingw*
+#ld: -shared ${srcdir}/${subdir}/exclude-symbols-def.def
+#objdump: -p
+
+#...
+.*\[[ 	]*0\] sym1
+.*\[[ 	]*1\] sym3
+.*\[[ 	]*2\] sym5
+#pass
diff --git a/ld/testsuite/ld-pe/exclude-symbols-def-x86_64.s b/ld/testsuite/ld-pe/exclude-symbols-def-x86_64.s
new file mode 100644
index 00000000000..2889de1c160
--- /dev/null
+++ b/ld/testsuite/ld-pe/exclude-symbols-def-x86_64.s
@@ -0,0 +1,11 @@
+.global sym1
+.global sym2
+.global sym3
+.global sym4
+.global sym5
+sym1:
+sym2:
+sym3:
+sym4:
+sym5:
+  ret
diff --git a/ld/testsuite/ld-pe/exclude-symbols-def.def b/ld/testsuite/ld-pe/exclude-symbols-def.def
new file mode 100644
index 00000000000..c0cee7b1e70
--- /dev/null
+++ b/ld/testsuite/ld-pe/exclude-symbols-def.def
@@ -0,0 +1,4 @@
+LIBRARY exclude-symbols-def.dll
+EXCLUDE_SYMBOLS
+sym2
+sym4
diff --git a/ld/testsuite/ld-pe/pe.exp b/ld/testsuite/ld-pe/pe.exp
index b640b0891f2..22819e0894f 100644
--- a/ld/testsuite/ld-pe/pe.exp
+++ b/ld/testsuite/ld-pe/pe.exp
@@ -127,3 +127,5 @@ run_ld_link_tests $foreign_sym_test
 
 run_dump_test "exclude-symbols-embedded-i386"
 run_dump_test "exclude-symbols-embedded-x86_64"
+run_dump_test "exclude-symbols-def-i386"
+run_dump_test "exclude-symbols-def-x86_64"
-- 
2.25.1

Re: [PATCH v3 1/2] ld: Add support for a new option, -exclude-symbols, in COFF object file directives

[Nick Clifton]

Hi Martin,

> This maps to the same as ld's --exclude-symbols command line option,
> but allowing specifying the option via directives embedded in the
> object files instead of passed manually on the command line.
> ---
> v2: Fixed parsing multiple comma separated symbols. While pe_dll_add_excludes
> does tokenize the string, the symbol tokens in deffilep.y don't
> include commas, so we need to handle that at that level.
> 
> v3: Added an x86_64 testcase too, changed i*86 into i?86 in the testcases.

Patch approved - please apply.

Cheers
   Nick

Re: [PATCH v3 2/2] ld: Support the -exclude-symbols option via COFF def files, with the EXCLUDE_SYMBOLS keyword

[Nick Clifton]

Hi Martin,

> This was requested in review.
> ---
> v3: Fixed the testcase to run successfully, added an x86_64 testcase, changed
> i*86 into i?86.

Patch approved - please apply.

Cheers
   Nick

Re: [PATCH v3 1/2] ld: Add support for a new option, -exclude-symbols, in COFF object file directives

[Martin Storsjö]

On Mon, 1 Aug 2022, Nick Clifton wrote:

> Hi Martin,
>
>> This maps to the same as ld's --exclude-symbols command line option,
>> but allowing specifying the option via directives embedded in the
>> object files instead of passed manually on the command line.
>> ---
>> v2: Fixed parsing multiple comma separated symbols. While 
>> pe_dll_add_excludes
>> does tokenize the string, the symbol tokens in deffilep.y don't
>> include commas, so we need to handle that at that level.
>> 
>> v3: Added an x86_64 testcase too, changed i*86 into i?86 in the testcases.
>
> Patch approved - please apply.

Thanks! I don't have commit access, so can someone apply the patches for 
me?

// Martin

Re: [PATCH v3 1/2] ld: Add support for a new option, -exclude-symbols, in COFF object file directives

[Nick Clifton]

Hi Martin,

> Thanks! I don't have commit access, so can someone apply the patches for me?

Would you like access permission ? ...

If so, please fill out this form:

https://sourceware.org/cgi-bin/pdw/ps_form.cgi

You can use my email address as the approver...

Cheers
   Nick

Re: [PATCH v3 1/2] ld: Add support for a new option, -exclude-symbols, in COFF object file directives

[Martin Storsjö]

On Mon, 1 Aug 2022, Nick Clifton wrote:

> Hi Martin,
>
>> Thanks! I don't have commit access, so can someone apply the patches for 
>> me?
>
> Would you like access permission ? ...
>
> If so, please fill out this form:
>
> https://sourceware.org/cgi-bin/pdw/ps_form.cgi
>
> You can use my email address as the approver...

Sure, thanks! I sent such a request now.

// Martin

Re: [PATCH v3 2/2] ld: Support the -exclude-symbols option via COFF def files, with the EXCLUDE_SYMBOLS keyword

[Martin Storsjö]

On Mon, 1 Aug 2022, Nick Clifton wrote:

> Hi Martin,
>
>> This was requested in review.
>> ---
>> v3: Fixed the testcase to run successfully, added an x86_64 testcase, 
>> changed
>> i*86 into i?86.
>
> Patch approved - please apply.

I applied these two patches now - thanks!

// Martin