Changeset 66112 in vbox

Timestamp:

Mar 15, 2017 2:28:43 PM (8 years ago)

Author:

vboxsync

Message:

bs3kit: Override DECLASM for 64-bit GCC targets to ensure we use the same calling convention as when we do the assembling (ASM_CALL64_MSC).

File:

• trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h (modified) (1 diff)

trunk/src/VBox/ValidationKit/bootsectors/bs3kit/bs3kit.h

@@ -36 +36 @@
 #ifndef DOXYGEN_RUNNING
 # undef  IN_RING0
+#endif
+
+/*
+ * Make asm.h and friend compatible with our 64-bit assembly config (ASM_CALL64_MSC).
+ */
+#if defined(__GNUC__) && ARCH_BITS == 64
+# undef DECLASM
+# ifdef __cplusplus
+#  define DECLASM(type)             extern "C" type BS3_CALL
+# else
+#  define DECLASM(type)             type BS3_CALL
+# endif
 #endif