gcc50: Disconnect from buildworld.
authorzrj <rimvydas.jasinskas@gmail.com>
Tue, 19 Mar 2019 13:48:09 +0000 (13:48 +0000)
committerzrj <zrj@dragonflybsd.org>
Tue, 19 Mar 2019 19:55:48 +0000 (21:55 +0200)
You served us good.

Makefile.inc1
Makefile_upgrade.inc
UPDATING
bin/sh/Makefile
etc/mtree/BSD.include.dist
etc/mtree/BSD.usr.dist
gnu/lib/Makefile
gnu/usr.bin/Makefile
share/mk/Makefile
share/mk/bsd.README
share/mk/bsd.cpu.mk

index c3dd0b1..da2c0bc 100644 (file)
@@ -917,7 +917,6 @@ bstrap-${_tool}!
 # and this file for WORLD_CCVER.
 #
 _gcc47_cross= gnu/usr.bin/cc47
-_gcc50_cross= gnu/usr.bin/cc50
 _gcc80_cross= gnu/usr.bin/cc80
 _gcc_common_cross= lib/libz gnu/usr.bin/gmp gnu/usr.bin/mpfr gnu/usr.bin/mpc
 
@@ -927,12 +926,6 @@ _altcompiler_cross+= ${_gcc47_cross}
 . endif
 .endif
 
-.if !defined(NO_ALTCOMPILER)
-. if defined(WORLD_ALTCOMPILER) && (${WORLD_ALTCOMPILER} == "all" || ${WORLD_ALTCOMPILER:Mgcc50})
-_altcompiler_cross+= ${_gcc50_cross}
-. endif
-.endif
-
 _basecompiler_cross= ${_gcc80_cross}
 
 _custom_cross= libexec/customcc
@@ -995,11 +988,6 @@ libraries:
            HOST_CCVER=${HOST_CCVER} CCVER=gcc47 \
                make -f Makefile.inc1 _startup_libs47 -DSYSBUILD -DLIBGCC_ONLY;
 . endif
-. if defined(WORLD_ALTCOMPILER) && (${WORLD_ALTCOMPILER} == "all" || ${WORLD_ALTCOMPILER:Mgcc50})
-       cd ${.CURDIR}; \
-           HOST_CCVER=${HOST_CCVER} CCVER=gcc50 \
-               make -f Makefile.inc1 _startup_libs50 -DSYSBUILD -DLIBGCC_ONLY;
-. endif
 .endif
        cd ${.CURDIR}; \
            make -f Makefile.inc1 _startup_libs -DSYSBUILD && \
@@ -1020,13 +1008,6 @@ _startup_libs47= gnu/usr.bin/cc47/cc_prep \
                        gnu/lib/gcc47/libgcc_eh \
                        gnu/lib/gcc47/libgcc_pic
 
-_startup_libs50=       gnu/usr.bin/cc50/cc_prep \
-                       gnu/usr.bin/cc50/cc_tools \
-                       gnu/lib/gcc50/csu \
-                       gnu/lib/gcc50/libgcc \
-                       gnu/lib/gcc50/libgcc_eh \
-                       gnu/lib/gcc50/libgcc_pic
-
 _startup_libs80=       gnu/usr.bin/cc80/cc_prep \
                        gnu/usr.bin/cc80/cc_tools \
                        gnu/lib/gcc80/csu \
@@ -1040,12 +1021,6 @@ _startup_libs_alt+=      _startup_libs47
 . endif
 .endif
 
-.if !defined(NO_ALTCOMPILER)
-. if defined(WORLD_ALTCOMPILER) && (${WORLD_ALTCOMPILER} == "all" || ${WORLD_ALTCOMPILER:Mgcc50})
-_startup_libs_alt+=    _startup_libs50
-. endif
-.endif
-
 _startup_libs_base=    _startup_libs80
 
 _startup_libs=         lib/csu lib/libc lib/libc_rtld
index 903f1dd..f80bae8 100644 (file)
@@ -3502,6 +3502,17 @@ TO_REMOVE+=/usr/include/sys/semaphore.h
 TO_REMOVE+=/usr/share/man/man2/brk.2.gz
 TO_REMOVE+=/usr/share/man/man1/ld-elf.so.1.1.gz
 TO_REMOVE+=/usr/share/misc/man.template
