Bug 796927 - XPCOM build fix, followup for b777292. r=siarhei.siamashka@gmail.com
authorOleg Romashin <romaxa@gmail.com>
Sat, 06 Oct 2012 14:00:47 -0700
changeset 109548 0bea829361c3e1858b4972ad26eec8087c0748c5
parent 109547 a5551c001a2110aed561416b16f6823d0ee0f1b6
child 109549 13fd1d18cdf445819cbd23459f49106a498758a9
push id23632
push userphilringnalda@gmail.com
push dateSun, 07 Oct 2012 19:14:37 +0000
treeherdermozilla-central@83d38854c21e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerssiarhei.siamashka
bugs796927
milestone18.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 796927 - XPCOM build fix, followup for b777292. r=siarhei.siamashka@gmail.com
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
--- a/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
+++ b/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
@@ -346,17 +346,17 @@ typedef uint32_t (*vtable_func)(nsISuppo
 EXPORT_XPCOM_API(nsresult)
 NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
                    uint32_t paramCount, nsXPTCVariant* params)
 {
   vtable_func *vtable = *reinterpret_cast<vtable_func **>(that);
   vtable_func func = vtable[methodIndex];
   // 'register uint32_t result asm("r0")' could be used here, but it does not
   //  seem to be reliable in all cases: http://gcc.gnu.org/PR46164
-  uint32_t result;
+  nsresult result;
   asm (
     "mov    r3, sp\n"
     "mov    %[stack_space_size], %[param_count_plus_2], lsl #3\n"
     "tst    r3, #4\n" /* check stack alignment */
 
     "add    %[stack_space_size], #(4 * 16)\n" /* space for VFP registers */
     "mov    r3, %[params]\n"