Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove remaining makefile support for GCC < 45 that i found.

Browse Source
This commit is contained in:
mrg 2014-06-14 20:49:36 +00:00
parent 10aed88aaf
commit ac641cb906
22 changed files with 52 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/external/bsd/netpgp/dist/src/libdigest/Makefile vendored
View File

@ -10,7 +10,5 @@ EXTDIST=${.CURDIR}
.include <bsd.lib.mk>
.if ${HAVE_GCC} >= 45
#COPTS.isns_pdu.c+= -fno-strict-aliasing
CPPFLAGS+= -fno-strict-aliasing
.endif

4
external/bsd/ntp/lib/libiscntp/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.8 2014/01/23 14:06:28 joerg Exp $
# $NetBSD: Makefile,v 1.9 2014/06/14 20:49:36 mrg Exp $
LIBISPRIVATE=yes
@ -43,8 +43,6 @@ SRCS= assertions.c \
time.c \
sockaddr.c
.if !defined(HAVE_GCC) || ${HAVE_GCC} >= 45
COPTS.log.c+= -Wno-error=format-nonliteral
.endif
.include <bsd.lib.mk>

4
external/bsd/ntp/lib/libntp/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.11 2014/01/24 23:42:31 matt Exp $
# $NetBSD: Makefile,v 1.12 2014/06/14 20:49:36 mrg Exp $
LIBISPRIVATE=yes
@ -77,9 +77,7 @@ ymd2yd.c
CPPFLAGS+= -I${IDIST}/sntp/libopts
.if !defined(HAVE_GCC) || ${HAVE_GCC} >= 45
COPTS.msyslog.c+= -Wno-error=format-nonliteral
.endif
# For MKREPRO, avoid using __DATE__ and __TIME__.
# Instead, use the date and time from ${IMPORTDATE_FILE}.

6
external/bsd/ntp/lib/libopts/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2014/01/20 01:43:34 christos Exp $
# $NetBSD: Makefile,v 1.10 2014/06/14 20:49:36 mrg Exp $
LIBISPRIVATE=yes
@ -17,10 +17,6 @@ CPPFLAGS+=-I${DIST}
SRCS=libopts.c
COPTS.libopts.c += -DPOSIX_SHELL="\"/bin/sh\"" -Wno-format-nonliteral
.if ${HAVE_GCC:U} >= 45
COPTS.libopts.c+= ${${ACTIVE_CC} == "gcc":? -Wno-format-contains-nul :}
.else
COPTS.libopts.c+= -Wno-format
.endif
.include <bsd.lib.mk>

4
external/gpl3/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.9 2014/02/26 09:54:32 mrg Exp $
# $NetBSD: Makefile,v 1.10 2014/06/14 20:49:36 mrg Exp $
.include <bsd.own.mk>
@ -7,12 +7,10 @@ SUBDIR+= binutils
.endif
.if ${MKGCC} != "no"
.if ${HAVE_GCC} >= 45
.if ${MKGCCCMDS} != "no"
SUBDIR+= ${EXTERNAL_GCC_SUBDIR}
.endif
.endif
.endif
.if ${MKGDB} != "no"
.if ${HAVE_GDB} == "7"

6
external/gpl3/gcc.old/Makefile.gcc_path vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.gcc_path,v 1.1.1.1 2014/02/26 10:56:10 mrg Exp $
# $NetBSD: Makefile.gcc_path,v 1.2 2014/06/14 20:49:37 mrg Exp $
# Define some commom paths
@ -7,11 +7,7 @@ _EXTERNAL_GPL3_GCC_MAKEFILE_INC_=1
.include <bsd.own.mk>
.if ${HAVE_GCC} >= 45
GCC_SUBDIR= ${NETBSDSRCDIR}/external/gpl3/${EXTERNAL_GCC_SUBDIR}
.else
GCC_SUBDIR= /not/here/for/you
.endif
#.if exists(${GCC_SUBDIR}/dist)
GCCDIST= ${GCC_SUBDIR}/dist

