Enable native targets used for non-SFI

make/platform/clang_nacl.mk

 Description := Static runtime libraries for clang/NaCl.
 
 ###
 
 CC := clang
 Arch := unknown
 Configs :=
 
 # We don't currently have any general purpose way to target architectures other
 # than the compiler defaults (because there is no generalized way to invoke
 # cross compilers). For now, we just find the target architecture of the compiler
 # and only define configurations we know that compiler can generate.
 CompilerTargetTriple := $(shell \
         $(CC) $(EXTRA_CFLAGS) -v 2>&1 | grep 'Target:' | cut -d' ' -f2)
 ifneq ($(DEBUGMAKE),)
 ifeq ($(CompilerTargetTriple),)
 $(error "unable to infer compiler target triple for $(CC)")
 endif
 endif
 
 CompilerTargetArch := $(firstword $(subst -, ,$(CompilerTargetTriple)))
 $(call CheckValue,CompilerTargetTriple)
-# Only define configs if we detected a nacl target.
-ifneq ($(findstring -nacl,$(CompilerTargetTriple)),)
 
 ifneq ($(findstring pnacl-clang,$(CC)),)
 # pnacl-clang already uses the integrated assembler and does not support the
 # integrated-as flag
 INTEGRATED_AS :=
 else
 INTEGRATED_AS := -integrated-as
 endif
 
 # Configurations which just include all the runtime functions.
 ifeq ($(call contains,i686,$(CompilerTargetArch)),true)
 Configs += full-i386
 Arch.full-i386 := i386
 else
 ifeq ($(call contains,x86_64,$(CompilerTargetArch)),true)
 Configs += full-x86_64
 Arch.full-x86_64 := x86_64
 else
-ifeq ($(call contains,arm,$(CompilerTargetArch)),true)
-# arm-nacl-clang reports this target
+ifeq ($(call contains,arm armv7 armv7a,$(CompilerTargetArch)),true)
 Configs += full-arm
 Arch.full-arm := armv7
 else
-ifeq ($(call contains,armv7,$(CompilerTargetArch)),true)
-# pnacl-clang with arm bias (used for arm-nonsfi) reports this target
-Configs += full-arm
-Arch.full-arm := armv7
-else
 ifeq ($(call contains,le32,$(CompilerTargetArch)),true)
 # This is really for mips, but mips uses le32 bitcode
 # TODO(petarj): Remove this if possible.
 Configs += full-mips32
 Arch.full-mips32 := mips32
 else
 ifeq ($(call contains,mipsel,$(CompilerTargetArch)),true)
 # This is for mips d2n
 Configs += full-mips32
 Arch.full-mips32 := mips32
 endif
 endif
 endif
 endif
 endif
-endif
 
 endif
 
 ###
 
 $(call CheckValue,CFLAGS)
 CFLAGS := -Wall -Werror -O3 -fomit-frame-pointer $(EXTRA_CFLAGS)
 $(call CheckValue,CFLAGS)
 # Use the integrated assembler on x86-64 to ensure sandbox base-address hiding.
 
@@ skipping 92 matching lines @@
 
 nacltest-x86-32:
         test/builtins/Unit/nacltest.py $(TCROOT)/bin/i686-nacl-clang \
          $(FUNCTIONS.full-i386)
 nacltest-x86-64:
         test/builtins/Unit/nacltest.py $(TCROOT)/bin/x86_64-nacl-clang \
          $(FUNCTIONS.full-x86_64)
 nacltest-arm:
         test/builtins/Unit/nacltest.py $(TCROOT)/bin/arm-nacl-clang \
          $(FUNCTIONS.full-arm)