[PATCH, AArch64 07/11] Link static libgcc after shared libgcc for -shared-libgcc

[rth7680]

From: Richard Henderson <richard.hender...@linaro.org>

We are about to introduce symbols to libgcc.a that will
not be present in libgcc_s.so.  Most symbols will be
resolved from the shared library first, and only the new
symbols will be pulled from the static library.

        * gcc.c (init_gcc_specs): Include static_name after shared_name.
---
 gcc/gcc.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/gcc/gcc.c b/gcc/gcc.c
index 264204d7b37..4a7ca691122 100644
--- a/gcc/gcc.c
+++ b/gcc/gcc.c
@@ -1676,9 +1676,8 @@ init_gcc_specs (struct obstack *obstack, const char 
*shared_name,
                static_name, " " LD_AS_NEEDED_OPTION " ",
                shared_name, " " LD_NO_AS_NEEDED_OPTION
                "}"
-               "%{shared-libgcc:",
-               shared_name, "%{!shared: ", static_name, "}"
-               "}}"
+               "%{shared-libgcc:", shared_name, " ", static_name, "}"
+               "}"
 #else
   buf = concat ("%{static|static-libgcc:", static_name, " ", eh_name, "}"
                "%{!static:%{!static-libgcc:"
@@ -1688,11 +1687,11 @@ init_gcc_specs (struct obstack *obstack, const char 
*shared_name,
                "}"
 #ifdef LINK_EH_SPEC
                "%{shared:"
-               "%{shared-libgcc:", shared_name, "}"
+               "%{shared-libgcc:", shared_name, " ", static_name, "}"
                "%{!shared-libgcc:", static_name, "}"
                "}"
 #else
-               "%{shared:", shared_name, "}"
+               "%{shared:", shared_name, " ", static_name, "}"
 #endif
 #endif
                "}}", NULL);
-- 
2.17.1