5
external/gpl3/gcc.old/lib/libstdc++-v3/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.1.1.2 2014/02/26 10:57:31 mrg Exp $
# $NetBSD: Makefile,v 1.2 2014/06/14 20:49:37 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@ -52,8 +52,6 @@ COPTS.wlocale-inst.cc = -Wno-stack-protector
COPTS.concept-inst.cc= -D_GLIBCPP_CONCEPT_CHECKS -fimplicit-templates
CPPFLAGS.strstream.cc= -I$(GLIBCPP_INCLUDE_DIR)/backward -Wno-deprecated
# For GCC 4.5
.if ${HAVE_GCC} >= 45
# XXX also need this for some PCHs.
CPPFLAGS.atomic.cc = -std=gnu++0x
CPPFLAGS.compatibility-c++0x.cc = -std=gnu++0x
@ -76,7 +74,6 @@ CPPFLAGS.concept-inst.cc += -D_GLIBCXX_CONCEPT_CHECKS
CPPFLAGS.parallel_list.cc += -D_GLIBCXX_PARALLEL
CPPFLAGS.parallel_settings.cc += -D_GLIBCXX_PARALLEL
CPPFLAGS.compatibility-parallel_list.cc += -D_GLIBCXX_PARALLEL
.endif
# XXX
MKDEPFLAGS+= -I$(GLIBCPP_INCLUDE_DIR)/backward

6
external/gpl3/gcc/Makefile.gcc_path vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.gcc_path,v 1.1 2014/02/26 09:54:32 mrg Exp $
# $NetBSD: Makefile.gcc_path,v 1.2 2014/06/14 20:49:36 mrg Exp $
# Define some commom paths
@ -7,11 +7,7 @@ _EXTERNAL_GPL3_GCC_MAKEFILE_INC_=1
.include <bsd.own.mk>
.if ${HAVE_GCC} >= 45
GCC_SUBDIR= ${NETBSDSRCDIR}/external/gpl3/${EXTERNAL_GCC_SUBDIR}
.else
GCC_SUBDIR= /not/here/for/you
.endif
#.if exists(${GCC_SUBDIR}/dist)
GCCDIST= ${GCC_SUBDIR}/dist

5
external/gpl3/gcc/lib/libstdc++-v3/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.15 2014/06/01 19:51:01 mrg Exp $
# $NetBSD: Makefile,v 1.16 2014/06/14 20:49:36 mrg Exp $
REQUIRETOOLS= yes
NOLINT= # defined
@ -57,8 +57,6 @@ COPTS.hashtable_c++0x.cc= -fimplicit-templates
COPTS.bitmap_allocator.cc = -fimplicit-templates
CPPFLAGS.strstream.cc= -I$(GLIBCPP_INCLUDE_DIR)/backward -Wno-deprecated
# For GCC 4.5
.if ${HAVE_GCC} >= 45
# XXX also need this for some PCHs.
CPPFLAGS.atomic.cc = -std=gnu++0x
CPPFLAGS.compatibility-c++0x.cc = -std=gnu++0x
@ -81,7 +79,6 @@ CPPFLAGS.concept-inst.cc += -D_GLIBCXX_CONCEPT_CHECKS
CPPFLAGS.parallel_list.cc += -D_GLIBCXX_PARALLEL
CPPFLAGS.parallel_settings.cc += -D_GLIBCXX_PARALLEL
CPPFLAGS.compatibility-parallel_list.cc += -D_GLIBCXX_PARALLEL
.endif
cp-demangle.d cp-demangle.o: cp-demangle.h

4
external/mit/xorg/lib/libGLU/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.12 2013/09/12 17:14:20 joerg Exp $
# $NetBSD: Makefile,v 1.13 2014/06/14 20:49:37 mrg Exp $
NOLINT= 1 # XTODO: tess.ln SIGSEGVs lint :(
@ -89,11 +89,9 @@ PKGCONFIG_VERSION.glu= ${MESA_VER}
.include <bsd.lib.mk>
# XXX
.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45
COPTS.arcsorter.cc+= -Wno-error
COPTS.sorter.cc+= -Wno-error
COPTS.tobezier.cc+= -Wno-error
.endif
.if ${MACHINE_ARCH} == "m68000" || ${MACHINE_ARCH} == "m68k"
COPTS.sampleCompTop.cc+= -O0

6
external/mit/xorg/lib/libX11/Makefile.libx11 vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.libx11,v 1.12 2013/10/18 01:12:00 riz Exp $
# $NetBSD: Makefile.libx11,v 1.13 2014/06/14 20:49:37 mrg Exp $
LIB= X11
.PATH: ${X11SRCDIR.${LIB}}/src
@ -462,10 +462,6 @@ COPTS.Font.c+= -Wno-error # XXX xf86bigfstr.h
COPTS.OpenDis.c+= -Wno-error # XXX xf86bigfstr.h
COPTS.XlibInt.c+= -Wno-error # XXX xcmiscstr.h
COPTS.XKBBind.c+= -Wno-error # uses XKeycodeToKeysym
.if defined(HAVE_GCC) && ${HAVE_GCC} < 45
COPTS.LiHosts.c+= -Wno-error # XXX: old gcc figures out that const
# cond because nHosts < max_hosts
.endif
CWARNFLAGS.clang+= -Wno-string-plus-int

