fixup

Author: illwieckz

CMakeLists.txt

@@ -12,12 +12,15 @@ if (ARCH STREQUAL "i686")
 	set(ARCH_SUFFIX "_x86_32")
 elseif (ARCH STREQUAL "amd64")
 	set(ARCH_SUFFIX "_X86_64")
-elseif (ARCH STREQUAL "arm")
+elseif (ARCH STREQUAL "armhf")
 	set(ARCH_SUFFIX "_arm")
 elseif (ARCH STREQUAL "mips32")
 	set(ARCH_SUFFIX "_mips32")
 endif()
 
+# FIXME: In src/shared/imc/build.scons it is only done on Linux bot not on Android.
+find_library(LIBRT rt)
+
 add_subdirectory(src/shared/gio)
 add_subdirectory(src/shared/imc)
 add_subdirectory(src/shared/platform)
@@ -34,6 +37,8 @@ add_subdirectory(src/trusted/validator)
 if (ARCH STREQUAL "i686" OR ARCH STREQUAL "amd64")
 	add_subdirectory(src/trusted/validator_x86)
 	add_subdirectory(src/trusted/validator_ragel)
+elseif (ARCH STREQUAL "armhf")
+	add_subdirectory(src/trusted/validator_arm)
 endif()
 
 add_subdirectory(src/trusted/service_runtime)

cmake/NaClFlags.cmake

@@ -83,6 +83,4 @@ if (LINUX)
 	set_linker_flag("-Wl,-z,noexecstack")
 	set_c_cxx_flag("-fPIE")
 	set_linker_flag("-pie")
-	# FIXME: In src/shared/imc/build.scons it is only done on Linux bot not on Android.
-	find_library(LIBRT rt)
 endif()

src/shared/imc/CMakeLists.txt

@@ -1,7 +1,9 @@
 if (LINUX AND NOT ANDROID)
 	# FIXME: librt is already set in LIBS_BASE for Linux,
 	# but src/shared/imc/build.scons was setting for Linux but not Android.
-	list(APPEND LIBS_NACL_IMC ${LIBRT})
+	if (LIBRT)
+		list(APPEND LIBS_NACL_IMC "${LIBRT}")
+	endif()
 endif()
 
 list(APPEND NACL_IMC_INPUTS "nacl_imc_common.cc")

src/trusted/platform_qualify/CMakeLists.txt

@@ -31,7 +31,7 @@ if (ARCH STREQUAL "i686" OR ARCH STREQUAL "amd64")
 	elseif (ARCH STREQUAL "amd64")
 		list(APPEND PQL_INPUTS "arch/x86_64/nacl_dep_qualify_arch.c")
 	endif()
-elseif (ARCH STREQUAL "arm")
+elseif (ARCH STREQUAL "armhf")
 	list(APPEND PQL_INPUTS
 		# Compile ARM primitives for checking XN functionality
 		"arch/arm/nacl_dep_qualify_arch.c"

src/trusted/service_runtime/CMakeLists.txt

@@ -312,7 +312,7 @@ list(APPEND LDR_LIBS validators)
 
 if (ARCH STREQUAL "i686" OR ARCH STREQUAL "amd64")
 	list(APPEND LDR_LIBS dfa_validate_caller)
-elseif (ARCH STREAQUAL "arm")
+elseif (ARCH STREQUAL "armhf")
 	list(APPEND LDR_LIBS ncvalidate_arm_v2)
 	list(APPEND LDR_LIBS arm_validator_reporters)
 endif()
@@ -350,13 +350,18 @@ if (WIN32)
 endif()
 
 if (NOT COVERAGE_ENABLED OR NOT WIN32)
+	if (LIBRT)
+		list(APPEND LDR_LIBS "${LIBRT}")
+	endif()
+
 #TODO:	sel_main_objs = [env.ComponentObject('nacl_test_injection_main.c')]
 	add_library(nacl_test_injection_main OBJECT "nacl_test_injection_main.c")
 	list(APPEND LDR_LIBS nacl_test_injection_main)
 #TODO:	SEL_LDR_NODE = env.ComponentProgram('sel_ldr', sel_main_objs, EXTRA_LIBS=['sel_main'])
-	# WIP:
+
 	add_executable(sel_ldr)
-	target_link_libraries(sel_ldr ${LDR_LIBS} ${LIBRT})
+	target_link_libraries(sel_ldr ${LDR_LIBS})
+
 
 	if (APPLE)
 		# This target exists only to check that the service_runtime code