From 226dcb5a0ba5ce1abaa2c6d6ae4044662f38579a Mon Sep 17 00:00:00 2001 From: LLVM Packaging Team Date: Wed, 26 Apr 2017 21:13:02 +0000 Subject: [PATCH] cmake-arm-version-hack Gbp-Pq: Name cmake-arm-version-hack.patch --- cmake/config.guess.hack | 2 ++ cmake/modules/GetHostTriple.cmake | 2 +- compiler-rt/cmake/base-config-ix.cmake | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) create mode 100644 cmake/config.guess.hack diff --git a/cmake/config.guess.hack b/cmake/config.guess.hack new file mode 100644 index 000000000..13b18bf7b --- /dev/null +++ b/cmake/config.guess.hack @@ -0,0 +1,2 @@ +#!/bin/bash -e +$(dirname "$0")/config.guess | sed -r s/arm[a-zA-Z0-9]*/armv6/ diff --git a/cmake/modules/GetHostTriple.cmake b/cmake/modules/GetHostTriple.cmake index 5de710c7e..aa47bfe3a 100644 --- a/cmake/modules/GetHostTriple.cmake +++ b/cmake/modules/GetHostTriple.cmake @@ -15,7 +15,7 @@ function( get_host_triple var ) set( value "i686-pc-mingw32" ) endif() else( MSVC ) - set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess) + set(config_guess ${LLVM_MAIN_SRC_DIR}/cmake/config.guess.hack) execute_process(COMMAND sh ${config_guess} RESULT_VARIABLE TT_RV OUTPUT_VARIABLE TT_OUT diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake index 34d92989e..9f79a8ee5 100644 --- a/compiler-rt/cmake/base-config-ix.cmake +++ b/compiler-rt/cmake/base-config-ix.cmake @@ -153,8 +153,8 @@ macro(test_targets) test_target_arch(mips "" "-mips32r2" "--target=mips-linux-gnu") test_target_arch(mips64 "" "-mips64r2" "--target=mips64-linux-gnu" "-mabi=64") elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "arm") - test_target_arch(arm "" "-march=armv7-a" "-mfloat-abi=soft") - test_target_arch(armhf "" "-march=armv7-a" "-mfloat-abi=hard") + test_target_arch(arm "" "" "-mfloat-abi=soft") + test_target_arch(armhf "" "" "-mfloat-abi=hard") elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch32") test_target_arch(aarch32 "" "-march=armv8-a") elseif("${COMPILER_RT_DEFAULT_TARGET_ARCH}" MATCHES "aarch64") -- 2.30.2