OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Enabled Usage of _Cilk_spawn and _Cilk_sync in Cilk Runtime (libcilkrts).

Browse Source 
+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
This commit is contained in:
Balaji V. Iyer 2013-12-13 16:44:02 +00:00 committed by Balaji V. Iyer
parent 8fd05f4d87
commit 1904eff113
4 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libcilkrts/ChangeLog
View File

@ -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> 2013-11-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* configure.ac (GCC_LIBSTDCXX_RAW_CXX_FLAGS): Remove. * configure.ac (GCC_LIBSTDCXX_RAW_CXX_FLAGS): Remove.

2
libcilkrts/Makefile.am
View File

@ -38,7 +38,7 @@ ACLOCAL_AMFLAGS = -I .. -I ../config
# Compiler and linker flags. # 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 = -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 # Enable Intel Cilk Plus extension
GENERAL_FLAGS += -fcilkplus GENERAL_FLAGS += -fcilkplus

4
libcilkrts/Makefile.in
View File

@ -342,12 +342,12 @@ AUTOMAKE_OPTIONS = foreign
ACLOCAL_AMFLAGS = -I .. -I ../config ACLOCAL_AMFLAGS = -I .. -I ../config
# Compiler and linker flags. # Compiler and linker flags.
# GENERAL_FLAGS += -D_Cilk_spawn="" -D_Cilk_sync="" -D_Cilk_for=for
# Enable Intel Cilk Plus extension # Enable Intel Cilk Plus extension
GENERAL_FLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/runtime \ GENERAL_FLAGS = -I$(top_srcdir)/include -I$(top_srcdir)/runtime \
-I$(top_srcdir)/runtime/config/$(config_dir) \ -I$(top_srcdir)/runtime/config/$(config_dir) \
-DIN_CILK_RUNTIME=1 -D_Cilk_spawn="" -D_Cilk_sync="" \ -DIN_CILK_RUNTIME=1 -fcilkplus
-D_Cilk_for=for -fcilkplus
AM_CFLAGS = $(GENERAL_FLAGS) -std=c99 AM_CFLAGS = $(GENERAL_FLAGS) -std=c99
AM_CPPFLAGS = $(GENERAL_FLAGS) AM_CPPFLAGS = $(GENERAL_FLAGS)
AM_LDFLAGS = -lpthread AM_LDFLAGS = -lpthread

1
libcilkrts/runtime/symbol_test.c
View File

@ -41,6 +41,7 @@
* will cause a linker error. * will cause a linker error.
*/ */
#define _Cilk_for for
extern void* __cilkrts_global_state; extern void* __cilkrts_global_state;
void *volatile p; void *volatile p;