Back out 78a8aeae5b30 (bug 696291) for Android build bustage
authorPhil Ringnalda <philringnalda@gmail.com>
Wed, 18 Jan 2012 20:36:59 -0800
changeset 86085 79b026da30f0a730b0afeec8a8e2fcca53dc306b
parent 86084 d4c6be1f2db47068efff2afe75cc75c117f14e3c
child 86086 e190ab5f22406055898c48248a2b6c671a839ada
push id805
push userakeybl@mozilla.com
push dateWed, 01 Feb 2012 18:17:35 +0000
treeherdermozilla-aurora@6fb3bf232436 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs696291
milestone12.0a1
backs out78a8aeae5b30f3c7cb7768bfae2645bf75743212
Back out 78a8aeae5b30 (bug 696291) for Android build bustage
js/src/assembler/assembler/MacroAssemblerARM.cpp
--- a/js/src/assembler/assembler/MacroAssemblerARM.cpp
+++ b/js/src/assembler/assembler/MacroAssemblerARM.cpp
@@ -51,17 +51,17 @@
 #endif
 
 #endif
 
 namespace JSC {
 
 static bool isVFPPresent()
 {
-#if WTF_OS_LINUX || WTF_OS_ANDROID
+#if WTF_PLATFORM_LINUX
     int fd = open("/proc/self/auxv", O_RDONLY);
     if (fd > 0) {
         Elf32_auxv_t aux;
         while (read(fd, &aux, sizeof(Elf32_auxv_t))) {
             if (aux.a_type == AT_HWCAP) {
                 close(fd);
                 return aux.a_un.a_val & HWCAP_VFP;
             }