diff options
| author | Jack Lloyd <[email protected]> | 2017-12-02 07:46:59 -0500 |
|---|---|---|
| committer | Jack Lloyd <[email protected]> | 2017-12-02 08:24:19 -0500 |
| commit | 35add1e69f380eeb3010e1d0cda5225fc8c5a0bf (patch) | |
| tree | a72f4f7a77b8691e3c02963e54d94e173470a34e /src | |
| parent | d7d0b4bf346a9cb383ad42c61a599140a4d8a269 (diff) | |
Drop support for Cilk+
It's been dropped from GCC, appears OpenACC is the new hotness
for this kind of thing.
Diffstat (limited to 'src')
| -rw-r--r-- | src/build-data/cc/gcc.txt | 3 | ||||
| -rw-r--r-- | src/lib/utils/compiler.h | 34 | ||||
| -rwxr-xr-x | src/scripts/ci_build.py | 5 |
3 files changed, 4 insertions, 38 deletions
diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt index 17b477db8..94cdd9e25 100644 --- a/src/build-data/cc/gcc.txt +++ b/src/build-data/cc/gcc.txt @@ -114,8 +114,7 @@ all_x86_64 -> "-momit-leaf-frame-pointer" <mach_abi_linking> all -> "-pthread" -cilkplus -> "-fcilkplus" -openmp -> "-fopenmp" +openmp -> "-fopenmp" mips64 -> "-mabi=64" s390 -> "-m31" diff --git a/src/lib/utils/compiler.h b/src/lib/utils/compiler.h index 9ef0f75b3..0115ae00c 100644 --- a/src/lib/utils/compiler.h +++ b/src/lib/utils/compiler.h @@ -168,9 +168,7 @@ */ #if !defined(BOTAN_PARALLEL_FOR) -#if defined(BOTAN_TARGET_HAS_CILKPLUS) - #define BOTAN_PARALLEL_FOR _Cilk_for -#elif defined(BOTAN_TARGET_HAS_OPENMP) +#if defined(BOTAN_TARGET_HAS_OPENMP) #define BOTAN_PARALLEL_FOR _Pragma("omp parallel for") for #else #define BOTAN_PARALLEL_FOR for @@ -183,9 +181,7 @@ */ #if !defined(BOTAN_PARALLEL_SIMD_FOR) -#if defined(BOTAN_TARGET_HAS_CILKPLUS) - #define BOTAN_PARALLEL_SIMD_FOR _Pragma("simd") for -#elif defined(BOTAN_TARGET_HAS_OPENMP) +#if defined(BOTAN_TARGET_HAS_OPENMP) #define BOTAN_PARALLEL_SIMD_FOR _Pragma("omp simd") for #elif defined(BOTAN_BUILD_COMPILER_IS_GCC) && (BOTAN_GCC_VERSION >= 490) #define BOTAN_PARALLEL_SIMD_FOR _Pragma("GCC ivdep") for @@ -195,30 +191,4 @@ #endif -/* -* Define BOTAN_PARALLEL_SPAWN -*/ -#if !defined(BOTAN_PARALLEL_SPAWN) - -#if defined(BOTAN_TARGET_HAS_CILKPLUS) - #define BOTAN_PARALLEL_SPAWN _Cilk_spawn -#else - #define BOTAN_PARALLEL_SPAWN -#endif - -#endif - -/* -* Define BOTAN_PARALLEL_SYNC -*/ -#if !defined(BOTAN_PARALLEL_SYNC) - -#if defined(BOTAN_TARGET_HAS_CILKPLUS) - #define BOTAN_PARALLEL_SYNC _Cilk_sync -#else - #define BOTAN_PARALLEL_SYNC BOTAN_FORCE_SEMICOLON -#endif - -#endif - #endif diff --git a/src/scripts/ci_build.py b/src/scripts/ci_build.py index 84deec8be..72e9d8e62 100755 --- a/src/scripts/ci_build.py +++ b/src/scripts/ci_build.py @@ -104,10 +104,7 @@ def determine_flags(target, target_os, target_cpu, target_cc, cc_bin, ccache, ro flags += ['--disable-modules=locking_allocator'] if target == 'parallel': - if target_cc == 'gcc': - flags += ['--with-cilkplus'] - else: - flags += ['--with-openmp'] + flags += ['--with-openmp'] if target == 'sonar': if target_os != 'linux' or target_cc != 'clang': |