[mirmince commits] {mirmince} branch master updated. cc491667cee3162e5181fcb99974a2276e075df1

[tg at freewrt.org]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Main git repository for FreeWRT project mirmince".

The branch, master has been updated
       via  cc491667cee3162e5181fcb99974a2276e075df1 (commit)
       via  090094bce771cc6ce8bad362508a83246ce79374 (commit)
      from  4de7ad02a319341ec238ff10d49cc5878a278ea7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit cc491667cee3162e5181fcb99974a2276e075df1
Author: Thorsten Glaser <tg at mirbsd.org>
Date:   Mon Jul 15 21:35:37 2013 +0000

    shave off another #ifdef

commit 090094bce771cc6ce8bad362508a83246ce79374
Author: Thorsten Glaser <tg at mirbsd.org>
Date:   Mon Jul 15 21:34:21 2013 +0000

    fixup __cdecl__ attribute usage (only really for i386/m68k)

-----------------------------------------------------------------------

Summary of changes:
 include/mirmince/asm.h |    4 ----
 md/amd64/asm.h         |    3 +++
 md/i386/asm.h          |   11 +++++++++++
 osdep/linux/asm.h      |    5 -----
 osdep/linux/i386/asm.h |    3 +++
 5 files changed, 17 insertions(+), 9 deletions(-)

diff --git a/include/mirmince/asm.h b/include/mirmince/asm.h
index 0d8bf8e..681e529 100644
--- a/include/mirmince/asm.h
+++ b/include/mirmince/asm.h
@@ -70,15 +70,11 @@
 
 #ifdef __GNUC__
 #define mirmince_bss		__attribute__((__section__ (".bss")))
-#define mirmince_cc_cdecl	__attribute__((__regparm__ (0), __cdecl__))
-#define mirmince_cc_regparm(x)	__attribute__((__regparm__ (x)))
 #define mirmince_dead		__attribute__((__noreturn__))
 #define mirmince_printf(x)	__attribute__((__printf__ x))
 #define mirmince_unused		__attribute__((__unused__))
 #else
 #define mirmince_bss
-#define mirmince_cc_cdecl	/* default */
-#define mirmince_cc_regparm(x)	/* not used */
 #define mirmince_dead
 #define mirmince_printf(x)
 #define mirmince_unused
diff --git a/md/amd64/asm.h b/md/amd64/asm.h
index d5f02d1..91f18a8 100644
--- a/md/amd64/asm.h
+++ b/md/amd64/asm.h
@@ -9,4 +9,7 @@
 #define _ALIGN_TEXT		.p2align 3,0x90
 #endif
 
+#define mirmince_cc_cdecl	/* not used */
+#define mirmince_cc_regparm(x)	/* default */
+
 #endif
diff --git a/md/i386/asm.h b/md/i386/asm.h
index 2cd2863..63726c5 100644
--- a/md/i386/asm.h
+++ b/md/i386/asm.h
@@ -9,6 +9,17 @@
 #define _ALIGN_TEXT		.p2align 2,0x90
 #endif
 
+#ifdef __GNUC__
+#define mirmince_cc_cdecl	__attribute__((__regparm__ (0), __cdecl__))
+#define mirmince_cc_regparm(x)	__attribute__((__regparm__ (x)))
+#else
+#define mirmince_cc_cdecl	/* default */
+#define mirmince_cc_regparm(x)	/* not used */
+#if defined(__mirmincE_use_regparm__) || defined(__mirmincE_use_rtd__)
+# error mirmince configured to use regparm/rtd needs GCC
+#endif
+#endif
+
 #ifdef __mirmincE_use_regparm__
 #define mirmince_cc_userspc	mirmince_cc_regparm(__mirmincE_use_regparm__)
 #endif
diff --git a/osdep/linux/asm.h b/osdep/linux/asm.h
index 62dc08b..81b5a9a 100644
--- a/osdep/linux/asm.h
+++ b/osdep/linux/asm.h
@@ -18,9 +18,4 @@
 #define SYSCALL5D		SYSCALLD
 #define SYSCALL6D		SYSCALLD
 
-#ifdef __mirmincE_arch_i386
-/* reset -mrtd but keep regparm */
-#define mirmince_cc_syscall	mirmince_cc_cdecl mirmince_cc_regparm(3)
-#endif
-
 #endif
diff --git a/osdep/linux/i386/asm.h b/osdep/linux/i386/asm.h
index 51427f2..68388b4 100644
--- a/osdep/linux/i386/asm.h
+++ b/osdep/linux/i386/asm.h
@@ -1,6 +1,9 @@
 #ifndef MIRMINCE_OSDEP_LINUX_I386_ASM_H
 #define MIRMINCE_OSDEP_LINUX_I386_ASM_H
 
+/* reset -mrtd but keep regparm */
+#define mirmince_cc_syscall	mirmince_cc_cdecl mirmince_cc_regparm(3)
+
 #define SYSCALLB(cname,kname)			\
 		.globl	_mince_syscall;		\
 	ENTRY(cname)				\


hooks/post-receive
-- 
Main git repository for FreeWRT project mirmince
(FreeWRT project mirmince repository mirmince)