Module Name: src
Committed By: skrll
Date: Tue Nov 10 14:47:53 UTC 2009
Modified Files:
src/external/gpl3/binutils/usr.bin/ld: Makefile
src/share/mk: bsd.kmodule.mk
src/sys/modules: Makefile
Added Files:
src/sys/modules/xldscripts: Makefile kmodule
Removed Files:
src/external/gpl3/binutils/usr.bin/ld/xldscripts: Makefile kmodule
Log Message:
Move the kmodule linker script source into sys/modules/xldscripts. It is
not part of binutils and definitely not GPL v3.
Discussed with mrg.
To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 src/external/gpl3/binutils/usr.bin/ld/Makefile
cvs rdiff -u -r1.1 -r0 \
src/external/gpl3/binutils/usr.bin/ld/xldscripts/Makefile \
src/external/gpl3/binutils/usr.bin/ld/xldscripts/kmodule
cvs rdiff -u -r1.20 -r1.21 src/share/mk/bsd.kmodule.mk
cvs rdiff -u -r1.34 -r1.35 src/sys/modules/Makefile
cvs rdiff -u -r0 -r1.1 src/sys/modules/xldscripts/Makefile \
src/sys/modules/xldscripts/kmodule
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/binutils/usr.bin/ld/Makefile
diff -u src/external/gpl3/binutils/usr.bin/ld/Makefile:1.4 src/external/gpl3/binutils/usr.bin/ld/Makefile:1.5
--- src/external/gpl3/binutils/usr.bin/ld/Makefile:1.4 Tue Nov 10 10:24:50 2009
+++ src/external/gpl3/binutils/usr.bin/ld/Makefile Tue Nov 10 14:47:52 2009
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.4 2009/11/10 10:24:50 skrll Exp $
+# $NetBSD: Makefile,v 1.5 2009/11/10 14:47:52 skrll Exp $
.include <bsd.own.mk>
-SUBDIR= xldscripts
-
TOP= ${NETBSDSRCDIR}/external/gpl3/binutils
.include "${.CURDIR}/../common/Makefile.inc"
Index: src/share/mk/bsd.kmodule.mk
diff -u src/share/mk/bsd.kmodule.mk:1.20 src/share/mk/bsd.kmodule.mk:1.21
--- src/share/mk/bsd.kmodule.mk:1.20 Sun Nov 8 22:27:09 2009
+++ src/share/mk/bsd.kmodule.mk Tue Nov 10 14:47:52 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.kmodule.mk,v 1.20 2009/11/08 22:27:09 skrll Exp $
+# $NetBSD: bsd.kmodule.mk,v 1.21 2009/11/10 14:47:52 skrll Exp $
# We are not building this with PIE
MKPIE=no
@@ -27,8 +27,8 @@
DPSRCS+= ${_YKMSRCS}
CLEANFILES+= ${_YKMSRCS}
-.if exists($S/../external/gpl3/binutils/usr.bin/ld/xldscripts/kmodule)
-KMODSCRIPT= $S/../external/gpl3/binutils/usr.bin/ld/xldscripts/kmodule
+.if exists($S/../sys/modules/xldscripts/kmodule)
+KMODSCRIPT= $S/../sys/modules/xldscripts/kmodule
.else
KMODSCRIPT= ${DESTDIR}/usr/libdata/ldscripts/kmodule
.endif
Index: src/sys/modules/Makefile
diff -u src/sys/modules/Makefile:1.34 src/sys/modules/Makefile:1.35
--- src/sys/modules/Makefile:1.34 Mon Oct 5 22:32:58 2009
+++ src/sys/modules/Makefile Tue Nov 10 14:47:52 2009
@@ -1,8 +1,9 @@
-# $NetBSD: Makefile,v 1.34 2009/10/05 22:32:58 haad Exp $
+# $NetBSD: Makefile,v 1.35 2009/11/10 14:47:52 skrll Exp $
# For all platforms
-SUBDIR= accf_dataready
+SUBDIR= xldscripts
+SUBDIR+= accf_dataready
SUBDIR+= accf_httpready
SUBDIR+= adosfs
SUBDIR+= aio
Added files:
Index: src/sys/modules/xldscripts/Makefile
diff -u /dev/null src/sys/modules/xldscripts/Makefile:1.1
--- /dev/null Tue Nov 10 14:47:53 2009
+++ src/sys/modules/xldscripts/Makefile Tue Nov 10 14:47:52 2009
@@ -0,0 +1,8 @@
+# $NetBSD: Makefile,v 1.1 2009/11/10 14:47:52 skrll Exp $
+
+NOOBJ= # defined
+
+FILES= kmodule
+FILESDIR=/usr/libdata/ldscripts
+
+.include <bsd.prog.mk>
Index: src/sys/modules/xldscripts/kmodule
diff -u /dev/null src/sys/modules/xldscripts/kmodule:1.1
--- /dev/null Tue Nov 10 14:47:53 2009
+++ src/sys/modules/xldscripts/kmodule Tue Nov 10 14:47:52 2009
@@ -0,0 +1,19 @@
+/* $NetBSD: kmodule,v 1.1 2009/11/10 14:47:52 skrll Exp $ */
+
+SECTIONS
+{
+ /* Pre-loaded modules must have merged BSS and data. */
+ .data 0 :
+ {
+ *(.data)
+ *(.data.*)
+ *(.bss)
+ *(.bss.*)
+ *(COMMON)
+ }
+ /* Pre-loaded modules do not need the following. */
+ /DISCARD/ :
+ {
+ *(.comment)
+ }
+}
