patches/patch-bm

   1 $NetBSD: patch-bm,v 1.1.1.1 2008/06/28 10:01:07 tnn Exp $
   2
   3 diff -ruN ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp
   4 --- ../Orig/mozilla/xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp  2004-04-18 23:18:18.000000000 +0900
   5 +++ ./xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp        2005-12-04 19:17:13.000000000 +0900
   6 @@ -118,18 +118,23 @@
   7   * so they are contiguous with values passed on the stack, and then calls
   8   * PrepareAndDispatch() to do the dirty work.
   9   */
  10 +#ifndef        __ELF__
  11 +#define        SYMBOLPREFIX    "_"
  12 +#else
  13 +#define        SYMBOLPREFIX
  14 +#endif
  15
  16  #define STUB_ENTRY(n)                                                  \
  17  __asm__(                                                               \
  18 -    ".global   _Stub"#n"__14nsXPTCStubBase\n\t"                        \
  19 -"_Stub"#n"__14nsXPTCStubBase:\n\t"                                     \
  20 +    ".global   "SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase\n\t"           \
  21 +SYMBOLPREFIX"Stub"#n"__14nsXPTCStubBase:\n\t"                          \
  22      "stmfd     sp!, {r1, r2, r3}       \n\t"                           \
  23      "mov       ip, sp                  \n\t"                           \
  24      "stmfd     sp!, {fp, ip, lr, pc}   \n\t"                           \
  25      "sub       fp, ip, #4              \n\t"                           \
  26      "mov       r1, #"#n"               \n\t"    /* = methodIndex       */ \
  27      "add       r2, sp, #16             \n\t"                           \
  28 -    "bl                _PrepareAndDispatch__FP14nsXPTCStubBaseUiPUi   \n\t"    \
  29 +    "bl                "SYMBOLPREFIX"PrepareAndDispatch__FP14nsXPTCStubBaseUiPUi   \n\t"       \
  30      "ldmea     fp, {fp, sp, lr}        \n\t"                           \
  31      "add       sp, sp, #12             \n\t"                           \
  32      "mov       pc, lr                  \n\t"                           \