diff --git a/interface/meson.build b/interface/meson.build index 5fbfc6ae0..d38285bcf 100644 --- a/interface/meson.build +++ b/interface/meson.build @@ -91,12 +91,6 @@ _static_libs += static_library( '-DBUILD_DOUBLE=1', '-DBUILD_COMPLEX=1', '-DBUILD_COMPLEX16=1', - '-UASMNAME', - '-UASMFNAME', - '-UNAME', - '-UCNAME', - '-UCHAR_NAME', - '-UCHAR_CNAME', '-DASMNAME=cblas_drot', '-DASMFNAME=cblas_drot_', '-DNAME=cblas_drot_', diff --git a/kernel/meson.build b/kernel/meson.build index 777056ad9..592b6b1ff 100644 --- a/kernel/meson.build +++ b/kernel/meson.build @@ -794,12 +794,6 @@ _configs = [ '-DBUILD_DOUBLE=1', '-DBUILD_COMPLEX=1', '-DBUILD_COMPLEX16=1', - '-UASMNAME', - '-UASMFNAME', - '-UNAME', - '-UCNAME', - '-UCHAR_NAME', - '-UCHAR_CNAME', '-DASMNAME=drot_k', '-DASMFNAME=drot_k_', '-DNAME=drot_k_', diff --git a/meson.build b/meson.build index 15a7b9526..4ac4e7694 100644 --- a/meson.build +++ b/meson.build @@ -197,6 +197,15 @@ bldroot = meson.build_root() _cargs += ['-include', f'@bldroot@/simd_conf.h'] add_project_arguments(simd_cargs, language: 'c') +# Common symbol related options +symnames = ['ASMNAME', 'ASMFNAME', 'NAME', 'CNAME', 'CHAR_NAME', 'CHAR_CNAME'] + +# Other common options, move later +foreach symb : symnames + _cargs += f'-U@symb@' +endforeach + + # Ignoring other hostarch checks and conflicts for arch in BSD for now _inc = include_directories('.') # subdir('lapack-netlib')