bfd/

2006-10-18  H.J. Lu  <hongjiu.lu@intel.com>

	PR ld/3290
	* elflink.c (elf_link_add_object_symbols): Hide definitions in
	debug sections.

ld/testsuite/

2006-10-18  H.J. Lu  <hongjiu.lu@intel.com>

	PR ld/3290
	* ld-elf/dummy.c: New file.
	* ld-elf/dwarf.exp: Likewise.
	* ld-elf/dwarf1.c: Likewise.
	* ld-elf/dwarf1.h: Likewise.
	* ld-elf/dwarf1.out: Likewise.
	* ld-elf/dwarf1main.c: Likewise.

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index dde37b4..3bc36e4 100644 (file)
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,9 @@
+2006-10-18  H.J. Lu  <hongjiu.lu@intel.com>
+
+       PR ld/3290
+       * elflink.c (elf_link_add_object_symbols): Hide definitions in
+       debug sections.
+
 2006-10-19  Alan Modra  <amodra@bigpond.net.au>
 
        * elf32-arm.c (bfd_elf32_arm_allocate_interworking_sect): Check,

diff --git a/bfd/elflink.c b/bfd/elflink.c
index 63cac8e..34816fa 100644 (file)
--- a/bfd/elflink.c
+++ b/bfd/elflink.c
@@ -4156,6 +4156,13 @@ elf_link_add_object_symbols (bfd *abfd, struct bfd_link_info *info)
                dynsym = TRUE;
            }
 
+         if (definition && (sec->flags & SEC_DEBUGGING))
+           {
+             /* We don't want to make debug symbol dynamic.  */
+             (*bed->elf_backend_hide_symbol) (info, h, TRUE);
+             dynsym = FALSE;
+           }
+
          /* Check to see if we need to add an indirect symbol for
             the default name.  */
          if (definition || h->root.type == bfd_link_hash_common)

diff --git a/ld/testsuite/ChangeLog b/ld/testsuite/ChangeLog
index 528e7b4..fd5bee9 100644 (file)
--- a/ld/testsuite/ChangeLog
+++ b/ld/testsuite/ChangeLog
@@ -1,5 +1,15 @@
 2006-10-18  H.J. Lu  <hongjiu.lu@intel.com>
 
+       PR ld/3290
+       * ld-elf/dummy.c: New file.
+       * ld-elf/dwarf.exp: Likewise.
+       * ld-elf/dwarf1.c: Likewise.
+       * ld-elf/dwarf1.h: Likewise.
+       * ld-elf/dwarf1.out: Likewise.
+       * ld-elf/dwarf1main.c: Likewise.
+
+2006-10-18  H.J. Lu  <hongjiu.lu@intel.com>
+
        * ld-elf/dl4.c: New file.
        * ld-elf/dl4.list: Likewise.
        * ld-elf/dl4a.out: Likewise.

diff --git a/ld/testsuite/ld-elf/dummy.c b/ld/testsuite/ld-elf/dummy.c
new file mode 100644 (file)
index 0000000..5c03287
--- /dev/null
+++ b/ld/testsuite/ld-elf/dummy.c
@@ -0,0 +1 @@
+/* An empty file.  */