6
external/mit/xorg/lib/libXi/Makefile vendored
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.12 2014/03/16 22:53:17 mrg Exp $
# $NetBSD: Makefile,v 1.13 2014/06/14 20:49:37 mrg Exp $
.include <bsd.own.mk>
@ -81,10 +81,6 @@ PKGDIST= ${LIB}
COPTS.XExtInt.c+= -Wno-error # XXX
COPTS.XSndExEv.c+= -Wno-error # XXX
.if defined(HAVE_GCC) && ${HAVE_GCC} < 45
COPTS.XGetFCtl.c+= -Wno-error # XXX
.endif
CWARNFLAGS.clang+= -Wno-pointer-sign
# XXX manuals

4
games/phantasia/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.36 2013/02/16 17:00:21 jmcneill Exp $
# $NetBSD: Makefile,v 1.37 2014/06/14 20:49:37 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 5/31/93
.include <bsd.own.mk>
@ -53,6 +53,6 @@ map: map.c
.include <bsd.prog.mk>
.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45 && ${MACHINE_ARCH} == "vax"
.if defined(HAVE_GCC) && ${MACHINE_ARCH} == "vax"
COPTS.misc.c+= -O0
.endif

8
lib/libc/softfloat/Makefile.inc
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.inc,v 1.17 2014/01/30 19:11:54 matt Exp $
# $NetBSD: Makefile.inc,v 1.18 2014/06/14 20:49:37 mrg Exp $
SOFTFLOAT_BITS?=64
.PATH: ${ARCHDIR}/softfloat \
@ -30,13 +30,13 @@ SRCS.softfloat+=eqsf2.c nesf2.c gtsf2.c gesf2.c ltsf2.c lesf2.c negsf2.c \
SRCS+= ${SRCS.softfloat}
# XXX
.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45
.if (${MACHINE_CPU} == "arm")
.if defined(HAVE_GCC)
. if (${MACHINE_CPU} == "arm")
# See doc/HACKS for more information.
COPTS.softfloat.c+= -Wno-enum-compare
COPTS.softfloat.c+= ${${ACTIVE_CXX} == "gcc":? -fno-tree-vrp :}
.elif (${MACHINE_CPU} == "mips" || \
${MACHINE_CPU} == "sh3")
COPTS.softfloat.c+= -Wno-enum-compare
.endif
. endif
.endif

4
lib/libedit/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.51 2012/08/10 12:20:10 joerg Exp $
# $NetBSD: Makefile,v 1.52 2014/06/14 20:49:37 mrg Exp $
# @(#)Makefile 8.1 (Berkeley) 6/4/93
USE_SHLIBDIR= yes
@ -127,7 +127,7 @@ tc1: libedit.a tc1.o
.include <bsd.subdir.mk>
# XXX
.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45
.if defined(HAVE_GCC)
COPTS.editline.c+= -Wno-cast-qual
COPTS.tokenizer.c+= -Wno-cast-qual
COPTS.tokenizern.c+= -Wno-cast-qual

7
sys/arch/vax/conf/Makefile.vax
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile.vax,v 1.82 2014/06/04 21:24:54 matt Exp $
# $NetBSD: Makefile.vax,v 1.83 2014/06/14 20:49:37 mrg Exp $
# Makefile for NetBSD
#
@ -75,11 +75,6 @@ lock_stubs.o unimpl_emul.o: assym.h
## (7) misc settings
##
# XXX recent gcc4 gets ICE on this one
.if ${HAVE_GCC} == "4"
COPTS.db_command.c+= -fno-tree-ter
.endif
##
## (8) config(8) generated machinery
##

4
sys/lib/libsa/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.81 2014/03/26 18:02:24 christos Exp $
# $NetBSD: Makefile,v 1.82 2014/06/14 20:49:37 mrg Exp $
LIB= sa
LIBISPRIVATE?= yes
@ -84,6 +84,6 @@ lib${LIB}.o:: ${OBJS}
CPPFLAGS+= -Wno-pointer-sign
.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45 && ${MACHINE_ARCH} == "vax"
.if defined(HAVE_GCC) && ${MACHINE_ARCH} == "vax"
COPTS.bootp.c+= -O0
.endif

