Module Name: src
Committed By: joerg
Date: Tue Apr 22 13:20:58 UTC 2014
Modified Files:
src/lib: Makefile
src/lib/csu: Makefile
src/share/mk: bsd.own.mk
src/tools/gcc: README.mknative
Log Message:
Retire USE_COMPILERCRTSTUFF=yes.
To generate a diff of this commit:
cvs rdiff -u -r1.212 -r1.213 src/lib/Makefile
cvs rdiff -u -r1.33 -r1.34 src/lib/csu/Makefile
cvs rdiff -u -r1.799 -r1.800 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.18 -r1.19 src/tools/gcc/README.mknative
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/Makefile
diff -u src/lib/Makefile:1.212 src/lib/Makefile:1.213
--- src/lib/Makefile:1.212 Sun Mar 9 17:09:20 2014
+++ src/lib/Makefile Tue Apr 22 13:20:58 2014
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.212 2014/03/09 17:09:20 christos Exp $
+# $NetBSD: Makefile,v 1.213 2014/04/22 13:20:58 joerg Exp $
# from: @(#)Makefile 5.25.1.1 (Berkeley) 5/7/91
.include <bsd.own.mk>
@@ -7,14 +7,8 @@ SUBDIR= csu .WAIT
.if (${MKGCC} != "no")
. if ${HAVE_GCC} == 4
-. if (${USE_COMPILERCRTSTUFF} == "yes")
-SUBDIR+= ../gnu/lib/crtstuff4 .WAIT
-. endif
SUBDIR+= ../gnu/lib/libgcc4 .WAIT
. else
-. if (${USE_COMPILERCRTSTUFF} == "yes")
-SUBDIR+= ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/crtstuff .WAIT
-. endif
SUBDIR+= ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libgcc .WAIT
. endif
.endif
Index: src/lib/csu/Makefile
diff -u src/lib/csu/Makefile:1.33 src/lib/csu/Makefile:1.34
--- src/lib/csu/Makefile:1.33 Tue Sep 10 16:45:33 2013
+++ src/lib/csu/Makefile Tue Apr 22 13:20:58 2014
@@ -1,9 +1,7 @@
-# $NetBSD: Makefile,v 1.33 2013/09/10 16:45:33 matt Exp $
+# $NetBSD: Makefile,v 1.34 2014/04/22 13:20:58 joerg Exp $
.include <bsd.own.mk>
-.if ${USE_COMPILERCRTSTUFF} != "yes"
-
CSU_MACHINE_ARCH?= ${MACHINE_ARCH}
.if !empty(CSU_MACHINE_ARCH:Mearm*)
@@ -18,28 +16,5 @@ ARCHDIR:= ${.CURDIR}/arch/${MACHINE_CPU}
.PATH: ${ARCHDIR}
-. include "${ARCHDIR}/Makefile.inc"
-
-. include "${.CURDIR}/common/Makefile.inc"
-
-.else
-
-CSU_MACHINE_ARCH?= ${MACHINE_ARCH}
-
-. if exists(${CSU_MACHINE_ARCH}_elf/Makefile)
-SUBDIR= ${CSU_MACHINE_ARCH}_elf
-. elif exists(${CSU_MACHINE_ARCH}/Makefile)
-SUBDIR= ${CSU_MACHINE_ARCH}
-. elif exists(${MACHINE_CPU}_elf/Makefile)
-SUBDIR= ${MACHINE_CPU}_elf
-. elif exists(${MACHINE_CPU}/Makefile)
-SUBDIR= ${MACHINE_CPU}
-. else
-.BEGIN:
- @echo no SUBDIR for ${MACHINE_ARCH}_elf, ${MACHINE_ARCH} nor \
- ${MACHINE_CPU}
- @false
-. endif
-
-. include <bsd.subdir.mk>
-.endif
+.include "${ARCHDIR}/Makefile.inc"
+.include "${.CURDIR}/common/Makefile.inc"
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.799 src/share/mk/bsd.own.mk:1.800
--- src/share/mk/bsd.own.mk:1.799 Sat Apr 19 21:21:24 2014
+++ src/share/mk/bsd.own.mk Tue Apr 22 13:20:58 2014
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.799 2014/04/19 21:21:24 joerg Exp $
+# $NetBSD: bsd.own.mk,v 1.800 2014/04/22 13:20:58 joerg Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -87,12 +87,6 @@ EXTERNAL_GCC_SUBDIR= /does/not/exist
.endif
-.if ${MACHINE_ARCH} == "ia64"
-USE_COMPILERCRTSTUFF?= yes
-.else
-USE_COMPILERCRTSTUFF?= no
-.endif
-
.if ${MKLLVM:Uno} == "yes" && (${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64")
HAVE_LIBGCC?= no
.else
Index: src/tools/gcc/README.mknative
diff -u src/tools/gcc/README.mknative:1.18 src/tools/gcc/README.mknative:1.19
--- src/tools/gcc/README.mknative:1.18 Wed Feb 26 09:54:34 2014
+++ src/tools/gcc/README.mknative Tue Apr 22 13:20:58 2014
@@ -1,4 +1,4 @@
-$NetBSD: README.mknative,v 1.18 2014/02/26 09:54:34 mrg Exp $
+$NetBSD: README.mknative,v 1.19 2014/04/22 13:20:58 joerg Exp $
This file describes how to bootstrap the native toolchain on a new NetBSD
platform (and how to update the new toolchain files, if needed). These
@@ -48,18 +48,14 @@ work.
5. In src/lib/csu, do
"nbmake-MACHINE dependall". and "nbmake-MACHINE install".
-6. If the platform sets USE_COMPILERCRTSTUFF=yes, then in
- src/external/gpl3/gcc/lib/crtstuff/ do
- "nbmake-MACHINE obj dependall install"
-
-7. In src/external/gpl3/gcc/lib/libgcc, do
+6. In src/external/gpl3/gcc/lib/libgcc, do
"nbmake-MACHINE obj includes dependall install".
-8. In each of src/external/lgpl3/gmp/lib/libgmp,
+7. In each of src/external/lgpl3/gmp/lib/libgmp,
src/external/lgpl3/mpfr/lib/libmpfr, src/external/lgpl3/mpc/lib/libmpc
do "nbmake-MACHINE obj dependall".
-9. In src/lib, do
+8. In src/lib, do
"nbmake-MACHINE dependall install MKGCC=no HAVE_GCC=45".
Optionally, all of the following may be set in the environment to reduce
@@ -74,7 +70,7 @@ work.
MKSHARE=no
MKRUMP=no
-10. In src/tools/gcc, do "nbmake-MACHINE native-gcc".
+9. In src/tools/gcc, do "nbmake-MACHINE native-gcc".
This will do a full configury in ${.OBJDIR}/.native that is a "Canadian"
cross toolchain (--build reflects the host platform, but --host and
@@ -82,7 +78,7 @@ work.
native-to-NetBSD compiler on a cross host, and mknative pulls glue data
from this.
-11. Try out a full build using "nbmake-MACHINE"; the result should include
+10. Try out a full build using "nbmake-MACHINE"; the result should include
a native compiler.
-12. If all is well, commit the glue files added to src/gnu/{lib,usr.bin}/*.
+11. If all is well, commit the glue files added to src/gnu/{lib,usr.bin}/*.
