Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src remove the build support for GCC 4.1, and any hacks i found ...



details:   https://anonhg.NetBSD.org/src/rev/904b555ced0e
branches:  trunk
changeset: 796654:904b555ced0e
user:      mrg <mrg%NetBSD.org@localhost>
date:      Fri Jun 13 01:17:45 2014 +0000

description:
remove the build support for GCC 4.1, and any hacks i found for it.

there could still be more -- i only looked for lines matching
both "HAVE_GCC" and "4" as words (grep -w.)

diffstat:

 Makefile                              |   9 +--------
 bin/csh/Makefile                      |   6 +-----
 doc/HACKS                             |  12 +-----------
 external/gpl3/gdb/lib/libgdb/Makefile |   6 +-----
 gnu/usr.bin/Makefile                  |  10 +---------
 lib/Makefile                          |  18 +++---------------
 lib/libcurses/Makefile                |   7 +------
 lib/libm/compiler_rt/Makefile.inc     |   6 +-----
 share/mk/bsd.lib.mk                   |   4 +---
 share/mk/bsd.sys.mk                   |   4 ++--
 sys/lib/libunwind/Makefile.inc        |  12 +-----------
 11 files changed, 14 insertions(+), 80 deletions(-)

diffs (266 lines):

diff -r dcdff5cc0fd7 -r 904b555ced0e Makefile
--- a/Makefile  Fri Jun 13 01:11:15 2014 +0000
+++ b/Makefile  Fri Jun 13 01:17:45 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.305 2014/02/26 09:54:32 mrg Exp $
+#      $NetBSD: Makefile,v 1.306 2014/06/13 01:17:45 mrg Exp $
 
 #
 # This is the top-level makefile for building NetBSD. For an outline of
@@ -199,16 +199,9 @@
 # Targets (in order!) called by "make build".
 #
 .if defined(HAVE_GCC)
-.if ${HAVE_GCC} == "4"
-LIBGCC_EXT=4
-BUILD_CC_LIB_BASEDIR= gnu/lib
-BUILD_CC_LIB_BASETARGET= gnu-lib
-.else
-LIBGCC_EXT=
 BUILD_CC_LIB_BASEDIR= external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib
 BUILD_CC_LIB_BASETARGET= external-gpl3-gcc-lib
 .endif
-.endif
 
 BUILDTARGETS+= check-tools
 .if ${MKUPDATE} == "no" && !defined(NOCLEANDIR)
diff -r dcdff5cc0fd7 -r 904b555ced0e bin/csh/Makefile
--- a/bin/csh/Makefile  Fri Jun 13 01:11:15 2014 +0000
+++ b/bin/csh/Makefile  Fri Jun 13 01:17:45 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.39 2013/07/16 17:47:43 christos Exp $
+#      $NetBSD: Makefile,v 1.40 2014/06/13 01:17:45 mrg Exp $
 #      @(#)Makefile    8.1 (Berkeley) 5/31/93
 #
 # C Shell with process control; VM/UNIX VAX Makefile
@@ -56,10 +56,6 @@
 SUBDIR+=USD.doc
 .endif
 
-# XXX Only GCC 4.1 problem
-.if defined(HAVE_GCC) && ${HAVE_GCC} == 4 && ${MACHINE_ARCH} == "vax"
-COPTS.parse.c+=        -O0
-.endif
 COPTS.err.c = -Wno-format-nonliteral
 COPTS.printf.c = -Wno-format-nonliteral
 COPTS.proc.c = -Wno-format-nonliteral
diff -r dcdff5cc0fd7 -r 904b555ced0e doc/HACKS
--- a/doc/HACKS Fri Jun 13 01:11:15 2014 +0000
+++ b/doc/HACKS Fri Jun 13 01:17:45 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: HACKS,v 1.151 2014/05/28 21:51:18 abs Exp $
+# $NetBSD: HACKS,v 1.152 2014/06/13 01:17:46 mrg Exp $
 #
 # This file is intended to document workarounds for currently unsolved
 # (mostly) compiler bugs.
@@ -604,16 +604,6 @@
                internal compiler error: in change_address_1, at emit-rtl.c:2019
        kcah
 
-       hack    gcc -fno-guess-branch-probability
-       cdate   28 May 2014
-       mdate   28 May 2014
-       who     abs
-       file    lib/libcurses/Makefile : 1.69
-       descr   sysinst crashes under vax gcc 4.1 after selecting
-                partition sizes due to curses bug
-        pr     lib/48827
-       kcah
-
 port   arm
 
        hack    gcc-unsigned-compare
