[src/trunk]: src Move the kmodule linker script source into sys/modules/xldsc...

[skrll <skrll%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/6085848bf3b3
branches:  trunk
changeset: 748915:6085848bf3b3
user:      skrll <skrll%NetBSD.org@localhost>
date:      Tue Nov 10 14:47:52 2009 +0000

description:
Move the kmodule linker script source into sys/modules/xldscripts. It is
not part of binutils and definitely not GPL v3.

Discussed with mrg.

diffstat:

 external/gpl3/binutils/usr.bin/ld/Makefile            |   4 +---
 external/gpl3/binutils/usr.bin/ld/xldscripts/Makefile |   8 --------
 external/gpl3/binutils/usr.bin/ld/xldscripts/kmodule  |  19 -------------------
 share/mk/bsd.kmodule.mk                               |   6 +++---
 sys/modules/Makefile                                  |   5 +++--
 sys/modules/xldscripts/Makefile                       |   8 ++++++++
 sys/modules/xldscripts/kmodule                        |  19 +++++++++++++++++++
 7 files changed, 34 insertions(+), 35 deletions(-)

diffs (119 lines):

diff -r 58fa2cd5ab3c -r 6085848bf3b3 external/gpl3/binutils/usr.bin/ld/Makefile
--- a/external/gpl3/binutils/usr.bin/ld/Makefile        Tue Nov 10 11:14:48 2009 +0000
+++ b/external/gpl3/binutils/usr.bin/ld/Makefile        Tue Nov 10 14:47:52 2009 +0000
@@ -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"
diff -r 58fa2cd5ab3c -r 6085848bf3b3 external/gpl3/binutils/usr.bin/ld/xldscripts/Makefile
--- a/external/gpl3/binutils/usr.bin/ld/xldscripts/Makefile     Tue Nov 10 11:14:48 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,8 +0,0 @@
-#      $NetBSD: Makefile,v 1.1 2009/08/18 20:22:19 skrll Exp $
-
-NOOBJ= # defined
-
-FILES= kmodule
-FILESDIR=/usr/libdata/ldscripts
-
-.include <bsd.prog.mk>
diff -r 58fa2cd5ab3c -r 6085848bf3b3 external/gpl3/binutils/usr.bin/ld/xldscripts/kmodule
--- a/external/gpl3/binutils/usr.bin/ld/xldscripts/kmodule      Tue Nov 10 11:14:48 2009 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-/*     $NetBSD: kmodule,v 1.1 2009/08/18 20:22:19 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)
-   }
-}
diff -r 58fa2cd5ab3c -r 6085848bf3b3 share/mk/bsd.kmodule.mk
--- a/share/mk/bsd.kmodule.mk   Tue Nov 10 11:14:48 2009 +0000
+++ b/share/mk/bsd.kmodule.mk   Tue Nov 10 14:47:52 2009 +0000
@@ -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
diff -r 58fa2cd5ab3c -r 6085848bf3b3 sys/modules/Makefile
--- a/sys/modules/Makefile      Tue Nov 10 11:14:48 2009 +0000
+++ b/sys/modules/Makefile      Tue Nov 10 14:47:52 2009 +0000
@@ -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
diff -r 58fa2cd5ab3c -r 6085848bf3b3 sys/modules/xldscripts/Makefile
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/modules/xldscripts/Makefile   Tue Nov 10 14:47:52 2009 +0000
@@ -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>
diff -r 58fa2cd5ab3c -r 6085848bf3b3 sys/modules/xldscripts/kmodule
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/sys/modules/xldscripts/kmodule    Tue Nov 10 14:47:52 2009 +0000
@@ -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)
+   }
+}