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

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.

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

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 

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;