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

Side by Side Diff: build/toolchain.gypi

Issue 98543008: Switch armv7 setting to arm_version=7 in v8 gyp files (Closed) Base URL: git://github.com/v8/v8.git@master
Patch Set: fixed Makefile Created 7 years 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 | « build/standalone.gypi ('k') | 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 # Copyright 2013 the V8 project authors. All rights reserved. 1 # Copyright 2013 the V8 project authors. All rights reserved.
2 # Redistribution and use in source and binary forms, with or without 2 # Redistribution and use in source and binary forms, with or without
3 # modification, are permitted provided that the following conditions are 3 # modification, are permitted provided that the following conditions are
4 # met: 4 # met:
5 # 5 #
6 # * Redistributions of source code must retain the above copyright 6 # * Redistributions of source code must retain the above copyright
7 # notice, this list of conditions and the following disclaimer. 7 # notice, this list of conditions and the following disclaimer.
8 # * Redistributions in binary form must reproduce the above 8 # * Redistributions in binary form must reproduce the above
9 # copyright notice, this list of conditions and the following 9 # copyright notice, this list of conditions and the following
10 # disclaimer in the documentation and/or other materials provided 10 # disclaimer in the documentation and/or other materials provided
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
85 'V8_TARGET_ARCH_ARM', 85 'V8_TARGET_ARCH_ARM',
86 ], 86 ],
87 'target_conditions': [ 87 'target_conditions': [
88 ['_toolset=="host"', { 88 ['_toolset=="host"', {
89 'variables': { 89 'variables': {
90 'armcompiler': '<!($(echo ${CXX_host:-$(which g++)}) -v 2>&1 | gre p -q "^Target: arm" && echo "yes" || echo "no")', 90 'armcompiler': '<!($(echo ${CXX_host:-$(which g++)}) -v 2>&1 | gre p -q "^Target: arm" && echo "yes" || echo "no")',
91 }, 91 },
92 'conditions': [ 92 'conditions': [
93 ['armcompiler=="yes"', { 93 ['armcompiler=="yes"', {
94 'conditions': [ 94 'conditions': [
95 [ 'armv7==1', { 95 [ 'arm_version==7', {
96 'cflags': ['-march=armv7-a',], 96 'cflags': ['-march=armv7-a',],
97 }], 97 }],
98 [ 'armv7==1 or armv7=="default"', { 98 [ 'arm_version==7 or arm_version=="default"', {
99 'conditions': [ 99 'conditions': [
100 [ 'arm_neon==1', { 100 [ 'arm_neon==1', {
101 'cflags': ['-mfpu=neon',], 101 'cflags': ['-mfpu=neon',],
102 }, 102 },
103 { 103 {
104 'conditions': [ 104 'conditions': [
105 [ 'arm_fpu!="default"', { 105 [ 'arm_fpu!="default"', {
106 'cflags': ['-mfpu=<(arm_fpu)',], 106 'cflags': ['-mfpu=<(arm_fpu)',],
107 }], 107 }],
108 ], 108 ],
(...skipping 11 matching lines...) Expand all
120 }], 120 }],
121 [ 'arm_test=="on"', { 121 [ 'arm_test=="on"', {
122 'defines': [ 122 'defines': [
123 'ARM_TEST', 123 'ARM_TEST',
124 ], 124 ],
125 }], 125 }],
126 ], 126 ],
127 }, { 127 }, {
128 # armcompiler=="no" 128 # armcompiler=="no"
129 'conditions': [ 129 'conditions': [
130 [ 'armv7==1 or armv7=="default"', { 130 [ 'arm_version==7 or arm_version=="default"', {
131 'defines': [ 131 'defines': [
132 'CAN_USE_ARMV7_INSTRUCTIONS=1', 132 'CAN_USE_ARMV7_INSTRUCTIONS=1',
133 ], 133 ],
134 'conditions': [ 134 'conditions': [
135 [ 'arm_fpu=="default"', { 135 [ 'arm_fpu=="default"', {
136 'defines': [ 136 'defines': [
137 'CAN_USE_VFP3_INSTRUCTIONS', 137 'CAN_USE_VFP3_INSTRUCTIONS',
138 ], 138 ],
139 }], 139 }],
140 [ 'arm_fpu=="vfpv3-d16"', { 140 [ 'arm_fpu=="vfpv3-d16"', {
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
173 }], 173 }],
174 ], 174 ],
175 }], # _toolset=="host" 175 }], # _toolset=="host"
176 ['_toolset=="target"', { 176 ['_toolset=="target"', {
177 'variables': { 177 'variables': {
178 'armcompiler': '<!($(echo ${CXX_target:-<(CXX)}) -v 2>&1 | grep -q "^Target: arm" && echo "yes" || echo "no")', 178 'armcompiler': '<!($(echo ${CXX_target:-<(CXX)}) -v 2>&1 | grep -q "^Target: arm" && echo "yes" || echo "no")',
179 }, 179 },
180 'conditions': [ 180 'conditions': [
181 ['armcompiler=="yes"', { 181 ['armcompiler=="yes"', {
182 'conditions': [ 182 'conditions': [
183 [ 'armv7==1', { 183 [ 'arm_version==7', {
184 'cflags': ['-march=armv7-a',], 184 'cflags': ['-march=armv7-a',],
185 }], 185 }],
186 [ 'armv7==1 or armv7=="default"', { 186 [ 'arm_version==7 or arm_version=="default"', {
187 'conditions': [ 187 'conditions': [
188 [ 'arm_neon==1', { 188 [ 'arm_neon==1', {
189 'cflags': ['-mfpu=neon',], 189 'cflags': ['-mfpu=neon',],
190 }, 190 },
191 { 191 {
192 'conditions': [ 192 'conditions': [
193 [ 'arm_fpu!="default"', { 193 [ 'arm_fpu!="default"', {
194 'cflags': ['-mfpu=<(arm_fpu)',], 194 'cflags': ['-mfpu=<(arm_fpu)',],
195 }], 195 }],
196 ], 196 ],
(...skipping 11 matching lines...) Expand all
208 }], 208 }],
209 [ 'arm_test=="on"', { 209 [ 'arm_test=="on"', {
210 'defines': [ 210 'defines': [
211 'ARM_TEST', 211 'ARM_TEST',
212 ], 212 ],
213 }], 213 }],
214 ], 214 ],
215 }, { 215 }, {
216 # armcompiler=="no" 216 # armcompiler=="no"
217 'conditions': [ 217 'conditions': [
218 [ 'armv7==1 or armv7=="default"', { 218 [ 'arm_version==7 or arm_version=="default"', {
219 'defines': [ 219 'defines': [
220 'CAN_USE_ARMV7_INSTRUCTIONS=1', 220 'CAN_USE_ARMV7_INSTRUCTIONS=1',
221 ], 221 ],
222 'conditions': [ 222 'conditions': [
223 [ 'arm_fpu=="default"', { 223 [ 'arm_fpu=="default"', {
224 'defines': [ 224 'defines': [
225 'CAN_USE_VFP3_INSTRUCTIONS', 225 'CAN_USE_VFP3_INSTRUCTIONS',
226 ], 226 ],
227 }], 227 }],
228 [ 'arm_fpu=="vfpv3-d16"', { 228 [ 'arm_fpu=="vfpv3-d16"', {
(...skipping 453 matching lines...) Expand 10 before | Expand all | Expand 10 after
682 'OptimizeReferences': '2', 682 'OptimizeReferences': '2',
683 'EnableCOMDATFolding': '2', 683 'EnableCOMDATFolding': '2',
684 }, 684 },
685 }, 685 },
686 }], # OS=="win" 686 }], # OS=="win"
687 ], # conditions 687 ], # conditions
688 }, # Release 688 }, # Release
689 }, # configurations 689 }, # configurations
690 }, # target_defaults 690 }, # target_defaults
691 } 691 }
OLDNEW
« no previous file with comments | « build/standalone.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698