[src/trunk]: src add /usr/include/gcc-5 directory to the distribution and adj...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0a12fea4d87f
branches:  trunk
changeset: 814238:0a12fea4d87f
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Mar 12 23:07:05 2016 +0000

description:
add /usr/include/gcc-5 directory to the distribution and adjust the
GCC 5 parts of the build (not yet enabled) to install/look there.

diffstat:

 distrib/sets/lists/base/mi                 |  3 ++-
 etc/mtree/NetBSD.dist.base                 |  3 ++-
 external/gpl3/gcc/dist/gcc/config/netbsd.h |  2 +-
 external/gpl3/gcc/lib/libgomp/Makefile     |  5 +++--
 external/gpl3/gcc/lib/libmudflap/Makefile  |  5 +++--
 external/gpl3/gcc/usr.bin/include/Makefile |  4 ++--
 6 files changed, 13 insertions(+), 9 deletions(-)

diffs (116 lines):

diff -r 738856d77fee -r 0a12fea4d87f distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Sat Mar 12 22:37:32 2016 +0000
+++ b/distrib/sets/lists/base/mi        Sat Mar 12 23:07:05 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1121 2016/02/27 21:47:36 joerg Exp $
+# $NetBSD: mi,v 1.1122 2016/03/12 23:07:05 mrg Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -1119,6 +1119,7 @@
 ./usr/include/gcc-4.1                          base-obsolete           obsolete
 ./usr/include/gcc-4.5                          base-c-usr              obsolete
 ./usr/include/gcc-4.8                          base-c-usr
+./usr/include/gcc-5                            base-c-usr
 ./usr/include/gssapi                           base-c-usr
 ./usr/include/gssapi/rpc                       base-obsolete           obsolete
 ./usr/include/isofs                            base-c-usr
diff -r 738856d77fee -r 0a12fea4d87f etc/mtree/NetBSD.dist.base
--- a/etc/mtree/NetBSD.dist.base        Sat Mar 12 22:37:32 2016 +0000
+++ b/etc/mtree/NetBSD.dist.base        Sat Mar 12 23:07:05 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NetBSD.dist.base,v 1.152 2016/02/27 21:47:30 joerg Exp $
+#      $NetBSD: NetBSD.dist.base,v 1.153 2016/03/12 23:07:05 mrg Exp $
 #      @(#)4.4BSD.dist 8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -183,6 +183,7 @@
 ./usr/include/g++/tr1_impl
 ./usr/include/g++/tr2
 ./usr/include/gcc-4.8
+./usr/include/gcc-5
 ./usr/include/gssapi
 ./usr/include/isofs
 ./usr/include/isofs/cd9660
diff -r 738856d77fee -r 0a12fea4d87f external/gpl3/gcc/dist/gcc/config/netbsd.h
--- a/external/gpl3/gcc/dist/gcc/config/netbsd.h        Sat Mar 12 22:37:32 2016 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/netbsd.h        Sat Mar 12 23:07:05 2016 +0000
@@ -63,7 +63,7 @@
  * XXX figure out a better way to do this
  */
 #undef GCC_INCLUDE_DIR
-#define GCC_INCLUDE_DIR "/usr/include/gcc-4.8"
+#define GCC_INCLUDE_DIR "/usr/include/gcc-5"
 
 /* Under NetBSD, the normal location of the various *crt*.o files is the
    /usr/lib directory.  */
diff -r 738856d77fee -r 0a12fea4d87f external/gpl3/gcc/lib/libgomp/Makefile
--- a/external/gpl3/gcc/lib/libgomp/Makefile    Sat Mar 12 22:37:32 2016 +0000
+++ b/external/gpl3/gcc/lib/libgomp/Makefile    Sat Mar 12 23:07:05 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.13 2014/06/04 19:07:22 tron Exp $
+#      $NetBSD: Makefile,v 1.14 2016/03/12 23:07:05 mrg Exp $
 
 # build GCC's libgomp, so that -fopenmp works.
 
@@ -53,6 +53,7 @@
 CWARNFLAGS.clang+=     -Wno-conversion
 
 # libgomp is 1.0 is in GCC 4.5, and 1.1 in 4.8 since it added more symbols
+# XXXGCC5
 SHLIB_MAJOR=   1
 SHLIB_MINOR=   1
 
@@ -64,7 +65,7 @@
 FILESDIR=      ${LIBDIR}
 
 INCS=          omp.h
-INCSDIR=       /usr/include/gcc-4.8
+INCSDIR=       /usr/include/gcc-5
 .endif
 
 .else                  # } else {
diff -r 738856d77fee -r 0a12fea4d87f external/gpl3/gcc/lib/libmudflap/Makefile
--- a/external/gpl3/gcc/lib/libmudflap/Makefile Sat Mar 12 22:37:32 2016 +0000
+++ b/external/gpl3/gcc/lib/libmudflap/Makefile Sat Mar 12 23:07:05 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.6 2015/01/05 01:52:23 mrg Exp $
+#      $NetBSD: Makefile,v 1.7 2016/03/12 23:07:05 mrg Exp $
 
 NOLINT=yes                     # core dumps
 UNSUPPORTED_COMPILER.clang=     # defined
@@ -9,6 +9,7 @@
 CPPFLAGS+=     -I${.CURDIR}
 LINTFLAGS+=-g
 
+# XXXGCC5
 SHLIB_MAJOR=   0
 SHLIB_MINOR=   0
 
@@ -18,7 +19,7 @@
 .include <bsd.own.mk>
 
 INCS=mf-runtime.h
-INCSDIR=/usr/include/gcc-4.8
+INCSDIR=/usr/include/gcc-5
 
 .include <bsd.lib.mk>
 
diff -r 738856d77fee -r 0a12fea4d87f external/gpl3/gcc/usr.bin/include/Makefile
--- a/external/gpl3/gcc/usr.bin/include/Makefile        Sat Mar 12 22:37:32 2016 +0000
+++ b/external/gpl3/gcc/usr.bin/include/Makefile        Sat Mar 12 23:07:05 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.7 2014/03/13 16:19:24 gdt Exp $
+#      $NetBSD: Makefile,v 1.8 2016/03/12 23:07:05 mrg Exp $
 
 .include "../Makefile.inc"
 
@@ -20,7 +20,7 @@
 CLEANFILES+=   mm_malloc.h
 .endif
 
-INCSDIR=       /usr/include/gcc-4.8
+INCSDIR=       /usr/include/gcc-5
 
 .include <bsd.prog.mk>