backport: re PR target/65711 (arm*-linux* "link" spec passes '-dynamic-linker' even...

	Backported from mainline r226158.
	2015-07-24  Szabolcs Nagy  <szabolcs.nagy@arm.com>

	PR target/65711
	* config/aarch64/aarch64-linux.h (LINUX_TARGET_LINK_SPEC): Move
	-dynamic-linker within %{!static %{!shared, and -rdynamic within
	%{!static.

From-SVN: r226169

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index a2bf2701bb6f12761625dec0de34832a0f92564b..a8245199f5e2730485f579cb741eaec3a8131480 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,13 @@
+2015-07-24  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+       Backported from mainline r226158.
+       2015-07-24  Szabolcs Nagy  <szabolcs.nagy@arm.com>
+
+       PR target/65711
+       * config/aarch64/aarch64-linux.h (LINUX_TARGET_LINK_SPEC): Move
+       -dynamic-linker within %{!static %{!shared, and -rdynamic within
+       %{!static.
+
 2015-07-21  Georg-Johann Lay  <avr@gjlay.de>
 
        Backport from 2015-07-21 trunk r226046.

diff --git a/gcc/config/aarch64/aarch64-linux.h b/gcc/config/aarch64/aarch64-linux.h
index b7d2d60f389d2d397303b39ca7c40965b939e353..88e5206e63a61d2c7d16c256f5a0b2ec9c3acea6 100644 (file)
--- a/gcc/config/aarch64/aarch64-linux.h
+++ b/gcc/config/aarch64/aarch64-linux.h
@@ -29,8 +29,9 @@
    %{static:-Bstatic}                          \
    %{shared:-shared}                           \
    %{symbolic:-Bsymbolic}                      \
-   %{rdynamic:-export-dynamic}                 \
-   -dynamic-linker " GNU_USER_DYNAMIC_LINKER " \
+   %{!static:                                  \
+     %{rdynamic:-export-dynamic}               \
+     %{!shared:-dynamic-linker " GNU_USER_DYNAMIC_LINKER "}} \
    -X                                          \
    %{mbig-endian:-EB} %{mlittle-endian:-EL}     \
    -maarch64linux%{mbig-endian:b}"