Reviewers: Benedikt Meurer,
Message:
PTAL
https://codereview.chromium.org/486123002/diff/1/build/android.gypi
File build/android.gypi (left):
https://codereview.chromium.org/486123002/diff/1/build/android.gypi#oldcode90
build/android.gypi:90: '-U__linux__', # Don't allow toolchain to claim
-D__linux__
Chrome common.gypi doesn't have line anymore.
Description:
Fix Android build.
BUG=v8:3506
Please review this at https://codereview.chromium.org/486123002/
SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge
Affected files (+2, -3 lines):
M build/android.gypi
M test/compiler-unittests/instruction-selector-unittest.h
Index: build/android.gypi
diff --git a/build/android.gypi b/build/android.gypi
index
46ece08524e8c7562d32bf375ebd8eca5ab0c5df..f984ea3af61b32b9728b58378eb6cb5c7d281d37
100644
--- a/build/android.gypi
+++ b/build/android.gypi
@@ -87,7 +87,6 @@
'-pthread', # Not supported by Android toolchain.
],
'cflags': [
- '-U__linux__', # Don't allow toolchain to claim -D__linux__
'-ffunction-sections',
'-funwind-tables',
'-fstack-protector',
Index: test/compiler-unittests/instruction-selector-unittest.h
diff --git a/test/compiler-unittests/instruction-selector-unittest.h
b/test/compiler-unittests/instruction-selector-unittest.h
index
5a4273fd1266d7e39b4d404540a0b5ba9ab861b9..124bc423578c9a8c50ebd5dcae7480ebcda8e86d
100644
--- a/test/compiler-unittests/instruction-selector-unittest.h
+++ b/test/compiler-unittests/instruction-selector-unittest.h
@@ -130,11 +130,11 @@ class InstructionSelectorTest : public CompilerTest {
ConstantMap::const_iterator i;
if (operand->IsConstant()) {
i = constants_.find(operand->index());
- EXPECT_NE(constants_.end(), i);
+ EXPECT_FALSE(constants_.end() == i);
} else {
EXPECT_EQ(InstructionOperand::IMMEDIATE, operand->kind());
i = immediates_.find(operand->index());
- EXPECT_NE(immediates_.end(), i);
+ EXPECT_FALSE(immediates_.end() == i);
}
EXPECT_EQ(operand->index(), i->first);
return i->second;
--
--
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.
