aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlan Modra <amodra@gmail.com>2018-01-12 10:37:28 +1030
committerAlan Modra <amodra@gmail.com>2018-01-12 21:13:11 +1030
commita78eea1623aa6d05a395a73414bf01f6c8ae81c6 (patch)
treea1fae91ca530cd09d857020b5f5d762deab57293
parent87e79a6515951fece72ee08871dd6e112b1042ba (diff)
downloadfsf-binutils-gdb-a78eea1623aa6d05a395a73414bf01f6c8ae81c6.zip
fsf-binutils-gdb-a78eea1623aa6d05a395a73414bf01f6c8ae81c6.tar.gz
fsf-binutils-gdb-a78eea1623aa6d05a395a73414bf01f6c8ae81c6.tar.bz2
Fix override of common symbols for a.out
The default should be bfd_link_common_skip_none, as in the original patch at https://sourceware.org/ml/binutils/2002-07/msg00717.html * aoutx.h (aout_link_check_ar_symbols): Remove default and handle bfd_link_common_skip_none in switch.
-rw-r--r--bfd/ChangeLog5
-rw-r--r--bfd/aoutx.h3
2 files changed, 7 insertions, 1 deletions
diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index 85ea86a..19364c0 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,8 @@
+2018-01-12 Gunther Nikl <gnikl@users.sourceforge.net>
+
+ * aoutx.h (aout_link_check_ar_symbols): Remove default and handle
+ bfd_link_common_skip_none in switch.
+
2018-01-12 Alan Modra <amodra@gmail.com>
PR ld/22649
diff --git a/bfd/aoutx.h b/bfd/aoutx.h
index 6dc4c68..eec9c4a 100644
--- a/bfd/aoutx.h
+++ b/bfd/aoutx.h
@@ -3366,13 +3366,14 @@ aout_link_check_ar_symbols (bfd *abfd,
switch (info->common_skip_ar_symbols)
{
+ case bfd_link_common_skip_none:
+ break;
case bfd_link_common_skip_text:
skip = (type == (N_TEXT | N_EXT));
break;
case bfd_link_common_skip_data:
skip = (type == (N_DATA | N_EXT));
break;
- default:
case bfd_link_common_skip_all:
skip = 1;
break;