Add explicit sysv_abi on amd64 asm routines.

diff --git a/ChangeLog b/ChangeLog
index 9548d982e96d8150879f1e10c7f13b4bd8e52876..63e63f9ad768a85faa3376fb56b853e3f2df6144 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2013-12-15  Vladimir Serbinenko  <phcoder@gmail.com>
+
+       Add explicit sysv_abi on amd64 asm routines.
+
 2013-12-15  Vladimir Serbinenko  <phcoder@gmail.com>
 
        * grub-core/commands/efi/lsefisystab.c: Use %lld to show

diff --git a/include/grub/x86_64/setjmp.h b/include/grub/x86_64/setjmp.h
index e9f2bac8e2c1d687e798129f779dd14553345427..b8f44cf29ac3c583bf6f5c58a0fa8c82a6a5ea65 100644 (file)
--- a/include/grub/x86_64/setjmp.h
+++ b/include/grub/x86_64/setjmp.h
@@ -21,7 +21,7 @@
 
 typedef unsigned long grub_jmp_buf[8];
 
-int grub_setjmp (grub_jmp_buf env) RETURNS_TWICE;
-void grub_longjmp (grub_jmp_buf env, int val) __attribute__ ((noreturn));
+int grub_setjmp (grub_jmp_buf env) RETURNS_TWICE __attribute__ ((sysv_abi));
+void grub_longjmp (grub_jmp_buf env, int val) __attribute__ ((noreturn,sysv_abi));
 
 #endif /* ! GRUB_SETJMP_CPU_HEADER */

diff --git a/include/grub/x86_64/xen/hypercall.h b/include/grub/x86_64/xen/hypercall.h
index 780db4d611524558255337e8a3f9288b1b1ceb2a..ad89d6c62874bb8d50133bf8a49e78d78da1c248 100644 (file)
--- a/include/grub/x86_64/xen/hypercall.h
+++ b/include/grub/x86_64/xen/hypercall.h
@@ -19,16 +19,16 @@
 #ifndef GRUB_XEN_CPU_HYPERCALL_HEADER
 #define GRUB_XEN_CPU_HYPERCALL_HEADER 1
 
-int EXPORT_FUNC (grub_xen_sched_op) (int cmd, void *arg);
-int grub_xen_update_va_mapping (void *addr, uint64_t pte, uint64_t flags);
-int grub_xen_event_channel_op (int op, void *arg);
+int EXPORT_FUNC (grub_xen_sched_op) (int cmd, void *arg) __attribute__ ((sysv_abi));
+int grub_xen_update_va_mapping (void *addr, uint64_t pte, uint64_t flags) __attribute__ ((sysv_abi));
+int grub_xen_event_channel_op (int op, void *arg) __attribute__ ((sysv_abi));
 
 int grub_xen_mmuext_op (mmuext_op_t * ops,
                        unsigned int count,
-                       unsigned int *pdone, unsigned int foreigndom);
+                       unsigned int *pdone, unsigned int foreigndom) __attribute__ ((sysv_abi));
 int EXPORT_FUNC (grub_xen_mmu_update) (const struct mmu_update * reqs,
                                       unsigned count, unsigned *done_out,
-                                      unsigned foreigndom);
-int EXPORT_FUNC (grub_xen_grant_table_op) (int, void *, int);
+                                      unsigned foreigndom) __attribute__ ((sysv_abi));
+int EXPORT_FUNC (grub_xen_grant_table_op) (int, void *, int) __attribute__ ((sysv_abi));
 
 #endif