Module Name: src
Committed By: mrg
Date: Sat Mar 12 23:07:05 UTC 2016
Modified Files:
src/distrib/sets/lists/base: mi
src/etc/mtree: NetBSD.dist.base
src/external/gpl3/gcc/dist/gcc/config: netbsd.h
src/external/gpl3/gcc/lib/libgomp: Makefile
src/external/gpl3/gcc/lib/libmudflap: Makefile
src/external/gpl3/gcc/usr.bin/include: Makefile
Log Message:
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.
To generate a diff of this commit:
cvs rdiff -u -r1.1121 -r1.1122 src/distrib/sets/lists/base/mi
cvs rdiff -u -r1.152 -r1.153 src/etc/mtree/NetBSD.dist.base
cvs rdiff -u -r1.16 -r1.17 src/external/gpl3/gcc/dist/gcc/config/netbsd.h
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/lib/libgomp/Makefile
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc/lib/libmudflap/Makefile
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc/usr.bin/include/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/distrib/sets/lists/base/mi
diff -u src/distrib/sets/lists/base/mi:1.1121 src/distrib/sets/lists/base/mi:1.1122
--- src/distrib/sets/lists/base/mi:1.1121 Sat Feb 27 21:47:36 2016
+++ src/distrib/sets/lists/base/mi Sat Mar 12 23:07:05 2016
@@ -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
Index: src/etc/mtree/NetBSD.dist.base
diff -u src/etc/mtree/NetBSD.dist.base:1.152 src/etc/mtree/NetBSD.dist.base:1.153
--- src/etc/mtree/NetBSD.dist.base:1.152 Sat Feb 27 21:47:30 2016
+++ src/etc/mtree/NetBSD.dist.base Sat Mar 12 23:07:05 2016
@@ -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
Index: src/external/gpl3/gcc/dist/gcc/config/netbsd.h
diff -u src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.16 src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.17
--- src/external/gpl3/gcc/dist/gcc/config/netbsd.h:1.16 Sun Jan 24 09:43:32 2016
+++ src/external/gpl3/gcc/dist/gcc/config/netbsd.h Sat Mar 12 23:07:05 2016
@@ -63,7 +63,7 @@ along with GCC; see the file COPYING3.
* 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. */
Index: src/external/gpl3/gcc/lib/libgomp/Makefile
diff -u src/external/gpl3/gcc/lib/libgomp/Makefile:1.13 src/external/gpl3/gcc/lib/libgomp/Makefile:1.14
--- src/external/gpl3/gcc/lib/libgomp/Makefile:1.13 Wed Jun 4 19:07:22 2014
+++ src/external/gpl3/gcc/lib/libgomp/Makefile Sat Mar 12 23:07:05 2016
@@ -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 @@ CFLAGS+=-pthread
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 @@ FILES= libgomp.spec
FILESDIR= ${LIBDIR}
INCS= omp.h
-INCSDIR= /usr/include/gcc-4.8
+INCSDIR= /usr/include/gcc-5
.endif
.else # } else {
Index: src/external/gpl3/gcc/lib/libmudflap/Makefile
diff -u src/external/gpl3/gcc/lib/libmudflap/Makefile:1.6 src/external/gpl3/gcc/lib/libmudflap/Makefile:1.7
--- src/external/gpl3/gcc/lib/libmudflap/Makefile:1.6 Mon Jan 5 01:52:23 2015
+++ src/external/gpl3/gcc/lib/libmudflap/Makefile Sat Mar 12 23:07:05 2016
@@ -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 @@ DIST= ${GCCDIST}/libmudflap
CPPFLAGS+= -I${.CURDIR}
LINTFLAGS+=-g
+# XXXGCC5
SHLIB_MAJOR= 0
SHLIB_MINOR= 0
@@ -18,7 +19,7 @@ SRCS=mf-runtime.c mf-heuristics.c mf-hoo
.include <bsd.own.mk>
INCS=mf-runtime.h
-INCSDIR=/usr/include/gcc-4.8
+INCSDIR=/usr/include/gcc-5
.include <bsd.lib.mk>
Index: src/external/gpl3/gcc/usr.bin/include/Makefile
diff -u src/external/gpl3/gcc/usr.bin/include/Makefile:1.7 src/external/gpl3/gcc/usr.bin/include/Makefile:1.8
--- src/external/gpl3/gcc/usr.bin/include/Makefile:1.7 Thu Mar 13 16:19:24 2014
+++ src/external/gpl3/gcc/usr.bin/include/Makefile Sat Mar 12 23:07:05 2016
@@ -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 @@ mm_malloc.h: ${DIST}/gcc/config/i386/pmm
CLEANFILES+= mm_malloc.h
.endif
-INCSDIR= /usr/include/gcc-4.8
+INCSDIR= /usr/include/gcc-5
.include <bsd.prog.mk>
