Index: crypto/external/bsd/netpgp/dist/src/libdigest/Makefile =================================================================== RCS file: /cvsroot/src/crypto/external/bsd/netpgp/dist/src/libdigest/Makefile,v retrieving revision 1.2 diff -p -r1.2 Makefile *** crypto/external/bsd/netpgp/dist/src/libdigest/Makefile 20 Nov 2012 05:26:25 -0000 1.2 --- crypto/external/bsd/netpgp/dist/src/libdigest/Makefile 14 Jun 2014 18:27:52 -0000 *************** EXTDIST=${.CURDIR} *** 10,16 **** .include - .if ${HAVE_GCC} >= 45 #COPTS.isns_pdu.c+= -fno-strict-aliasing CPPFLAGS+= -fno-strict-aliasing - .endif --- 10,14 ---- Index: external/bsd/ntp/lib/libiscntp/Makefile =================================================================== RCS file: /cvsroot/src/external/bsd/ntp/lib/libiscntp/Makefile,v retrieving revision 1.8 diff -p -r1.8 Makefile *** external/bsd/ntp/lib/libiscntp/Makefile 23 Jan 2014 14:06:28 -0000 1.8 --- external/bsd/ntp/lib/libiscntp/Makefile 14 Jun 2014 18:27:52 -0000 *************** SRCS= assertions.c \ *** 43,50 **** time.c \ sockaddr.c - .if !defined(HAVE_GCC) || ${HAVE_GCC} >= 45 COPTS.log.c+= -Wno-error=format-nonliteral - .endif .include --- 43,48 ---- Index: external/bsd/ntp/lib/libntp/Makefile =================================================================== RCS file: /cvsroot/src/external/bsd/ntp/lib/libntp/Makefile,v retrieving revision 1.11 diff -p -r1.11 Makefile *** external/bsd/ntp/lib/libntp/Makefile 24 Jan 2014 23:42:31 -0000 1.11 --- external/bsd/ntp/lib/libntp/Makefile 14 Jun 2014 18:27:52 -0000 *************** ymd2yd.c *** 77,85 **** 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}. --- 77,83 ---- Index: external/bsd/ntp/lib/libopts/Makefile =================================================================== RCS file: /cvsroot/src/external/bsd/ntp/lib/libopts/Makefile,v retrieving revision 1.9 diff -p -r1.9 Makefile *** external/bsd/ntp/lib/libopts/Makefile 20 Jan 2014 01:43:34 -0000 1.9 --- external/bsd/ntp/lib/libopts/Makefile 14 Jun 2014 18:27:52 -0000 *************** CPPFLAGS+=-I${DIST} *** 17,26 **** 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 --- 17,22 ---- Index: external/gpl3/Makefile =================================================================== RCS file: /cvsroot/src/external/gpl3/Makefile,v retrieving revision 1.9 diff -p -r1.9 Makefile *** external/gpl3/Makefile 26 Feb 2014 09:54:32 -0000 1.9 --- external/gpl3/Makefile 14 Jun 2014 18:27:52 -0000 *************** SUBDIR+= binutils *** 7,18 **** .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" --- 7,16 ---- Index: external/gpl3/gcc/lib/libstdc++-v3/Makefile =================================================================== RCS file: /cvsroot/src/external/gpl3/gcc/lib/libstdc++-v3/Makefile,v retrieving revision 1.15 diff -p -r1.15 Makefile *** external/gpl3/gcc/lib/libstdc++-v3/Makefile 1 Jun 2014 19:51:01 -0000 1.15 --- external/gpl3/gcc/lib/libstdc++-v3/Makefile 14 Jun 2014 18:27:52 -0000 *************** COPTS.hashtable_c++0x.cc= -fimplicit-te *** 57,64 **** 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 --- 57,62 ---- *************** CPPFLAGS.concept-inst.cc += -D_GLIBCXX_C *** 81,87 **** 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 --- 79,84 ---- Index: external/gpl3/gcc/Makefile.gcc_path =================================================================== RCS file: /cvsroot/src/external/gpl3/gcc/Makefile.gcc_path,v retrieving revision 1.1 diff -p -r1.1 Makefile.gcc_path *** external/gpl3/gcc/Makefile.gcc_path 26 Feb 2014 09:54:32 -0000 1.1 --- external/gpl3/gcc/Makefile.gcc_path 14 Jun 2014 18:27:52 -0000 *************** _EXTERNAL_GPL3_GCC_MAKEFILE_INC_=1 *** 7,17 **** .include - .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 --- 7,13 ---- Index: external/gpl3/gcc.old/lib/libstdc++-v3/Makefile =================================================================== RCS file: /cvsroot/src/external/gpl3/gcc.old/lib/libstdc++-v3/Makefile,v retrieving revision 1.1.1.2 diff -p -r1.1.1.2 Makefile *** external/gpl3/gcc.old/lib/libstdc++-v3/Makefile 26 Feb 2014 10:57:31 -0000 1.1.1.2 --- external/gpl3/gcc.old/lib/libstdc++-v3/Makefile 14 Jun 2014 18:27:52 -0000 *************** COPTS.wlocale-inst.cc = -Wno-stack-prote *** 52,59 **** 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 --- 52,57 ---- *************** CPPFLAGS.concept-inst.cc += -D_GLIBCXX_C *** 76,82 **** 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 --- 74,79 ---- Index: external/gpl3/gcc.old/Makefile.gcc_path =================================================================== RCS file: /cvsroot/src/external/gpl3/gcc.old/Makefile.gcc_path,v retrieving revision 1.1.1.1 diff -p -r1.1.1.1 Makefile.gcc_path *** external/gpl3/gcc.old/Makefile.gcc_path 26 Feb 2014 10:56:10 -0000 1.1.1.1 --- external/gpl3/gcc.old/Makefile.gcc_path 14 Jun 2014 18:27:52 -0000 *************** _EXTERNAL_GPL3_GCC_MAKEFILE_INC_=1 *** 7,17 **** .include - .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 --- 7,13 ---- Index: external/mit/xorg/lib/libGLU/Makefile =================================================================== RCS file: /cvsroot/src/external/mit/xorg/lib/libGLU/Makefile,v retrieving revision 1.12 diff -p -r1.12 Makefile *** external/mit/xorg/lib/libGLU/Makefile 12 Sep 2013 17:14:20 -0000 1.12 --- external/mit/xorg/lib/libGLU/Makefile 14 Jun 2014 18:27:52 -0000 *************** PKGCONFIG_VERSION.glu= ${MESA_VER} *** 89,99 **** .include # 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 --- 89,97 ---- Index: external/mit/xorg/lib/libX11/Makefile.libx11 =================================================================== RCS file: /cvsroot/src/external/mit/xorg/lib/libX11/Makefile.libx11,v retrieving revision 1.12 diff -p -r1.12 Makefile.libx11 *** external/mit/xorg/lib/libX11/Makefile.libx11 18 Oct 2013 01:12:00 -0000 1.12 --- external/mit/xorg/lib/libX11/Makefile.libx11 14 Jun 2014 18:27:52 -0000 *************** COPTS.Font.c+= -Wno-error # XXX xf86big *** 462,471 **** 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 --- 462,467 ---- Index: external/mit/xorg/lib/libXi/Makefile =================================================================== RCS file: /cvsroot/src/external/mit/xorg/lib/libXi/Makefile,v retrieving revision 1.12 diff -p -r1.12 Makefile *** external/mit/xorg/lib/libXi/Makefile 16 Mar 2014 22:53:17 -0000 1.12 --- external/mit/xorg/lib/libXi/Makefile 14 Jun 2014 18:27:52 -0000 *************** PKGDIST= ${LIB} *** 81,90 **** 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 --- 81,86 ---- Index: games/phantasia/Makefile =================================================================== RCS file: /cvsroot/src/games/phantasia/Makefile,v retrieving revision 1.36 diff -p -r1.36 Makefile *** games/phantasia/Makefile 16 Feb 2013 17:00:21 -0000 1.36 --- games/phantasia/Makefile 14 Jun 2014 18:27:52 -0000 *************** map: map.c *** 53,58 **** .include ! .if defined(HAVE_GCC) && ${HAVE_GCC} >= 45 && ${MACHINE_ARCH} == "vax" COPTS.misc.c+= -O0 .endif --- 53,58 ---- .include ! .if defined(HAVE_GCC) && ${MACHINE_ARCH} == "vax" COPTS.misc.c+= -O0 .endif Index: lib/libc/softfloat/Makefile.inc =================================================================== RCS file: /cvsroot/src/lib/libc/softfloat/Makefile.inc,v retrieving revision 1.17 diff -p -r1.17 Makefile.inc *** lib/libc/softfloat/Makefile.inc 30 Jan 2014 19:11:54 -0000 1.17 --- lib/libc/softfloat/Makefile.inc 14 Jun 2014 18:27:52 -0000 *************** SRCS.softfloat+=eqsf2.c nesf2.c gtsf2.c *** 30,42 **** SRCS+= ${SRCS.softfloat} # XXX ! .if defined(HAVE_GCC) && ${HAVE_GCC} >= 45 ! .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 --- 30,42 ---- SRCS+= ${SRCS.softfloat} # XXX ! .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 Index: lib/libedit/Makefile =================================================================== RCS file: /cvsroot/src/lib/libedit/Makefile,v retrieving revision 1.51 diff -p -r1.51 Makefile *** lib/libedit/Makefile 10 Aug 2012 12:20:10 -0000 1.51 --- lib/libedit/Makefile 14 Jun 2014 18:27:52 -0000 *************** tc1: libedit.a tc1.o *** 127,133 **** .include # XXX ! .if defined(HAVE_GCC) && ${HAVE_GCC} >= 45 COPTS.editline.c+= -Wno-cast-qual COPTS.tokenizer.c+= -Wno-cast-qual COPTS.tokenizern.c+= -Wno-cast-qual --- 127,133 ---- .include # XXX ! .if defined(HAVE_GCC) COPTS.editline.c+= -Wno-cast-qual COPTS.tokenizer.c+= -Wno-cast-qual COPTS.tokenizern.c+= -Wno-cast-qual Index: sys/arch/vax/conf/Makefile.vax =================================================================== RCS file: /cvsroot/src/sys/arch/vax/conf/Makefile.vax,v retrieving revision 1.82 diff -p -r1.82 Makefile.vax *** sys/arch/vax/conf/Makefile.vax 4 Jun 2014 21:24:54 -0000 1.82 --- sys/arch/vax/conf/Makefile.vax 14 Jun 2014 18:27:52 -0000 *************** lock_stubs.o unimpl_emul.o: assym.h *** 75,85 **** ## (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 ## --- 75,80 ---- Index: sys/lib/libsa/Makefile =================================================================== RCS file: /cvsroot/src/sys/lib/libsa/Makefile,v retrieving revision 1.81 diff -p -r1.81 Makefile *** sys/lib/libsa/Makefile 26 Mar 2014 18:02:24 -0000 1.81 --- sys/lib/libsa/Makefile 14 Jun 2014 18:27:52 -0000 *************** lib${LIB}.o:: ${OBJS} *** 84,89 **** CPPFLAGS+= -Wno-pointer-sign ! .if defined(HAVE_GCC) && ${HAVE_GCC} >= 45 && ${MACHINE_ARCH} == "vax" COPTS.bootp.c+= -O0 .endif --- 84,89 ---- CPPFLAGS+= -Wno-pointer-sign ! .if defined(HAVE_GCC) && ${MACHINE_ARCH} == "vax" COPTS.bootp.c+= -O0 .endif Index: sys/lib/libz/Makefile =================================================================== RCS file: /cvsroot/src/sys/lib/libz/Makefile,v retrieving revision 1.18 diff -p -r1.18 Makefile *** sys/lib/libz/Makefile 30 Oct 2011 00:28:57 -0000 1.18 --- sys/lib/libz/Makefile 14 Jun 2014 18:27:52 -0000 *************** lib${LIB}.o:: ${OBJS} *** 29,34 **** @rm -f lib${LIB}.o @${LD} -r -o lib${LIB}.o `lorder ${OBJS} | tsort` ! .if defined(HAVE_GCC) && ${HAVE_GCC} >= 45 && ${MACHINE_ARCH} == "vax" COPTS.inftrees.c+= -O0 .endif --- 29,34 ---- @rm -f lib${LIB}.o @${LD} -r -o lib${LIB}.o `lorder ${OBJS} | tsort` ! .if defined(HAVE_GCC) && ${MACHINE_ARCH} == "vax" COPTS.inftrees.c+= -O0 .endif Index: tools/Makefile =================================================================== RCS file: /cvsroot/src/tools/Makefile,v retrieving revision 1.173 diff -p -r1.173 Makefile *** tools/Makefile 3 Apr 2014 18:23:38 -0000 1.173 --- tools/Makefile 14 Jun 2014 18:27:52 -0000 *************** *** 25,41 **** TOOLS_BUILDRUMP?=no .if ${TOOLCHAIN_MISSING} == "no" ! .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 .if ${TOOLCHAIN_MISSING} == "no" --- 25,36 ---- TOOLS_BUILDRUMP?=no .if ${TOOLCHAIN_MISSING} == "no" ! . if defined(HAVE_GCC) TOOLCHAIN_BITS= gmake .WAIT TOOLCHAIN_BITS+= gmp .WAIT TOOLCHAIN_BITS+= mpfr .WAIT TOOLCHAIN_BITS+= mpc .WAIT ! . endif .endif .if ${TOOLCHAIN_MISSING} == "no" *************** TOOLCHAIN_BITS+= binutils .WAIT *** 43,61 **** .endif .if defined(HAVE_GCC) ! .if ${TOOLCHAIN_MISSING} == "no" TOOLCHAIN_BITS+= gcc . if ${MKCROSSGDB:Uno} != "no" || make(obj) TOOLCHAIN_BITS+= gdb . endif TOOLCHAIN_BITS+= .WAIT ! .endif .endif .if defined(HAVE_PCC) ! .if ${TOOLCHAIN_MISSING} == "no" TOOLCHAIN_BITS+= pcc ! .endif .endif .if ${TOOLCHAIN_MISSING} == "no" --- 38,56 ---- .endif .if defined(HAVE_GCC) ! . if ${TOOLCHAIN_MISSING} == "no" TOOLCHAIN_BITS+= gcc . if ${MKCROSSGDB:Uno} != "no" || make(obj) TOOLCHAIN_BITS+= gdb . endif TOOLCHAIN_BITS+= .WAIT ! . endif .endif .if defined(HAVE_PCC) ! . if ${TOOLCHAIN_MISSING} == "no" TOOLCHAIN_BITS+= pcc ! . endif .endif .if ${TOOLCHAIN_MISSING} == "no" *************** SUBDIR+= \ *** 134,151 **** llvm-include .WAIT \ llvm-lib .WAIT \ llvm-clang ! .if ${MKLLD} != "no" SUBDIR+= llvm-lld ! .endif ! .if ${MKMCLINKER} != "no" SUBDIR+= llvm-mcld ! .endif .endif .if ${MKMAN} != "no" || ${MKDOC} != "no" || ${MKHTML} != "no" ! . if ${MKGROFF} != "no" SUBDIR+= groff ! . endif SUBDIR+= mandoc .endif --- 129,146 ---- llvm-include .WAIT \ llvm-lib .WAIT \ llvm-clang ! . if ${MKLLD} != "no" SUBDIR+= llvm-lld ! . endif ! . if ${MKMCLINKER} != "no" SUBDIR+= llvm-mcld ! . endif .endif .if ${MKMAN} != "no" || ${MKDOC} != "no" || ${MKHTML} != "no" ! . if ${MKGROFF} != "no" SUBDIR+= groff ! . endif SUBDIR+= mandoc .endif Index: tools/gcc/Makefile =================================================================== RCS file: /cvsroot/src/tools/gcc/Makefile,v retrieving revision 1.69 diff -p -r1.69 Makefile *** tools/gcc/Makefile 29 May 2014 07:40:37 -0000 1.69 --- tools/gcc/Makefile 14 Jun 2014 18:27:52 -0000 *************** *** 5,15 **** 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 --- 5,11 ---- *************** COMMON_CONFIGURE_ARGS+= --with-tune=${GC *** 53,66 **** .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+= \ --disable-nls \ ${MULTILIB_ARGS} \ ${SOFTFLOAT_ARGS} \ --- 49,59 ---- .endif CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS} CONFIGURE_ARGS+= \ --with-sysroot=${DESTDIR} \ --with-mpc=${TOOLDIR} \ --with-mpfr=${TOOLDIR} \ ! --with-gmp=${TOOLDIR} \ --disable-nls \ ${MULTILIB_ARGS} \ ${SOFTFLOAT_ARGS} \ *************** MKNATIVE_TARGET= gcc48 *** 97,104 **** .elif ${HAVE_GCC} == 45 MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgomp MKNATIVE_TARGET= gcc45 - .else - MKNATIVE_TARGET= gcc4 .endif MKNATIVE_CONFIG_TARGET_LIBS+= \ --- 90,95 ---- *************** native-gcc: .native/.configure_done *** 161,167 **** ${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 --- 152,157 ---- *************** NATIVE_CONFIGURE_ARGS+= \ *** 179,191 **** --with-mpfr-include=${MPFR}/dist/src \ --with-gmp-include=${GMP}/lib/libgmp/arch/${GMP_MACHINE_ARCH} ! . if ${MACHINE_ARCH} != "vax" NATIVE_CONFIGURE_ARGS+= --enable-tls ! . endif ! . if !empty(MACHINE_ARCH:Mearm*) NATIVE_CONFIGURE_ARGS+= --enable-initfini-array - . endif .endif NATIVE_CONFIGURE_ARGS+= \ --disable-multilib \ --disable-symvers \ --- 169,181 ---- --with-mpfr-include=${MPFR}/dist/src \ --with-gmp-include=${GMP}/lib/libgmp/arch/${GMP_MACHINE_ARCH} ! .if ${MACHINE_ARCH} != "vax" NATIVE_CONFIGURE_ARGS+= --enable-tls ! .endif ! .if !empty(MACHINE_ARCH:Mearm*) NATIVE_CONFIGURE_ARGS+= --enable-initfini-array .endif + NATIVE_CONFIGURE_ARGS+= \ --disable-multilib \ --disable-symvers \ Index: tools/gcc/README.mknative =================================================================== RCS file: /cvsroot/src/tools/gcc/README.mknative,v retrieving revision 1.19 diff -p -r1.19 README.mknative *** tools/gcc/README.mknative 22 Apr 2014 13:20:58 -0000 1.19 --- tools/gcc/README.mknative 14 Jun 2014 18:27:52 -0000 *************** work. *** 29,35 **** 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". 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 --- 29,35 ---- 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=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 *************** work. *** 39,47 **** 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 going to mknative-for, the MKGCC=no prevents the standard makefiles from picking up any gcc version info automatically) --- 39,47 ---- will regenerate the "proper" libgcc config files. 4. At top level, do ! "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) *************** work. *** 56,62 **** do "nbmake-MACHINE obj dependall". 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 the amount of code needed to build at this step. Basically, it must be --- 56,62 ---- do "nbmake-MACHINE obj dependall". 8. In src/lib, do ! "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 Index: x11/lib/GLU/Makefile =================================================================== RCS file: /cvsroot/src/x11/lib/GLU/Makefile,v retrieving revision 1.10 diff -p -r1.10 Makefile *** x11/lib/GLU/Makefile 12 Sep 2013 17:14:20 -0000 1.10 --- x11/lib/GLU/Makefile 14 Jun 2014 18:27:52 -0000 *************** LIBDPLIBS=\ *** 69,75 **** .include # Many const char * vs char * issues in xsrc/xfree ! .if defined(HAVE_GCC) && ${HAVE_GCC} >= 45 # XXX -Wno-deprecated doesn't work? CXXFLAGS+= -Wno-error .endif --- 69,75 ---- .include # Many const char * vs char * issues in xsrc/xfree ! .if defined(HAVE_GCC) # XXX -Wno-deprecated doesn't work? CXXFLAGS+= -Wno-error .endif