From ee5dd9242c0d7e9eb10a6f937a8b4a0b7cd89160 Mon Sep 17 00:00:00 2001 From: Simon Schubert Date: Mon, 15 Jan 2007 18:29:44 +0000 Subject: [PATCH] Remove traces of gcc40 --- Makefile.inc1 | 22 ++------ etc/Makefile | 3 +- etc/defaults/make.conf | 6 +-- share/man/man5/make.conf.5 | 7 +-- share/mk/Makefile | 4 +- share/mk/bsd.README | 3 +- share/mk/bsd.cpu.gcc40.mk | 102 ------------------------------------- share/mk/bsd.cpu.mk | 4 +- 8 files changed, 14 insertions(+), 137 deletions(-) delete mode 100644 share/mk/bsd.cpu.gcc40.mk diff --git a/Makefile.inc1 b/Makefile.inc1 index 2a15c546ac..e6890e7c41 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1,6 +1,6 @@ # # $FreeBSD: src/Makefile.inc1,v 1.141.2.62 2003/04/06 19:54:00 dwmalone Exp $ -# $DragonFly: src/Makefile.inc1,v 1.99 2007/01/15 18:01:44 corecode Exp $ +# $DragonFly: src/Makefile.inc1,v 1.100 2007/01/15 18:29:44 corecode Exp $ # # Build-time options are documented in make.conf(5). # @@ -801,10 +801,6 @@ _share= share/syscons/scrnmaps _gcc34_cross= gnu/usr.bin/cc34 _gcc34_tools= gnu/usr.bin/cc34/cc_prep gnu/usr.bin/cc34/cc_tools -.if defined(WANT_GCC40) -_gcc40_cross= gnu/usr.bin/cc40 -_gcc40_tools= gnu/usr.bin/cc40/cc_prep gnu/usr.bin/cc40/cc_tools -.endif .if defined(WANT_GCC41) _gcc41_cross= gnu/usr.bin/cc41 _gcc41_tools= gnu/usr.bin/cc41/cc_prep gnu/usr.bin/cc41/cc_tools @@ -822,7 +818,7 @@ _libkrb5= kerberos5/tools kerberos5/lib/libroken kerberos5/lib/libvers \ .endif build-tools: -.for _tool in ${_gcc34_tools} ${_gcc40_tools} ${_gcc41_tools} ${_fortran} ${_libkrb5} ${_share} +.for _tool in ${_gcc34_tools} ${_gcc41_tools} ${_fortran} ${_libkrb5} ${_share} ${ECHODIR} "===> ${_tool} (build-tools)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ @@ -842,7 +838,7 @@ _btxld= usr.sbin/btxld cross-tools: .for _tool in ${_btxld} ${_binutils} \ usr.bin/objformat usr.sbin/crunch/crunchide \ - ${_gcc34_cross} ${_gcc40_cross} ${_gcc41_cross} + ${_gcc34_cross} ${_gcc41_cross} ${ECHODIR} "===> ${_tool} (cross-tools)"; \ cd ${.CURDIR}/${_tool}; \ ${MAKE} DIRPRFX=${_tool}/ obj; \ @@ -872,11 +868,6 @@ libraries: cd ${.CURDIR}; \ HOST_CCVER=${HOST_CCVER} CCVER=gcc34 \ ${MAKE} -f Makefile.inc1 _startup_libs34; -.if defined(WANT_GCC40) - cd ${.CURDIR}; \ - HOST_CCVER=${HOST_CCVER} CCVER=gcc40 \ - ${MAKE} -f Makefile.inc1 _startup_libs40; -.endif .if defined(WANT_GCC41) cd ${.CURDIR}; \ HOST_CCVER=${HOST_CCVER} CCVER=gcc41 \ @@ -892,10 +883,9 @@ libraries: # # gnu/lib/${CCVER}/libgcc and gnu/lib/${CCVER}/csu must be built before all # shared libraries for ELF. The target for _startup_libs34 is -# specifically built using gcc34. Same goes for _startup_libs40. +# specifically built using gcc34. Same goes for _startup_libs41. # _startup_libs34= gnu/lib/gcc34/csu gnu/lib/gcc34/libgcc -_startup_libs40= gnu/lib/gcc40/csu gnu/lib/gcc40/libgcc _startup_libs41= gnu/lib/gcc41/csu gnu/lib/gcc41/libgcc _startup_libs= lib/libc lib/libc_rtld @@ -935,7 +925,7 @@ _generic_libs+= secure/lib _generic_libs+= usr.bin/lex/lib -.for _lib in ${_startup_libs34} ${_startup_libs40} ${_startup_libs41} \ +.for _lib in ${_startup_libs34} ${_startup_libs41} \ ${_startup_libs} ${_prebuild_libs} ${_generic_libs} ${_lib}__L: .PHONY .if exists(${.CURDIR}/${_lib}) @@ -949,7 +939,6 @@ ${_lib}__L: .PHONY _startup_libs: ${_startup_libs:S/$/__L/} _startup_libs34: ${_startup_libs34:S/$/__L/} -_startup_libs40: ${_startup_libs40:S/$/__L/} _startup_libs41: ${_startup_libs41:S/$/__L/} _prebuild_libs: ${_prebuild_libs:S/$/__L/} _generic_libs: ${_generic_libs:S/$/__L/} @@ -958,7 +947,6 @@ _generic_libs: ${_generic_libs:S/$/__L/} # races (e.g. generation of tconfig.h) # .ORDER: ${_startup_libs34:S/$/__L/} -.ORDER: ${_startup_libs40:S/$/__L/} .ORDER: ${_startup_libs41:S/$/__L/} .ORDER: ${_startup_libs:S/$/__L/} .ORDER: ${_prebuild_libs:S/$/__L/} diff --git a/etc/Makefile b/etc/Makefile index f3121444bb..4c61d389ef 100644 --- a/etc/Makefile +++ b/etc/Makefile @@ -1,6 +1,6 @@ # from: @(#)Makefile 5.11 (Berkeley) 5/21/91 # $FreeBSD: src/etc/Makefile,v 1.219.2.38 2003/03/04 09:49:00 ru Exp $ -# $DragonFly: src/etc/Makefile,v 1.155 2007/01/15 18:23:24 corecode Exp $ +# $DragonFly: src/etc/Makefile,v 1.156 2007/01/15 18:29:44 corecode Exp $ .if !defined(NO_SENDMAIL) SUBDIR= sendmail @@ -468,6 +468,7 @@ upgrade_etc: preupgrade ${DESTDIR}/usr/libexec/gcc40 \ ${DESTDIR}/usr/libdata/gcc40 csh -c "rm -f ${DESTDIR}/usr/share/man/{man,cat}1/{cpp,g++,gcc,gcov}41.1.gz" + rm -f ${DESTDIR}/usr/share/mk/bsd.cpu.gcc40.mk ldconfig -R .if !defined(BINARY_UPGRADE) # binary upgrade just copies these nodes .if !defined(NOMAN) diff --git a/etc/defaults/make.conf b/etc/defaults/make.conf index e55f309e66..b164869278 100644 --- a/etc/defaults/make.conf +++ b/etc/defaults/make.conf @@ -1,5 +1,5 @@ # $FreeBSD: src/etc/defaults/make.conf,v 1.97.2.80 2003/02/15 16:34:56 trhodes Exp $ -# $DragonFly: src/etc/defaults/make.conf,v 1.24 2006/11/19 22:17:04 victor Exp $ +# $DragonFly: src/etc/defaults/make.conf,v 1.25 2007/01/15 18:29:44 corecode Exp $ # # NOTE: Please would any committer updating this file also update the # make.conf(5) manual page, if necessary, which is located in @@ -42,12 +42,8 @@ # recommend that an override NOT be set in /etc/make.conf. # #CCVER?=gcc34 # (use GCC 3.4, default) -#CCVER?=gcc40 # (use GCC 4.0, experimental, must define WANT_GCC40) #CCVER?=gcc41 # (use GCC 4.1, experimental, must define WANT_GCC41) # -# Build gcc40 with world. This won't make gcc40 the default compiler -#WANT_GCC40=yes -# # Build gcc41 with world. This won't make gcc41 the default compiler. #WANT_GCC41=yes # diff --git a/share/man/man5/make.conf.5 b/share/man/man5/make.conf.5 index 86056f4985..328205d03c 100644 --- a/share/man/man5/make.conf.5 +++ b/share/man/man5/make.conf.5 @@ -23,7 +23,7 @@ .\" SUCH DAMAGE. .\" .\" $FreeBSD: src/share/man/man5/make.conf.5,v 1.12.2.30 2003/05/18 17:05:55 brueffer Exp $ -.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.18 2006/11/09 18:44:52 pavalos Exp $ +.\" $DragonFly: src/share/man/man5/make.conf.5,v 1.19 2007/01/15 18:29:44 corecode Exp $ .\" .Dd September 10, 2006 .Dt MAKE.CONF 5 @@ -114,7 +114,7 @@ Controls which GCC version to use by default. It should be set as CCVER?= so as not to interfere with overrides from userland. We currently recommend that an override NOT be set in .Pa /etc/make.conf . -Currently accepted values are cc34 and cc40 (experimental). +Currently accepted values are cc34 and cc41 (experimental). .It Va CFLAGS .Pq Vt str Controls the compiler setting when compiling C code. @@ -573,9 +573,6 @@ to match the number of local users. The table size should be a prime number approximately twice as large as the number of lines in .Pa /etc/passwd . The default number is 20011. -.It Va WANT_GCC40 -.Pq Vt bool -Set to build the experimental version of GCC (4.0). .It Va WANT_GCC41 .Pq Vt bool Set to build the experimental version of GCC (4.1). diff --git a/share/mk/Makefile b/share/mk/Makefile index 91396eae40..116dd521ab 100644 --- a/share/mk/Makefile +++ b/share/mk/Makefile @@ -1,9 +1,9 @@ # $FreeBSD: src/share/mk/Makefile,v 1.27.2.8 2002/07/22 14:21:51 ru Exp $ -# $DragonFly: src/share/mk/Makefile,v 1.16 2006/09/27 12:10:35 corecode Exp $ +# $DragonFly: src/share/mk/Makefile,v 1.17 2007/01/15 18:29:44 corecode Exp $ # @(#)Makefile 8.1 (Berkeley) 6/8/93 FILES= bsd.README -FILES+= bsd.cpu.mk bsd.cpu.gcc34.mk bsd.cpu.gcc40.mk bsd.cpu.gcc41.mk +FILES+= bsd.cpu.mk bsd.cpu.gcc34.mk bsd.cpu.gcc41.mk FILES+= bsd.dep.mk bsd.doc.mk bsd.files.mk bsd.patch.mk FILES+= bsd.incs.mk bsd.info.mk bsd.init.mk FILES+= bsd.kmod.mk bsd.hostlib.mk diff --git a/share/mk/bsd.README b/share/mk/bsd.README index 1614daa039..6033ac7117 100644 --- a/share/mk/bsd.README +++ b/share/mk/bsd.README @@ -1,6 +1,6 @@ # @(#)bsd.README 8.2 (Berkeley) 4/2/94 # $FreeBSD: src/share/mk/bsd.README,v 1.15.2.6 2002/07/19 08:34:07 ru Exp $ -# $DragonFly: src/share/mk/bsd.README,v 1.6 2006/09/27 12:10:35 corecode Exp $ +# $DragonFly: src/share/mk/bsd.README,v 1.7 2007/01/15 18:29:44 corecode Exp $ XXX This document is seriously out of date, it is currenly being revised. @@ -9,7 +9,6 @@ source tree. The files are installed in /usr/share/mk, and are, by convention, named with the suffix ".mk". bsd.cpu.gcc34.mk - handle GCC 3.4 specific CPU flags & variables -bsd.cpu.gcc40.mk - handle GCC 4.0 specific CPU flags & variables bsd.cpu.gcc41.mk - handle GCC 4.1 specific CPU flags & variables bsd.cpu.mk - handle CPU flags & variables bsd.dep.mk - handle Makefile dependencies diff --git a/share/mk/bsd.cpu.gcc40.mk b/share/mk/bsd.cpu.gcc40.mk deleted file mode 100644 index d89119332d..0000000000 --- a/share/mk/bsd.cpu.gcc40.mk +++ /dev/null @@ -1,102 +0,0 @@ -# $DragonFly: src/share/mk/Attic/bsd.cpu.gcc40.mk,v 1.3 2006/11/19 22:04:19 victor Exp $ - -# Set default CPU compile flags and baseline CPUTYPE for each arch. The -# compile flags must support the minimum CPU type for each architecture but -# may tune support for more advanced processors. - -.if !defined(CPUTYPE) || empty(CPUTYPE) -. if ${MACHINE_ARCH} == "i386" -_CPUCFLAGS = -mtune=pentiumpro -MACHINE_CPU = i486 -.elif ${MACHINE_ARCH} == "amd64" -MACHINE_CPU = amd64 sse2 sse -. endif -.else - -# Handle aliases (not documented in make.conf to avoid user confusion -# between e.g. i586 and pentium) - -. if ${MACHINE_ARCH} == "i386" -. if ${CPUTYPE} == "pentiumpro" -CPUTYPE = i686 -. elif ${CPUTYPE} == "pentium" -CPUTYPE = i586 -. elif ${CPUTYPE} == "k7" -CPUTYPE = athlon -. endif -. endif - -# Logic to set up correct gcc optimization flag. This must be included -# after /etc/make.conf so it can react to the local value of CPUTYPE -# defined therein. Consult: -# http://gcc.gnu.org/onlinedocs/gcc/i386-and-x86-64-Options.html -# http://gcc.gnu.org/onlinedocs/gcc/SPARC-Options.html -# http://gcc.gnu.org/onlinedocs/gcc/RS-6000-and-PowerPC-Options.html - -. if ${MACHINE_ARCH} == "i386" -. if ${CPUTYPE} == "k8" || ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || ${CPUTYPE} == "athlon-fx" -_CPUCFLAGS = -march=${CPUTYPE} -. elif ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || ${CPUTYPE} == "athlon-4" || ${CPUTYPE} == "athlon-tbird" || ${CPUTYPE} == "athlon" -_CPUCFLAGS = -march=${CPUTYPE} -. elif ${CPUTYPE} == "k6-3" || ${CPUTYPE} == "k6-2" || ${CPUTYPE} == "k6" -_CPUCFLAGS = -march=${CPUTYPE} -. elif ${CPUTYPE} == "k5" -_CPUCFLAGS = -march=pentium -. elif ${CPUTYPE} == "p4" -_CPUCFLAGS = -march=pentium4 -. elif ${CPUTYPE} == "pentium-m" -_CPUCFLAGS = -march=pentium-m -. elif ${CPUTYPE} == "p3" -_CPUCFLAGS = -march=pentium3 -. elif ${CPUTYPE} == "p2" -_CPUCFLAGS = -march=pentium2 -. elif ${CPUTYPE} == "i686" -_CPUCFLAGS = -march=pentiumpro -. elif ${CPUTYPE} == "i586/mmx" -_CPUCFLAGS = -march=pentium-mmx -. elif ${CPUTYPE} == "i586" -_CPUCFLAGS = -march=pentium -. elif ${CPUTYPE} == "i486" -_CPUCFLAGS = -march=i486 -. endif -. endif - -# Set up the list of CPU features based on the CPU type. This is an -# unordered list to make it easy for client makefiles to test for the -# presence of a CPU feature. - -.if ${MACHINE_ARCH} == "i386" -. if ${CPUTYPE} == "k8" || ${CPUTYPE} == "opteron" || ${CPUTYPE} == "athlon64" || ${CPUTYPE} == "athlon-fx" -MACHINE_CPU = athlon-xp k7 3dnow sse mmx k6 k5 i586 i486 i386 -. elif ${CPUTYPE} == "athlon-mp" || ${CPUTYPE} == "athlon-xp" || ${CPUTYPE} == "athlon-4" -MACHINE_CPU = athlon-xp k7 3dnow sse mmx k6 k5 i586 i486 i386 -. elif ${CPUTYPE} == "athlon" || ${CPUTYPE} == "athlon-tbird" -MACHINE_CPU = athlon k7 3dnow mmx k6 k5 i586 i486 i386 -. elif ${CPUTYPE} == "k6-3" || ${CPUTYPE} == "k6-2" -MACHINE_CPU = 3dnow mmx k6 k5 i586 i486 i386 -. elif ${CPUTYPE} == "k6" -MACHINE_CPU = mmx k6 k5 i586 i486 i386 -. elif ${CPUTYPE} == "k5" -MACHINE_CPU = k5 i586 i486 i386 -. elif ${CPUTYPE} == "p4" || ${CPUTYPE} == "pentium-m" -MACHINE_CPU = sse2 sse i686 mmx i586 i486 i386 -. elif ${CPUTYPE} == "p3" -MACHINE_CPU = sse i686 mmx i586 i486 i386 -. elif ${CPUTYPE} == "p2" -MACHINE_CPU = i686 mmx i586 i486 i386 -. elif ${CPUTYPE} == "i686" -MACHINE_CPU = i686 i586 i486 i386 -. elif ${CPUTYPE} == "i586/mmx" -MACHINE_CPU = mmx i586 i486 i386 -. elif ${CPUTYPE} == "i586" -MACHINE_CPU = i586 i486 i386 -. elif ${CPUTYPE} == "i486" -MACHINE_CPU = i486 i386 -. elif ${CPUTYPE} == "i386" -MACHINE_CPU = i386 -. endif -. elif ${MACHINE_ARCH} == "amd64" -MACHINE_CPU = amd64 sse2 sse -. endif -.endif - diff --git a/share/mk/bsd.cpu.mk b/share/mk/bsd.cpu.mk index f1155ff6f5..f1557abc70 100644 --- a/share/mk/bsd.cpu.mk +++ b/share/mk/bsd.cpu.mk @@ -1,5 +1,5 @@ # $FreeBSD: src/share/mk/bsd.cpu.mk,v 1.2.2.5 2002/07/19 08:09:32 ru Exp $ -# $DragonFly: src/share/mk/bsd.cpu.mk,v 1.13 2006/09/27 12:10:35 corecode Exp $ +# $DragonFly: src/share/mk/bsd.cpu.mk,v 1.14 2007/01/15 18:29:44 corecode Exp $ # include compiler-specific bsd.cpu.mk. Note that CCVER may or may not # be passed as an environment variable. If not set we make it consistent @@ -18,8 +18,6 @@ HOST_CCVER?= ${_CCVER} .if ${CCVER} == "gcc34" . include -.elif ${CCVER} == "gcc40" -. include .elif ${CCVER} == "gcc41" . include .elif defined(CCVER_BSD_CPU_MK) -- 2.41.0