Module Name:    src
Committed By:   joerg
Date:           Mon Dec  8 20:50:11 UTC 2014

Modified Files:
        src/sys/sys: cdefs_elf.h

Log Message:
Add macro to mark a symbol as weak. Use it to mark the end of a linker
set as empty linker set otherwise violate the aliasing rules of C by
presenting zero sized objects.


To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 src/sys/sys/cdefs_elf.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/sys/sys/cdefs_elf.h
diff -u src/sys/sys/cdefs_elf.h:1.46 src/sys/sys/cdefs_elf.h:1.47
--- src/sys/sys/cdefs_elf.h:1.46	Tue Aug 26 09:03:17 2014
+++ src/sys/sys/cdefs_elf.h	Mon Dec  8 20:50:11 2014
@@ -1,4 +1,4 @@
-/*	$NetBSD: cdefs_elf.h,v 1.46 2014/08/26 09:03:17 christos Exp $	*/
+/*	$NetBSD: cdefs_elf.h,v 1.47 2014/12/08 20:50:11 joerg Exp $	*/
 
 /*
  * Copyright (c) 1995, 1996 Carnegie-Mellon University.
@@ -65,6 +65,12 @@
     __asm(".weak " _C_LABEL_STRING(#sym));
 
 #if __GNUC_PREREQ__(4, 0)
+#define	__weak	__attribute__((__weak__))
+#else
+#define	__weak
+#endif
+
+#if __GNUC_PREREQ__(4, 0)
 #define	__weak_reference(sym)	__attribute__((__weakref__(#sym)))
 #else
 #define	__weak_reference(sym)	; __asm(".weak " _C_LABEL_STRING(#sym))
@@ -169,7 +175,7 @@
 
 #define	__link_set_decl(set, ptype)					\
 	extern ptype * const __link_set_start(set)[] __dso_hidden;	\
-	extern ptype * const __link_set_end(set)[] __dso_hidden
+	extern ptype * const __link_set_end(set)[] __weak __dso_hidden
 
 #define	__link_set_count(set)						\
 	(__link_set_end(set) - __link_set_start(set))

Reply via email to