[mirmince commits] {mirmince} branch master updated. 4bb2adde467c616ed9ee84c371ad28f2bea600bc
tg at freewrt.org
tg at freewrt.org
Wed Jan 30 20:38:51 UTC 2013
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 4bb2adde467c616ed9ee84c371ad28f2bea600bc (commit)
via d3c441e1fe7a56cf230421dec45028eaa87e90cb (commit)
from 62fdbe9ee8c37e27ed539b8746d6b5e87fbcf88f (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 4bb2adde467c616ed9ee84c371ad28f2bea600bc
Author: Thorsten Glaser <tg at mirbsd.org>
Date: Wed Jan 30 20:38:23 2013 +0000
simplify some checks and definitions by always assuming an ELF target
bsiegert at mb.o agrees that this is reasonable, right now,
and it somewhat matches the five designated target systems
I currently have in mind, too…
commit d3c441e1fe7a56cf230421dec45028eaa87e90cb
Author: Thorsten Glaser <tg at mirbsd.org>
Date: Wed Jan 30 20:32:52 2013 +0000
fix typo in comment
-----------------------------------------------------------------------
Summary of changes:
include/mirmince/asm.h | 30 +++++++-----------------------
include/mirmince/c.h | 7 ++++++-
md/i386/asm.h | 2 +-
osdep/linux/asm.h | 4 ----
osdep/linux/c.h | 4 ----
osdep/mirbsd/asm.h | 4 ----
osdep/mirbsd/c.h | 4 ----
7 files changed, 14 insertions(+), 41 deletions(-)
diff --git a/include/mirmince/asm.h b/include/mirmince/asm.h
index f510e3b..c39c298 100644
--- a/include/mirmince/asm.h
+++ b/include/mirmince/asm.h
@@ -1,3 +1,7 @@
+#ifndef __ELF__
+# error mirmince currently requires an ELF platform
+#else
+
#ifndef MIRMINCE_ASM_H
#define MIRMINCE_ASM_H
@@ -17,41 +21,20 @@
#include mirmince_hdr_osdep(asm.h)
#include mirmince_hdr_osmd(asm.h)
-#ifndef MIRMINCE_ASM_USCORES
-#ifdef __ELF__
-#define MIRMINCE_ASM_USCORES 0
-#else
-#define MIRMINCE_ASM_USCORES 1
-#endif
-#endif
-
-#if MIRMINCE_ASM_USCORES
-#define _C_LABEL(x) _ ## x
-#else
+/* prefix an underscore on some platforms, like a.out */
#define _C_LABEL(x) x
-#endif
#ifndef _FTYPE
-#ifdef __ELF__
#define _FTYPE(x) .type x, at function
#define _OTYPE(x) .type x, at object
-#else
-#define _FTYPE(x) /* nothing */
-#define _OTYPE(x) /* nothing */
-#endif
#endif
#ifndef _TEXT
#define _TEXT .text
#define _DATA .data
#define _BSS .bss
-#ifdef __ELF__
#define _RODATA .section .rodata
#define _COMMENT .section .comment
-#else
-#define _RODATA .text
-#define _COMMENT .text
-#endif
#endif
#ifndef _ALIGN_DATA
@@ -70,4 +53,5 @@
#define END(x) ENDSYM(_C_LABEL(x))
#define EXTRN(x) .globl _C_LABEL(x)
-#endif
+#endif /* !MIRMINCE_ASM_H */
+#endif /* ELF */
diff --git a/include/mirmince/c.h b/include/mirmince/c.h
index 1a3c445..d3e007b 100644
--- a/include/mirmince/c.h
+++ b/include/mirmince/c.h
@@ -1,3 +1,7 @@
+#ifndef __ELF__
+# error mirmince currently requires an ELF platform
+#else
+
#ifndef MIRMINCE_C_H
#define MIRMINCE_C_H
@@ -72,4 +76,5 @@ typedef signed short mirmince_s16;
typedef signed int mirmince_s32;
typedef signed long long mirmince_s64;
-#endif
+#endif /* !MIRMINCE_C_H */
+#endif /* ELF */
diff --git a/md/i386/asm.h b/md/i386/asm.h
index 554473b..d1c3474 100644
--- a/md/i386/asm.h
+++ b/md/i386/asm.h
@@ -10,7 +10,7 @@
#endif
#ifdef notdef
-/* we do not need this, reallt, on x86 */
+/* we do not need this, really, on x86 */
#define _ALIGN_DATA(x) .balign x,0
#endif
diff --git a/osdep/linux/asm.h b/osdep/linux/asm.h
index a68ae81..81b5a9a 100644
--- a/osdep/linux/asm.h
+++ b/osdep/linux/asm.h
@@ -1,10 +1,6 @@
#ifndef MIRMINCE_OSDEP_LINUX_ASM_H
#define MIRMINCE_OSDEP_LINUX_ASM_H
-#ifndef __ELF__
-#error we always use ELF on Linux
-#endif
-
#define SYSCALLVB SYSCALLB
#define SYSCALL0B SYSCALLB
#define SYSCALL1B SYSCALLB
diff --git a/osdep/linux/c.h b/osdep/linux/c.h
index 3b62fba..e08be80 100644
--- a/osdep/linux/c.h
+++ b/osdep/linux/c.h
@@ -1,10 +1,6 @@
#ifndef MIRMINCE_OSDEP_LINUX_C_H
#define MIRMINCE_OSDEP_LINUX_C_H
-#ifndef __ELF__
-#error we always use ELF on Linux
-#endif
-
#ifdef __mirmincE_arch_i386
/* reset -mrtd but keep regparm */
#define mirmince_cc_syscall mirmince_cc_cdecl mirmince_cc_regparm(3)
diff --git a/osdep/mirbsd/asm.h b/osdep/mirbsd/asm.h
index 8f4c451..11498d0 100644
--- a/osdep/mirbsd/asm.h
+++ b/osdep/mirbsd/asm.h
@@ -1,10 +1,6 @@
#ifndef MIRMINCE_OSDEP_MIRBSD_ASM_H
#define MIRMINCE_OSDEP_MIRBSD_ASM_H
-#ifndef __ELF__
-#error we always use ELF on MirBSD
-#endif
-
#define SYSCALLVB SYSCALLB
#define SYSCALL0B SYSCALLB
#define SYSCALL1B SYSCALLB
diff --git a/osdep/mirbsd/c.h b/osdep/mirbsd/c.h
index c616670..45ec6d9 100644
--- a/osdep/mirbsd/c.h
+++ b/osdep/mirbsd/c.h
@@ -1,10 +1,6 @@
#ifndef MIRMINCE_OSDEP_MIRBSD_C_H
#define MIRMINCE_OSDEP_MIRBSD_C_H
-#ifndef __ELF__
-#error we always use ELF on MirBSD
-#endif
-
#define MIRMINCE_UT_MODE_T mirmince_u32
#endif
hooks/post-receive
--
Main git repository for FreeWRT project mirmince
(FreeWRT project mirmince repository mirmince)
More information about the Mirmince-commits
mailing list