+TO_REMOVE+=/usr/include/c++/5.0
+TO_REMOVE+=/usr/libdata/gcc50
+TO_REMOVE+=/usr/libexec/gcc50
+TO_REMOVE+=/usr/share/man/man1/CC50.1.gz
+TO_REMOVE+=/usr/share/man/man1/c++50.1.gz
+TO_REMOVE+=/usr/share/man/man1/cc50.1.gz
+TO_REMOVE+=/usr/share/man/man1/cpp50.1.gz
+TO_REMOVE+=/usr/share/man/man1/g++50.1.gz
+TO_REMOVE+=/usr/share/man/man1/gcc50.1.gz
+TO_REMOVE+=/usr/share/man/man1/gcov50.1.gz
+TO_REMOVE+=/usr/share/mk/bsd.cpu.gcc50.mk
 
 .if !defined(WANT_INSTALLER)
 TO_REMOVE+=/usr/sbin/dfuibe_installer
@@ -3519,18 +3530,6 @@ TO_REMOVE+=/usr/share/games/fortune/limerick
 TO_REMOVE+=/usr/share/games/fortune/murphy-o
 .endif
 
-# XXX Move to common list when gcc50 is removed from the src tree
-TO_REMOVE_LATE+=/usr/include/c++/5.0
-TO_REMOVE_LATE+=/usr/libdata/gcc50
-TO_REMOVE_LATE+=/usr/libexec/gcc50
-TO_REMOVE_LATE+=/usr/share/man/man1/CC50.1.gz
-TO_REMOVE_LATE+=/usr/share/man/man1/c++50.1.gz
-TO_REMOVE_LATE+=/usr/share/man/man1/cc50.1.gz
-TO_REMOVE_LATE+=/usr/share/man/man1/cpp50.1.gz
-TO_REMOVE_LATE+=/usr/share/man/man1/g++50.1.gz
-TO_REMOVE_LATE+=/usr/share/man/man1/gcc50.1.gz
-TO_REMOVE_LATE+=/usr/share/man/man1/gcov50.1.gz
-
 # Very special cases only.
 TO_REMOVE_LATE+=/lib/libcrypto.so.5
 TO_REMOVE_LATE+=/usr/lib/libssl.a
index ae06678..3e6d8b7 100644 (file)
--- a/UPDATING
+++ b/UPDATING
 +         UPGRADING DRAGONFLY FROM 5.4 TO LATER VERSIONS                +
 +-----------------------------------------------------------------------+
 
+GCC50 REMOVED
+-------------
+
+The GCC50 compiler has been retired.  It has been replaced by a GCC80.
+The default alternative compiler has stayed the same - GCC47.
+
+
 PUFFS, PUTTER AND LIBREFUSE REMOVED
 -----------------------------------
 
index 6acc4cd..71fd608 100644 (file)
@@ -15,7 +15,6 @@ SRCS= ${SHSRCS} ${GENSRCS} ${GENHDRS}
 # would be needed if WARNS upgraded to 3, but lets keep the stderr output
 # clean, so WARNS has been lowered to 2.
 #
-# NO_WERROR=   yes # [-Werror=clobbered] on gcc50
 WARNS?= 2
 
 # MLINKS for Shell built in commands for which there are no userland
index be5b4df..9bd44e2 100644 (file)
             tr2
             ..
         ..
-        5.0
-            backward
-            ..
-            bits
-            ..
-            debug
-            ..
-            decimal
-            ..
-            experimental
-            ..
-            ext
-                pb_ds
-                    detail
-                        bin_search_tree_
-                        ..
-                        binary_heap_
-                        ..
-                        binomial_heap_
-                        ..
-                        binomial_heap_base_
-                        ..
-                        branch_policy
-                        ..
-                        cc_hash_table_map_
-                        ..
-                        eq_fn
-                        ..
-                        gp_hash_table_map_
-                        ..
-                        hash_fn
-                        ..
-                        left_child_next_sibling_heap_
-                        ..
-                        list_update_map_
-                        ..
-                        list_update_policy
-                        ..
-                        ov_tree_map_
-                        ..
-                        pairing_heap_
-                        ..
-                        pat_trie_
-                        ..
-                        rb_tree_map_
-                        ..
-                        rc_binomial_heap_
-                        ..
-                        resize_policy
-                        ..
-                        splay_tree_
-                        ..
-                        thin_heap_
-                        ..
-                        tree_policy
-                        ..
-                        trie_policy
-                        ..
-                        unordered_iterator
-                        ..
-                    ..
-                ..
-            ..
-            parallel
-            ..
-            profile
-                impl
-                ..
-            ..
-            tr1
-            ..
-            tr2
-            ..
-        ..
         8.0
             backward
             ..
