fixup

Author: illwieckz

src/trusted/service_runtime/CMakeLists.txt

@@ -10,7 +10,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/../../../cmake)
 
 include(DaemonPlatform/Platform)
 
-#FIXME: What to do with it?
+#FIXME: What to do with this?
 set(CPPPATH "${CMAKE_BINARY_DIR}/gen")
 
 # normally comment out -- uncomment out to test the pedantic removal
@@ -122,9 +122,9 @@ elseif (ARCH STREQUAL "amd64")
 
 #TODO:		AMD64_ZERO_BASED_SANDBOX = env.Bit('x86_64_zero_based_sandbox')
 		if (AMD64_ZERO_BASED_SANDBOX)
-#TODO:		env.Append(CPPDEFINES=['-DNACL_X86_64_ZERO_BASED_SANDBOX=1'])
+#TODO:			env.Append(CPPDEFINES=['-DNACL_X86_64_ZERO_BASED_SANDBOX=1'])
 		else()
-#TODO:		env.Append(CPPDEFINES=['-DNACL_X86_64_ZERO_BASED_SANDBOX=0'])
+#TODO:			env.Append(CPPDEFINES=['-DNACL_X86_64_ZERO_BASED_SANDBOX=0'])
 		endif()
 	endif()
 elseif(ARCH STREQUAL "armhf")
@@ -265,9 +265,9 @@ if (LINUX)
 		# nacl_signal.c needs to be compiled without the stack protector
 		# on i386.
 		# See https://code.google.com/p/nativeclient/issues/detail?id=3581.
-#TODO:	nacl_signal_env.FilterOut(CCFLAGS=['-fstack-protector', '-fstack-protector-all'])
-#TODO:	nacl_signal_env.Append(CCFLAGS=['-fno-stack-protector'])
-#TODO:	NACL_SIGNAL_OBJ = nacl_signal_env.ComponentObject('linux/nacl_signal.c')])
+#TODO:		nacl_signal_env.FilterOut(CCFLAGS=['-fstack-protector', '-fstack-protector-all'])
+#TODO:		nacl_signal_env.Append(CCFLAGS=['-fno-stack-protector'])
+#TODO:		NACL_SIGNAL_OBJ = nacl_signal_env.ComponentObject('linux/nacl_signal.c')])
 		set(LDR_INPUTS ${LDR_INPUTS} ${NACL_SIGNAL_OBJ})
 	endif()
 endif()
@@ -327,10 +327,10 @@ if (WIN32)
 		kernel32
 		advapi32
 		winmm
-# TODO(gregoryd): ntdll.lib is required for sem_get_value implementation but
-# it is available in Windows DDK only. The DDK is not
-# in third_party, but we might need to add it if we want to use it.
-#		ntdll
+		# TODO(gregoryd): ntdll.lib is required for sem_get_value implementation but
+		# it is available in Windows DDK only. The DDK is not
+		# in third_party, but we might need to add it if we want to use it.
+		# ntdll
 	)
 endif()
 
@@ -413,7 +413,7 @@ if (LINUX AND NOT BUILD_ELSEWHERE)
 
 	set(COMPILER_OVERRIDE '')
 
-	if (SYSTEM_amd64)
+	if (ARCH STREQUAL "amd64")
 		set(LD_EMUL 'elf_x86_64')
 
 #TODO:		AMD64_ZERO_BASED_SANDBOX = env.Bit('x86_64_zero_based_sandbox')
@@ -445,16 +445,16 @@ if (LINUX AND NOT BUILD_ELSEWHERE)
 		else()
 			set(reserve_top '0x0')
 		endif()
-	elseif (SYSTEM_i686)
+	elseif (ARCH STREQUAL "i686")
 		set(LD_EMUL 'elf_i386')
 		set(RESERVE_TOP '0x40000000')
-	elseif (SYSTEM_armhf)
-		set(ld_emul 'armelf_linux_eabi')
-		set(reserve_top '0x40002000')
-		set(compiler_override '--compiler arm-linux-gnueabihf-gcc')
-	elseif (SYSTEM_mips32)
-		set(ld_emul 'elf32ltsmip')
-		set(reserve_top '0x40008000')
+	elseif (ARCH STREQUAL "armhf")
+		set(LD_EMUL 'armelf_linux_eabi')
+		set(RESERVE_TOP '0x40002000')
+		set(COMPILER_OVERRIDE '--compiler arm-linux-gnueabihf-gcc')
+	elseif (ARCH STREQUAL "mips32")
+		set(LD_EMOUL 'elf32ltsmip')
+		set(RESERVE_TOP '0x40008000')
 	endif()
 
 #TODO:	bootstrap_obj = bootstrap_env.ComponentObject('linux/nacl_bootstrap.c')