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

Side by Side Diff: make/platform/clang_nacl.mk

Issue 1291913002: Remove an extraneous endif (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 unified diff | Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 Description := Static runtime libraries for clang/NaCl. 1 Description := Static runtime libraries for clang/NaCl.
2 2
3 ### 3 ###
4 4
5 CC := clang 5 CC := clang
6 Arch := unknown 6 Arch := unknown
7 Configs := 7 Configs :=
8 8
9 # We don't currently have any general purpose way to target architectures other 9 # We don't currently have any general purpose way to target architectures other
10 # than the compiler defaults (because there is no generalized way to invoke 10 # than the compiler defaults (because there is no generalized way to invoke
(...skipping 38 matching lines...) Expand 10 before | Expand all | Expand 10 after
49 Arch.full-mips32 := mips32 49 Arch.full-mips32 := mips32
50 else 50 else
51 ifeq ($(call contains,mipsel,$(CompilerTargetArch)),true) 51 ifeq ($(call contains,mipsel,$(CompilerTargetArch)),true)
52 # This is for mips d2n 52 # This is for mips d2n
53 Configs += full-mips32 53 Configs += full-mips32
54 Arch.full-mips32 := mips32 54 Arch.full-mips32 := mips32
55 endif 55 endif
56 endif 56 endif
57 endif 57 endif
58 endif 58 endif
59 endif
60 59
61 endif 60 endif
62 61
63 ### 62 ###
64 63
65 $(call CheckValue,CFLAGS) 64 $(call CheckValue,CFLAGS)
66 CFLAGS := -Wall -Werror -O3 -fomit-frame-pointer $(EXTRA_CFLAGS) 65 CFLAGS := -Wall -Werror -O3 -fomit-frame-pointer $(EXTRA_CFLAGS)
67 $(call CheckValue,CFLAGS) 66 $(call CheckValue,CFLAGS)
68 # Use the integrated assembler on x86-64 to ensure sandbox base-address hiding. 67 # Use the integrated assembler on x86-64 to ensure sandbox base-address hiding.
69 68
(...skipping 92 matching lines...) Expand 10 before | Expand all | Expand 10 after
162 161
163 nacltest-x86-32: 162 nacltest-x86-32:
164 test/builtins/Unit/nacltest.py $(TCROOT)/bin/i686-nacl-clang \ 163 test/builtins/Unit/nacltest.py $(TCROOT)/bin/i686-nacl-clang \
165 $(FUNCTIONS.full-i386) 164 $(FUNCTIONS.full-i386)
166 nacltest-x86-64: 165 nacltest-x86-64:
167 test/builtins/Unit/nacltest.py $(TCROOT)/bin/x86_64-nacl-clang \ 166 test/builtins/Unit/nacltest.py $(TCROOT)/bin/x86_64-nacl-clang \
168 $(FUNCTIONS.full-x86_64) 167 $(FUNCTIONS.full-x86_64)
169 nacltest-arm: 168 nacltest-arm:
170 test/builtins/Unit/nacltest.py $(TCROOT)/bin/arm-nacl-clang \ 169 test/builtins/Unit/nacltest.py $(TCROOT)/bin/arm-nacl-clang \
171 $(FUNCTIONS.full-arm) 170 $(FUNCTIONS.full-arm)
OLDNEW
« 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