diff options
| author | eschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2013-01-27 15:14:23 +0000 |
|---|---|---|
| committer | eschnett <eschnett@17b73243-c579-4c4c-a9d2-2d5706c11dac> | 2013-01-27 15:14:23 +0000 |
| commit | d8d08a3a12b5c3810de7eaeb23878b897779debd (patch) | |
| tree | fde5cbb5003cf296260b8604f8ae9810806d14ea /lib | |
| parent | 46e12ed996d56dfbd373a2083c526c9b95c442c9 (diff) | |
Support IBM Blue Gene compilers
git-svn-id: http://svn.cactuscode.org/flesh/trunk@4949 17b73243-c579-4c4c-a9d2-2d5706c11dac
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/make/cctk_Config.h.in | 13 | ||||
| -rw-r--r-- | lib/make/known-architectures/linux | 4 |
2 files changed, 12 insertions, 5 deletions
diff --git a/lib/make/cctk_Config.h.in b/lib/make/cctk_Config.h.in index a2219e20..44af266c 100644 --- a/lib/make/cctk_Config.h.in +++ b/lib/make/cctk_Config.h.in @@ -350,9 +350,14 @@ typedef enum {false, true} bool; #endif /* OpenMP collapse clause */ -#if defined __INTEL_COMPILER && __INTEL_COMPILER_BUILD_DATE < 20100801 +#if (defined CCTK_DISABLE_OMP_COLLAPSE || \ + (defined __IBMC__ && defined _ARCH_450D) || \ + (defined __INTEL_COMPILER && __INTEL_COMPILER_BUILD_DATE < 20100801)) /* see http://software.intel.com/en-us/articles/intel-professional-edition-compilers-111-fixes-list/ */ # define collapse(N) +# ifndef CCTK_DISABLE_OMP_COLLAPSE +# error "OpenMP collapse directive disabled for C, but enabled for Fortran -- likely an error in the option list" +# endif #else # undef collapse #endif @@ -545,7 +550,9 @@ typedef enum {false, true} bool; #endif /* OpenMP collapse clause */ -#if defined __INTEL_COMPILER && __INTEL_COMPILER_BUILD_DATE < 20100801 +#if (defined CCTK_DISABLE_OMP_COLLAPSE || \ + (defined __IBMCPP__ && defined _ARCH_450D) || \ + ( defined __INTEL_COMPILER && __INTEL_COMPILER_BUILD_DATE < 20100801)) /* see http://software.intel.com/en-us/articles/intel-professional-edition-compilers-111-fixes-list/ */ # define collapse(N) #else @@ -572,7 +579,7 @@ typedef enum {false, true} bool; #undef CCTK_COMPLEX32_KIND /* OpenMP collapse clause */ -#if defined __INTEL_COMPILER && __INTEL_COMPILER_BUILD_DATE < 20100801 +#ifdef CCTK_DISABLE_OMP_COLLAPSE /* see http://software.intel.com/en-us/articles/intel-professional-edition-compilers-111-fixes-list/ */ # define collapse(N) # define COLLAPSE(N) diff --git a/lib/make/known-architectures/linux b/lib/make/known-architectures/linux index 10c81acd..1e0475e4 100644 --- a/lib/make/known-architectures/linux +++ b/lib/make/known-architectures/linux @@ -436,7 +436,7 @@ else CC_VERSION="`$CC -v 2>&1 | grep -i version | head -n1`" : ${C_OPENMP_FLAGS='-openmp'} ;; - xlc | xlc_r) + xlc | xlc_r | bgxlc | bgxlc_r) : ${CFLAGS='-q64'} : ${C_DEPEND='$(CXX) -E -M $(CPPFLAGS)'} : ${C_DEPEND_OUT=' > /dev/null ; mv $(basename $(basename $@)).d $@'} @@ -510,7 +510,7 @@ else CXX_VERSION="`$CXX -v 2>&1 | grep -i version | head -n1`" : ${CXX_OPENMP_FLAGS='-openmp'} ;; - xlC | xlC_r) + xlC | xlC_r | bgxlC | bgxlC_r) : ${CXXFLAGS='-q64'} : ${CXX_DEPEND='$(CXX) -E -M $(CPPFLAGS)'} : ${CXX_DEPEND_OUT=' > /dev/null ; mv $(basename $(basename $@)).d $@'} |