[dotgnu-pnet-commits] libjit ChangeLog jit/jit-apply-x86.h tools/gen-...

[Aleksey Demakov]

CVSROOT:        /sources/dotgnu-pnet
Module name:    libjit
Changes by:     Aleksey Demakov <avd>   08/11/23 09:15:26

Modified files:
        .              : ChangeLog 
        jit            : jit-apply-x86.h 
        tools          : gen-apply-macosx.h gen-apply.c 

Log message:
        Mac OS X compatibility fixes

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/libjit/ChangeLog?cvsroot=dotgnu-pnet&r1=1.392&r2=1.393
http://cvs.savannah.gnu.org/viewcvs/libjit/jit/jit-apply-x86.h?cvsroot=dotgnu-pnet&r1=1.7&r2=1.8
http://cvs.savannah.gnu.org/viewcvs/libjit/tools/gen-apply-macosx.h?cvsroot=dotgnu-pnet&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/libjit/tools/gen-apply.c?cvsroot=dotgnu-pnet&r1=1.19&r2=1.20

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/dotgnu-pnet/libjit/ChangeLog,v
retrieving revision 1.392
retrieving revision 1.393
diff -u -b -r1.392 -r1.393
--- ChangeLog   4 Nov 2008 19:49:12 -0000       1.392
+++ ChangeLog   23 Nov 2008 09:15:24 -0000      1.393
@@ -1,3 +1,8 @@
+2008-11-23  Arto Bendiken <address@hidden>
+
+       * jit/jit-apply-x86.h, tools/gen-apply.c, tools/gen-apply-macosx.h:
+       Mac OS X compatibility fixes.
+
 2008-11-04  Klaus Treichel  <address@hidden>
 
        * jit/jit-apply-x86-64.h (jit_builtin_apply): Use r11 for calling

Index: jit/jit-apply-x86.h
===================================================================
RCS file: /sources/dotgnu-pnet/libjit/jit/jit-apply-x86.h,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- jit/jit-apply-x86.h 26 May 2008 21:06:30 -0000      1.7
+++ jit/jit-apply-x86.h 23 Nov 2008 09:15:25 -0000      1.8
@@ -37,6 +37,16 @@
 #if !defined(__CYGWIN__) && !defined(__CYGWIN32__) && \
        !defined(_WIN32) && !defined(WIN32)
 
+/* Mac OS X prefixes static symbols with an underscore, and external symbol
+   references are late-bound through a PIC stub by the dynamic linker */
+#ifndef JIT_MEMCPY
+# if defined(__APPLE__) && defined(__MACH__)
+#  define JIT_MEMCPY "L_memcpy$stub"
+# else
+#  define JIT_MEMCPY "memcpy"
+# endif
+#endif
+
 #define        jit_builtin_apply(func,args,size,return_float,return_buf)       
\
                do { \
                        void *__func = (void *)(func); \
@@ -54,7 +64,7 @@
                                "pushl %2\n\t" \
                                "pushl %%ecx\n\t" \
                                "pushl %%eax\n\t" \
-                               "call memcpy\n\t" \
+                               "call " JIT_MEMCPY "\n\t" \
                                "addl $12, %%esp\n\t" \
                                "movl %1, %%ecx\n\t" \
                                "movl %0, %%eax\n\t" \

Index: tools/gen-apply-macosx.h
===================================================================
RCS file: /sources/dotgnu-pnet/libjit/tools/gen-apply-macosx.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- tools/gen-apply-macosx.h    24 Jan 2008 20:12:55 -0000      1.2
+++ tools/gen-apply-macosx.h    23 Nov 2008 09:15:25 -0000      1.3
@@ -62,6 +62,13 @@
 #define JIT_APPLY_X86_POP_STRUCT_RETURN 0
 #define JIT_APPLY_PAD_FLOAT_REGS 1
 
+#define JIT_APPLY_NUM_DOUBLE_REGS 0
+#define JIT_APPLY_NUM_NFLOAT_REGS 0
+#define JIT_APPLY_DOUBLES_IN_WORD_REGS 0
+#define JIT_APPLY_NFLOATS_IN_WORD_REGS 0
+#define JIT_APPLY_RETURN_DOUBLES_AFTER 0
+#define JIT_APPLY_RETURN_NFLOATS_AFTER 0
+
 #ifdef __cplusplus
 };
 #endif

Index: tools/gen-apply.c
===================================================================
RCS file: /sources/dotgnu-pnet/libjit/tools/gen-apply.c,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- tools/gen-apply.c   7 Aug 2008 12:51:48 -0000       1.19
+++ tools/gen-apply.c   23 Nov 2008 09:15:25 -0000      1.20
@@ -22,7 +22,13 @@
 
 #include <jit/jit-arch.h>
 #include <jit/jit-defs.h>
-#define        JIT_MEMCPY              "mem_copy"
+
+#if defined(__APPLE__) && defined(__MACH__)
+# define       JIT_MEMCPY      "_mem_copy"
+#else
+# define       JIT_MEMCPY      "mem_copy"
+#endif
+
 #include "jit-apply-func.h"
 #include <stdio.h>
 #include <config.h>