diff --git a/ld/testsuite/ld-elf/dwarf.exp b/ld/testsuite/ld-elf/dwarf.exp
new file mode 100644 (file)
index 0000000..b10e3d2
--- /dev/null
+++ b/ld/testsuite/ld-elf/dwarf.exp
@@ -0,0 +1,111 @@
+# Expect script for various DWARF tests.
+#   Copyright 2006 Free Software Foundation, Inc.
+#
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+#
+
+#
+# Written by H.J. Lu (hongjiu.lu@intel.com)
+#
+
+# Exclude non-ELF targets.
+
+if ![is_elf_format] {
+    return
+}
+
+# The following tests require running the executable generated by ld.
+if ![isnative] {
+    return
+}
+
+# Check if compiler works
+if { [which $CC] == 0 } {
+    return
+}
+
+# Skip if -feliminate-dwarf2-dups isn't supported.
+if ![ld_compile "$CC -g -feliminate-dwarf2-dups" $srcdir/$subdir/dummy.c tmpdir/dummy.o] {
+    return
+}
+
+set build_tests {
+  {"Build libdwarf1.so"
+   "-s -shared" "-fPIC -g -feliminate-dwarf2-dups"
+   {dwarf1.c} {} "libdwarf1.so"}
+}
+
+set run_tests {
+    {"Run with libdwarf1.so first"
+     "tmpdir/libdwarf1.so" ""
+     {dwarf1main.c} "dwarf1a" "dwarf1.out"
+     "-g -feliminate-dwarf2-dups"}
+    {"Run with libdwarf1.so last"
+     "tmpdir/dwarf1main.o tmpdir/libdwarf1.so" ""
+     {dummy.c} "dwarf1b" "dwarf1.out"
+     "-g -feliminate-dwarf2-dups"}
+}
+
+run_cc_link_tests $build_tests
+run_ld_link_exec_tests [] $run_tests
+
+proc strip_test {} {
+    global ld
+    global strip
+    global NM
+
+    set test "libdwarf1c.so"
+    set test_name "Strip -s $test"
+    set prog $strip
+
+    if ![ld_simple_link $ld tmpdir/$test "-shared tmpdir/dwarf1.o"] {
+       unresolved "$test_name"
+       return
+    }
+
+    send_log "$NM -D tmpdir/$test > tmpdir/$test.exp\n"
+    catch "exec $NM -D tmpdir/$test > tmpdir/$test.exp" got
+    if ![string match "" $got] then {
+       send_log "$got\n"
+       unresolved "$test_name"
+       return
+    }
+
+    send_log "$prog -s tmpdir/$test\n"
+    catch "exec $prog -s tmpdir/$test" got
+    if ![string match "" $got] then {
+       send_log "$got\n"
+       fail "$test_name"
+       return
+    }
+
+    send_log "$NM -D tmpdir/$test > tmpdir/$test.out\n"
+    catch "exec $NM -D tmpdir/$test > tmpdir/$test.out" got
+    if ![string match "" $got] then {
+       send_log "$got\n"
+       unresolved "$test_name"
+       return
+    }
+
+    if { [catch {exec cmp tmpdir/$test.exp tmpdir/$test.out}] } then {
+       send_log "tmpdir/$test.exp tmpdir/$test.out differ.\n"
+       fail "$test_name"
+       return
+    }
+
+    pass "$test_name"
+}
+
+strip_test

diff --git a/ld/testsuite/ld-elf/dwarf1.c b/ld/testsuite/ld-elf/dwarf1.c
new file mode 100644 (file)
index 0000000..2895d4c
--- /dev/null
+++ b/ld/testsuite/ld-elf/dwarf1.c
@@ -0,0 +1,10 @@
+#include <stdio.h>
+#include "dwarf1.h"
+
+struct foo_s foo;
+
+void
+doprintf (void)
+{
+  printf ("OK\n");
+}

diff --git a/ld/testsuite/ld-elf/dwarf1.h b/ld/testsuite/ld-elf/dwarf1.h
new file mode 100644 (file)
index 0000000..3cd7918
--- /dev/null
+++ b/ld/testsuite/ld-elf/dwarf1.h
@@ -0,0 +1,6 @@
+struct foo_s
+{
+  int foo;
+};
+
+extern void doprintf (void);

diff --git a/ld/testsuite/ld-elf/dwarf1.out b/ld/testsuite/ld-elf/dwarf1.out
new file mode 100644 (file)
index 0000000..d86bac9
--- /dev/null
+++ b/ld/testsuite/ld-elf/dwarf1.out
@@ -0,0 +1 @@
+OK

diff --git a/ld/testsuite/ld-elf/dwarf1main.c b/ld/testsuite/ld-elf/dwarf1main.c
new file mode 100644 (file)
index 0000000..9045198
--- /dev/null
+++ b/ld/testsuite/ld-elf/dwarf1main.c
@@ -0,0 +1,10 @@
+#include "dwarf1.h"
+
+struct foo_s foo;
+
+int
+main (void)
+{
+  doprintf ();
+  return 0;
+}