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

[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  b21c1be6c86925d6e46d3a27f81ebc29394090da (commit)
       via  927189b5720b4b7013f2d24f9f9ac9d634a605e0 (commit)
      from  c3561e3b9a91bf29160bef60cc7cfd0f81c16fe4 (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 b21c1be6c86925d6e46d3a27f81ebc29394090da
Author: Thorsten Glaser <tg at mirbsd.org>
Date:   Fri Jun 14 22:45:29 2013 +0000

    add safeguard to ensure MirMinze compiled files require it for linking
    
    this is similar to the trick employed by Felix von Leitner’s dietlibc;
    thanks for the inspiration!

commit 927189b5720b4b7013f2d24f9f9ac9d634a605e0
Author: Thorsten Glaser <tg at mirbsd.org>
Date:   Fri Jun 14 22:45:21 2013 +0000

    add __STRING from BSD <sys/cdefs.h> and __STRINGIND for cpp macros

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

Summary of changes:
 include/mirmince/asm.h |   38 ++++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/include/mirmince/asm.h b/include/mirmince/asm.h
index ce33aa8..6c4b6b1 100644
--- a/include/mirmince/asm.h
+++ b/include/mirmince/asm.h
@@ -5,6 +5,9 @@
 #ifndef MIRMINCE_ASM_H
 #define MIRMINCE_ASM_H
 
+#define __STRING(x)		#x
+#define __STRINGIND(x)		__STRING(x)
+
 #ifndef mirmince_hdr_PFX
 #ifdef __mirmincE_bootstrap
 #define mirmince_hdr_PFX
@@ -53,6 +56,12 @@
 #define END(x)			ENDSYM(_C_LABEL(x))
 #define EXTRN(x)		.globl _C_LABEL(x)
 
+#ifdef __LP64__
+#define ASPTR			.quad
+#else
+#define ASPTR			.long
+#endif
+
 #ifndef __ASSEMBLER__
 
 #ifdef __cplusplus
@@ -112,5 +121,34 @@ typedef signed long long mirmince_s64;
 
 #endif /* !__ASSEMBLER__ */
 
+#ifndef MIRMINCE_SAFEGUARD_NOTE
+#define MIRMINCE_SAFEGUARD_NOTE
+
+#ifdef __ASSEMBLER__
+	.section .note
+	.p2align 2
+	.long	2f-1f				/* name size */
+	.long	4f-3f				/* desc size */
+	.long	0				/* type (safeguard note) */
+1:	.asciz	"MirMinze"			/* name */
+2:	.p2align 2
+3:	ASPTR	_C_LABEL(_mince_csu_init)	/* desc */
+4:	.p2align 2
+	.previous
+#else
+__asm__(".section .note"
+"\n	.p2align 2"
+"\n	.long	2f-1f"				/* name size */
+"\n	.long	4f-3f"				/* desc size */
+"\n	.long	0"				/* type (safeguard note) */
+"\n1:	.asciz	\"MirMinze\""			/* name */
+"\n2:	.p2align 2"
+"\n3:	" __STRINGIND(ASPTR) "\t" \
+	    __STRINGIND(_C_LABEL(_mince_csu_init))	/* desc */
+"\n4:	.p2align 2"
+"\n	.previous");
+#endif
+#endif /* !MIRMINCE_SAFEGUARD_NOTE */
+
 #endif /* !MIRMINCE_ASM_H */
 #endif /* ELF */


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