summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGeunsik Lim <geunsik.lim@samsung.com>2016-03-26 21:53:08 +0900
committerGeunsik Lim <geunsik.lim@samsung.com>2016-03-26 21:58:24 +0900
commit12924be33d6d84a2e78e98291dfdd03cb621fc21 (patch)
treec0f82729f4aed3c3f49509c7e2747d3e2f3c1246
parent4f1aef23dac7f26b048e8910dab42d948c9b9c9c (diff)
downloadcoreclr-12924be33d6d84a2e78e98291dfdd03cb621fc21.tar.gz
coreclr-12924be33d6d84a2e78e98291dfdd03cb621fc21.tar.bz2
coreclr-12924be33d6d84a2e78e98291dfdd03cb621fc21.zip
[Linux/ARM32] Unifying the redundant usages of cross-toolchain
The name of toolchain name has been increasing gradually. Let's unify the toolchain name of Linux/ARM32 to prevent the increase of the fragmentation, and to the manatainability. Signed-off-by: Geunsik Lim geunsik.lim@samsung.com Signed-off-by: MyungJoo Ham myungjoo.ham@samsung.com Signed-off-by: Prajwal A N an.prajwal@samsung.com
-rw-r--r--cross/arm/toolchain.cmake20
1 files changed, 15 insertions, 5 deletions
diff --git a/cross/arm/toolchain.cmake b/cross/arm/toolchain.cmake
index 35611cc50d..c7fea199cb 100644
--- a/cross/arm/toolchain.cmake
+++ b/cross/arm/toolchain.cmake
@@ -4,14 +4,24 @@ set(CMAKE_SYSTEM_NAME Linux)
set(CMAKE_SYSTEM_VERSION 1)
set(CMAKE_SYSTEM_PROCESSOR armv7l)
+## Specify the toolchain
+set(TOOLCHAIN "arm-linux-gnueabihf")
+set(TOOLCHAIN_PREFIX ${TOOLCHAIN}-)
+# set(CMAKE_C_COMPILER ${TOOLCHAIN_PREFIX}gcc)
+# set(CMAKE_CXX_COMPILER ${TOOLCHAIN_PREFIX}g++)
+# set(CMAKE_ASM_COMPILER ${TOOLCHAIN_PREFIX}as)
+#set(CMAKE_AR ${TOOLCHAIN_PREFIX}ar)
+#set(CMAKE_OBJCOPY ${TOOLCHAIN_PREFIX}objcopy)
+#set(CMAKE_OBJDUMP ${TOOLCHAIN_PREFIX}objdump)
+
add_compile_options(-target armv7-linux-gnueabihf)
add_compile_options(-mthumb)
add_compile_options(-mfpu=vfpv3)
add_compile_options(--sysroot=${CROSS_ROOTFS})
-set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -target arm-linux-gnueabihf")
-set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B ${CROSS_ROOTFS}/usr/lib/gcc/arm-linux-gnueabihf")
-set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/lib/arm-linux-gnueabihf")
+set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -target ${TOOLCHAIN}")
+set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -B ${CROSS_ROOTFS}/usr/lib/gcc/${TOOLCHAIN}")
+set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} -L${CROSS_ROOTFS}/lib/${TOOLCHAIN}")
set(CROSS_LINK_FLAGS "${CROSS_LINK_FLAGS} --sysroot=${CROSS_ROOTFS}")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CROSS_LINK_FLAGS}" CACHE STRING "" FORCE)
@@ -24,5 +34,5 @@ set(CMAKE_FIND_ROOT_PATH_MODE_LIBRARY ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY)
set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY)
-set(WITH_LLDB_LIBS "${CROSS_ROOTFS}/usr/lib/arm-linux-gnueabihf" CACHE STRING "")
-set(WITH_LLDB_INCLUDES "${CROSS_ROOTFS}/usr/lib/llvm-3.6/include" CACHE STRING "") \ No newline at end of file
+set(WITH_LLDB_LIBS "${CROSS_ROOTFS}/usr/lib/${TOOLCHAIN}" CACHE STRING "")
+set(WITH_LLDB_INCLUDES "${CROSS_ROOTFS}/usr/lib/llvm-3.6/include" CACHE STRING "")