Subject: Normalizing kernel cross-build support, take 2
To: None <tech-toolchain@netbsd.org>
From: Jason R Thorpe <thorpej@wasabisystems.com>
List: tech-toolchain
Date: 09/09/2001 15:29:45
--V32M1hWVjliPHW+c
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
This time, with the diff.
--
-- Jason R. Thorpe <thorpej@wasabisystems.com>
--V32M1hWVjliPHW+c
Content-Type: text/plain; charset=us-ascii
Content-Description: kern.tools.mk.diff
Content-Disposition: attachment; filename=foo
Index: arch/alpha/conf/Makefile.alpha
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/alpha/conf/Makefile.alpha,v
retrieving revision 1.65
diff -c -r1.65 Makefile.alpha
*** arch/alpha/conf/Makefile.alpha 2001/05/31 07:37:01 1.65
--- arch/alpha/conf/Makefile.alpha 2001/09/09 22:06:24
***************
*** 20,43 ****
#
# makeoptions DEBUGLIST="uvm* trap if_*"
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
# source tree is located via $S relative to the compilation directory
.ifndef S
S!= cd ../../../..; pwd
.endif
ALPHA= $S/arch/alpha
HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
--- 20,32 ----
#
# makeoptions DEBUGLIST="uvm* trap if_*"
# source tree is located via $S relative to the compilation directory
.ifndef S
S!= cd ../../../..; pwd
.endif
ALPHA= $S/arch/alpha
+
+ .include "${S}/conf/kern.tools.mk"
HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
Index: arch/amiga/conf/Makefile.amiga
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/amiga/conf/Makefile.amiga,v
retrieving revision 1.94
diff -c -r1.94 Makefile.amiga
*** arch/amiga/conf/Makefile.amiga 2001/05/29 02:20:20 1.94
--- arch/amiga/conf/Makefile.amiga 2001/09/09 22:06:25
***************
*** 15,33 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -O2
# source tree is located via $S relative to the compilation directory
--- 15,20 ----
***************
*** 35,40 ****
--- 22,29 ----
S!= cd ../../../..; pwd
.endif
AMIGA= $S/arch/amiga
+
+ .include "${S}/conf/kern.tools.mk"
HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
Index: arch/amigappc/conf/Makefile.amigappc
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/amigappc/conf/Makefile.amigappc,v
retrieving revision 1.3
diff -c -r1.3 Makefile.amigappc
*** arch/amigappc/conf/Makefile.amigappc 2001/05/29 02:20:21 1.3
--- arch/amigappc/conf/Makefile.amigappc 2001/09/09 22:06:26
***************
*** 17,36 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR= /usr/pkg/cross/powerpc-netbsd/bin/ar
- AS= /usr/pkg/cross/powerpc-netbsd/bin/as
- CC= /usr/pkg/cross/powerpc-netbsd/bin/cc
- CPP= /usr/pkg/cross/lib/gcc-lib/powerpc-netbsd/egcs-2.91.60/cpp
- LD= /usr/pkg/cross/powerpc-netbsd/bin/ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM= /usr/pkg/cross/powerpc-netbsd/bin/nm
- RANLIB= /usr/pkg/cross/powerpc-netbsd/bin/ranlib
- SIZE= /usr/pkg/cross/powerpc-netbsd/bin/size
- STRIP= /usr/pkg/cross/powerpc-netbsd/bin/strip
- TSORT?= tsort -q
-
COPTS?= -O2
# source tree is located via $S relative to the compilation directory
.ifndef S
--- 17,25 ----
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
COPTS?= -O2
+
+ .include "${S}/conf/kern.tools.mk"
# source tree is located via $S relative to the compilation directory
.ifndef S
Index: arch/arm/conf/Makefile.arm
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/arm/conf/Makefile.arm,v
retrieving revision 1.6
diff -c -r1.6 Makefile.arm
*** arch/arm/conf/Makefile.arm 2001/07/28 15:08:10 1.6
--- arch/arm/conf/Makefile.arm 2001/09/09 22:06:27
***************
*** 15,34 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -O2
ARM32= $S/arch/arm32
ARM= $S/arch/arm
--- 15,23 ----
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
COPTS?= -O2
+
+ .include "${S}/conf/kern.tools.mk"
ARM32= $S/arch/arm32
ARM= $S/arch/arm
Index: arch/arm26/conf/Makefile.arm26
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/arm26/conf/Makefile.arm26,v
retrieving revision 1.8
diff -c -r1.8 Makefile.arm26
*** arch/arm26/conf/Makefile.arm26 2001/07/28 13:48:32 1.8
--- arch/arm26/conf/Makefile.arm26 2001/09/09 22:06:29
***************
*** 18,36 ****
MACHINE=arm26
MACHINE_ARCH=arm26
- AR?= ar
- AS?= as
- CC?= gcc
- CPP?= gcc -E
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -O2
# source tree is located via $S relative to the compilation directory
--- 18,23 ----
***************
*** 38,43 ****
--- 25,32 ----
S!= cd ../../../..; pwd
.endif
ARM26= $S/arch/arm26
+
+ .include "${S}/conf/kern.tools.mk"
HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
Index: arch/arm32/conf/Makefile.arm32
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/arm32/conf/Makefile.arm32,v
retrieving revision 1.57
diff -c -r1.57 Makefile.arm32
*** arch/arm32/conf/Makefile.arm32 2001/07/28 15:50:40 1.57
--- arch/arm32/conf/Makefile.arm32 2001/09/09 22:06:31
***************
*** 15,33 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -O2
# source tree is located via $S relative to the compilation directory
--- 15,20 ----
***************
*** 36,41 ****
--- 23,30 ----
.endif
ARM32= $S/arch/arm32
ARM= $S/arch/arm
+
+ .include "${S}/conf/kern.tools.mk"
HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
Index: arch/atari/conf/Makefile.atari
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/atari/conf/Makefile.atari,v
retrieving revision 1.62
diff -c -r1.62 Makefile.atari
*** arch/atari/conf/Makefile.atari 2001/05/29 02:20:21 1.62
--- arch/atari/conf/Makefile.atari 2001/09/09 22:06:33
***************
*** 15,33 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -O2
# source tree is located via $S relative to the compilation directory
--- 15,20 ----
***************
*** 35,40 ****
--- 22,29 ----
S!= cd ../../../..; pwd
.endif
ATARI= $S/arch/atari
+
+ .include "${S}/conf/kern.tools.mk"
HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
Index: arch/cesfic/conf/Makefile.cesfic
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/cesfic/conf/Makefile.cesfic,v
retrieving revision 1.3
diff -c -r1.3 Makefile.cesfic
*** arch/cesfic/conf/Makefile.cesfic 2001/08/25 18:57:37 1.3
--- arch/cesfic/conf/Makefile.cesfic 2001/09/09 22:06:35
***************
*** 19,29 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- CC?= cc
- LD?= ld
- MKDEP?= mkdep
- STRIP?= strip
- SIZE?= size
COPTS?= -O2
# source tree is located via $S relative to the compilation directory
--- 19,24 ----
***************
*** 31,36 ****
--- 26,33 ----
S!= cd ../../../..; pwd
.endif
CESFIC= $S/arch/cesfic
+
+ .include "${S}/conf/kern.tools.mk"
HAVE_GCC28!= ${CC} --version | egrep "^(2\.8|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
Index: arch/hp300/conf/Makefile.hp300
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/hp300/conf/Makefile.hp300,v
retrieving revision 1.78
diff -c -r1.78 Makefile.hp300
*** arch/hp300/conf/Makefile.hp300 2001/05/29 02:20:22 1.78
--- arch/hp300/conf/Makefile.hp300 2001/09/09 22:06:39
***************
*** 15,33 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -O2
# source tree is located via $S relative to the compilation directory
--- 15,20 ----
***************
*** 35,40 ****
--- 22,29 ----
S!= cd ../../../..; pwd
.endif
HP300= $S/arch/hp300
+
+ .include "${S}/conf/kern.tools.mk"
HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
Index: arch/hpcarm/conf/Makefile.hpcarm
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/hpcarm/conf/Makefile.hpcarm,v
retrieving revision 1.4
diff -c -r1.4 Makefile.hpcarm
*** arch/hpcarm/conf/Makefile.hpcarm 2001/08/02 14:45:40 1.4
--- arch/hpcarm/conf/Makefile.hpcarm 2001/09/09 22:06:41
***************
*** 15,33 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -O2
# source tree is located via $S relative to the compilation directory
--- 15,20 ----
***************
*** 35,40 ****
--- 22,29 ----
S!= cd ../../../..; pwd
.endif
HPCARM= $S/arch/hpcarm
+
+ .include "${S}/conf/kern.tools.mk"
HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
Index: arch/i386/conf/Makefile.i386
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/i386/conf/Makefile.i386,v
retrieving revision 1.116
diff -c -r1.116 Makefile.i386
*** arch/i386/conf/Makefile.i386 2001/06/05 05:05:46 1.116
--- arch/i386/conf/Makefile.i386 2001/09/09 22:06:43
***************
*** 17,35 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -O2
# source tree is located via $S relative to the compilation directory
--- 17,22 ----
***************
*** 37,42 ****
--- 24,31 ----
S!= cd ../../../..; pwd
.endif
I386= $S/arch/i386
+
+ .include "${S}/conf/kern.tools.mk"
HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
Index: arch/luna68k/conf/Makefile.luna68k
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/luna68k/conf/Makefile.luna68k,v
retrieving revision 1.9
diff -c -r1.9 Makefile.luna68k
*** arch/luna68k/conf/Makefile.luna68k 2001/05/29 02:20:23 1.9
--- arch/luna68k/conf/Makefile.luna68k 2001/09/09 22:06:45
***************
*** 15,34 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
- OBJCOPY?= objcopy
-
COPTS?= -O2
# source tree is located via $S relative to the compilation directory
--- 15,20 ----
***************
*** 36,41 ****
--- 22,29 ----
S!= cd ../../../..; pwd
.endif
LUNA68K=$S/arch/luna68k
+
+ .include "${S}/conf/kern.tools.mk"
# Override CPP defaults entirely, so cross-compilation works.
# Keep -nostdinc before all -I flags, similar for -undef ...
Index: arch/mac68k/conf/Makefile.mac68k
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/mac68k/conf/Makefile.mac68k,v
retrieving revision 1.78
diff -c -r1.78 Makefile.mac68k
*** arch/mac68k/conf/Makefile.mac68k 2001/05/29 02:20:23 1.78
--- arch/mac68k/conf/Makefile.mac68k 2001/09/09 22:06:45
***************
*** 15,33 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -O2
# source tree is located via $S relative to the compilation directory
--- 15,20 ----
***************
*** 35,40 ****
--- 22,29 ----
S!= cd ../../../..; pwd
.endif
MAC68K= $S/arch/mac68k
+
+ .include "${S}/conf/kern.tools.mk"
HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
Index: arch/mips/conf/Makefile.mips
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/mips/conf/Makefile.mips,v
retrieving revision 1.16
diff -c -r1.16 Makefile.mips
*** arch/mips/conf/Makefile.mips 2001/07/19 01:46:15 1.16
--- arch/mips/conf/Makefile.mips 2001/09/09 22:06:46
***************
*** 17,36 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ${CROSSDIR}ar
- AS?= ${CROSSDIR}as
- CC?= ${CROSSDIR}cc
- CPP?= cpp
- LD?= ${CROSSDIR}ld
- LORDER?= lorder
- MKDEP?= mkdep
- NM?= ${CROSSDIR}nm
- RANLIB?= ${CROSSDIR}ranlib
- SIZE?= ${CROSSDIR}size
- STRIP?= ${CROSSDIR}strip
- TSORT?= ${CROSSDIR}tsort -q
- OBJCOPY?= ${CROSSDIR}objcopy
-
DEFCOPTS?= -O2
COPTS?= ${DEFCOPTS}
--- 17,22 ----
***************
*** 43,48 ****
--- 29,36 ----
.endif
THISMIPS= $S/arch/${TARGET_MACHINE}
MIPS= $S/arch/mips
+
+ .include "${S}/conf/kern.tools.mk"
HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
Index: arch/mvme68k/conf/Makefile.mvme68k
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/mvme68k/conf/Makefile.mvme68k,v
retrieving revision 1.51
diff -c -r1.51 Makefile.mvme68k
*** arch/mvme68k/conf/Makefile.mvme68k 2001/05/29 02:20:24 1.51
--- arch/mvme68k/conf/Makefile.mvme68k 2001/09/09 22:06:47
***************
*** 15,33 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -O2
# source tree is located via $S relative to the compilation directory
--- 15,20 ----
***************
*** 35,40 ****
--- 22,29 ----
S!= cd ../../../..; pwd
.endif
MVME68K=$S/arch/mvme68k
+
+ .include "${S}/conf/kern.tools.mk"
# Override CPP defaults entirely, so cross-compilation works.
# Keep -nostdinc before all -I flags, similar for -undef ...
Index: arch/news68k/conf/Makefile.news68k
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/news68k/conf/Makefile.news68k,v
retrieving revision 1.9
diff -c -r1.9 Makefile.news68k
*** arch/news68k/conf/Makefile.news68k 2001/05/29 02:20:24 1.9
--- arch/news68k/conf/Makefile.news68k 2001/09/09 22:06:53
***************
*** 15,33 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -O2
# source tree is located via $S relative to the compilation directory
--- 15,20 ----
***************
*** 36,41 ****
--- 23,30 ----
S= ../../../..
.endif
NEWS68K=$S/arch/news68k
+
+ .include "${S}/conf/kern.tools.mk"
HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
Index: arch/next68k/conf/Makefile.next68k
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/next68k/conf/Makefile.next68k,v
retrieving revision 1.19
diff -c -r1.19 Makefile.next68k
*** arch/next68k/conf/Makefile.next68k 2001/05/29 02:20:24 1.19
--- arch/next68k/conf/Makefile.next68k 2001/09/09 22:06:54
***************
*** 15,33 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -O2
# source tree is located via $S relative to the compilation directory
--- 15,20 ----
***************
*** 35,40 ****
--- 22,29 ----
S!= cd ../../../..; pwd
.endif
NEXT68K= $S/arch/next68k
+
+ .include "${S}/conf/kern.tools.mk"
HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
Index: arch/pc532/conf/Makefile.pc532
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/pc532/conf/Makefile.pc532,v
retrieving revision 1.65
diff -c -r1.65 Makefile.pc532
*** arch/pc532/conf/Makefile.pc532 2001/05/29 02:20:25 1.65
--- arch/pc532/conf/Makefile.pc532 2001/09/09 22:06:55
***************
*** 15,33 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -O2 -msb
# source tree is located via $S relative to the compilation directory
--- 15,20 ----
***************
*** 35,40 ****
--- 22,29 ----
S!= cd ../../../..; pwd
.endif
PC532= $S/arch/pc532
+
+ .include "${S}/conf/kern.tools.mk"
HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
Index: arch/powerpc/conf/Makefile.powerpc
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/powerpc/conf/Makefile.powerpc,v
retrieving revision 1.15
diff -c -r1.15 Makefile.powerpc
*** arch/powerpc/conf/Makefile.powerpc 2001/08/26 10:59:26 1.15
--- arch/powerpc/conf/Makefile.powerpc 2001/09/09 22:06:56
***************
*** 23,43 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?= lorder
- MKDEP?= mkdep
- NM?= nm
- OBJCOPY?= objcopy
- OBJDUMP?= objdump
- RANLIB?= ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -O2
TEXTADDR?= 0x100000
--- 23,28 ----
***************
*** 47,52 ****
--- 32,39 ----
.endif
THISPPC= $S/arch/${TARGET_MACHINE}
POWERPC= $S/arch/powerpc
+
+ .include "${S}/conf/kern.tools.mk"
INCLUDES= -I. -I$S/arch -I$S -nostdinc
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} \
Index: arch/sh3/conf/Makefile.sh3
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sh3/conf/Makefile.sh3,v
retrieving revision 1.12
diff -c -r1.12 Makefile.sh3
*** arch/sh3/conf/Makefile.sh3 2001/05/29 02:20:25 1.12
--- arch/sh3/conf/Makefile.sh3 2001/09/09 22:06:58
***************
*** 17,36 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
- OBJCOPY?=objcopy
-
# pkgsrc/cross/sh* dies with -O2, use -O1 for now
#COPTS?= -O2
COPTS?= -O1
--- 17,22 ----
***************
*** 41,46 ****
--- 27,34 ----
.endif
THISSH3=$S/arch/${TARGET_MACHINE}
SH3= $S/arch/sh3
+
+ .include "${S}/conf/kern.tools.mk"
HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
Index: arch/sh3/conf/Makefile.sh3.be
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sh3/conf/Makefile.sh3.be,v
retrieving revision 1.7
diff -c -r1.7 Makefile.sh3.be
*** arch/sh3/conf/Makefile.sh3.be 2001/05/29 02:20:25 1.7
--- arch/sh3/conf/Makefile.sh3.be 2001/09/09 22:06:58
***************
*** 15,33 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -g -O
# source tree is located via $S relative to the compilation directory
--- 15,20 ----
***************
*** 35,40 ****
--- 22,29 ----
S!= cd ../../../..; pwd
.endif
SH3= $S/arch/sh3
+
+ .include "${S}/conf/kern.tools.mk"
INCLUDES= -I. -I$S/arch -I$S -nostdinc
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D_KERNEL_OPT \
Index: arch/sparc/conf/Makefile.sparc
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc/conf/Makefile.sparc,v
retrieving revision 1.73
diff -c -r1.73 Makefile.sparc
*** arch/sparc/conf/Makefile.sparc 2001/05/29 02:20:26 1.73
--- arch/sparc/conf/Makefile.sparc 2001/09/09 22:06:58
***************
*** 17,35 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -O2
# source tree is located via $S relative to the compilation directory
--- 17,22 ----
***************
*** 37,42 ****
--- 24,31 ----
S!= cd ../../../..; pwd
.endif
SPARC= $S/arch/sparc
+
+ .include "${S}/conf/kern.tools.mk"
HAVE_EGCS!= ${CC} --version | egrep "^(2\.[89]|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
Index: arch/sparc64/conf/Makefile.sparc64
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sparc64/conf/Makefile.sparc64,v
retrieving revision 1.38
diff -c -r1.38 Makefile.sparc64
*** arch/sparc64/conf/Makefile.sparc64 2001/07/19 23:31:06 1.38
--- arch/sparc64/conf/Makefile.sparc64 2001/09/09 22:06:59
***************
*** 21,40 ****
.include "/etc/mk.conf"
.endif
- CC?= cc
- .if exists(/usr/ccs/bin/ld)
- LD?= /usr/ccs/bin/ld #Need to use Solaris ld to use the solaris loader
- .endif
- MKDEP?= mkdep
- STRIP?=strip
- SIZE?= size
COPTS?= -O2
- #### Stuff for cross compiling
- NM?=nm
- LORDER?=lorder
- TSORT?=tsort
-
# deal with Solaris vs. NetBSD build environments for now ..
OS!=uname -s
.if (${OS} == "NetBSD")
--- 21,28 ----
***************
*** 55,60 ****
--- 43,50 ----
S!= cd ../../../..; pwd
.endif
SPARC64= $S/arch/sparc64
+
+ .include "${S}/conf/kern.tools.mk"
INCLUDES= -I. -I$S/arch -I$S -nostdinc
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D_KERNEL_OPT -Dsparc64 ${SVR4}
Index: arch/sun2/conf/Makefile.sun2
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sun2/conf/Makefile.sun2,v
retrieving revision 1.4
diff -c -r1.4 Makefile.sun2
*** arch/sun2/conf/Makefile.sun2 2001/06/27 17:03:10 1.4
--- arch/sun2/conf/Makefile.sun2 2001/09/09 22:06:59
***************
*** 25,43 ****
MACHINE_ARCH=m68000
MACHINE=sun2
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -O2 -fno-defer-pop
# source tree is located via $S relative to the compilation directory
--- 25,30 ----
***************
*** 45,50 ****
--- 32,39 ----
S!= cd ../../../..; pwd
.endif
SUN2= $S/arch/sun2
+
+ .include "${S}/conf/kern.tools.mk"
TEXTADDR=00006000
Index: arch/sun3/conf/Makefile.sun3
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/sun3/conf/Makefile.sun3,v
retrieving revision 1.87
diff -c -r1.87 Makefile.sun3
*** arch/sun3/conf/Makefile.sun3 2001/05/29 02:20:26 1.87
--- arch/sun3/conf/Makefile.sun3 2001/09/09 22:07:00
***************
*** 19,37 ****
MACHINE_ARCH=m68k
MACHINE=sun3
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -O2 -fno-defer-pop
# source tree is located via $S relative to the compilation directory
--- 19,24 ----
***************
*** 39,44 ****
--- 26,33 ----
S!= cd ../../../..; pwd
.endif
SUN3= $S/arch/sun3
+
+ .include "${S}/conf/kern.tools.mk"
.if ${MACHTYPE} == "sun3x"
TEXTADDR=F8004000
Index: arch/vax/conf/Makefile.vax
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/vax/conf/Makefile.vax,v
retrieving revision 1.59
diff -c -r1.59 Makefile.vax
*** arch/vax/conf/Makefile.vax 2001/06/25 05:12:01 1.59
--- arch/vax/conf/Makefile.vax 2001/09/09 22:07:05
***************
*** 15,33 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -O2
# source tree is located via $S relative to the compilation directory
--- 15,20 ----
***************
*** 35,40 ****
--- 22,29 ----
S!= cd ../../../..; pwd
.endif
VAX= $S/arch/vax
+
+ .include "${S}/conf/kern.tools.mk"
HAVE_EGCS!= ${CC} --version | egrep "^(2\.8|2\.9[0-4]|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
Index: arch/x68k/conf/Makefile.x68k
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/x68k/conf/Makefile.x68k,v
retrieving revision 1.50
diff -c -r1.50 Makefile.x68k
*** arch/x68k/conf/Makefile.x68k 2001/05/29 02:20:27 1.50
--- arch/x68k/conf/Makefile.x68k 2001/09/09 22:07:06
***************
*** 17,35 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -O2
# source tree is located via $S relative to the compilation directory
--- 17,22 ----
***************
*** 37,42 ****
--- 24,31 ----
S!= cd ../../../..; pwd
.endif
X68K= $S/arch/x68k
+
+ .include "${S}/conf/kern.tools.mk"
HAVE_EGCS!= ${CC} --version | egrep "^(2\.8|egcs)" ; echo
INCLUDES= -I. -I$S/arch -I$S -nostdinc
Index: arch/x86_64/conf/Makefile.x86_64
===================================================================
RCS file: /cvsroot/syssrc/sys/arch/x86_64/conf/Makefile.x86_64,v
retrieving revision 1.2
diff -c -r1.2 Makefile.x86_64
*** arch/x86_64/conf/Makefile.x86_64 2001/06/19 13:19:54 1.2
--- arch/x86_64/conf/Makefile.x86_64 2001/09/09 22:07:07
***************
*** 17,35 ****
# DEBUG is set to -g if debugging.
# PROF is set to -pg if profiling.
- AR?= ar
- AS?= as
- CC?= cc
- CPP?= cpp
- LD?= ld
- LORDER?=lorder
- MKDEP?= mkdep
- NM?= nm
- RANLIB?=ranlib
- SIZE?= size
- STRIP?= strip
- TSORT?= tsort -q
-
COPTS?= -O2
# source tree is located via $S relative to the compilation directory
--- 17,22 ----
***************
*** 37,42 ****
--- 24,31 ----
S!= cd ../../../..; pwd
.endif
X86_64= $S/arch/x86_64
+
+ .include "${S}/conf/kern.tools.mk"
INCLUDES= -I. -I$S/arch -I$S -nostdinc
CPPFLAGS= ${INCLUDES} ${IDENT} ${PARAM} -D_KERNEL -D_KERNEL_OPT -Dx86_64
Index: conf/kern.tools.mk
===================================================================
RCS file: kern.tools.mk
diff -N kern.tools.mk
*** /dev/null Sun Sep 9 03:15:08 2001
--- kern.tools.mk Mon Sep 10 01:07:13 2001
***************
*** 0 ****
--- 1,31 ----
+ # $NetBSD$
+ #
+ # Toolchain definitions for NetBSD kernel builds. This file should
+ # be included by port- or arch-specific Makefiles like so:
+ #
+ # .include "${S}/conf/kern.tools.mk"
+ #
+
+ # Set TOOLPREFIX to the prefix to add to toolchain program names.
+ # For use when cross-compiling or otherwise using a non-native or
+ # alternate toolchain. This may be done in the shell environment:
+ #
+ # export TOOLPREFIX=/usr/local/bin/
+ #
+ # or in the kernel configuration file:
+ #
+ # makeoptions TOOLPREFIX="/usr/local/bin/"
+
+ AR?= ${TOOLPREFIX}ar
+ AS?= ${TOOLPREFIX}as
+ CC?= ${TOOLPREFIX}cc
+ CPP?= ${TOOLPREFIX}cpp
+ LD?= ${TOOLPREFIX}ld
+ LORDER?= ${TOOLPREFIX}lorder
+ MKDEP?= ${TOOLPREFIX}mkdep
+ NM?= ${TOOLPREFIX}nm
+ RANLIB?= ${TOOLPREFIX}ranlib
+ SIZE?= ${TOOLPREFIX}size
+ STRIP?= ${TOOLPREFIX}strip
+ TSORT?= ${TOOLPREFIX}tsort -q
+ OBJCOPY?= ${TOOLPREFIX}objcopy
--V32M1hWVjliPHW+c--