*** cln-1.1.8.orig/include/cln/modules.h	Sun Jun 27 21:44:41 2004
--- cln-1.1.8/include/cln/modules.h	Thu Aug 19 02:50:51 2004
***************
*** 85,91 ****
      #define CL_GLOBALIZE_LABEL(label)
    #endif
    #if defined(__rs6000__) || defined(_WIN32)
!     #define CL_GLOBALIZE_JUMP_LABEL(label)  CL_GLOBALIZE_LABEL(#label)
    #else
      #define CL_GLOBALIZE_JUMP_LABEL(label)
    #endif
--- 85,91 ----
      #define CL_GLOBALIZE_LABEL(label)
    #endif
    #if defined(__rs6000__) || defined(_WIN32)
!     #define CL_GLOBALIZE_JUMP_LABEL(label)  CL_GLOBALIZE_LABEL(ASM_UNDERSCORE_PREFIX #label)
    #else
      #define CL_GLOBALIZE_JUMP_LABEL(label)
    #endif
***************
*** 121,127 ****
      #define CL_JUMP_TO(addr)  ASM_VOLATILE("jmp %*%0" : : "rm" ((void*)(addr)))
    #endif
    #if defined(__x86_64__)
!     #define CL_JUMP_TO(addr)  ASM_VOLATILE("jmp " #addr)
    #endif
    #if defined(__m68k__)
      #define CL_JUMP_TO(addr)  ASM_VOLATILE("jmp %0@" : : "a" ((void*)(addr)))
--- 121,127 ----
      #define CL_JUMP_TO(addr)  ASM_VOLATILE("jmp %*%0" : : "rm" ((void*)(addr)))
    #endif
    #if defined(__x86_64__)
!     #define CL_JUMP_TO(addr)  ASM_VOLATILE("jmp " ASM_UNDERSCORE_PREFIX #addr)
    #endif
    #if defined(__m68k__)
      #define CL_JUMP_TO(addr)  ASM_VOLATILE("jmp %0@" : : "a" ((void*)(addr)))
***************
*** 137,150 ****
    #endif
    #if defined(__hppa__)
      //#define CL_JUMP_TO(addr)  ASM_VOLATILE("bv,n 0(%0)" : : "r" ((void*)(addr)))
!     #define CL_JUMP_TO(addr)  ASM_VOLATILE("b " #addr "\n\tnop")
    #endif
    #if defined(__arm__)
      #define CL_JUMP_TO(addr)  ASM_VOLATILE("mov pc,%0" : : "r" ((void*)(addr)))
    #endif
    #if defined(__rs6000__) || defined(__powerpc__) || defined(__ppc__)
      //#define CL_JUMP_TO(addr)  ASM_VOLATILE("mtctr %0\n\tbctr" : : "r" ((void*)(addr)))
!     #define CL_JUMP_TO(addr)  ASM_VOLATILE("b " #addr)
    #endif
    #if defined(__m88k__)
      #define CL_JUMP_TO(addr)  ASM_VOLATILE("jmp %0" : : "r" ((void*)(addr)))
--- 137,150 ----
    #endif
    #if defined(__hppa__)
      //#define CL_JUMP_TO(addr)  ASM_VOLATILE("bv,n 0(%0)" : : "r" ((void*)(addr)))
!     #define CL_JUMP_TO(addr)  ASM_VOLATILE("b " ASM_UNDERSCORE_PREFIX #addr "\n\tnop")
    #endif
    #if defined(__arm__)
      #define CL_JUMP_TO(addr)  ASM_VOLATILE("mov pc,%0" : : "r" ((void*)(addr)))
    #endif
    #if defined(__rs6000__) || defined(__powerpc__) || defined(__ppc__)
      //#define CL_JUMP_TO(addr)  ASM_VOLATILE("mtctr %0\n\tbctr" : : "r" ((void*)(addr)))
!     #define CL_JUMP_TO(addr)  ASM_VOLATILE("b " ASM_UNDERSCORE_PREFIX #addr)
    #endif
    #if defined(__m88k__)
      #define CL_JUMP_TO(addr)  ASM_VOLATILE("jmp %0" : : "r" ((void*)(addr)))
***************
*** 153,159 ****
      #define CL_JUMP_TO(addr)  ASM_VOLATILE("jmp (%0)" : : "r" ((void*)(addr)))
    #endif
    #if defined(__ia64__)
!     #define CL_JUMP_TO(addr)  ASM_VOLATILE("br " #addr)
    #endif
    #if defined(__s390__)
      #define CL_JUMP_TO(addr)  ASM_VOLATILE("br %0" : : "a" ((void*)(addr)))
--- 153,159 ----
      #define CL_JUMP_TO(addr)  ASM_VOLATILE("jmp (%0)" : : "r" ((void*)(addr)))
    #endif
    #if defined(__ia64__)
!     #define CL_JUMP_TO(addr)  ASM_VOLATILE("br " ASM_UNDERSCORE_PREFIX #addr)
    #endif
    #if defined(__s390__)
      #define CL_JUMP_TO(addr)  ASM_VOLATILE("br %0" : : "a" ((void*)(addr)))