diff -r dcdff5cc0fd7 -r 904b555ced0e external/gpl3/gdb/lib/libgdb/Makefile
--- a/external/gpl3/gdb/lib/libgdb/Makefile     Fri Jun 13 01:11:15 2014 +0000
+++ b/external/gpl3/gdb/lib/libgdb/Makefile     Fri Jun 13 01:17:45 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2013/10/04 13:04:00 christos Exp $
+#      $NetBSD: Makefile,v 1.6 2014/06/13 01:17:45 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -52,7 +52,3 @@
 .if ${MACHINE} == "amiga"
 COPTS.dwarf2-frame.c+=-O1
 .endif
-
-.if defined(HAVE_GCC) && HAVE_GCC == 4 && ${MACHINE} == "sun2"
-COPTS.dwarf2-frame.c+=-O0
-.endif
diff -r dcdff5cc0fd7 -r 904b555ced0e gnu/usr.bin/Makefile
--- a/gnu/usr.bin/Makefile      Fri Jun 13 01:11:15 2014 +0000
+++ b/gnu/usr.bin/Makefile      Fri Jun 13 01:17:45 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.137 2012/11/06 12:25:56 skrll Exp $
+#      $NetBSD: Makefile,v 1.138 2014/06/13 01:17:45 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -17,12 +17,4 @@
 
 SUBDIR+=       gettext
 
-.if ${MKGCC} != "no"
-.if ${HAVE_GCC} == 4
-.if ${MKGCCCMDS} != "no"
-SUBDIR+=       gcc4
-.endif
-.endif
-.endif
-
 .include <bsd.subdir.mk>
diff -r dcdff5cc0fd7 -r 904b555ced0e lib/Makefile
--- a/lib/Makefile      Fri Jun 13 01:11:15 2014 +0000
+++ b/lib/Makefile      Fri Jun 13 01:17:45 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.214 2014/05/09 08:36:09 plunky Exp $
+#      $NetBSD: Makefile,v 1.215 2014/06/13 01:17:45 mrg Exp $
 #      from: @(#)Makefile      5.25.1.1 (Berkeley) 5/7/91
 
 .include <bsd.own.mk>
@@ -6,11 +6,7 @@
 SUBDIR=                csu .WAIT
 
 .if (${MKGCC} != "no")
-. if ${HAVE_GCC} == 4
-SUBDIR+=       ../gnu/lib/libgcc4 .WAIT
-. else
 SUBDIR+=       ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libgcc .WAIT
-. endif
 .endif
 
 SUBDIR+=       libc
@@ -75,15 +71,12 @@
 SUBDIR+=       ../gnu/lib/libmalloc
 
 .if (${MKGCC} != "no")
-. if ${HAVE_GCC} == 4
-SUBDIR+=       ../gnu/lib/libobjc4
-. else
 SUBDIR+=       ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libobjc
 SUBDIR+=       ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libgomp
-. endif
-. if ${HAVE_GCC} >= 45 && !defined(MLIBDIR)
 # Should probably move GMP, MPFR and MPC builds into the GCC >= 4.5
 # specific build area, but we get better parallelism this way.
+# We don't build compat versions of these.
+. if !defined(MLIBDIR)
 SUBDIR+=       ../external/lgpl3/gmp/lib/libgmp
 SUBDIR+=       ../external/lgpl3/mpfr/lib/libmpfr
 SUBDIR+=       ../external/lgpl3/mpc/lib/libmpc
@@ -147,13 +140,8 @@
 .endif
 
 .if (${MKGCC} != "no" && ${MKCXX} != "no" && ${MKLIBSTDCXX} != "no")
-. if ${HAVE_GCC} == 4
-SUBDIR+=       ../gnu/lib/libstdc++-v3_4       # depends on libm
-SUBDIR+=       ../gnu/lib/libsupc++4
-. else
 SUBDIR+=       ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libstdc++-v3
 SUBDIR+=       ../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libsupc++
-. endif
 .endif
 
 #==================== 2nd library dependency barrier ====================
diff -r dcdff5cc0fd7 -r 904b555ced0e lib/libcurses/Makefile
--- a/lib/libcurses/Makefile    Fri Jun 13 01:11:15 2014 +0000
+++ b/lib/libcurses/Makefile    Fri Jun 13 01:17:45 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.69 2014/05/21 14:01:30 abs Exp $
+#      $NetBSD: Makefile,v 1.70 2014/06/13 01:17:45 mrg Exp $
 #      @(#)Makefile    8.2 (Berkeley) 1/2/94
 
 .include <bsd.own.mk>
@@ -176,11 +176,6 @@
         curses_touch.3 wtouchln.3 curses_underscore.3 wunderend.3 \
         curses_underscore.3 wunderscore.3 curses_line.3 wvline.3
 
-# sysinst crashes under gcc 4.1 after selecting partition sizes - PR lib/48827
-.if ${HAVE_GCC:U} == "4" && ${ACTIVE_CC} == "gcc" && ${MACHINE_ARCH} == "vax"
-COPTS.refresh.c+=      -fno-guess-branch-probability
-.endif
-
 .if make(install)
 SUBDIR+= PSD.doc
 .endif
