Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix a merge error with LIBGCC_PIC_SUFFIX code.

Browse Source
This commit is contained in:
mrg 2011-06-29 02:12:29 +00:00
parent f7fea21d51
commit bf3f398f4e
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
external/gpl3/gcc/dist/gcc/gcc.c vendored
View File

@ -1766,17 +1766,11 @@ init_gcc_specs (struct obstack *obstack, const char *shared_name,
"}"
"%{!static:%{!static-libgcc:"
#if USE_LD_AS_NEEDED
"%{!shared:"
"%{!shared-libgcc:",
static_name, " --as-needed ", shared_name, " --no-as-needed"
"}"
"%{shared-libgcc:",
shared_name, "%{!shared: ", static_name, "}"
"}"
"}"
"%{shared:"
"%{shared-libgcc: --as-needed", shared_name, " --no-as-needed} ",
"%{!shared-libgcc:", static_name,
shared_name, "%{!shared: ", static_name,
#ifdef LIBGCC_PICSUFFIX
LIBGCC_PICSUFFIX,
#endif
@ -1787,7 +1781,8 @@ init_gcc_specs (struct obstack *obstack, const char *shared_name,
"%{!shared-libgcc:", static_name, " ", eh_name, "}"
"%{shared-libgcc:", shared_name, " ", static_name, "}"
"}"
#ifdef LINK_EH_SPEC
/* XXX NH XXX */
#ifdef LINK_EH_SPEC || 1
"%{shared:"
"%{shared-libgcc:", shared_name, "}"
"%{!shared-libgcc:", static_name,