diff options
| author | Tobias Burnus <burnus@net-b.de> | 2014-03-26 20:16:35 +0100 |
|---|---|---|
| committer | Tobias Burnus <burnus@gcc.gnu.org> | 2014-03-26 20:16:35 +0100 |
| commit | b9487dd868d0befebe4af7acf0954ad1251837d9 (patch) | |
| tree | 223f64ccc65d033a347369720cfd2fb11f1d0dc2 /gcc | |
| parent | 8707b3bcc00e1026c0ff9c98b68d2d3e97cf0a24 (diff) | |
| download | gcc-b9487dd868d0befebe4af7acf0954ad1251837d9.zip gcc-b9487dd868d0befebe4af7acf0954ad1251837d9.tar.gz gcc-b9487dd868d0befebe4af7acf0954ad1251837d9.tar.bz2 | |
gcc.c (LINK_COMMAND_SPEC): Use libcilkrts.spec for -fcilkplus.
gcc/
2014-03-26 Tobias Burnus <burnus@net-b.de>
* gcc.c (LINK_COMMAND_SPEC): Use libcilkrts.spec for -fcilkplus.
(CILK_SELF_SPECS): New define.
(driver_self_specs): Use it.
libcilkrts/
2014-03-26 Tobias Burnus <burnus@net-b.de>
* libcilkrts.spec.in: New.
* Makefile.am: Handle libcilkrts.spec.
* configure.ac: Determine link options for libcilkrts.spec.
* Makefile.in: Regenerate.
* configure: Regenerate.
* aclocal.m4: Regenerate.
From-SVN: r208847
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/gcc.c | 9 |
2 files changed, 14 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 53d58b3..9b124fb 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2014-03-26 Tobias Burnus <burnus@net-b.de> + + * gcc.c (LINK_COMMAND_SPEC): Use libcilkrts.spec for -fcilkplus. + (CILK_SELF_SPECS): New define. + (driver_self_specs): Use it. + 2014-03-26 Richard Biener <rguenther@suse.de> * tree-pretty-print.c (percent_K_format): Implement special @@ -766,6 +766,7 @@ proper position among the other output files. */ %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}} " VTABLE_VERIFICATION_SPEC " \ %{static:} %{L*} %(mfwrap) %(link_libgcc) " SANITIZER_EARLY_SPEC " %o\ %{fopenmp|ftree-parallelize-loops=*:%:include(libgomp.spec)%(link_gomp)}\ + %{fcilkplus:%:include(libcilkrts.spec)%(link_cilkrts)}\ %{fgnu-tm:%:include(libitm.spec)%(link_itm)}\ %(mflib) " STACK_SPLIT_SPEC "\ %{fprofile-arcs|fprofile-generate*|coverage:-lgcov} " SANITIZER_SPEC " \ @@ -932,9 +933,15 @@ static const char *const multilib_defaults_raw[] = MULTILIB_DEFAULTS; #define GTM_SELF_SPECS "%{fgnu-tm: -pthread}" #endif +/* Likewise for -fcilkplus. */ +#ifndef CILK_SELF_SPECS +#define CILK_SELF_SPECS "%{fcilkplus: -pthread}" +#endif + static const char *const driver_self_specs[] = { "%{fdump-final-insns:-fdump-final-insns=.} %<fdump-final-insns", - DRIVER_SELF_SPECS, CONFIGURE_SPECS, GOMP_SELF_SPECS, GTM_SELF_SPECS + DRIVER_SELF_SPECS, CONFIGURE_SPECS, GOMP_SELF_SPECS, GTM_SELF_SPECS, + CILK_SELF_SPECS }; #ifndef OPTION_DEFAULT_SPECS |