diff --git a/var/spack/repos/builtin/packages/cp2k/package.py b/var/spack/repos/builtin/packages/cp2k/package.py
index 3674ac9c1cfff1a6af65b4063bfe0bfbb91a246d..23edfd10b21bcda2e31ca91aa997105702e0a935 100644
--- a/var/spack/repos/builtin/packages/cp2k/package.py
+++ b/var/spack/repos/builtin/packages/cp2k/package.py
@@ -160,7 +160,6 @@ def edit(self, spec, prefix):
optimization_flags = {
'gcc': [
'-O2',
- '-mtune=native',
'-funroll-loops',
'-ftree-vectorize',
],
diff --git a/var/spack/repos/builtin/packages/dealii/package.py b/var/spack/repos/builtin/packages/dealii/package.py
index eac2fc4892e25d2632068c70a1d8adb34a322fe1..109b67da2dab55f915dafafdec7139157032f40e 100644
--- a/var/spack/repos/builtin/packages/dealii/package.py
+++ b/var/spack/repos/builtin/packages/dealii/package.py
@@ -277,13 +277,10 @@ def cmake_args(self):
# https://groups.google.com/forum/?fromgroups#!topic/dealii/3Yjy8CBIrgU
if spec.satisfies('%gcc'):
cxx_flags_release.extend(['-O3'])
- cxx_flags.extend(['-march=native'])
elif spec.satisfies('%intel'):
cxx_flags_release.extend(['-O3'])
- cxx_flags.extend(['-march=native'])
elif spec.satisfies('%clang'):
cxx_flags_release.extend(['-O3', '-ffp-contract=fast'])
- cxx_flags.extend(['-march=native'])
# Python bindings
if spec.satisfies('@8.5.0:'):
diff --git a/var/spack/repos/builtin/packages/elpa/package.py b/var/spack/repos/builtin/packages/elpa/package.py
index d73371e93c544908ff9e3fa0eed37e0772d8ffa4..cc3f75a4c0c715a8920d4e0cf9bcd1ec79a5496b 100644
--- a/var/spack/repos/builtin/packages/elpa/package.py
+++ b/var/spack/repos/builtin/packages/elpa/package.py
@@ -84,8 +84,8 @@ def configure_args(self):
# adjust the C compiler or CFLAGS
if '+optflags' in self.spec:
options.extend([
- 'FCFLAGS=-O2 -march=native -ffree-line-length-none',
- 'CFLAGS=-O2 -march=native'
+ 'FCFLAGS=-O2 -ffree-line-length-none',
+ 'CFLAGS=-O2'
])
if '+openmp' in self.spec:
options.append('--enable-openmp')
diff --git a/var/spack/repos/builtin/packages/hpgmg/package.py b/var/spack/repos/builtin/packages/hpgmg/package.py
index 6807b79ae5e848a8aebb7879c7df6ce75b45c8a3..64d9fafa048ed6c08e820d7b7a55d2b6794f7e15 100644
--- a/var/spack/repos/builtin/packages/hpgmg/package.py
+++ b/var/spack/repos/builtin/packages/hpgmg/package.py
@@ -66,11 +66,6 @@ def configure_args(self):
cflags.append('-g')
elif any(map(self.spec.satisfies, ['%gcc', '%clang', '%intel'])):
cflags.append('-O3')
- if self.compiler.target in ['x86_64']:
- cflags.append('-march=native')
- elif not self.spec.satisfies('target=aarch64: %gcc@:5.9'):
- cflags.append('-mcpu=native')
- cflags.append('-mtune=native')
else:
cflags.append('-O3')
diff --git a/var/spack/repos/builtin/packages/krims/package.py b/var/spack/repos/builtin/packages/krims/package.py
index 640c2e82da04eabee86a34e94950e18836b3d7e3..3a08b61820af2ce7d727097e0f1d298bd38fab4f 100644
--- a/var/spack/repos/builtin/packages/krims/package.py
+++ b/var/spack/repos/builtin/packages/krims/package.py
@@ -58,8 +58,6 @@ def cmake_args(self):
"-DAUTOCHECKOUT_MISSING_REPOS=OFF",
#
"-DBUILD_SHARED_LIBS=" + str("+shared" in spec),
- "-DDRB_MACHINE_SPECIFIC_OPTIM_Release=ON", # Adds -march=native
- #
# TODO Hard-disable tests for now, since rapidcheck not in Spack
"-DKRIMS_ENABLE_TESTS=OFF",
"-DKRIMS_ENABLE_EXAMPLES=" + str("+examples" in spec),
diff --git a/var/spack/repos/builtin/packages/lazyten/package.py b/var/spack/repos/builtin/packages/lazyten/package.py
index 3ae9f2c88ca5af9ce66341d743bfbe2ea50d4b75..7a0061a656a233f76c4b26f42c77e58a2cb97e71 100644
--- a/var/spack/repos/builtin/packages/lazyten/package.py
+++ b/var/spack/repos/builtin/packages/lazyten/package.py
@@ -71,8 +71,6 @@ def cmake_args(self):
"-DAUTOCHECKOUT_MISSING_REPOS=OFF",
#
"-DBUILD_SHARED_LIBS=" + str("+shared" in spec),
- "-DDRB_MACHINE_SPECIFIC_OPTIM_Release=ON", # Adds -march=native
- #
# TODO Hard-disable tests for now, since rapidcheck not in Spack
"-DLAZYTEN_ENABLE_TESTS=OFF",
"-DLAZYTEN_ENABLE_EXAMPLES=" + str("+examples" in spec),
diff --git a/var/spack/repos/builtin/packages/libceed/package.py b/var/spack/repos/builtin/packages/libceed/package.py
index 5eb11a6ef8d03de80355d5243f9e05d306505d99..2991b5bc8b436722fda0779f2152ebde9b2d1c23 100644
--- a/var/spack/repos/builtin/packages/libceed/package.py
+++ b/var/spack/repos/builtin/packages/libceed/package.py
@@ -62,10 +62,6 @@ def common_make_opts(self):
opt = '-g'
elif compiler.name == 'gcc':
opt = '-O3 -g -ffp-contract=fast'
- if compiler.target in ['x86_64']:
- opt += ' -march=native'
- elif compiler.target in ['ppc64le']:
- opt += ' -mcpu=native -mtune=native'
if compiler.version >= ver(4.9):
opt += ' -fopenmp-simd'
elif compiler.name == 'clang':
diff --git a/var/spack/repos/builtin/packages/nanoflann/package.py b/var/spack/repos/builtin/packages/nanoflann/package.py
index 2e5a259469681ecbd05d31cb346ccacb2ba2d2af..d2fe6f642b853b2cc6ba546704b63bae34e01157 100644
--- a/var/spack/repos/builtin/packages/nanoflann/package.py
+++ b/var/spack/repos/builtin/packages/nanoflann/package.py
@@ -16,9 +16,7 @@ class Nanoflann(CMakePackage):
version('1.2.3', '92a0f44a631c41aa06f9716c51dcdb11')
def patch(self):
- if self.spec.target.family == 'aarch64' and \
- self.spec.satisfies('%gcc@:5.9'):
- filter_file('-mtune=native', '', 'CMakeLists.txt')
+ filter_file('-mtune=native', '', 'CMakeLists.txt')
def cmake_args(self):
args = ['-DBUILD_SHARED_LIBS=ON']
diff --git a/var/spack/repos/builtin/packages/rocksdb/package.py b/var/spack/repos/builtin/packages/rocksdb/package.py
index 4d13393dde02341016263d36b89e4e98650be4a7..e002c5b14e88864aec7b59130ca9944af818d8de 100644
--- a/var/spack/repos/builtin/packages/rocksdb/package.py
+++ b/var/spack/repos/builtin/packages/rocksdb/package.py
@@ -35,12 +35,10 @@ class Rocksdb(MakefilePackage):
phases = ['install']
def patch(self):
- if (self.spec.target.family == 'aarch64' and
- self.spec.satisfies('%gcc@:5.9')):
- filter_file(
- '-march=native', '',
- join_path('build_tools', 'build_detect_platform')
- )
+ filter_file(
+ '-march=native', '',
+ join_path('build_tools', 'build_detect_platform')
+ )
def install(self, spec, prefix):
cflags = []
diff --git a/var/spack/repos/builtin/packages/tealeaf/package.py b/var/spack/repos/builtin/packages/tealeaf/package.py
index 49b13251afcf11a9c017d5e8b4f60dae5d1f8283..4a720fa115efac200819cd5e68d61dac9cd0dbc1 100644
--- a/var/spack/repos/builtin/packages/tealeaf/package.py
+++ b/var/spack/repos/builtin/packages/tealeaf/package.py
@@ -25,10 +25,7 @@ class Tealeaf(MakefilePackage):
depends_on('mpi')
def edit(self, spec, prefix):
- if spec.target.family == 'aarch64' and spec.satisfies('%gcc@:5.9'):
- filter_file(
- '-march=native', '', join_path('TeaLeaf_ref', 'Makefile')
- )
+ filter_file('-march=native', '', join_path('TeaLeaf_ref', 'Makefile'))
@property
def build_targets(self):
diff --git a/var/spack/repos/tutorial/packages/elpa/package.py b/var/spack/repos/tutorial/packages/elpa/package.py
index 9ddae2b8b779ce38e75036c7696a6859a7069550..f8c4ca787315c4fe100a075dd8ad4e81ed078405 100644
--- a/var/spack/repos/tutorial/packages/elpa/package.py
+++ b/var/spack/repos/tutorial/packages/elpa/package.py
@@ -65,13 +65,10 @@ def configure_args(self):
# https://src.fedoraproject.org/cgit/rpms/elpa.git/
# https://packages.qa.debian.org/e/elpa.html
options = []
- # without -march=native there is configure error for 2017.05.02
- # Could not compile test program, try with --disable-sse, or
- # adjust the C compiler or CFLAGS
if '+optflags' in self.spec:
options.extend([
- 'FCFLAGS=-O2 -march=native -ffree-line-length-none',
- 'CFLAGS=-O2 -march=native'
+ 'FCFLAGS=-O2 -ffree-line-length-none',
+ 'CFLAGS=-O2'
])
if '+openmp' in self.spec:
options.append('--enable-openmp')