Module Name: src
Committed By: mrg
Date: Sun Aug 12 21:48:57 UTC 2018
Modified Files:
src/external/gpl3/gcc: Makefile.gcc_path
src/external/gpl3/gcc.old: Makefile.gcc_path
src/external/gpl3/gcc.old/lib/libgomp: Makefile
src/external/gpl3/gcc.old/usr.bin/include: Makefile
src/external/gpl3/gcc.old/usr.bin/include/sanitizer: Makefile
src/external/gpl3/gcc/lib/libgomp: Makefile
src/external/gpl3/gcc/usr.bin/include: Makefile
src/external/gpl3/gcc/usr.bin/include/sanitizer: Makefile
Log Message:
consolidate path for gcc-version specific into GCC_INCSDIR, and
have it derived from the HAVE_GCC value so it does not need to
be modified for newer GCCs.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/Makefile.gcc_path
cvs rdiff -u -r1.6 -r1.7 src/external/gpl3/gcc.old/Makefile.gcc_path
cvs rdiff -u -r1.7 -r1.8 src/external/gpl3/gcc.old/lib/libgomp/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/gpl3/gcc.old/usr.bin/include/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc.old/usr.bin/include/sanitizer/Makefile
cvs rdiff -u -r1.19 -r1.20 src/external/gpl3/gcc/lib/libgomp/Makefile
cvs rdiff -u -r1.12 -r1.13 src/external/gpl3/gcc/usr.bin/include/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/gpl3/gcc/usr.bin/include/sanitizer/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/gpl3/gcc/Makefile.gcc_path
diff -u src/external/gpl3/gcc/Makefile.gcc_path:1.2 src/external/gpl3/gcc/Makefile.gcc_path:1.3
--- src/external/gpl3/gcc/Makefile.gcc_path:1.2 Sat Jun 14 20:49:36 2014
+++ src/external/gpl3/gcc/Makefile.gcc_path Sun Aug 12 21:48:56 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gcc_path,v 1.2 2014/06/14 20:49:36 mrg Exp $
+# $NetBSD: Makefile.gcc_path,v 1.3 2018/08/12 21:48:56 mrg Exp $
# Define some commom paths
@@ -13,4 +13,6 @@ GCC_SUBDIR= ${NETBSDSRCDIR}/external/gpl
GCCDIST= ${GCC_SUBDIR}/dist
#.endif
+GCC_INCSDIR= /usr/include/gcc-${HAVE_GCC}
+
.endif # _GPL3_GCC_MAKEFILE_INC_
Index: src/external/gpl3/gcc.old/Makefile.gcc_path
diff -u src/external/gpl3/gcc.old/Makefile.gcc_path:1.6 src/external/gpl3/gcc.old/Makefile.gcc_path:1.7
--- src/external/gpl3/gcc.old/Makefile.gcc_path:1.6 Sun Jul 23 01:10:50 2017
+++ src/external/gpl3/gcc.old/Makefile.gcc_path Sun Aug 12 21:48:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.gcc_path,v 1.6 2017/07/23 01:10:50 mrg Exp $
+# $NetBSD: Makefile.gcc_path,v 1.7 2018/08/12 21:48:57 mrg Exp $
# Define some commom paths
@@ -13,4 +13,6 @@ GCC_SUBDIR= ${NETBSDSRCDIR}/external/gpl
GCCDIST= ${GCC_SUBDIR}/dist
#.endif
+GCC_INCSDIR= /usr/include/gcc-${HAVE_GCC}
+
.endif # _GPL3_GCC_MAKEFILE_INC_
Index: src/external/gpl3/gcc.old/lib/libgomp/Makefile
diff -u src/external/gpl3/gcc.old/lib/libgomp/Makefile:1.7 src/external/gpl3/gcc.old/lib/libgomp/Makefile:1.8
--- src/external/gpl3/gcc.old/lib/libgomp/Makefile:1.7 Thu Aug 2 00:03:42 2018
+++ src/external/gpl3/gcc.old/lib/libgomp/Makefile Sun Aug 12 21:48:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2018/08/02 00:03:42 mrg Exp $
+# $NetBSD: Makefile,v 1.8 2018/08/12 21:48:57 mrg Exp $
# build GCC's libgomp, so that -fopenmp works.
@@ -79,7 +79,7 @@ FILES= libgomp.spec
FILESDIR= ${LIBDIR}
INCS= omp.h openacc.h
-INCSDIR= /usr/include/gcc-6
+INCSDIR= ${GCC_INCSDIR}
.endif
.else # } else {
Index: src/external/gpl3/gcc.old/usr.bin/include/Makefile
diff -u src/external/gpl3/gcc.old/usr.bin/include/Makefile:1.9 src/external/gpl3/gcc.old/usr.bin/include/Makefile:1.10
--- src/external/gpl3/gcc.old/usr.bin/include/Makefile:1.9 Thu Aug 2 00:04:03 2018
+++ src/external/gpl3/gcc.old/usr.bin/include/Makefile Sun Aug 12 21:48:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2018/08/02 00:04:03 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2018/08/12 21:48:57 mrg Exp $
.include <bsd.init.mk>
@@ -25,7 +25,7 @@ mm_malloc.h: ${DIST}/gcc/config/i386/pmm
CLEANFILES+= mm_malloc.h
.endif
-INCSDIR= /usr/include/gcc-6
+INCSDIR= ${GCC_INCSDIR}
.include <bsd.subdir.mk>
.include <bsd.prog.mk>
Index: src/external/gpl3/gcc.old/usr.bin/include/sanitizer/Makefile
diff -u src/external/gpl3/gcc.old/usr.bin/include/sanitizer/Makefile:1.2 src/external/gpl3/gcc.old/usr.bin/include/sanitizer/Makefile:1.3
--- src/external/gpl3/gcc.old/usr.bin/include/sanitizer/Makefile:1.2 Thu Aug 2 07:47:30 2018
+++ src/external/gpl3/gcc.old/usr.bin/include/sanitizer/Makefile Sun Aug 12 21:48:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/08/02 07:47:30 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2018/08/12 21:48:57 mrg Exp $
.include "../../../Makefile.gcc_path"
@@ -19,6 +19,6 @@ INCS+= tsan_interface_atomic.h
.include <bsd.own.mk>
-INCSDIR= /usr/include/gcc-6/sanitizer
+INCSDIR= ${GCC_INCSDIR}/sanitizer
.include <bsd.prog.mk>
Index: src/external/gpl3/gcc/lib/libgomp/Makefile
diff -u src/external/gpl3/gcc/lib/libgomp/Makefile:1.19 src/external/gpl3/gcc/lib/libgomp/Makefile:1.20
--- src/external/gpl3/gcc/lib/libgomp/Makefile:1.19 Sat Feb 3 21:27:45 2018
+++ src/external/gpl3/gcc/lib/libgomp/Makefile Sun Aug 12 21:48:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2018/02/03 21:27:45 mrg Exp $
+# $NetBSD: Makefile,v 1.20 2018/08/12 21:48:57 mrg Exp $
# build GCC's libgomp, so that -fopenmp works.
@@ -79,7 +79,7 @@ FILES= libgomp.spec
FILESDIR= ${LIBDIR}
INCS= omp.h openacc.h
-INCSDIR= /usr/include/gcc-6
+INCSDIR= ${GCC_INCSDIR}
.endif
.else # } else {
Index: src/external/gpl3/gcc/usr.bin/include/Makefile
diff -u src/external/gpl3/gcc/usr.bin/include/Makefile:1.12 src/external/gpl3/gcc/usr.bin/include/Makefile:1.13
--- src/external/gpl3/gcc/usr.bin/include/Makefile:1.12 Sun Feb 11 02:12:29 2018
+++ src/external/gpl3/gcc/usr.bin/include/Makefile Sun Aug 12 21:48:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2018/02/11 02:12:29 christos Exp $
+# $NetBSD: Makefile,v 1.13 2018/08/12 21:48:57 mrg Exp $
.include <bsd.init.mk>
@@ -25,7 +25,7 @@ mm_malloc.h: ${DIST}/gcc/config/i386/pmm
CLEANFILES+= mm_malloc.h
.endif
-INCSDIR= /usr/include/gcc-6
+INCSDIR= ${GCC_INCSDIR}
.include <bsd.subdir.mk>
.include <bsd.prog.mk>
Index: src/external/gpl3/gcc/usr.bin/include/sanitizer/Makefile
diff -u src/external/gpl3/gcc/usr.bin/include/sanitizer/Makefile:1.2 src/external/gpl3/gcc/usr.bin/include/sanitizer/Makefile:1.3
--- src/external/gpl3/gcc/usr.bin/include/sanitizer/Makefile:1.2 Fri Feb 2 20:57:53 2018
+++ src/external/gpl3/gcc/usr.bin/include/sanitizer/Makefile Sun Aug 12 21:48:57 2018
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2018/02/02 20:57:53 mrg Exp $
+# $NetBSD: Makefile,v 1.3 2018/08/12 21:48:57 mrg Exp $
.include "../../../Makefile.gcc_path"
@@ -19,6 +19,6 @@ INCS+= tsan_interface_atomic.h
.include <bsd.own.mk>
-INCSDIR= /usr/include/gcc-6/sanitizer
+INCSDIR= ${GCC_INCSDIR}/sanitizer
.include <bsd.prog.mk>
