diff options
| -rwxr-xr-x | configure.py | 9 | ||||
| -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 |
4 files changed, 4 insertions, 47 deletions
diff --git a/configure.py b/configure.py index 76887a4d1..320c62ec1 100755 --- a/configure.py +++ b/configure.py @@ -427,8 +427,6 @@ def process_command_line(args): # pylint: disable=too-many-locals build_group.add_option('--with-openmp', default=False, action='store_true', help='enable use of OpenMP') - build_group.add_option('--with-cilkplus', default=False, action='store_true', - help='enable use of Cilk Plus') link_methods = ['symlink', 'hardlink', 'copy'] build_group.add_option('--link-method', default=None, metavar='METHOD', @@ -1074,8 +1072,6 @@ class ArchInfo(InfoObject): if options.with_openmp: macros.append('TARGET_HAS_OPENMP') - if options.with_cilkplus: - macros.append('TARGET_HAS_CILKPLUS') return macros @@ -1211,11 +1207,6 @@ class CompilerInfo(InfoObject): # pylint: disable=too-many-instance-attributes raise UserError('No support for OpenMP for %s' % (self.basename)) abi_link.append(self.mach_abi_linking['openmp']) - if options.with_cilkplus: - if 'cilkplus' not in self.mach_abi_linking: - raise UserError('No support for Cilk Plus for %s' % (self.basename)) - abi_link.append(self.mach_abi_linking['cilkplus']) - abi_flags = ' '.join(sorted(abi_link)) if options.cc_abi_flags != '': 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': |