diff options
| author | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-09-25 17:52:07 +0100 |
|---|---|---|
| committer | Georgios Pinitas <georgios.pinitas@arm.com> | 2019-09-26 16:04:22 +0000 |
| commit | bc88c621bd89cb93b503e2d8386383ff9ae6412a (patch) | |
| tree | 713da19d959791fe69d8d9aa3a5a19af561ce030 /SConstruct | |
| parent | dc200dc1328b34c85554ec7db3b48bcc6410d18f (diff) | |
| download | ComputeLibrary-bc88c621bd89cb93b503e2d8386383ff9ae6412a.tar.gz | |
COMPMID-2452: Replace DOT assemble macro with the corresponding word directives.
Change-Id: Id602cfe2d00deed6d994ba4c90cdc5914a8e6016
Signed-off-by: Georgios Pinitas <georgios.pinitas@arm.com>
Reviewed-on: https://review.mlplatform.org/c/1987
Comments-Addressed: Arm Jenkins <bsgcomp@arm.com>
Reviewed-by: Pablo Marquez <pablo.tello@arm.com>
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/SConstruct b/SConstruct index 8fd9e63f6e..33cc72cf0d 100644 --- a/SConstruct +++ b/SConstruct @@ -180,15 +180,13 @@ if env['arch'] == 'armv7a': env.Append(CXXFLAGS = ['-mfloat-abi=softfp']) elif env['arch'] == 'arm64-v8a': env.Append(CXXFLAGS = ['-march=armv8-a']) - env.Append(CPPDEFINES = ['ARM_COMPUTE_AARCH64_V8A','NO_DOT_IN_TOOLCHAIN']) + env.Append(CPPDEFINES = ['ARM_COMPUTE_AARCH64_V8A']) if env['os'] == 'linux': prefix = "aarch64-linux-gnu-" elif env['os'] == 'bare_metal': prefix = "aarch64-elf-" elif env['os'] == 'android': prefix = "aarch64-linux-android-" - if 'clang++' in cpp_compiler: - env.Append(CXXFLAGS = ['-no-integrated-as']) elif 'arm64-v8.2-a' in env['arch']: if env['arch'] == 'arm64-v8.2-a-sve': env.Append(CXXFLAGS = ['-march=armv8.2-a+sve+fp16+dotprod']) @@ -200,9 +198,7 @@ elif 'arm64-v8.2-a' in env['arch']: prefix = "aarch64-elf-" elif env['os'] == 'android': prefix = "aarch64-linux-android-" - env.Append(CPPDEFINES = ['ARM_COMPUTE_AARCH64_V8_2','NO_DOT_IN_TOOLCHAIN']) - if 'clang++' in cpp_compiler: - env.Append(CXXFLAGS = ['-no-integrated-as']) + env.Append(CPPDEFINES = ['ARM_COMPUTE_AARCH64_V8_2']) elif env['arch'] == 'x86_32': env.Append(CCFLAGS = ['-m32']) env.Append(LINKFLAGS = ['-m32']) @@ -211,10 +207,6 @@ elif env['arch'] == 'x86_64': env.Append(CCFLAGS = ['-m64']) env.Append(LINKFLAGS = ['-m64']) -# Rework flags depending on compiler version -if 'armclang' in cpp_compiler: - if 'NO_DOT_IN_TOOLCHAIN' in env['CPPDEFINES']: env['CPPDEFINES'].remove('NO_DOT_IN_TOOLCHAIN') - if env['build'] == 'native': prefix = "" |