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.
+

From-SVN: r205965

diff --git a/libcilkrts/ChangeLog b/libcilkrts/ChangeLog
index 6785d37ff5358066c79f0b6aafa78974ef0b736b..74f592b9fc5e82d2599aea3d2aec5486953c0fb8 100644 (file)
--- 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 56bc9ebb85dfe26fac48fe85e9358e377324baeb..d2520870a7e6cb4c6deb80242ac6645cf9f4de30 100644 (file)
--- 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 5066bef3dcc01b9c1c65ebaf0c9d42fd6aeabebb..94902e1336e0cea8c07eeb3cfc83726ed2cfdb0b 100644 (file)
--- 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 1113ecd44cd4ae80a256d1d33c0f283ab81f28cd..8291d369a6567ff26f2222ee31156ecb0b4562e4 100644 (file)
--- 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;