4
sys/lib/libz/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.18 2011/10/30 00:28:57 mrg Exp $
# $NetBSD: Makefile,v 1.19 2014/06/14 20:49:37 mrg Exp $
LIB= z
LIBISPRIVATE= yes
@ -29,6 +29,6 @@ lib${LIB}.o:: ${OBJS}
@rm -f lib${LIB}.o
@${LD} -r -o lib${LIB}.o `lorder ${OBJS} | tsort`
.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45 && ${MACHINE_ARCH} == "vax"
.if defined(HAVE_GCC) && ${MACHINE_ARCH} == "vax"
COPTS.inftrees.c+= -O0
.endif

31
tools/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.173 2014/04/03 18:23:38 riastradh Exp $
# $NetBSD: Makefile,v 1.174 2014/06/14 20:49:37 mrg Exp $
.include <bsd.own.mk>
.include <bsd.endian.mk>
@ -25,17 +25,12 @@
TOOLS_BUILDRUMP?=no
.if ${TOOLCHAIN_MISSING} == "no"
.if defined(HAVE_GCC)
. if defined(HAVE_GCC)
TOOLCHAIN_BITS= gmake .WAIT
.endif
.if defined(HAVE_GCC)
.if ${HAVE_GCC} >= 45
TOOLCHAIN_BITS+= gmp .WAIT
TOOLCHAIN_BITS+= mpfr .WAIT
TOOLCHAIN_BITS+= mpc .WAIT
.endif
.endif
. endif
.endif
.if ${TOOLCHAIN_MISSING} == "no"
@ -43,19 +38,19 @@ TOOLCHAIN_BITS+= binutils .WAIT
.endif
.if defined(HAVE_GCC)
.if ${TOOLCHAIN_MISSING} == "no"
. if ${TOOLCHAIN_MISSING} == "no"
TOOLCHAIN_BITS+= gcc
. if ${MKCROSSGDB:Uno} != "no" || make(obj)
TOOLCHAIN_BITS+= gdb
. endif
TOOLCHAIN_BITS+= .WAIT
.endif
. endif
.endif
.if defined(HAVE_PCC)
.if ${TOOLCHAIN_MISSING} == "no"
. if ${TOOLCHAIN_MISSING} == "no"
TOOLCHAIN_BITS+= pcc
.endif
. endif
.endif
.if ${TOOLCHAIN_MISSING} == "no"
@ -134,18 +129,18 @@ SUBDIR+= \
llvm-include .WAIT \
llvm-lib .WAIT \
llvm-clang
.if ${MKLLD} != "no"
. if ${MKLLD} != "no"
SUBDIR+= llvm-lld
.endif
.if ${MKMCLINKER} != "no"
. endif
. if ${MKMCLINKER} != "no"
SUBDIR+= llvm-mcld
.endif
. endif
.endif
.if ${MKMAN} != "no" || ${MKDOC} != "no" || ${MKHTML} != "no"
. if ${MKGROFF} != "no"
. if ${MKGROFF} != "no"
SUBDIR+= groff
. endif
. endif
SUBDIR+= mandoc
.endif

24
tools/gcc/Makefile
View File

