diff options
| author | bviyer <bviyer@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-12-13 16:44:02 +0000 |
|---|---|---|
| committer | bviyer <bviyer@138bc75d-0d04-0410-961f-82ee72b054a4> | 2013-12-13 16:44:02 +0000 |
| commit | 34a5d2a56d4b0a0ea74339c985c919aabfc530a4 (patch) | |
| tree | d3d7ecd2f59145779fce0229b238ad766d04ecb2 /libcilkrts | |
| parent | 2cb32abfe954730c551311869f25683b6479c089 (diff) | |
| download | gcc-34a5d2a56d4b0a0ea74339c985c919aabfc530a4.tar.gz | |
Enabled Usage of _Cilk_spawn and _Cilk_sync in Cilk Runtime (libcilkrts).
+2013-12-13 Balaji V. Iyer <balaji.v.iyer@intel.com>
+
+ * Makefile.am (GENERAL_FLAGS): Removed undefining of Cilk keywords.
+ * Makefile.in: Reconfigure.
+ * runtime/symbol_test.c: Added a #define to clear out _Cilk_for.
+
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@205965 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libcilkrts')
| -rw-r--r-- | libcilkrts/ChangeLog | 6 | ||||
| -rw-r--r-- | libcilkrts/Makefile.am | 2 | ||||
| -rw-r--r-- | libcilkrts/Makefile.in | 4 | ||||
| -rw-r--r-- | libcilkrts/runtime/symbol_test.c | 1 |
4 files changed, 10 insertions, 3 deletions
diff --git a/libcilkrts/ChangeLog b/libcilkrts/ChangeLog index 6785d37ff53..74f592b9fc5 100644 --- a/libcilkrts/ChangeLog +++ b/libcilkrts/ChangeLog @@ -1,3 +1,9 @@ +2013-12-13 Balaji V. Iyer <balaji.v.iyer@intel.com> + + * Makefile.am (GENERAL_FLAGS): Removed undefining of Cilk keywords. + * Makefile.in: Reconfigure. + * runtime/symbol_test.c: Added a #define to clear out _Cilk_for. + 2013-11-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> * configure.ac (GCC_LIBSTDCXX_RAW_CXX_FLAGS): Remove. diff --git a/libcilkrts/Makefile.am b/libcilkrts/Makefile.am index 56bc9ebb85d..d2520870a7e 100644 --- a/libcilkrts/Makefile.am +++ b/libcilkrts/Makefile.am @@ -38,7 +38,7 @@ ACLOCAL_AMFLAGS = -I .. -I ../config # Compiler and linker flags. GENERAL_FLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/runtime -I$(top_srcdir)/runtime/config/$(config_dir) -DIN_CILK_RUNTIME=1 -GENERAL_FLAGS += -D_Cilk_spawn="" -D_Cilk_sync="" -D_Cilk_for=for +# GENERAL_FLAGS += -D_Cilk_spawn="" -D_Cilk_sync="" -D_Cilk_for=for # Enable Intel Cilk Plus extension GENERAL_FLAGS += -fcilkplus diff --git a/libcilkrts/Makefile.in b/libcilkrts/Makefile.in index 5066bef3dcc..94902e1336e 100644 --- a/libcilkrts/Makefile.in +++ b/libcilkrts/Makefile.in @@ -342,12 +342,12 @@ AUTOMAKE_OPTIONS = foreign ACLOCAL_AMFLAGS = -I .. -I ../config # Compiler and linker flags. +# GENERAL_FLAGS += -D_Cilk_spawn="" -D_Cilk_sync="" -D_Cilk_for=for # Enable Intel Cilk Plus extension GENERAL_FLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/runtime \ -I$(top_srcdir)/runtime/config/$(config_dir) \ - -DIN_CILK_RUNTIME=1 -D_Cilk_spawn="" -D_Cilk_sync="" \ - -D_Cilk_for=for -fcilkplus + -DIN_CILK_RUNTIME=1 -fcilkplus AM_CFLAGS = $(GENERAL_FLAGS) -std=c99 AM_CPPFLAGS = $(GENERAL_FLAGS) AM_LDFLAGS = -lpthread diff --git a/libcilkrts/runtime/symbol_test.c b/libcilkrts/runtime/symbol_test.c index 1113ecd44cd..8291d369a65 100644 --- a/libcilkrts/runtime/symbol_test.c +++ b/libcilkrts/runtime/symbol_test.c @@ -41,6 +41,7 @@ * will cause a linker error. */ +#define _Cilk_for for extern void* __cilkrts_global_state; void *volatile p; |