Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(769)

Unified Diff: make/platform/clang_nacl.mk

Issue 1283983002: Enable native targets used for non-SFI (Closed) Base URL: https://chromium.googlesource.com/a/native_client/pnacl-compiler-rt.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: make/platform/clang_nacl.mk
diff --git a/make/platform/clang_nacl.mk b/make/platform/clang_nacl.mk
index b6a85052dc05e92d1040b7cb3ee58ff6f6a4850c..ec04bc9838441ff69fb27021086d7e2070f89cb1 100644
--- a/make/platform/clang_nacl.mk
+++ b/make/platform/clang_nacl.mk
@@ -20,8 +20,6 @@ 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
@@ -40,13 +38,7 @@ 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
-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
+ifeq ($(call contains,arm armv7 armv7a,$(CompilerTargetArch)),true)
Configs += full-arm
Arch.full-arm := armv7
else
@@ -65,7 +57,6 @@ endif
endif
endif
endif
-endif
endif
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698