@ -1,15 +1,11 @@
# $NetBSD: Makefile,v 1.69 2014/05/29 07:40:37 mrg Exp $
# $NetBSD: Makefile,v 1.70 2014/06/14 20:49:37 mrg Exp $
.include <bsd.own.mk>
GCC_LANGUAGES=c c++ objc
MODULE= gcc4
.if ${HAVE_GCC} < 45
GCCDIST= ${.CURDIR}/../../gnu/dist/gcc4
.else
GCCDIST= ${.CURDIR}/../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/dist
.endif
GNUHOSTDIST= ${GCCDIST}
.if ${HAVE_GCC} == 48
@ -53,14 +49,11 @@ COMMON_CONFIGURE_ARGS+= --with-tune=${GCC_CONFIG_TUNE.${MACHINE_ARCH}}
.endif
CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
.if ${HAVE_GCC} >= 45
CONFIGURE_ARGS+= \
--with-sysroot=${DESTDIR} \
--with-mpc=${TOOLDIR} \
--with-mpfr=${TOOLDIR} \
--with-gmp=${TOOLDIR}
.endif
CONFIGURE_ARGS+= \
--with-gmp=${TOOLDIR} \
--disable-nls \
${MULTILIB_ARGS} \
${SOFTFLOAT_ARGS} \
@ -97,8 +90,6 @@ MKNATIVE_TARGET= gcc48
.elif ${HAVE_GCC} == 45
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgomp
MKNATIVE_TARGET= gcc45
.else
MKNATIVE_TARGET= gcc4
.endif
MKNATIVE_CONFIG_TARGET_LIBS+= \
@ -161,7 +152,6 @@ native-gcc: .native/.configure_done
${MACHINE_GNU_PLATFORM} ${DESTDIR} ${TOOLDIR}
NATIVE_CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
.if ${HAVE_GCC} >= 45
MPC= ${NETBSDSRCDIR}/external/lgpl3/mpc
MPFR= ${NETBSDSRCDIR}/external/lgpl3/mpfr
GMP= ${NETBSDSRCDIR}/external/lgpl3/gmp
@ -179,13 +169,13 @@ NATIVE_CONFIGURE_ARGS+= \
--with-mpfr-include=${MPFR}/dist/src \
--with-gmp-include=${GMP}/lib/libgmp/arch/${GMP_MACHINE_ARCH}
. if ${MACHINE_ARCH} != "vax"
.if ${MACHINE_ARCH} != "vax"
NATIVE_CONFIGURE_ARGS+= --enable-tls
. endif
. if !empty(MACHINE_ARCH:Mearm*)
NATIVE_CONFIGURE_ARGS+= --enable-initfini-array
. endif
.endif
.if !empty(MACHINE_ARCH:Mearm*)
NATIVE_CONFIGURE_ARGS+= --enable-initfini-array
.endif
NATIVE_CONFIGURE_ARGS+= \
--disable-multilib \
--disable-symvers \

12
tools/gcc/README.mknative
View File

@ -1,4 +1,4 @@
$NetBSD: README.mknative,v 1.19 2014/04/22 13:20:58 joerg Exp $
$NetBSD: README.mknative,v 1.20 2014/06/14 20:49:37 mrg 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
@ -29,7 +29,7 @@ work.
to build.sh. Use -M instead. (The differences are in layout and pathname
prefixes in the object directory pointed to by each option.)
3. In src/tools/gcc, do "nbmake-MACHINE HAVE_GCC=45 bootstrap-libgcc".
3. In src/tools/gcc, do "nbmake-MACHINE HAVE_GCC=48 bootstrap-libgcc".
This will create just enough glue in src/external/gpl3/gcc/lib/libgcc/arch
to make it possible to build, based on the toolchain built in
@ -39,9 +39,9 @@ work.
will regenerate the "proper" libgcc config files.
4. At top level, do
"nbmake-MACHINE obj do-distrib-dirs MKGCC=no MKBINUTILS=no HAVE_GCC=45", and
"nbmake-MACHINE includes HAVE_GCC= MKGCC=no MKBINUTILS=no HAVE_GCC=45".
(Note: replace 45 [for gcc 4.5.x] with the appropriate version you are
"nbmake-MACHINE obj do-distrib-dirs MKGCC=no MKBINUTILS=no HAVE_GCC=48", and
"nbmake-MACHINE includes HAVE_GCC= MKGCC=no MKBINUTILS=no HAVE_GCC=48".
(Note: replace 48 [for gcc 4.8.x] with the appropriate version you are
going to mknative-for, the MKGCC=no prevents the standard makefiles from
picking up any gcc version info automatically)
@ -56,7 +56,7 @@ work.
do "nbmake-MACHINE obj dependall".
8. In src/lib, do
"nbmake-MACHINE dependall install MKGCC=no HAVE_GCC=45".
"nbmake-MACHINE dependall install MKGCC=no HAVE_GCC=48".
Optionally, all of the following may be set in the environment to reduce
the amount of code needed to build at this step. Basically, it must be

4
x11/lib/GLU/Makefile
View File

@ -1,4 +1,4 @@
# $NetBSD: Makefile,v 1.10 2013/09/12 17:14:20 joerg Exp $
# $NetBSD: Makefile,v 1.11 2014/06/14 20:49:37 mrg Exp $
NOLINT= 1 # XTODO: tess.ln SIGSEGVs lint :(
@ -69,7 +69,7 @@ LIBDPLIBS=\
.include <bsd.lib.mk>
# Many const char * vs char * issues in xsrc/xfree
.if defined(HAVE_GCC) && ${HAVE_GCC} >= 45
.if defined(HAVE_GCC)
# XXX -Wno-deprecated doesn't work?
CXXFLAGS+= -Wno-error
.endif