Bug 1105766 - Part 2: A couple of additions to enable compilation on Windows Phone 8. r=terrence r=ehoogeveen
authorMaksim Lebedev <alessarik@gmail.com>
Sat, 21 Mar 2015 15:24:00 +0100
changeset 235042 0e6a3b389227a489228e0d2f3d87d31cf4538427
parent 235041 cf9b6a1d22a4dda97c89f44cf7736bb2819584db
child 235043 a80cf2d5395414920b1f5c8aef837aad85111e2b
push id57310
push usercbook@mozilla.com
push dateMon, 23 Mar 2015 10:13:55 +0000
treeherdermozilla-inbound@0e6a3b389227 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersterrence, ehoogeveen
bugs1105766
milestone39.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1105766 - Part 2: A couple of additions to enable compilation on Windows Phone 8. r=terrence r=ehoogeveen
js/src/jsnativestack.cpp
mfbt/Endian.h
--- a/js/src/jsnativestack.cpp
+++ b/js/src/jsnativestack.cpp
@@ -42,16 +42,20 @@ js::GetNativeStackBaseImpl()
         MOV pTib, EAX
     }
     return static_cast<void*>(pTib->StackBase);
 
 # elif defined(_M_X64)
     PNT_TIB64 pTib = reinterpret_cast<PNT_TIB64>(NtCurrentTeb());
     return reinterpret_cast<void*>(pTib->StackBase);
 
+# elif defined(_M_ARM)
+    PNT_TIB pTib = reinterpret_cast<PNT_TIB>(NtCurrentTeb());
+    return static_cast<void*>(pTib->StackBase);
+
 # elif defined(_WIN32) && defined(__GNUC__)
     NT_TIB* pTib;
     asm ("movl %%fs:0x18, %0\n" : "=r" (pTib));
     return static_cast<void*>(pTib->StackBase);
 
 # endif
 }
 
--- a/mfbt/Endian.h
+++ b/mfbt/Endian.h
@@ -84,16 +84,18 @@
 #  if defined(_M_X64) || defined(_M_AMD64) || defined(_AMD64_)
 #    define MOZ_LITTLE_ENDIAN 1
 #  else
 #    error "CPU type is unknown"
 #  endif
 #elif defined(_WIN32)
 #  if defined(_M_IX86)
 #    define MOZ_LITTLE_ENDIAN 1
+#  elif defined(_M_ARM)
+#    define MOZ_LITTLE_ENDIAN 1
 #  else
 #    error "CPU type is unknown"
 #  endif
 #elif defined(__APPLE__) || defined(__powerpc__) || defined(__ppc__)
 #  if __LITTLE_ENDIAN__
 #    define MOZ_LITTLE_ENDIAN 1
 #  elif __BIG_ENDIAN__
 #    define MOZ_BIG_ENDIAN 1