diff options
| -rwxr-xr-x | configure.py | 9 | ||||
| -rw-r--r-- | doc/building.rst | 5 | ||||
| -rw-r--r-- | src/build-data/buildh.in | 4 | ||||
| -rw-r--r-- | src/build-data/cc/clang.txt | 2 | ||||
| -rw-r--r-- | src/build-data/cc/gcc.txt | 2 | ||||
| -rw-r--r-- | src/lib/utils/compiler.h | 4 |
6 files changed, 1 insertions, 25 deletions
diff --git a/configure.py b/configure.py index 5ec5af536..bf087e00b 100755 --- a/configure.py +++ b/configure.py @@ -443,9 +443,6 @@ def process_command_line(args): # pylint: disable=too-many-locals,too-many-state build_group.add_option('--with-sysroot-dir', metavar='DIR', default='', help='use DIR for system root while cross-compiling') - build_group.add_option('--with-openmp', default=False, action='store_true', - help='enable use of OpenMP') - link_methods = ['symlink', 'hardlink', 'copy'] build_group.add_option('--link-method', default=None, metavar='METHOD', choices=link_methods, @@ -1372,11 +1369,6 @@ class CompilerInfo(InfoObject): # pylint: disable=too-many-instance-attributes self.sanitizer_types = san - if options.with_openmp: - if 'openmp' not in self.mach_abi_linking: - raise UserError('No support for OpenMP for %s' % (self.basename)) - abi_link.add(self.mach_abi_linking['openmp']) - abi_flags = ' '.join(sorted(abi_link)) if options.cc_abi_flags != '': @@ -2203,7 +2195,6 @@ def create_template_vars(source_paths, build_paths, options, modules, cc, arch, 'fuzzer_type': options.build_fuzzers.upper() if options.build_fuzzers else '', 'with_valgrind': options.with_valgrind, - 'with_openmp': options.with_openmp, 'with_debug_asserts': options.with_debug_asserts, 'test_mode': options.test_mode, 'optimize_for_size': options.optimize_for_size, diff --git a/doc/building.rst b/doc/building.rst index db0b61ebb..667b9354c 100644 --- a/doc/building.rst +++ b/doc/building.rst @@ -801,11 +801,6 @@ definitions. Both KEY=VALUE and KEY (without specific value) are supported. Use specified dir for system root while cross-compiling -``--with-openmp`` -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -Enable use of OpenMP - ``--link-method=METHOD`` ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ diff --git a/src/build-data/buildh.in b/src/build-data/buildh.in index d96321fe6..43efecda1 100644 --- a/src/build-data/buildh.in +++ b/src/build-data/buildh.in @@ -90,10 +90,6 @@ #define BOTAN_HAS_VALGRIND %{endif} -%{if with_openmp} -#define BOTAN_TARGET_HAS_OPENMP -%{endif} - %{if with_debug_asserts} #define BOTAN_ENABLE_DEBUG_ASSERTS %{endif} diff --git a/src/build-data/cc/clang.txt b/src/build-data/cc/clang.txt index bc8a47a5a..896109590 100644 --- a/src/build-data/cc/clang.txt +++ b/src/build-data/cc/clang.txt @@ -75,8 +75,6 @@ llvm -> "-emit-llvm -fno-use-cxa-atexit" <mach_abi_linking> all!haiku,llvm -> "-pthread" -openmp -> "-fopenmp" - x86_32 -> "-m32" x86_64 -> "-m64" ppc64 -> "-m64" diff --git a/src/build-data/cc/gcc.txt b/src/build-data/cc/gcc.txt index 4c00b9455..e4a6bda8e 100644 --- a/src/build-data/cc/gcc.txt +++ b/src/build-data/cc/gcc.txt @@ -84,8 +84,6 @@ arm64:neon -> "" <mach_abi_linking> all!haiku,qnx,none -> "-pthread" -openmp -> "-fopenmp" - s390 -> "-m31" s390x -> "-m64" sparc32 -> "-m32 -mno-app-regs" diff --git a/src/lib/utils/compiler.h b/src/lib/utils/compiler.h index ef793b8de..43fada68e 100644 --- a/src/lib/utils/compiler.h +++ b/src/lib/utils/compiler.h @@ -135,9 +135,7 @@ */ #if !defined(BOTAN_PARALLEL_SIMD_FOR) -#if defined(BOTAN_TARGET_HAS_OPENMP) - #define BOTAN_PARALLEL_SIMD_FOR _Pragma("omp simd") for -#elif defined(BOTAN_BUILD_COMPILER_IS_GCC) +#if defined(BOTAN_BUILD_COMPILER_IS_GCC) #define BOTAN_PARALLEL_SIMD_FOR _Pragma("GCC ivdep") for #else #define BOTAN_PARALLEL_SIMD_FOR for |