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

Side by Side Diff: src/globals.h

Issue 21243004: Revert target arch detection. (Closed) Base URL: https://v8.googlecode.com/svn/branches/bleeding_edge
Patch Set: Created 7 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 | Annotate | Revision Log
« 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 // Copyright 2012 the V8 project authors. All rights reserved. 1 // Copyright 2012 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 198 matching lines...) Expand 10 before | Expand all | Expand 10 after
209 #endif 209 #endif
210 210
211 211
212 // ---------------------------------------------------------------------------- 212 // ----------------------------------------------------------------------------
213 // Target architecture detection. This may be set externally. If not, detect 213 // Target architecture detection. This may be set externally. If not, detect
214 // in the same way as the host architecture, that is, target the native 214 // in the same way as the host architecture, that is, target the native
215 // environment as presented by the compiler. 215 // environment as presented by the compiler.
216 216
217 #if !V8_TARGET_ARCH_X64 && !V8_TARGET_ARCH_IA32 && \ 217 #if !V8_TARGET_ARCH_X64 && !V8_TARGET_ARCH_IA32 && \
218 !V8_TARGET_ARCH_ARM && !V8_TARGET_ARCH_MIPS 218 !V8_TARGET_ARCH_ARM && !V8_TARGET_ARCH_MIPS
219 # if V8_HOST_ARCH_X64 219 # if defined(_M_X64) || defined(__x86_64__)
220 # define V8_TARGET_ARCH_X64 1 220 # define V8_TARGET_ARCH_X64 1
221 # elif V8_HOST_ARCH_IA32 221 # elif defined(_M_IX86) || defined(__i386__)
222 # define V8_TARGET_ARCH_IA32 1 222 # define V8_TARGET_ARCH_IA32 1
223 # elif V8_HOST_ARCH_ARM 223 # elif defined(__ARMEL__)
224 # define V8_TARGET_ARCH_ARM 1 224 # define V8_TARGET_ARCH_ARM 1
225 # elif V8_HOST_ARCH_MIPS 225 # elif defined(__MIPSEL__)
226 # define V8_TARGET_ARCH_MIPS 1 226 # define V8_TARGET_ARCH_MIPS 1
227 # else 227 # else
228 # error Target architecture was not detected as supported by v8 228 # error Target architecture was not detected as supported by v8
229 # endif 229 # endif
230 #endif 230 #endif
231 231
232 // Check for supported combinations of host and target architectures. 232 // Check for supported combinations of host and target architectures.
233 #if V8_TARGET_ARCH_IA32 && !V8_HOST_ARCH_IA32 233 #if V8_TARGET_ARCH_IA32 && !V8_HOST_ARCH_IA32
234 # error Target architecture ia32 is only supported on ia32 host 234 # error Target architecture ia32 is only supported on ia32 host
235 #elif V8_TARGET_ARCH_X64 && !V8_HOST_ARCH_X64 235 #elif V8_TARGET_ARCH_X64 && !V8_HOST_ARCH_X64
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
556 // the backend, so both modes are represented by the kStrictMode value. 556 // the backend, so both modes are represented by the kStrictMode value.
557 enum StrictModeFlag { 557 enum StrictModeFlag {
558 kNonStrictMode, 558 kNonStrictMode,
559 kStrictMode 559 kStrictMode
560 }; 560 };
561 561
562 562
563 } } // namespace v8::internal 563 } } // namespace v8::internal
564 564
565 #endif // V8_GLOBALS_H_ 565 #endif // V8_GLOBALS_H_
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