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

Unified Diff: Makefile.standalone

Issue 1424923005: Add workaround to allow testing of ARM integrated assembler. (Closed) Base URL: https://chromium.googlesource.com/native_client/pnacl-subzero.git@master
Patch Set: Remove unnecessary addition of ARM32 local (assembler) label. Created 5 years, 1 month 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 | src/IceAssemblerARM32.h » ('j') | src/IceInstARM32.cpp » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: Makefile.standalone
diff --git a/Makefile.standalone b/Makefile.standalone
index 2583db2e407ccd1cf104cb13476feec4809936ac..738052fa25065ea035c7fce4835c9652e06cd33e 100644
--- a/Makefile.standalone
+++ b/Makefile.standalone
@@ -86,6 +86,16 @@ else
-DALLOW_MINIMAL_BUILD=0
endif
+ifdef IASM_SAFE
+ # Only allow integrated assembler to translate instructions that are
+ # marked as safe.
+ OBJDIR := $(OBJDIR)+Safe
+ BASE_CXX_DEFINES += -DIASM_SAFE=1
+else
+ BASE_CXX_DEFINES += -DIASM_SAFE=0
+endif
+
+
SB_CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=1
CXX_DEFINES := $(BASE_CXX_DEFINES) -DPNACL_BROWSER_TRANSLATOR=0
« no previous file with comments | « no previous file | src/IceAssemblerARM32.h » ('j') | src/IceInstARM32.cpp » ('J')

Powered by Google App Engine
This is Rietveld 408576698