for each jit_apply_ macro add individual check if it's already defined

diff --git a/ChangeLog b/ChangeLog
index 4b69177b9195c1fb9d80115d9744e80e35968ec2..6598bce77bc0dbe377f5c84fd892aa289ae182e6 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -20,6 +20,8 @@
        override jit_builtin_apply.
        * jit/jit-apply-arm.c (_jit_create_indirector, _jit_pad_buffer): add
        functions.
+       * jit/jit-apply-func.h: for each jit_builtin_* macro add individual
+       check if it's already defined.
 
 2009-01-30  Peter Fristedt  <fristedt@gmail.com>
             Kirill Kononenko  <Kirill.Kononenko@gmail.com>

diff --git a/jit/jit-apply-func.h b/jit/jit-apply-func.h
index 707e2af1c5b820ff10c10e2396a1d33f2e22e229..0cf19262b72fe35cd66d6b1ef8ad9348b0721504 100644 (file)
--- a/jit/jit-apply-func.h
+++ b/jit/jit-apply-func.h
@@ -42,43 +42,53 @@
 #endif
 
 #if !defined(jit_builtin_apply)
-
 #define        jit_builtin_apply(func,args,size,return_float,return_buf)       \
                do { \
                        (return_buf) = __builtin_apply \
                                        ((void (*)())(func), (args), (size)); \
                } while (0)
+#endif
 
+#if !defined(jit_builtin_apply_args)
 #define        jit_builtin_apply_args(type,args)       \
                do { \
                        (args) = (type)__builtin_apply_args(); \
                } while (0)
+#endif
 
+#if !defined(jit_builtin_return_int)
 #define        jit_builtin_return_int(return_buf)      \
                do { \
                        __builtin_return((return_buf)); \
                } while (0)
+#endif
 
+#if !defined(jit_builtin_return_long)
 #define        jit_builtin_return_long(return_buf)     \
                do { \
                        __builtin_return((return_buf)); \
                } while (0)
+#endif
 
+#if !defined(jit_builtin_return_float)
 #define        jit_builtin_return_float(return_buf)    \
                do { \
                        __builtin_return((return_buf)); \
                } while (0)
+#endif
 
+#if !defined(jit_builtin_return_double)
 #define        jit_builtin_return_double(return_buf)   \
                do { \
                        __builtin_return((return_buf)); \
                } while (0)
+#endif
 
+#if !defined(jit_builtin_return_nfloat)
 #define        jit_builtin_return_nfloat(return_buf)   \
                do { \
                        __builtin_return((return_buf)); \
                } while (0)
-
 #endif
 
 /*