Reviewers: jochen,
Message:
Committed patchset #1 manually as r21914 (presubmit successful).
Description:
Revert "Set host_arch to ia32 on machines with a 32bit userland but a 64bit
kernel."
This reverts r21909.
Reason: breaks NaCL build.
BUG=
[email protected]
Committed: https://code.google.com/p/v8/source/detail?r=21914
Please review this at https://codereview.chromium.org/346223004/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+7, -68 lines):
D build/detect_v8_host_arch.py
M build/standalone.gypi
Index: build/detect_v8_host_arch.py
diff --git a/build/detect_v8_host_arch.py b/build/detect_v8_host_arch.py
deleted file mode 100644
index
f66383b5c5fdbeadeebf216ee538fd8ddb1d6b98..0000000000000000000000000000000000000000
--- a/build/detect_v8_host_arch.py
+++ /dev/null
@@ -1,67 +0,0 @@
-#!/usr/bin/env python
-# Copyright 2014 the V8 project authors. All rights reserved.
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are
-# met:
-#
-# * Redistributions of source code must retain the above copyright
-# notice, this list of conditions and the following disclaimer.
-# * Redistributions in binary form must reproduce the above
-# copyright notice, this list of conditions and the following
-# disclaimer in the documentation and/or other materials provided
-# with the distribution.
-# * Neither the name of Google Inc. nor the names of its
-# contributors may be used to endorse or promote products derived
-# from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
-"""Outputs host CPU architecture in format recognized by gyp."""
-
-import platform
-import re
-import sys
-
-
-def main():
- print DoMain([])
- return 0
-
-def DoMain(_):
- """Hook to be called from gyp without starting a separate python
- interpreter."""
- host_arch = platform.machine()
-
- # Convert machine type to format recognized by gyp.
- if re.match(r'i.86', host_arch) or host_arch == 'i86pc':
- host_arch = 'ia32'
- elif host_arch in ['x86_64', 'amd64']:
- host_arch = 'x64'
- elif host_arch.startswith('arm'):
- host_arch = 'arm'
- elif host_arch == 'aarch64':
- host_arch = 'arm64'
- elif host_arch.startswith('mips'):
- host_arch = 'mipsel'
-
- # platform.machine is based on running kernel. It's possible to use
64-bit
- # kernel with 32-bit userland, e.g. to give linker slightly more memory.
- # Distinguish between different userland bitness by querying
- # the python binary.
- if host_arch == 'x64' and platform.architecture()[0] == '32bit':
- host_arch = 'ia32'
-
- return host_arch
-
-if __name__ == '__main__':
- sys.exit(main())
Index: build/standalone.gypi
diff --git a/build/standalone.gypi b/build/standalone.gypi
index
7952bdca90dd28bc83dc71a8d617745a9b55944f..7670e5bead5793efd6ef9fa7480fb2a619cd86d0
100644
--- a/build/standalone.gypi
+++ b/build/standalone.gypi
@@ -51,7 +51,13 @@
# Anything else gets passed through, which probably won't
work
# very well; such hosts should pass an explicit target_arch
# to gyp.
- 'host_arch%': '<!pymod_do_main(detect_v8_host_arch)',
+ 'host_arch%':
+ '<!(uname -m | sed -e "s/i.86/ia32/;\
+ s/x86_64/x64/;\
+ s/amd64/x64/;\
+ s/arm.*/arm/;\
+ s/aarch64/arm64/;\
+ s/mips.*/mipsel/")',
}, {
# OS!="linux" and OS!="freebsd" and OS!="openbsd" and
# OS!="netbsd" and OS!="mac"
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