diff -r dcdff5cc0fd7 -r 904b555ced0e lib/libm/compiler_rt/Makefile.inc
--- a/lib/libm/compiler_rt/Makefile.inc Fri Jun 13 01:11:15 2014 +0000
+++ b/lib/libm/compiler_rt/Makefile.inc Fri Jun 13 01:17:45 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.inc,v 1.5 2014/02/26 22:37:56 joerg Exp $
+# $NetBSD: Makefile.inc,v 1.6 2014/06/13 01:17:45 mrg Exp $
 
 COMPILER_RT_SRCDIR=    ${NETBSDSRCDIR}/sys/external/bsd/compiler_rt/dist
 
@@ -28,10 +28,6 @@
 SRCS+= ${src:R}.S
 .  else
 SRCS+= ${src}
-.    if ${HAVE_GCC:U} != "4"
 COPTS.${src}+= -Wno-error=missing-prototypes
-.    else
-COPTS.${src}+= -Wno-missing-prototypes
-.    endif
 .  endif
 .endfor
diff -r dcdff5cc0fd7 -r 904b555ced0e share/mk/bsd.lib.mk
--- a/share/mk/bsd.lib.mk       Fri Jun 13 01:11:15 2014 +0000
+++ b/share/mk/bsd.lib.mk       Fri Jun 13 01:17:45 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.lib.mk,v 1.354 2014/04/24 00:14:59 pooka Exp $
+#      $NetBSD: bsd.lib.mk,v 1.355 2014/06/13 01:17:45 mrg Exp $
 #      @(#)bsd.lib.mk  8.3 (Berkeley) 4/22/94
 
 .include <bsd.init.mk>
@@ -604,8 +604,6 @@
 LIBCC:=        ${CXX}
 . if ${MKLIBCXX} == "yes"
 LIBDPLIBS+=     c++    ${.CURDIR}/../../../../../external/bsd/libc++/lib
-. elif defined(HAVE_GCC) && ${HAVE_GCC} == 4
-LIBDPLIBS+=     stdc++ ${.CURDIR}/../../../../../gnu/lib/libstdc++-v3_4
 . else
 LIBDPLIBS+=     stdc++ ${.CURDIR}/../../../../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/lib/libstdc++-v3
 . endif
diff -r dcdff5cc0fd7 -r 904b555ced0e share/mk/bsd.sys.mk
--- a/share/mk/bsd.sys.mk       Fri Jun 13 01:11:15 2014 +0000
+++ b/share/mk/bsd.sys.mk       Fri Jun 13 01:17:45 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.sys.mk,v 1.239 2014/05/27 16:16:01 plunky Exp $
+#      $NetBSD: bsd.sys.mk,v 1.240 2014/06/13 01:17:45 mrg Exp $
 #
 # Build definitions used for NetBSD source tree builds.
 
@@ -80,7 +80,7 @@
 .if ${WARNS} > 3 && defined(HAVE_LLVM)
 CFLAGS+=       ${${ACTIVE_CC} == "clang":? -Wpointer-sign -Wmissing-noreturn :}
 .endif
-.if (defined(HAVE_GCC) && ${HAVE_GCC} >= 45 \
+.if (defined(HAVE_GCC) \
      && (${MACHINE_ARCH} == "coldfire" || \
         ${MACHINE_ARCH} == "sh3eb" || \
         ${MACHINE_ARCH} == "sh3el" || \
diff -r dcdff5cc0fd7 -r 904b555ced0e sys/lib/libunwind/Makefile.inc
--- a/sys/lib/libunwind/Makefile.inc    Fri Jun 13 01:11:15 2014 +0000
+++ b/sys/lib/libunwind/Makefile.inc    Fri Jun 13 01:17:45 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.inc,v 1.5 2014/03/19 16:46:23 joerg Exp $
+#      $NetBSD: Makefile.inc,v 1.6 2014/06/13 01:17:46 mrg Exp $
 
 .PATH: ${NETBSDSRCDIR}/sys/lib/libunwind
 
@@ -7,15 +7,5 @@
 
 INCS+= unwind.h
 
-.if ${HAVE_GCC:U48} == "4"
-CLEANFILES+=   cstdint
-DPSRCS+=       cstdint
-
-cstdint:
-       echo '#include <stdint.h>' > ${.TARGET}
-
-COPTS.libunwind.cxx+=  "-D__builtin_unreachable()=abort()"
-.else
 COPTS.libunwind.cxx+=  ${${ACTIVE_CXX} == "gcc":? -std=c++0x : -std=c++11 }
-.endif
 COPTS.libunwind.cxx+=  -funwind-tables -fno-rtti -fno-exceptions -fvisibility=hidden -Wno-old-style-cast



Home | Main Index | Thread Index | Old Index