index dbaf2cf..fc7c96d 100644 (file)
             profile
             ..
         ..
-        gcc50
-            plugin
-                include
-                    c-family
-                    ..
-                    objc
-                    ..
-                    config
-                        i386
-                        ..
-                    ..
-                    cp
-                    ..
-                ..
-            ..
-            profile
-            ..
-        ..
         gcc80
             plugin
                 include
             ssp
             ..
         ..
-        gcc50
-            objc
-            ..
-            ssp
-            ..
-        ..
         gcc80
             ssp
             ..
         ..
         gcc47
         ..
-        gcc50
-        ..
         gcc80
         ..
         lpr
index 6e3545c..e8a2afb 100644 (file)
@@ -7,9 +7,6 @@ SUBDIR+= gcc80
 . if defined(WORLD_ALTCOMPILER) && (${WORLD_ALTCOMPILER} == "all" || ${WORLD_ALTCOMPILER:Mgcc47})
 SUBDIR+= gcc47
 . endif
-. if defined(WORLD_ALTCOMPILER) && (${WORLD_ALTCOMPILER} == "all" || ${WORLD_ALTCOMPILER:Mgcc50})
-SUBDIR+= gcc50
-. endif
 .endif
 
 SUBDIR+= libcryptsetup libdevmapper libdialog libluks liblvm
index 5211f8e..4d0fb0a 100644 (file)
@@ -32,10 +32,6 @@ _compiler_dir= cc80
 SUBDIR+= cc47
 _altcompiler_dirs+= cc47
 . endif
-. if defined(WORLD_ALTCOMPILER) && (${WORLD_ALTCOMPILER} == "all" || ${WORLD_ALTCOMPILER:Mgcc50})
-SUBDIR+= cc50
-_altcompiler_dirs+= cc50
-. endif
 .endif
 
 .ORDER: ${BU_PRIMARY} gmp mpfr mpc ${_compiler_dir} ${_altcompiler_dirs}
index 7a5c23c..b50dee0 100644 (file)
@@ -3,7 +3,6 @@
 
 FILES= bsd.README
 FILES+=        bsd.cpu.mk bsd.cpu.gcc47.mk bsd.cpu.custom.mk
-FILES+=        bsd.cpu.gcc50.mk
 FILES+=        bsd.cpu.gcc80.mk
 FILES+=        bsd.cpu.clang.mk
 FILES+=        bsd.dep.mk bsd.doc.mk bsd.files.mk bsd.patch.mk
index 268063a..cacad7e 100644 (file)
@@ -18,7 +18,6 @@ bsd.lib.mk.
 
 bsd.cpu.custom.mk      - handle CPU flags for custom compilers
 bsd.cpu.gcc47.mk       - handle GCC 4.7 specific CPU flags & variables
-bsd.cpu.gcc50.mk       - handle GCC 5.0 specific CPU flags & variables
 bsd.cpu.gcc80.mk       - handle GCC 8.0 specific CPU flags & variables
 bsd.cpu.mk             - handle CPU flags & variables
 bsd.crunchgen.mk       - building crunched binaries using crunchgen(1)
index 2af97d7..78f419b 100644 (file)
@@ -42,8 +42,6 @@ CPUTYPE= ${FORCE_CPUTYPE}
 .  endif
 .elif ${CCVER} == gcc47
 .  include <bsd.cpu.gcc47.mk>
-.elif ${CCVER} == gcc50
-.  include <bsd.cpu.gcc50.mk>
 .elif ${CCVER} == gcc80
 .  include <bsd.cpu.gcc80.mk>
 .elif ${CCVER:Mclang*}