Author: [email protected]
Date: Tue Mar 24 07:29:49 2009
New Revision: 1601
Modified:
branches/bleeding_edge/SConstruct
branches/bleeding_edge/src/d8.cc
branches/bleeding_edge/src/d8.h
Log:
Strcmp thinko and SConstruct improvement for d8 on Android.
Review URL: http://codereview.chromium.org/42560
Modified: branches/bleeding_edge/SConstruct
==============================================================================
--- branches/bleeding_edge/SConstruct (original)
+++ branches/bleeding_edge/SConstruct Tue Mar 24 07:29:49 2009
@@ -70,6 +70,17 @@
ANDROID_TOP + '/bionic/libm/include/arch/arm',
ANDROID_TOP + '/bionic/libthread_db/include']
+ANDROID_LINKFLAGS = ['-nostdlib',
+ '-Bdynamic',
+ '-Wl,-T,' + ANDROID_TOP + '/build/core/armelf.x',
+ '-Wl,-dynamic-linker,/system/bin/linker',
+ '-Wl,--gc-sections',
+ '-Wl,-z,nocopyreloc',
+ '-Wl,-rpath-link=' + ANDROID_TOP
+ '/out/target/product/generic/obj/lib',
+ ANDROID_TOP
+ '/out/target/product/generic/obj/lib/crtbegin_dynamic.o',
+ ANDROID_TOP
+
'/prebuilt/linux-x86/toolchain/arm-eabi-4.2.1/lib/gcc/arm-eabi/4.2.1/interwork/libgcc.a',
+ ANDROID_TOP
+ '/out/target/product/generic/obj/lib/crtend_android.o'];
+
LIBRARY_FLAGS = {
'all': {
'CPPDEFINES': ['ENABLE_LOGGING_AND_PROFILING']
@@ -306,16 +317,7 @@
'CCFLAGS': ANDROID_FLAGS,
'CPPPATH': ANDROID_INCLUDES,
'LIBPATH': [ANDROID_TOP + '/out/target/product/generic/obj/lib'],
- 'LINKFLAGS': ['-nostdlib',
- '-Bdynamic',
- '-Wl,-T,' + ANDROID_TOP + '/build/core/armelf.x',
- '-Wl,-dynamic-linker,/system/bin/linker',
- '-Wl,--gc-sections',
- '-Wl,-z,nocopyreloc',
- '-Wl,-rpath-link=' + ANDROID_TOP
+ '/out/target/product/generic/obj/lib',
- ANDROID_TOP
+ '/out/target/product/generic/obj/lib/crtbegin_dynamic.o',
- ANDROID_TOP
+
'/prebuilt/linux-x86/toolchain/arm-eabi-4.2.1/lib/gcc/arm-eabi/4.2.1/interwork/libgcc.a',
- ANDROID_TOP
+ '/out/target/product/generic/obj/lib/crtend_android.o'],
+ 'LINKFLAGS': ANDROID_LINKFLAGS,
'LIBS': ['c', 'stdc++', 'm'],
'mode:release': {
'CPPDEFINES': ['SK_RELEASE', 'NDEBUG']
@@ -385,6 +387,11 @@
},
'os:freebsd': {
'LIBS': ['pthread'],
+ },
+ 'os:android': {
+ 'LIBPATH': [ANDROID_TOP + '/out/target/product/generic/obj/lib'],
+ 'LINKFLAGS': ANDROID_LINKFLAGS,
+ 'LIBS': ['c', 'stdc++', 'm'],
},
'os:win32': {
'LIBS': ['winmm', 'ws2_32'],
Modified: branches/bleeding_edge/src/d8.cc
==============================================================================
--- branches/bleeding_edge/src/d8.cc (original)
+++ branches/bleeding_edge/src/d8.cc Tue Mar 24 07:29:49 2009
@@ -97,7 +97,7 @@
bool CounterMap::Match(void* key1, void* key2) {
const char* name1 = reinterpret_cast<const char*>(key1);
const char* name2 = reinterpret_cast<const char*>(key2);
- return strcmp(name1, name2) != 0;
+ return strcmp(name1, name2) == 0;
}
Modified: branches/bleeding_edge/src/d8.h
==============================================================================
--- branches/bleeding_edge/src/d8.h (original)
+++ branches/bleeding_edge/src/d8.h Tue Mar 24 07:29:49 2009
@@ -89,7 +89,8 @@
}
class Iterator {
public:
- Iterator(CounterMap* map): map_(&map->hash_map_),
entry_(map_->Start()) { }
+ explicit Iterator(CounterMap* map)
+ : map_(&map->hash_map_), entry_(map_->Start()) { }
void Next() { entry_ = map_->Next(entry_); }
bool More() { return entry_ != NULL; }
const char* CurrentKey() { return static_cast<const
char*>(entry_->key); }
--~--~---------~--~----~------------~-------~--~----~
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
-~----------~----~----~----~------~----~------~--~---
