CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sun Jun 30 09:41:47 UTC 2024
Modified Files:
src/tools/gcc: gcc-version.mk
Log Message:
update netbsd gcc version/date.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/tools/gcc/gcc-version.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.26 src/tools/gcc/gcc-version.mk:1.27
--- src/tools/gcc/gcc-version.mk:1.26 Sun Feb 25 02:24:19 2024
+++ src/tools/gcc/gcc-version.mk Sun Jun 30 09:41:47 2024
@@ -1,4 +1,4 @@
-# $NetBSD: gcc-version.mk,v 1.26 2024/02/25 02:24:19 mrg Exp $
+# $NetBSD: gcc-version.mk,v 1.27 2024/06/30 09:41:47 mrg Exp $
# common location for tools and native build
@@ -6,5 +6,5 @@
NETBSD_GCC_VERSION=nb3 20231008
.endif
.if ${HAVE_GCC} == 12
-NETBSD_GCC_VERSION=nb2 20240221
+NETBSD_GCC_VERSION=nb1 20240630
.endif
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Sun Jun 30 09:41:47 UTC 2024 Modified Files: src/tools/gcc: gcc-version.mk Log Message: update netbsd gcc version/date. To generate a diff of this commit: cvs rdiff -u -r1.26 -r1.27 src/tools/gcc/gcc-version.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/tools/gcc
Taylor R Campbell writes: > How is the host C++ compiler supposed to know that we are asking it to > compile C++11 and not C++98 or C++17? The compilation line should pass --std=c++11. Arguably, any program that invokes a compiler and does not pass a --std is buggy. Things only mostly work because mostly --std=c++17 will compile C++11 programs, and the tendency is for later compiler versions to have higher default languages. In pkgsrc, we have a way to add --std=foo via the wrappers, to handle packages that don't do this right (generally, at all). Is that what you meant, or something else?
Re: CVS commit: src/tools/gcc
> Date: Mon, 17 Jun 2024 03:01:55 +1000 > from: matthew green > > "David H. Gutteridge" writes: > > Module Name:src > > Committed By: gutteridge > > Date: Sun Jun 16 16:03:30 UTC 2024 > > > > tools/gcc/Makefile: force std=c++11 for GCC 12 builds > > > > GCC >= 11 now requires C++11 to build. Impacted individual components > > vary whether they test for if std=c++11 is the default or has to be > > passed. Regardless, our build infrastructure applies its own overrides. > > Force this setting so that we can still build on NetBSD 8.x hosts (and > > probably 7.x, too). Build tested on NetBSD 8.3. > > i'm not sure i like this. the build environment is expected to > provide a valid compiler, and the above assumes how the compiler > works. > > if we really want to support this without user-env setup, then > i think a confiure test (from tools/compat) would be better than > forcing this option here directly. > > (also note this is not the first time this sort of issue has > arrived, and we always asked the build-env provider to fix it, > but i'm not against eg, the configure test idea.) How is the host C++ compiler supposed to know that we are asking it to compile C++11 and not C++98 or C++17? gcc's configure scripts search for a way to pass this information to the host compiler (e.g., AX_CXX_COMPILE_STDCXX). I'm fuzzy on how these are supposed to work but it looks like maybe the existing configure tests are not getting used for some reason.
Re: CVS commit: src/tools/gcc
On 2024-06-16 13:01, matthew green wrote:
"David H. Gutteridge" writes:
Module Name:src
Committed By:gutteridge
Date:Sun Jun 16 16:03:30 UTC 2024
Modified Files:
src/tools/gcc: Makefile
Log Message:
tools/gcc/Makefile: force std=c++11 for GCC 12 builds
GCC >= 11 now requires C++11 to build. Impacted individual components
vary whether they test for if std=c++11 is the default or has to be
passed. Regardless, our build infrastructure applies its own
overrides.
Force this setting so that we can still build on NetBSD 8.x hosts (and
probably 7.x, too). Build tested on NetBSD 8.3.
i'm not sure i like this. the build environment is expected to
provide a valid compiler, and the above assumes how the compiler
works.
if we really want to support this without user-env setup, then
i think a confiure test (from tools/compat) would be better than
forcing this option here directly.
(also note this is not the first time this sort of issue has
arrived, and we always asked the build-env provider to fix it,
but i'm not against eg, the configure test idea.)
I can certainly simply revert for now, if you prefer.
I'm a little confused by your answer, as there are pre-existing bits
that already do this or something similar. (Well, or intend to.)
tools/isl/Makefile has:
# XXX this gets lost some how. Not portable.
HOST_CXXFLAGS+= -std=gnu++17
A different example is from tools/Makefile.gmakehost:
# Disable use of pre-compiled headers on Darwin.
BUILD_OSTYPE!= uname -s
HOST_COMPILER_CLANG!= if ${HOST_CC} --version | grep -q -s clang; then
echo yes; else echo no; fi
.if ${HOST_COMPILER_CLANG} == "yes"
HOST_CFLAGS+=-O2 -no-cpp-precomp
.endif
The latter is intended to deal with a different sort of issue, but I
see it as being related in terms of reaching over and injecting its
own HOST_* values. If we say "the host should sort out its own issues",
effectively, then I don't see why that would be there, either. (There
is more like that elsewhere.)
I realize I supplied a "GCC-style" argument that not all compilers
will accept. I don't know what compilers would be viable now other than
GCC and Clang?
The goal is to be able to set different compiler flags on a per
component basis. There could be other components that don't want the
same standard forced (or whatever). To your point, we could have
something that tests and sets a make variable that's conditionally
applied down in a particular component.
Regards,
Dave
re: CVS commit: src/tools/gcc
"David H. Gutteridge" writes: > Module Name: src > Committed By: gutteridge > Date: Sun Jun 16 16:03:30 UTC 2024 > > Modified Files: > src/tools/gcc: Makefile > > Log Message: > tools/gcc/Makefile: force std=c++11 for GCC 12 builds > > GCC >= 11 now requires C++11 to build. Impacted individual components > vary whether they test for if std=c++11 is the default or has to be > passed. Regardless, our build infrastructure applies its own overrides. > Force this setting so that we can still build on NetBSD 8.x hosts (and > probably 7.x, too). Build tested on NetBSD 8.3. i'm not sure i like this. the build environment is expected to provide a valid compiler, and the above assumes how the compiler works. if we really want to support this without user-env setup, then i think a confiure test (from tools/compat) would be better than forcing this option here directly. (also note this is not the first time this sort of issue has arrived, and we always asked the build-env provider to fix it, but i'm not against eg, the configure test idea.) thanks. .mrg.
CVS commit: src/tools/gcc
Module Name:src
Committed By: gutteridge
Date: Sun Jun 16 16:03:30 UTC 2024
Modified Files:
src/tools/gcc: Makefile
Log Message:
tools/gcc/Makefile: force std=c++11 for GCC 12 builds
GCC >= 11 now requires C++11 to build. Impacted individual components
vary whether they test for if std=c++11 is the default or has to be
passed. Regardless, our build infrastructure applies its own overrides.
Force this setting so that we can still build on NetBSD 8.x hosts (and
probably 7.x, too). Build tested on NetBSD 8.3.
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.112 src/tools/gcc/Makefile:1.113
--- src/tools/gcc/Makefile:1.112 Sat Jun 8 01:07:44 2024
+++ src/tools/gcc/Makefile Sun Jun 16 16:03:30 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.112 2024/06/08 01:07:44 gutteridge Exp $
+# $NetBSD: Makefile,v 1.113 2024/06/16 16:03:30 gutteridge Exp $
.include
@@ -16,6 +16,12 @@ MKNATIVE= ${.CURDIR}/mknative-gcc.old
CC_FOR_BUILD= ${HOST_CXX:Q}
MKNATIVE?= ${.CURDIR}/mknative-gcc
+# Force C++11 so builds succeed on hosts where this isn't the compiler
+# default, e.g., NetBSD 8.x with GCC 5.5.
+.if ${HAVE_GCC} > 10
+HOST_CXXFLAGS+= -std=c++11
+.endif
+
.if ${MACHINE_ARCH} == "x86_64" || ${MACHINE_ARCH} == "sparc64"
MULTILIB_ARGS= --enable-multilib
.else
CVS commit: src/tools/gcc
Module Name:src Committed By: gutteridge Date: Sun Jun 16 16:03:30 UTC 2024 Modified Files: src/tools/gcc: Makefile Log Message: tools/gcc/Makefile: force std=c++11 for GCC 12 builds GCC >= 11 now requires C++11 to build. Impacted individual components vary whether they test for if std=c++11 is the default or has to be passed. Regardless, our build infrastructure applies its own overrides. Force this setting so that we can still build on NetBSD 8.x hosts (and probably 7.x, too). Build tested on NetBSD 8.3. To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/tools/gcc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: gutteridge
Date: Sat Jun 8 01:07:44 UTC 2024
Modified Files:
src/tools/gcc: Makefile
Log Message:
tools/gcc/Makefile: fix typo in comment
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.111 src/tools/gcc/Makefile:1.112
--- src/tools/gcc/Makefile:1.111 Thu Feb 22 02:47:26 2024
+++ src/tools/gcc/Makefile Sat Jun 8 01:07:44 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2024/02/22 02:47:26 mrg Exp $
+# $NetBSD: Makefile,v 1.112 2024/06/08 01:07:44 gutteridge Exp $
.include
@@ -57,7 +57,7 @@ COMMON_CONFIGURE_ARGS+= --enable-fix-cor
COMMON_CONFIGURE_ARGS+= --with-default-libstdcxx-abi=new
.endif
-# We nabled isl support for GCC 12. Move into normal segment when
+# We enabled isl support for GCC 12. Move into normal segment when
# removing GCC 10.
.if ${HAVE_GCC} < 12
ISL_CONFIGURE_ARGS+= --without-isl
CVS commit: src/tools/gcc
Module Name:src Committed By: gutteridge Date: Sat Jun 8 01:07:44 UTC 2024 Modified Files: src/tools/gcc: Makefile Log Message: tools/gcc/Makefile: fix typo in comment To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 src/tools/gcc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sun Feb 25 02:24:19 UTC 2024
Modified Files:
src/tools/gcc: gcc-version.mk
Log Message:
version our GCC 12 as "nb2 20240221" now.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/tools/gcc/gcc-version.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.25 src/tools/gcc/gcc-version.mk:1.26
--- src/tools/gcc/gcc-version.mk:1.25 Sun Oct 8 21:52:34 2023
+++ src/tools/gcc/gcc-version.mk Sun Feb 25 02:24:19 2024
@@ -1,4 +1,4 @@
-# $NetBSD: gcc-version.mk,v 1.25 2023/10/08 21:52:34 mrg Exp $
+# $NetBSD: gcc-version.mk,v 1.26 2024/02/25 02:24:19 mrg Exp $
# common location for tools and native build
@@ -6,5 +6,5 @@
NETBSD_GCC_VERSION=nb3 20231008
.endif
.if ${HAVE_GCC} == 12
-NETBSD_GCC_VERSION=nb1 20230729
+NETBSD_GCC_VERSION=nb2 20240221
.endif
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Sun Feb 25 02:24:19 UTC 2024 Modified Files: src/tools/gcc: gcc-version.mk Log Message: version our GCC 12 as "nb2 20240221" now. To generate a diff of this commit: cvs rdiff -u -r1.25 -r1.26 src/tools/gcc/gcc-version.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/tools/gcc
Hi,
"matthew green" writes:
> Module Name: src
> Committed By: mrg
> Date: Thu Feb 22 02:47:27 UTC 2024
>
> Modified Files:
> src/tools/gcc: Makefile
>
> Log Message:
> enable isl support for GCC 12.
I have HAVE_GCC=12 in my /etc/mk.conf.
I have gotten the following error.
Maybe something for isl library is missing in the src tree.
Could you take a look at my problem?
Thank you.
checking for objdir... .libs [463/94127]
checking for the correct version of gmp.h... yes
checking for the correct version of mpfr.h... yes
checking for the correct version of mpc.h... yes
checking for the correct version of the gmp/mpfr/mpc libraries... yes
checking for isl 0.15 or later... no
required isl version is 0.15 or later
configure: error: Unable to find a usable isl. See config.log for details.
*** Failed target: .configure_done
*** Failed commands:
@mkdir build 2>/dev/null || true
@(cd build && ${CONFIGURE_ENV} ${HOST_SH} ${GNUHOSTDIST}/configure ${CON
FIGURE_ARGS})
=> @(cd build && gcc_cv_libc_provides_ssp=yes gcc_cv_as_sparc_gotdata_o
p=no AR=ar AWK=/usr/world/10.99/amd64/tools/bin/nbawk CC=cc CFLAGS=-O CONFIG
_SHELL=/bin/sh CPPFLAGS= CXX=c++ CXXFLAGS=-O INSTALL=/usr/world/10.99/amd64/
tools/bin/x86_64--netbsd-install\ -c\ -p\ -r LDFLAGS= LEX=/usr/world/10.99/amd
64/tools/bin/nblex FLEX=/usr/world/10.99/amd64/tools/bin/nblex M4=/usr/world/1
0.99/amd64/tools/bin/nbm4 MAKE=/usr/world/10.99/amd64/tools/bin/nbgmake PATH="
/usr/world/10.99/amd64/tools/bin:$PATH" RANLIB=ranlib YACC=/usr/world/10.99/am
d64/tools/bin/nbyacc /bin/sh /usr/src/tools/gcc/../../external/gpl3/gcc/dist/con
figure --target=x86_64--netbsd --enable-long-long --enable-threads --with-bug
url=http://www.NetBSD.org/support/send-pr.html --with-pkgversion="NetBSD nb1 20
230729" --with-system-zlib --enable-__cxa_atexit --enable-libstdcxx-time=rt
--enable-libstdcxx-threads --with-diagnostics-color=auto-if-env --with-tune=noc
ona --with-default-libstdcxx-abi=new --with-sysroot=/usr/world/10.99/amd64/dest
--with-mpc=/usr/world/10.99/amd64/tools --with-mpfr=/usr/world/10.99/amd64/too
ls --with-gmp=/usr/world/10.99/amd64/tools --with-isl=/usr/world/10.99/amd64/t
ools --disable-nls --enable-multilib--program-transform-name="s,^,x86_64--
netbsd-," --enable-languages="c c++ objc" --prefix=/usr/world/10.99/amd64/tools
)
@echo ${BUILD_PLATFORM} > $@
=> @echo NetBSD-10.99.10-amd64 > .configure_done
*** [.configure_done] Error code 1
nbmake[4]: stopped in /usr/src/tools/gcc
nbmake[4]: 1 error
nbmake[4]: stopped in /usr/src/tools/gcc
>
>
> To generate a diff of this commit:
> cvs rdiff -u -r1.110 -r1.111 src/tools/gcc/Makefile
>
> Please note that diffs are not public domain; they are subject to the
> copyright notices on the relevant files.
>
> Modified files:
>
> Index: src/tools/gcc/Makefile
> diff -u src/tools/gcc/Makefile:1.110 src/tools/gcc/Makefile:1.111
> --- src/tools/gcc/Makefile:1.110 Thu Feb 22 02:40:21 2024
> +++ src/tools/gcc/MakefileThu Feb 22 02:47:26 2024
> @@ -1,4 +1,4 @@
> -#$NetBSD: Makefile,v 1.110 2024/02/22 02:40:21 mrg Exp $
> +#$NetBSD: Makefile,v 1.111 2024/02/22 02:47:26 mrg Exp $
>
> .include
>
> @@ -35,7 +35,6 @@ COMMON_CONFIGURE_ARGS= --target=${MACHIN
>
> --with-bugurl=http://www.NetBSD.org/support/send-pr.html \
> --with-pkgversion="NetBSD ${NETBSD_GCC_VERSION}" \
> --with-system-zlib \
> - --without-isl \
> --enable-__cxa_atexit \
> --enable-libstdcxx-time=rt \
> --enable-libstdcxx-threads \
> @@ -58,12 +57,21 @@ COMMON_CONFIGURE_ARGS+= --enable-fix-cor
> COMMON_CONFIGURE_ARGS+= --with-default-libstdcxx-abi=new
> .endif
>
> +# We nabled isl support for GCC 12. Move into normal segment when
> +# removing GCC 10.
> +.if ${HAVE_GCC} < 12
> +ISL_CONFIGURE_ARGS+= --without-isl
> +.else
> +ISL_CONFIGURE_ARGS+= --with-isl=${TOOLDIR}
> +.endif
> +
> CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
> CONFIGURE_ARGS+= \
> --with-sysroot=${DESTDIR} \
> --with-mpc=${TOOLDIR} \
> --with-mpfr=${TOOLDIR} \
> --with-gmp=${TOOLDIR} \
> + ${ISL_CONFIGURE_ARGS} \
> --disable-nls \
> ${MULTILIB_ARGS} \
> ${SOFTFLOAT_ARGS} \
>
--
Ryo ONODERA // r...@tetera.org
PGP fingerprint = 82A2 DC91 76E0 A10A 8ABB FD1B F404 27FA C7D1 15F3
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Thu Feb 22 02:47:27 UTC 2024
Modified Files:
src/tools/gcc: Makefile
Log Message:
enable isl support for GCC 12.
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.110 src/tools/gcc/Makefile:1.111
--- src/tools/gcc/Makefile:1.110 Thu Feb 22 02:40:21 2024
+++ src/tools/gcc/Makefile Thu Feb 22 02:47:26 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.110 2024/02/22 02:40:21 mrg Exp $
+# $NetBSD: Makefile,v 1.111 2024/02/22 02:47:26 mrg Exp $
.include
@@ -35,7 +35,6 @@ COMMON_CONFIGURE_ARGS= --target=${MACHIN
--with-bugurl=http://www.NetBSD.org/support/send-pr.html \
--with-pkgversion="NetBSD ${NETBSD_GCC_VERSION}" \
--with-system-zlib \
- --without-isl \
--enable-__cxa_atexit \
--enable-libstdcxx-time=rt \
--enable-libstdcxx-threads \
@@ -58,12 +57,21 @@ COMMON_CONFIGURE_ARGS+= --enable-fix-cor
COMMON_CONFIGURE_ARGS+= --with-default-libstdcxx-abi=new
.endif
+# We nabled isl support for GCC 12. Move into normal segment when
+# removing GCC 10.
+.if ${HAVE_GCC} < 12
+ISL_CONFIGURE_ARGS+= --without-isl
+.else
+ISL_CONFIGURE_ARGS+= --with-isl=${TOOLDIR}
+.endif
+
CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
CONFIGURE_ARGS+= \
--with-sysroot=${DESTDIR} \
--with-mpc=${TOOLDIR} \
--with-mpfr=${TOOLDIR} \
--with-gmp=${TOOLDIR} \
+ ${ISL_CONFIGURE_ARGS} \
--disable-nls \
${MULTILIB_ARGS} \
${SOFTFLOAT_ARGS} \
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Thu Feb 22 02:47:27 UTC 2024 Modified Files: src/tools/gcc: Makefile Log Message: enable isl support for GCC 12. To generate a diff of this commit: cvs rdiff -u -r1.110 -r1.111 src/tools/gcc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Thu Feb 22 02:40:21 UTC 2024 Modified Files: src/tools/gcc: Makefile Log Message: Include the local NetBSD GCC version so that bumps to it trigger rebuilds unfortunately, this will cause one rebuild to get the new name. To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 src/tools/gcc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Thu Feb 22 02:40:21 UTC 2024
Modified Files:
src/tools/gcc: Makefile
Log Message:
Include the local NetBSD GCC version so that bumps to it trigger rebuilds
unfortunately, this will cause one rebuild to get the new name.
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.109 src/tools/gcc/Makefile:1.110
--- src/tools/gcc/Makefile:1.109 Sat Oct 7 12:12:58 2023
+++ src/tools/gcc/Makefile Thu Feb 22 02:40:21 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.109 2023/10/07 12:12:58 rin Exp $
+# $NetBSD: Makefile,v 1.110 2024/02/22 02:40:21 mrg Exp $
.include
@@ -267,16 +267,21 @@ PREV_GCC=
CLEANFILES+= PREV_GCC
+# Include the local NetBSD GCC version so that bumps to it trigger rebuilds.
+NETBSD_GCC_VERSION_NOSPACE= ${NETBSD_GCC_VERSION:S/ /-/gW}
+
realall realdepend: .MAKE
-.if !empty(PREV_GCC) && "${PREV_GCC}" != "${EXTERNAL_GCC_SUBDIR}-${HAVE_GCC}"
+.if !empty(PREV_GCC) && "${PREV_GCC}" != "${EXTERNAL_GCC_SUBDIR}-${HAVE_GCC}-${NETBSD_GCC_VERSION_NOSPACE}"
@echo "*** WARNING: GCC has changed version?"
@echo "*** PREV_GCC '${PREV_GCC}'"
- @echo "*** != EXTERNAL_GCC_SUBDIR-HAVE_GCC '${EXTERNAL_GCC_SUBDIR}-${HAVE_GCC}'"
+ @echo "*** NETBSD_GCC_VERSION_NOSPACE '${NETBSD_GCC_VERSION_NOSPACE}'"
+ @echo "*** != EXTERNAL_GCC_SUBDIR-HAVE_GCC-NETBSD_GCC_VERSION_NOSPACE:"
+ @echo "*** != '${EXTERNAL_GCC_SUBDIR}-${HAVE_GCC}-${NETBSD_GCC_VERSION_NOSPACE}'"
@echo "*** Cleaning mis-matched tools/gcc"
rm -f PREV_GCC
(cd ${.CURDIR} && ${MAKE} cleandir)
.endif
- echo ${EXTERNAL_GCC_SUBDIR}-${HAVE_GCC} >PREV_GCC
+ echo ${EXTERNAL_GCC_SUBDIR}-${HAVE_GCC}-${NETBSD_GCC_VERSION_NOSPACE} >PREV_GCC
clean: clean.native
clean.native:
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Wed Feb 21 08:24:46 UTC 2024
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
fetch G_CPP20_SOURCES.
To generate a diff of this commit:
cvs rdiff -u -r1.117 -r1.118 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.117 src/tools/gcc/mknative-gcc:1.118
--- src/tools/gcc/mknative-gcc:1.117 Mon Jul 31 01:48:37 2023
+++ src/tools/gcc/mknative-gcc Wed Feb 21 08:24:46 2024
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.117 2023/07/31 01:48:37 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.118 2024/02/21 08:24:46 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -251,8 +251,9 @@ get_libstdcxx_v3 () {
getvars $_PLATFORM/libstdc++-v3/Makefile \
port_specific_symbol_files
getvars $_PLATFORM/libstdc++-v3/src/Makefile \
- cxx17_sources \
cxx11_sources \
+ cxx17_sources \
+ cxx20_sources \
cxx98_sources
# libsupc++
@@ -271,6 +272,9 @@ get_libstdcxx_v3 () {
getvars $_PLATFORM/libstdc++-v3/src/c++17/Makefile \
libc__17convenience_la_SOURCES | \
sed -e 's/^G_libc__17convenience_la_SOURCES=/G_CPP17_SOURCES=/'
+ getvars $_PLATFORM/libstdc++-v3/src/c++20/Makefile \
+ libc__20convenience_la_SOURCES | \
+ sed -e 's/^G_libc__20convenience_la_SOURCES=/G_CPP20_SOURCES=/'
getvars $_PLATFORM/libstdc++-v3/src/c++11/Makefile \
libc__11convenience_la_SOURCES | \
sed -e 's/^G_libc__11convenience_la_SOURCES=/G_CPP11_SOURCES=/'
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Wed Feb 21 08:24:46 UTC 2024 Modified Files: src/tools/gcc: mknative-gcc Log Message: fetch G_CPP20_SOURCES. To generate a diff of this commit: cvs rdiff -u -r1.117 -r1.118 src/tools/gcc/mknative-gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Sun Oct 8 21:52:34 UTC 2023 Modified Files: src/tools/gcc: gcc-version.mk Log Message: bump the netbsd gcc 10 version to "nb3 20231008" for all the vax updates. XXX: check if mknative needed? XXX: pullup-10 To generate a diff of this commit: cvs rdiff -u -r1.24 -r1.25 src/tools/gcc/gcc-version.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sun Oct 8 21:52:34 UTC 2023
Modified Files:
src/tools/gcc: gcc-version.mk
Log Message:
bump the netbsd gcc 10 version to "nb3 20231008" for all the vax updates.
XXX: check if mknative needed?
XXX: pullup-10
To generate a diff of this commit:
cvs rdiff -u -r1.24 -r1.25 src/tools/gcc/gcc-version.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.24 src/tools/gcc/gcc-version.mk:1.25
--- src/tools/gcc/gcc-version.mk:1.24 Sun Jul 30 06:36:21 2023
+++ src/tools/gcc/gcc-version.mk Sun Oct 8 21:52:34 2023
@@ -1,9 +1,9 @@
-# $NetBSD: gcc-version.mk,v 1.24 2023/07/30 06:36:21 mrg Exp $
+# $NetBSD: gcc-version.mk,v 1.25 2023/10/08 21:52:34 mrg Exp $
# common location for tools and native build
.if ${HAVE_GCC} == 10
-NETBSD_GCC_VERSION=nb2 20230710
+NETBSD_GCC_VERSION=nb3 20231008
.endif
.if ${HAVE_GCC} == 12
NETBSD_GCC_VERSION=nb1 20230729
CVS commit: src/tools/gcc
Module Name:src
Committed By: rin
Date: Sat Oct 7 12:12:58 UTC 2023
Modified Files:
src/tools/gcc: Makefile
Log Message:
tools/gcc: Sprinkle NB_FIX_VAX_BACKEND for vax to enable gcc.old MI fixes
PR port-vax/57646: Import major vax toolchain fix by Kalvis Duckmanton
To generate a diff of this commit:
cvs rdiff -u -r1.108 -r1.109 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.108 src/tools/gcc/Makefile:1.109
--- src/tools/gcc/Makefile:1.108 Wed Aug 9 18:57:04 2023
+++ src/tools/gcc/Makefile Sat Oct 7 12:12:58 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.108 2023/08/09 18:57:04 christos Exp $
+# $NetBSD: Makefile,v 1.109 2023/10/07 12:12:58 rin Exp $
.include
@@ -74,6 +74,10 @@ GCC_CPPFLAGS= -DNETBSD_TOOLS -DTARGET_SY
-DTARGET_SYSTEM_ROOT_RELOCATABLE
# ${HOST_CPPFLAGS}
+.if ${MACHINE} == "vax"
+GCC_CPPFLAGS+= -DNB_FIX_VAX_BACKEND
+.endif
+
MAKE_ARGS= MACHINE= MAKEINFO=${TOOL_MAKEINFO:Q} \
LIBGCC= LIBGCC1= LIBGCC1_TEST= LIBGCC2= INSTALL_LIBGCC= \
EXTRA_PARTS= CPPFLAGS=${GCC_CPPFLAGS:Q} \
CVS commit: src/tools/gcc
Module Name:src Committed By: rin Date: Sat Oct 7 12:12:58 UTC 2023 Modified Files: src/tools/gcc: Makefile Log Message: tools/gcc: Sprinkle NB_FIX_VAX_BACKEND for vax to enable gcc.old MI fixes PR port-vax/57646: Import major vax toolchain fix by Kalvis Duckmanton To generate a diff of this commit: cvs rdiff -u -r1.108 -r1.109 src/tools/gcc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Mon Jul 31 01:48:37 UTC 2023 Modified Files: src/tools/gcc: Makefile mknative-gcc Log Message: updates for GCC 12 (relatively tiny). - gcov-iov.h is now called version.h and we build it directly. - need to explicitly ask for bversion.h gtyp-input.list to be built. To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.107 src/tools/gcc/Makefile cvs rdiff -u -r1.116 -r1.117 src/tools/gcc/mknative-gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Mon Jul 31 01:48:37 UTC 2023
Modified Files:
src/tools/gcc: Makefile mknative-gcc
Log Message:
updates for GCC 12 (relatively tiny).
- gcov-iov.h is now called version.h and we build it directly.
- need to explicitly ask for bversion.h gtyp-input.list to be built.
To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/tools/gcc/Makefile
cvs rdiff -u -r1.116 -r1.117 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.106 src/tools/gcc/Makefile:1.107
--- src/tools/gcc/Makefile:1.106 Fri Jul 28 08:05:29 2023
+++ src/tools/gcc/Makefile Mon Jul 31 01:48:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.106 2023/07/28 08:05:29 mrg Exp $
+# $NetBSD: Makefile,v 1.107 2023/07/31 01:48:37 mrg Exp $
.include
@@ -110,6 +110,12 @@ MKNATIVE_CONFIG_TARGET_LIBS+= \
.endif
.endif
+.if ${HAVE_GCC} <= 10
+EXTRA_FILES= gcov-iov.h
+.else
+EXTRA_FILES= bversion.h gtyp-input.list
+.endif
+
BINENV= /usr/bin/env -i
@@ -230,7 +236,7 @@ MKENV_BUILD_MAKE=cd .native && ${MKNATIV
-e 's/\(maybe-all-target-libgcc:\) all-target-libgcc/\1/' \
< Makefile.config > Makefile)
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
- (cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e tree-check.h config.h multilib.h gcov-iov.h)
+ (cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e tree-check.h config.h multilib.h ${EXTRA_FILES})
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e libgcc.mvars tconfig.h); \
(cd .native && touch gcc/cc1obj gcc/cc1plus gcc/f771 gcc/libgcc.a gcc/libgcc_s.so)
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.116 src/tools/gcc/mknative-gcc:1.117
--- src/tools/gcc/mknative-gcc:1.116 Fri Jul 22 06:50:26 2022
+++ src/tools/gcc/mknative-gcc Mon Jul 31 01:48:37 2023
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.116 2022/07/22 06:50:26 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.117 2023/07/31 01:48:37 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -132,9 +132,6 @@ get_libgcov () {
LIBGCOV_DRIVER
} | write_mk $_OUTDIRBASE/lib/lib$_subdir/libgcov/arch/$_MACHINE_ARCH/defs.mk
- write_c $_OUTDIRBASE/lib/lib$_subdir/libgcov/arch/$_MACHINE_ARCH/gcov-iov.h \
- <$_TMPDIR/gcc/gcov-iov.h
-
}
# lib/libiberty #
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sun Jul 30 06:36:21 UTC 2023
Modified Files:
src/tools/gcc: gcc-version.mk
Log Message:
mark our GCC 12 as "nb1 20230729".
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/tools/gcc/gcc-version.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.23 src/tools/gcc/gcc-version.mk:1.24
--- src/tools/gcc/gcc-version.mk:1.23 Tue Jul 11 18:13:27 2023
+++ src/tools/gcc/gcc-version.mk Sun Jul 30 06:36:21 2023
@@ -1,7 +1,10 @@
-# $NetBSD: gcc-version.mk,v 1.23 2023/07/11 18:13:27 mrg Exp $
+# $NetBSD: gcc-version.mk,v 1.24 2023/07/30 06:36:21 mrg Exp $
# common location for tools and native build
.if ${HAVE_GCC} == 10
NETBSD_GCC_VERSION=nb2 20230710
.endif
+.if ${HAVE_GCC} == 12
+NETBSD_GCC_VERSION=nb1 20230729
+.endif
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Sun Jul 30 06:36:21 UTC 2023 Modified Files: src/tools/gcc: gcc-version.mk Log Message: mark our GCC 12 as "nb1 20230729". To generate a diff of this commit: cvs rdiff -u -r1.23 -r1.24 src/tools/gcc/gcc-version.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Fri Jul 28 08:05:29 UTC 2023
Modified Files:
src/tools/gcc: Makefile mknative-gcc.old
Log Message:
gcc 10 is now in gcc.old, make mknative-gcc.old gcc-10 happy.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/tools/gcc/Makefile
cvs rdiff -u -r1.10 -r1.11 src/tools/gcc/mknative-gcc.old
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.105 src/tools/gcc/Makefile:1.106
--- src/tools/gcc/Makefile:1.105 Sat Sep 18 01:47:10 2021
+++ src/tools/gcc/Makefile Fri Jul 28 08:05:29 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2021/09/18 01:47:10 christos Exp $
+# $NetBSD: Makefile,v 1.106 2023/07/28 08:05:29 mrg Exp $
.include
@@ -8,7 +8,7 @@ MODULE= ${EXTERNAL_GCC_SUBDIR}
GCCDIST= ${.CURDIR}/../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/dist
GNUHOSTDIST= ${GCCDIST}
-.if ${HAVE_GCC} == 9
+.if ${HAVE_GCC} == 10
MKNATIVE= ${.CURDIR}/mknative-gcc.old
.endif
Index: src/tools/gcc/mknative-gcc.old
diff -u src/tools/gcc/mknative-gcc.old:1.10 src/tools/gcc/mknative-gcc.old:1.11
--- src/tools/gcc/mknative-gcc.old:1.10 Sun Apr 11 01:44:14 2021
+++ src/tools/gcc/mknative-gcc.old Fri Jul 28 08:05:29 2023
@@ -1,10 +1,10 @@
#!/bin/sh
-# $NetBSD: mknative-gcc.old,v 1.10 2021/04/11 01:44:14 mrg Exp $
+# $NetBSD: mknative-gcc.old,v 1.11 2023/07/28 08:05:29 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
#
-# This version is for GCC 9.3
+# This version is for GCC 10.3
# initialise
@@ -234,8 +234,10 @@ get_libstdcxx_v3 () {
_headers1="$_headers1 pb_headers1 pb_headers2 pb_headers3 pb_headers4"
_headers1="$_headers1 pb_headers5 pb_headers6 pb_headers7"
_headers1="$_headers1 bits_headers ext_headers host_headers"
- _headers1="$_headers1 thread_host_headers pstl_headers"
+ _headers1="$_headers1 pstl_headers"
_headers1="$_headers1 profile_headers profile_impl_headers"
+ _headers1="$_headers1 experimental_headers experimental_bits_headers"
+ _headers1="$_headers1 ext_host_headers"
# build files
for h in $_build_headers; do
@@ -274,12 +276,10 @@ get_libstdcxx_v3 () {
sed -e 's/^G_libc__17convenience_la_SOURCES=/G_CPP17_SOURCES=/'
getvars $_PLATFORM/libstdc++-v3/src/c++11/Makefile \
libc__11convenience_la_SOURCES | \
- sed -e 's/^G_libc__11convenience_la_SOURCES=/G_CPP11_SOURCES=/' \
- -e 's/codecvt.cc/c11-codecvt.cc/'
+ sed -e 's/^G_libc__11convenience_la_SOURCES=/G_CPP11_SOURCES=/'
getvars $_PLATFORM/libstdc++-v3/src/c++98/Makefile \
GLIBCXX_ABI_FLAGS libc__98convenience_la_SOURCES | \
- sed -e 's/^G_libc__98convenience_la_SOURCES=/G_CPP98_SOURCES=/' \
- -e 's/codecvt.cc/c98-codecvt.cc/'
+ sed -e 's/^G_libc__98convenience_la_SOURCES=/G_CPP98_SOURCES=/'
getvars $_PLATFORM/libstdc++-v3/src/filesystem/Makefile \
libstdc__fs_la_SOURCES | \
sed -e 's/^G_libstdc__fs_la_SOURCES=/G_FILESYSTEM_SOURCES=/'
@@ -312,9 +312,11 @@ get_libsanitizer () {
getvars $_PLATFORM/libsanitizer/lsan/Makefile \
lsan_files
getvars $_PLATFORM/libsanitizer/tsan/Makefile \
- tsan_plugin_files
+ tsan_files
getvars $_PLATFORM/libsanitizer/ubsan/Makefile \
- ubsan_plugin_files
+ ubsan_files
+ getvars $_PLATFORM/libsanitizer/interception/Makefile \
+ interception_files
} | sanitise_includes \
| write_mk $_OUTDIRBASE/lib/$_subdir/arch/$_MACHINE_ARCH/defs.mk
@@ -399,7 +401,7 @@ get_gcc () {
| write_mk $_OUTDIRBASE/usr.bin/common-target/arch/$_MACHINE_ARCH.mk
write_c $_OUTDIRBASE/usr.bin/libcpp/arch/$_MACHINE_ARCH/config.h <$_TMPDIR/libcpp/config.h
- hfiles='auto-host configargs config bconfig bversion plugin-version multilib tm'
+ hfiles='auto-host configargs config bconfig bversion plugin-version multilib tm omp-device-properties'
for f in $hfiles; do
write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$_MACHINE_ARCH/$f.h <$_TMPDIR/gcc/$f.h
if [ "${_MACHINE_ARCH}" = "powerpc" -a "${f}" = "configargs" ]
@@ -491,7 +493,7 @@ gcc*)
get_gcc_libiberty gcc
get_libobjc libobjc
get_libstdcxx_v3 libstdc++-v3 gcc
- # XXX not yet
+ # wants libstdc++-v3 built
# get_libsanitizer libsanitizer
get_libdecnumber libdecnumber
get_libgomp libgomp
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Fri Jul 28 08:05:29 UTC 2023 Modified Files: src/tools/gcc: Makefile mknative-gcc.old Log Message: gcc 10 is now in gcc.old, make mknative-gcc.old gcc-10 happy. To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/tools/gcc/Makefile cvs rdiff -u -r1.10 -r1.11 src/tools/gcc/mknative-gcc.old Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Tue Jul 11 18:13:27 UTC 2023
Modified Files:
src/tools/gcc: gcc-version.mk
Log Message:
bump gcc 10 version.
To generate a diff of this commit:
cvs rdiff -u -r1.22 -r1.23 src/tools/gcc/gcc-version.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.22 src/tools/gcc/gcc-version.mk:1.23
--- src/tools/gcc/gcc-version.mk:1.22 Sat Jul 23 19:01:18 2022
+++ src/tools/gcc/gcc-version.mk Tue Jul 11 18:13:27 2023
@@ -1,11 +1,7 @@
-# $NetBSD: gcc-version.mk,v 1.22 2022/07/23 19:01:18 mrg Exp $
+# $NetBSD: gcc-version.mk,v 1.23 2023/07/11 18:13:27 mrg Exp $
# common location for tools and native build
-.if ${HAVE_GCC} == 8
-NETBSD_GCC_VERSION=nb1 20200311
-.elif ${HAVE_GCC} == 9
-NETBSD_GCC_VERSION=nb1 20200907
-.elif ${HAVE_GCC} == 10
-NETBSD_GCC_VERSION=nb1 20220722
+.if ${HAVE_GCC} == 10
+NETBSD_GCC_VERSION=nb2 20230710
.endif
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Tue Jul 11 18:13:27 UTC 2023 Modified Files: src/tools/gcc: gcc-version.mk Log Message: bump gcc 10 version. To generate a diff of this commit: cvs rdiff -u -r1.22 -r1.23 src/tools/gcc/gcc-version.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sat Jul 23 19:01:18 UTC 2022
Modified Files:
src/tools/gcc: gcc-version.mk
Log Message:
bump the netbsd version GCC to yesterday's date.
To generate a diff of this commit:
cvs rdiff -u -r1.21 -r1.22 src/tools/gcc/gcc-version.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.21 src/tools/gcc/gcc-version.mk:1.22
--- src/tools/gcc/gcc-version.mk:1.21 Sun Apr 11 23:55:47 2021
+++ src/tools/gcc/gcc-version.mk Sat Jul 23 19:01:18 2022
@@ -1,4 +1,4 @@
-# $NetBSD: gcc-version.mk,v 1.21 2021/04/11 23:55:47 mrg Exp $
+# $NetBSD: gcc-version.mk,v 1.22 2022/07/23 19:01:18 mrg Exp $
# common location for tools and native build
@@ -7,5 +7,5 @@ NETBSD_GCC_VERSION=nb1 20200311
.elif ${HAVE_GCC} == 9
NETBSD_GCC_VERSION=nb1 20200907
.elif ${HAVE_GCC} == 10
-NETBSD_GCC_VERSION=nb1 20210411
+NETBSD_GCC_VERSION=nb1 20220722
.endif
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Sat Jul 23 19:01:18 UTC 2022 Modified Files: src/tools/gcc: gcc-version.mk Log Message: bump the netbsd version GCC to yesterday's date. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 src/tools/gcc/gcc-version.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Fri Jul 22 06:50:26 UTC 2022 Modified Files: src/tools/gcc: mknative-gcc Log Message: don't rename codecvt.cc here, do it in a Makefile when consumed. since the Makefiles already need updates for these, it's easier if all of the changes are there. To generate a diff of this commit: cvs rdiff -u -r1.115 -r1.116 src/tools/gcc/mknative-gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Fri Jul 22 06:50:26 UTC 2022
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
don't rename codecvt.cc here, do it in a Makefile when consumed.
since the Makefiles already need updates for these, it's easier
if all of the changes are there.
To generate a diff of this commit:
cvs rdiff -u -r1.115 -r1.116 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.115 src/tools/gcc/mknative-gcc:1.116
--- src/tools/gcc/mknative-gcc:1.115 Mon Aug 16 06:25:45 2021
+++ src/tools/gcc/mknative-gcc Fri Jul 22 06:50:26 2022
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.115 2021/08/16 06:25:45 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.116 2022/07/22 06:50:26 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -276,12 +276,10 @@ get_libstdcxx_v3 () {
sed -e 's/^G_libc__17convenience_la_SOURCES=/G_CPP17_SOURCES=/'
getvars $_PLATFORM/libstdc++-v3/src/c++11/Makefile \
libc__11convenience_la_SOURCES | \
- sed -e 's/^G_libc__11convenience_la_SOURCES=/G_CPP11_SOURCES=/' \
- -e 's/codecvt.cc/c11-codecvt.cc/'
+ sed -e 's/^G_libc__11convenience_la_SOURCES=/G_CPP11_SOURCES=/'
getvars $_PLATFORM/libstdc++-v3/src/c++98/Makefile \
GLIBCXX_ABI_FLAGS libc__98convenience_la_SOURCES | \
- sed -e 's/^G_libc__98convenience_la_SOURCES=/G_CPP98_SOURCES=/' \
- -e 's/codecvt.cc/c98-codecvt.cc/'
+ sed -e 's/^G_libc__98convenience_la_SOURCES=/G_CPP98_SOURCES=/'
getvars $_PLATFORM/libstdc++-v3/src/filesystem/Makefile \
libstdc__fs_la_SOURCES | \
sed -e 's/^G_libstdc__fs_la_SOURCES=/G_FILESYSTEM_SOURCES=/'
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Mon Aug 16 06:25:45 UTC 2021
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
fetch experimental_headers, experimental_bits_headers, and ext_host_headers
to install install experimental/* and ext/opt_random.h.
To generate a diff of this commit:
cvs rdiff -u -r1.114 -r1.115 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.114 src/tools/gcc/mknative-gcc:1.115
--- src/tools/gcc/mknative-gcc:1.114 Sun Apr 11 07:35:45 2021
+++ src/tools/gcc/mknative-gcc Mon Aug 16 06:25:45 2021
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.114 2021/04/11 07:35:45 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.115 2021/08/16 06:25:45 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -234,8 +234,10 @@ get_libstdcxx_v3 () {
_headers1="$_headers1 pb_headers1 pb_headers2 pb_headers3 pb_headers4"
_headers1="$_headers1 pb_headers5 pb_headers6 pb_headers7"
_headers1="$_headers1 bits_headers ext_headers host_headers"
- _headers1="$_headers1 thread_host_headers pstl_headers"
+ _headers1="$_headers1 pstl_headers"
_headers1="$_headers1 profile_headers profile_impl_headers"
+ _headers1="$_headers1 experimental_headers experimental_bits_headers"
+ _headers1="$_headers1 ext_host_headers"
# build files
for h in $_build_headers; do
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Mon Aug 16 06:25:45 UTC 2021 Modified Files: src/tools/gcc: mknative-gcc Log Message: fetch experimental_headers, experimental_bits_headers, and ext_host_headers to install install experimental/* and ext/opt_random.h. To generate a diff of this commit: cvs rdiff -u -r1.114 -r1.115 src/tools/gcc/mknative-gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Re: CVS commit: src/tools/gcc
I understand. Thanks! rin On 2021/05/09 9:20, Christos Zoulas wrote: In article , Rin Okuyama wrote: How about binutils? http://cvsweb.netbsd.org/bsdweb.cgi/src/tools/binutils/Makefile#rev1.32 I don't think it makes a difference. It seems that we need to mknative again for this: Eventually, but not right now. christos
Re: CVS commit: src/tools/gcc
In article , Rin Okuyama wrote: >How about binutils? > >http://cvsweb.netbsd.org/bsdweb.cgi/src/tools/binutils/Makefile#rev1.32 I don't think it makes a difference. >It seems that we need to mknative again for this: Eventually, but not right now. christos
Re: CVS commit: src/tools/gcc
How about binutils? http://cvsweb.netbsd.org/bsdweb.cgi/src/tools/binutils/Makefile#rev1.32 It seems that we need to mknative again for this: % find /usr/src/external/gpl3/binutils/usr.bin/ld -name '*.h' | xargs grep HAVE_INITFINI_ARRAY /usr/src/external/gpl3/binutils/usr.bin/ld/arch/aarch64/config.h:/* #undef HAVE_INITFINI_ARRAY */ /usr/src/external/gpl3/binutils/usr.bin/ld/arch/aarch64eb/config.h:/* #undef HAVE_INITFINI_ARRAY */ ...(snip)... Thanks, rin On 2021/05/09 4:36, Christos Zoulas wrote: Module Name:src Committed By: christos Date: Sat May 8 19:36:28 UTC 2021 Modified Files: src/tools/gcc: Makefile Log Message: Disable again initfini; breaks some archs and not worth dealing with when we have both gcc's active in the tree. To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 src/tools/gcc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: christos
Date: Sat May 8 19:36:28 UTC 2021
Modified Files:
src/tools/gcc: Makefile
Log Message:
Disable again initfini; breaks some archs and not worth dealing with when
we have both gcc's active in the tree.
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.103 src/tools/gcc/Makefile:1.104
--- src/tools/gcc/Makefile:1.103 Fri May 7 19:00:04 2021
+++ src/tools/gcc/Makefile Sat May 8 15:36:28 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2021/05/07 23:00:04 christos Exp $
+# $NetBSD: Makefile,v 1.104 2021/05/08 19:36:28 christos Exp $
.include
@@ -37,7 +37,6 @@ COMMON_CONFIGURE_ARGS= --target=${MACHIN
--with-system-zlib \
--without-isl \
--enable-__cxa_atexit \
- --enable-initfini-array=yes \
--enable-libstdcxx-time=rt \
--enable-libstdcxx-threads \
--with-diagnostics-color=auto-if-env
CVS commit: src/tools/gcc
Module Name:src Committed By: christos Date: Sat May 8 19:36:28 UTC 2021 Modified Files: src/tools/gcc: Makefile Log Message: Disable again initfini; breaks some archs and not worth dealing with when we have both gcc's active in the tree. To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 src/tools/gcc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sun Apr 11 23:55:47 UTC 2021
Modified Files:
src/tools/gcc: Makefile gcc-version.mk
Log Message:
add a netbsd version for GCC 10. properly generate omp-device-properties.h.
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/tools/gcc/Makefile
cvs rdiff -u -r1.20 -r1.21 src/tools/gcc/gcc-version.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.101 src/tools/gcc/Makefile:1.102
--- src/tools/gcc/Makefile:1.101 Sun Apr 11 07:35:45 2021
+++ src/tools/gcc/Makefile Sun Apr 11 23:55:47 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.101 2021/04/11 07:35:45 mrg Exp $
+# $NetBSD: Makefile,v 1.102 2021/04/11 23:55:47 mrg Exp $
.include
@@ -234,7 +234,7 @@ MKENV_BUILD_MAKE=cd .native && ${MKNATIV
(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e libgcc.mvars tconfig.h); \
(cd .native && touch gcc/cc1obj gcc/cc1plus gcc/f771 gcc/libgcc.a gcc/libgcc_s.so)
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
- (cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e omp-device-properties.h)
+ (cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e s-omp-device-properties-h)
.if defined(EXTRA_GCC_TARGETS)
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e ${EXTRA_GCC_TARGETS})
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.20 src/tools/gcc/gcc-version.mk:1.21
--- src/tools/gcc/gcc-version.mk:1.20 Sun Sep 6 21:59:33 2020
+++ src/tools/gcc/gcc-version.mk Sun Apr 11 23:55:47 2021
@@ -1,4 +1,4 @@
-# $NetBSD: gcc-version.mk,v 1.20 2020/09/06 21:59:33 mrg Exp $
+# $NetBSD: gcc-version.mk,v 1.21 2021/04/11 23:55:47 mrg Exp $
# common location for tools and native build
@@ -6,4 +6,6 @@
NETBSD_GCC_VERSION=nb1 20200311
.elif ${HAVE_GCC} == 9
NETBSD_GCC_VERSION=nb1 20200907
+.elif ${HAVE_GCC} == 10
+NETBSD_GCC_VERSION=nb1 20210411
.endif
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Sun Apr 11 23:55:47 UTC 2021 Modified Files: src/tools/gcc: Makefile gcc-version.mk Log Message: add a netbsd version for GCC 10. properly generate omp-device-properties.h. To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/tools/gcc/Makefile cvs rdiff -u -r1.20 -r1.21 src/tools/gcc/gcc-version.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sun Apr 11 07:35:45 UTC 2021
Modified Files:
src/tools/gcc: Makefile mknative-gcc
Log Message:
fetch omp-device-properties.h and don't try to fetch sanitizer
stuff automatically yet.
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/tools/gcc/Makefile
cvs rdiff -u -r1.113 -r1.114 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.100 src/tools/gcc/Makefile:1.101
--- src/tools/gcc/Makefile:1.100 Sun Sep 6 02:24:38 2020
+++ src/tools/gcc/Makefile Sun Apr 11 07:35:45 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.100 2020/09/06 02:24:38 mrg Exp $
+# $NetBSD: Makefile,v 1.101 2021/04/11 07:35:45 mrg Exp $
.include
@@ -8,7 +8,7 @@ MODULE= ${EXTERNAL_GCC_SUBDIR}
GCCDIST= ${.CURDIR}/../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/dist
GNUHOSTDIST= ${GCCDIST}
-.if ${HAVE_GCC} == 7
+.if ${HAVE_GCC} == 9
MKNATIVE= ${.CURDIR}/mknative-gcc.old
.endif
@@ -233,6 +233,8 @@ MKENV_BUILD_MAKE=cd .native && ${MKNATIV
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e libgcc.mvars tconfig.h); \
(cd .native && touch gcc/cc1obj gcc/cc1plus gcc/f771 gcc/libgcc.a gcc/libgcc_s.so)
+ PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
+ (cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e omp-device-properties.h)
.if defined(EXTRA_GCC_TARGETS)
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native/gcc && ${MKNATIVE_ENV} ${BUILD_MAKE} -e ${EXTRA_GCC_TARGETS})
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.113 src/tools/gcc/mknative-gcc:1.114
--- src/tools/gcc/mknative-gcc:1.113 Sun Apr 11 01:44:14 2021
+++ src/tools/gcc/mknative-gcc Sun Apr 11 07:35:45 2021
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.113 2021/04/11 01:44:14 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.114 2021/04/11 07:35:45 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -401,7 +401,7 @@ get_gcc () {
| write_mk $_OUTDIRBASE/usr.bin/common-target/arch/$_MACHINE_ARCH.mk
write_c $_OUTDIRBASE/usr.bin/libcpp/arch/$_MACHINE_ARCH/config.h <$_TMPDIR/libcpp/config.h
- hfiles='auto-host configargs config bconfig bversion plugin-version multilib tm'
+ hfiles='auto-host configargs config bconfig bversion plugin-version multilib tm omp-device-properties'
for f in $hfiles; do
write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$_MACHINE_ARCH/$f.h <$_TMPDIR/gcc/$f.h
if [ "${_MACHINE_ARCH}" = "powerpc" -a "${f}" = "configargs" ]
@@ -493,7 +493,8 @@ gcc*)
get_gcc_libiberty gcc
get_libobjc libobjc
get_libstdcxx_v3 libstdc++-v3 gcc
- get_libsanitizer libsanitizer
+ # wants libstdc++-v3 built
+ # get_libsanitizer libsanitizer
get_libdecnumber libdecnumber
get_libgomp libgomp
get_libbacktrace libbacktrace
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Sun Apr 11 07:35:45 UTC 2021 Modified Files: src/tools/gcc: Makefile mknative-gcc Log Message: fetch omp-device-properties.h and don't try to fetch sanitizer stuff automatically yet. To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/tools/gcc/Makefile cvs rdiff -u -r1.113 -r1.114 src/tools/gcc/mknative-gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sun Apr 11 01:44:14 UTC 2021
Modified Files:
src/tools/gcc: mknative-gcc mknative-gcc.old
Log Message:
make mknative-gcc.old for GCC 9. begin to update mknative-gcc for GCC 10.
To generate a diff of this commit:
cvs rdiff -u -r1.112 -r1.113 src/tools/gcc/mknative-gcc
cvs rdiff -u -r1.9 -r1.10 src/tools/gcc/mknative-gcc.old
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.112 src/tools/gcc/mknative-gcc:1.113
--- src/tools/gcc/mknative-gcc:1.112 Wed Sep 9 07:12:04 2020
+++ src/tools/gcc/mknative-gcc Sun Apr 11 01:44:14 2021
@@ -1,10 +1,10 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.112 2020/09/09 07:12:04 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.113 2021/04/11 01:44:14 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
#
-# This version is for GCC 9.3
+# This version is for GCC 10.3
# initialise
@@ -312,9 +312,11 @@ get_libsanitizer () {
getvars $_PLATFORM/libsanitizer/lsan/Makefile \
lsan_files
getvars $_PLATFORM/libsanitizer/tsan/Makefile \
- tsan_plugin_files
+ tsan_files
getvars $_PLATFORM/libsanitizer/ubsan/Makefile \
- ubsan_plugin_files
+ ubsan_files
+ getvars $_PLATFORM/libsanitizer/interception/Makefile \
+ interception_files
} | sanitise_includes \
| write_mk $_OUTDIRBASE/lib/$_subdir/arch/$_MACHINE_ARCH/defs.mk
@@ -491,8 +493,7 @@ gcc*)
get_gcc_libiberty gcc
get_libobjc libobjc
get_libstdcxx_v3 libstdc++-v3 gcc
- # XXX not yet
- # get_libsanitizer libsanitizer
+ get_libsanitizer libsanitizer
get_libdecnumber libdecnumber
get_libgomp libgomp
get_libbacktrace libbacktrace
Index: src/tools/gcc/mknative-gcc.old
diff -u src/tools/gcc/mknative-gcc.old:1.9 src/tools/gcc/mknative-gcc.old:1.10
--- src/tools/gcc/mknative-gcc.old:1.9 Sun Sep 6 02:24:38 2020
+++ src/tools/gcc/mknative-gcc.old Sun Apr 11 01:44:14 2021
@@ -1,10 +1,10 @@
#!/bin/sh
-# $NetBSD: mknative-gcc.old,v 1.9 2020/09/06 02:24:38 mrg Exp $
+# $NetBSD: mknative-gcc.old,v 1.10 2021/04/11 01:44:14 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
#
-# This version is for GCC 7.5
+# This version is for GCC 9.3
# initialise
@@ -226,12 +226,16 @@ get_libstdcxx_v3 () {
mkdir -p $_OUTDIR/lib/$_subdir/arch/$_MACHINE_ARCH
_build_headers="c++config.h cxxabi_tweaks.h"
- _headers1="c_base_headers_extra_install"
- _headers1="$_headers1 tr1_headers tr2_headers decimal_headers c_compatibility_headers_install"
+ _headers1="backward_headers c_base_headers_extra"
+ _headers1="$_headers1 c_base_headers_extra_install"
+ _headers1="$_headers1 tr1_headers tr2_headers"
+ _headers1="$_headers1 decimal_headers c_compatibility_headers_install"
_headers1="$_headers1 debug_headers parallel_headers"
- _headers2="host_headers thread_host_headers"
- _pf_headers="profile_headers profile_impl_headers"
- _pb_headers="pb_headers1 pb_headers2 pb_headers3 pb_headers4 pb_headers5 pb_headers6 pb_headers7"
+ _headers1="$_headers1 pb_headers1 pb_headers2 pb_headers3 pb_headers4"
+ _headers1="$_headers1 pb_headers5 pb_headers6 pb_headers7"
+ _headers1="$_headers1 bits_headers ext_headers host_headers"
+ _headers1="$_headers1 thread_host_headers pstl_headers"
+ _headers1="$_headers1 profile_headers profile_impl_headers"
# build files
for h in $_build_headers; do
@@ -248,6 +252,7 @@ get_libstdcxx_v3 () {
getvars $_PLATFORM/libstdc++-v3/Makefile \
port_specific_symbol_files
getvars $_PLATFORM/libstdc++-v3/src/Makefile \
+ cxx17_sources \
cxx11_sources \
cxx98_sources
@@ -264,6 +269,9 @@ get_libstdcxx_v3 () {
# src
getvars $_PLATFORM/libstdc++-v3/src/Makefile \
libstdc___la_SOURCES | sed 's/^G_libstdc___la_SOURCES=/G_SRC_SOURCES=/'
+ getvars $_PLATFORM/libstdc++-v3/src/c++17/Makefile \
+ libc__17convenience_la_SOURCES | \
+ sed -e 's/^G_libc__17convenience_la_SOURCES=/G_CPP17_SOURCES=/'
getvars $_PLATFORM/libstdc++-v3/src/c++11/Makefile \
libc__11convenience_la_SOURCES | \
sed -e 's/^G_libc__11convenience_la_SOURCES=/G_CPP11_SOURCES=/' \
@@ -282,19 +290,36 @@ get_libstdcxx_v3 () {
# includes
getvars $_PLATFORM/libstdc++-v3/include/Makefile \
- backward_headers c_base_headers_extra $_headers1 $_pb_headers | \
-sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/##g'
- getvars $_PLATFORM/libstdc++-v3/include/Makefile \
- bits_headers ext_headers $_headers2 | \
-sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/##g' -e 's#\${GNUHOSTDIST}/libstdc++-v3/config/##g'
- getvars $_PLATFORM/libstdc++-v3/include/Makefile \
- $_pf_headers | sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/profile/##g'
+ $_headers1 | \
+sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/##g' \
+-e 's#\${GNUHOSTDIST}/libstdc++-v3/config/##g'
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Sun Apr 11 01:44:14 UTC 2021 Modified Files: src/tools/gcc: mknative-gcc mknative-gcc.old Log Message: make mknative-gcc.old for GCC 9. begin to update mknative-gcc for GCC 10. To generate a diff of this commit: cvs rdiff -u -r1.112 -r1.113 src/tools/gcc/mknative-gcc cvs rdiff -u -r1.9 -r1.10 src/tools/gcc/mknative-gcc.old Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Wed Sep 9 07:12:04 UTC 2020
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
more consolidation and properly condition all variables like previously.
To generate a diff of this commit:
cvs rdiff -u -r1.111 -r1.112 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.111 src/tools/gcc/mknative-gcc:1.112
--- src/tools/gcc/mknative-gcc:1.111 Wed Sep 9 04:52:32 2020
+++ src/tools/gcc/mknative-gcc Wed Sep 9 07:12:04 2020
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.111 2020/09/09 04:52:32 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.112 2020/09/09 07:12:04 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -226,14 +226,16 @@ get_libstdcxx_v3 () {
mkdir -p $_OUTDIR/lib/$_subdir/arch/$_MACHINE_ARCH
_build_headers="c++config.h cxxabi_tweaks.h"
- _headers1="backward_headers c_base_headers_extra c_base_headers_extra_install"
- _headers1="$_headers1 tr1_headers tr2_headers decimal_headers c_compatibility_headers_install"
+ _headers1="backward_headers c_base_headers_extra"
+ _headers1="$_headers1 c_base_headers_extra_install"
+ _headers1="$_headers1 tr1_headers tr2_headers"
+ _headers1="$_headers1 decimal_headers c_compatibility_headers_install"
_headers1="$_headers1 debug_headers parallel_headers"
_headers1="$_headers1 pb_headers1 pb_headers2 pb_headers3 pb_headers4"
_headers1="$_headers1 pb_headers5 pb_headers6 pb_headers7"
- # These subdirs get the subdir removed from the values.
- _headers2="bits_headers ext_headers host_headers thread_host_headers pstl_headers"
- _headers2="$_headers2 profile_headers profile_impl_headers"
+ _headers1="$_headers1 bits_headers ext_headers host_headers"
+ _headers1="$_headers1 thread_host_headers pstl_headers"
+ _headers1="$_headers1 profile_headers profile_impl_headers"
# build files
for h in $_build_headers; do
@@ -289,10 +291,8 @@ get_libstdcxx_v3 () {
# includes
getvars $_PLATFORM/libstdc++-v3/include/Makefile \
$_headers1 | \
-sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/##g'
- getvars $_PLATFORM/libstdc++-v3/include/Makefile \
- $_headers2 | \
-sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/[^/][^/]*/##g'
+sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/##g' \
+-e 's#\${GNUHOSTDIST}/libstdc++-v3/config/##g'
getvars $_PLATFORM/libstdc++-v3/include/Makefile \
BASIC_FILE_H ALLOCATOR_H CSTDIO_H CLOCALE_H CMESSAGES_H CTIME_H
} | sanitise_includes \
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Wed Sep 9 07:12:04 UTC 2020 Modified Files: src/tools/gcc: mknative-gcc Log Message: more consolidation and properly condition all variables like previously. To generate a diff of this commit: cvs rdiff -u -r1.111 -r1.112 src/tools/gcc/mknative-gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Wed Sep 9 04:52:32 UTC 2020 Modified Files: src/tools/gcc: mknative-gcc Log Message: consolidate a bunch of libstdc++ variable collection. To generate a diff of this commit: cvs rdiff -u -r1.110 -r1.111 src/tools/gcc/mknative-gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Wed Sep 9 04:52:32 UTC 2020
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
consolidate a bunch of libstdc++ variable collection.
To generate a diff of this commit:
cvs rdiff -u -r1.110 -r1.111 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.110 src/tools/gcc/mknative-gcc:1.111
--- src/tools/gcc/mknative-gcc:1.110 Tue Sep 8 19:17:24 2020
+++ src/tools/gcc/mknative-gcc Wed Sep 9 04:52:32 2020
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.110 2020/09/08 19:17:24 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.111 2020/09/09 04:52:32 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -226,12 +226,14 @@ get_libstdcxx_v3 () {
mkdir -p $_OUTDIR/lib/$_subdir/arch/$_MACHINE_ARCH
_build_headers="c++config.h cxxabi_tweaks.h"
- _headers1="c_base_headers_extra_install"
+ _headers1="backward_headers c_base_headers_extra c_base_headers_extra_install"
_headers1="$_headers1 tr1_headers tr2_headers decimal_headers c_compatibility_headers_install"
- _headers1="$_headers1 debug_headers parallel_headers pstl_headers"
- _headers2="host_headers thread_host_headers"
- _pf_headers="profile_headers profile_impl_headers"
- _pb_headers="pb_headers1 pb_headers2 pb_headers3 pb_headers4 pb_headers5 pb_headers6 pb_headers7"
+ _headers1="$_headers1 debug_headers parallel_headers"
+ _headers1="$_headers1 pb_headers1 pb_headers2 pb_headers3 pb_headers4"
+ _headers1="$_headers1 pb_headers5 pb_headers6 pb_headers7"
+ # These subdirs get the subdir removed from the values.
+ _headers2="bits_headers ext_headers host_headers thread_host_headers pstl_headers"
+ _headers2="$_headers2 profile_headers profile_impl_headers"
# build files
for h in $_build_headers; do
@@ -286,13 +288,11 @@ get_libstdcxx_v3 () {
# includes
getvars $_PLATFORM/libstdc++-v3/include/Makefile \
- backward_headers c_base_headers_extra $_headers1 $_pb_headers | \
+ $_headers1 | \
sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/##g'
getvars $_PLATFORM/libstdc++-v3/include/Makefile \
- bits_headers ext_headers $_headers2 | \
-sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/##g' -e 's#\${GNUHOSTDIST}/libstdc++-v3/config/##g'
- getvars $_PLATFORM/libstdc++-v3/include/Makefile \
- $_pf_headers | sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/profile/##g'
+ $_headers2 | \
+sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/[^/][^/]*/##g'
getvars $_PLATFORM/libstdc++-v3/include/Makefile \
BASIC_FILE_H ALLOCATOR_H CSTDIO_H CLOCALE_H CMESSAGES_H CTIME_H
} | sanitise_includes \
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Tue Sep 8 19:17:24 UTC 2020
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
oops, pull out the value of pstl_headers.
To generate a diff of this commit:
cvs rdiff -u -r1.109 -r1.110 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.109 src/tools/gcc/mknative-gcc:1.110
--- src/tools/gcc/mknative-gcc:1.109 Sun Sep 6 02:24:38 2020
+++ src/tools/gcc/mknative-gcc Tue Sep 8 19:17:24 2020
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.109 2020/09/06 02:24:38 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.110 2020/09/08 19:17:24 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -228,7 +228,7 @@ get_libstdcxx_v3 () {
_build_headers="c++config.h cxxabi_tweaks.h"
_headers1="c_base_headers_extra_install"
_headers1="$_headers1 tr1_headers tr2_headers decimal_headers c_compatibility_headers_install"
- _headers1="$_headers1 debug_headers parallel_headers"
+ _headers1="$_headers1 debug_headers parallel_headers pstl_headers"
_headers2="host_headers thread_host_headers"
_pf_headers="profile_headers profile_impl_headers"
_pb_headers="pb_headers1 pb_headers2 pb_headers3 pb_headers4 pb_headers5 pb_headers6 pb_headers7"
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Tue Sep 8 19:17:24 UTC 2020 Modified Files: src/tools/gcc: mknative-gcc Log Message: oops, pull out the value of pstl_headers. To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 src/tools/gcc/mknative-gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Sun Sep 6 21:59:34 UTC 2020 Modified Files: src/tools/gcc: gcc-version.mk Log Message: mark GCC 9 as (so far) netbsd 20200907 version. this should fix the compiler saying it is "gcc version 9.3.0 ()". (needs mknative redo.) To generate a diff of this commit: cvs rdiff -u -r1.19 -r1.20 src/tools/gcc/gcc-version.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sun Sep 6 21:59:34 UTC 2020
Modified Files:
src/tools/gcc: gcc-version.mk
Log Message:
mark GCC 9 as (so far) netbsd 20200907 version. this should fix the
compiler saying it is "gcc version 9.3.0 ()".
(needs mknative redo.)
To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/tools/gcc/gcc-version.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.19 src/tools/gcc/gcc-version.mk:1.20
--- src/tools/gcc/gcc-version.mk:1.19 Tue Aug 11 09:51:57 2020
+++ src/tools/gcc/gcc-version.mk Sun Sep 6 21:59:33 2020
@@ -1,9 +1,9 @@
-# $NetBSD: gcc-version.mk,v 1.19 2020/08/11 09:51:57 mrg Exp $
+# $NetBSD: gcc-version.mk,v 1.20 2020/09/06 21:59:33 mrg Exp $
# common location for tools and native build
-.if ${HAVE_GCC} == 7
-NETBSD_GCC_VERSION=nb4 20200810
-.elif ${HAVE_GCC} == 8
+.if ${HAVE_GCC} == 8
NETBSD_GCC_VERSION=nb1 20200311
+.elif ${HAVE_GCC} == 9
+NETBSD_GCC_VERSION=nb1 20200907
.endif
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sun Sep 6 02:24:38 UTC 2020
Modified Files:
src/tools/gcc: Makefile mknative-gcc mknative-gcc.old
Log Message:
pass down earm* not earmv5* to mknative-gcc.
To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 src/tools/gcc/Makefile
cvs rdiff -u -r1.108 -r1.109 src/tools/gcc/mknative-gcc
cvs rdiff -u -r1.8 -r1.9 src/tools/gcc/mknative-gcc.old
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.99 src/tools/gcc/Makefile:1.100
--- src/tools/gcc/Makefile:1.99 Sat Sep 5 10:58:08 2020
+++ src/tools/gcc/Makefile Sun Sep 6 02:24:38 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.99 2020/09/05 10:58:08 mrg Exp $
+# $NetBSD: Makefile,v 1.100 2020/09/06 02:24:38 mrg Exp $
.include
@@ -95,7 +95,6 @@ MKNATIVE_CONFIG_TARGET_LIBS=
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgcc
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgomp
-MKNATIVE_TARGET= gcc
MKNATIVE_CONFIG_TARGET_LIBS+= \
configure-target-libstdc++-v3 \
@@ -142,25 +141,27 @@ CCADDFLAGS= --sysroot=${DESTDIR} -L${DES
# in case the version being used is not.
NEWCONFIGDIR?= ${.CURDIR}/../..
+GCC_MACHINE_ARCH= ${MACHINE_ARCH:S/earmv5/earm/}
+
bootstrap-libgcc: .configure_done
@echo 'Creating files needed for libgcc by a native bootstrap build.'
(cd ${.OBJDIR}/build && ${BUILD_COMMAND} configure-target-libgcc)
- @MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} lib${MKNATIVE_TARGET}-bootstrap \
+ @MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} libgcc-bootstrap \
${.OBJDIR}/build ${NEWCONFIGDIR} ${NETBSDSRCDIR} \
- ${MACHINE_GNU_PLATFORM} ${DESTDIR} ${TOOLDIR}
+ ${MACHINE_GNU_PLATFORM} ${GCC_MACHINE_ARCH} ${DESTDIR} ${TOOLDIR}
bootstrap-libstdc++: .configure_done
@echo 'Creating files needed for libstdc++ by a native bootstrap build.'
(cd ${.OBJDIR}/build && ${BUILD_COMMAND} configure-target-libstdc++-v3)
@MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} libstdc++-bootstrap \
${.OBJDIR}/build ${NEWCONFIGDIR} ${NETBSDSRCDIR} \
- ${MACHINE_GNU_PLATFORM} ${DESTDIR} ${TOOLDIR}
+ ${MACHINE_GNU_PLATFORM} ${GCC_MACHINE_ARCH} ${DESTDIR} ${TOOLDIR}
native-gcc: .native/.configure_done
@echo 'Extracting GNU GCC configury for a native toolchain.'
- @MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} ${MKNATIVE_TARGET} \
+ @MAKE=${BUILD_MAKE:Q} ${HOST_SH} ${MKNATIVE} gcc \
${.OBJDIR}/.native ${NEWCONFIGDIR} ${NETBSDSRCDIR} \
- ${MACHINE_GNU_PLATFORM} ${DESTDIR} ${TOOLDIR}
+ ${MACHINE_GNU_PLATFORM} ${GCC_MACHINE_ARCH} ${DESTDIR} ${TOOLDIR}
NATIVE_CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
MPC= ${NETBSDSRCDIR}/external/lgpl3/mpc
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.108 src/tools/gcc/mknative-gcc:1.109
--- src/tools/gcc/mknative-gcc:1.108 Sat Sep 5 10:58:08 2020
+++ src/tools/gcc/mknative-gcc Sun Sep 6 02:24:38 2020
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.108 2020/09/05 10:58:08 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.109 2020/09/06 02:24:38 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -12,8 +12,9 @@ _TMPDIR=$2
_TOP=$3
_SRC=$4
_PLATFORM=$5
-_DESTDIR=$6
-_TOOLDIR=$7
+_MACHINE_ARCH=$6
+_DESTDIR=$7
+_TOOLDIR=$8
_VPATH=`grep VPATH ${_TMPDIR}/Makefile | sed 's,^.*=[ ]*,,'`
_GNU_DIST=`cd ${_VPATH}; pwd`
@@ -47,10 +48,10 @@ sanitise_includes () {
# lib/libg2c #
get_libg2c () {
- mkdir -p $_OUTDIR/lib/libg2c3/arch/$MACHINE_ARCH
+ mkdir -p $_OUTDIR/lib/libg2c3/arch/$_MACHINE_ARCH
- write_c $_OUTDIRBASE/lib/libg2c3/arch/$MACHINE_ARCH/config.h <$_TMPDIR/$_PLATFORM/libf2c/libU77/config.h
- write_c $_OUTDIRBASE/lib/libg2c3/arch/$MACHINE_ARCH/g2c.h <$_TMPDIR/$_PLATFORM/libf2c/g2c.h
+ write_c $_OUTDIRBASE/lib/libg2c3/arch/$_MACHINE_ARCH/config.h <$_TMPDIR/$_PLATFORM/libf2c/libU77/config.h
+ write_c $_OUTDIRBASE/lib/libg2c3/arch/$_MACHINE_ARCH/g2c.h <$_TMPDIR/$_PLATFORM/libf2c/g2c.h
{
getvars $_PLATFORM/libf2c/Makefile \
@@ -61,7 +62,7 @@ get_libg2c () {
ALL_CFLAGS OBJS | sed 's,=,+=,'
getvars $_PLATFORM/libf2c/libU77/Makefile \
ALL_CFLAGS OBJS | sed 's,=,+=,'
- } | write_mk $_OUTDIRBASE/lib/libg2c3/arch/$MACHINE_ARCH/defs.mk
+ } | write_mk $_OUTDIRBASE/lib/libg2c3/arch/$_MACHINE_ARCH/defs.mk
}
# lib/libgcc #
@@ -74,7 +75,7 @@ get_libgcc () {
# XXX we should probably grab everything Just In Case for
# the future.
- mkdir -p $_OUTDIR/lib/lib$_subdir/arch/$MACHINE_ARCH
+ mkdir -p $_OUTDIR/lib/lib$_subdir/arch/$_MACHINE_ARCH
cd $_TMPDIR/$_PLATFORM/libgcc
{
getvars $_PLATFORM/libgcc/Makefile \
@@ -90,7 +91,7 @@ get_libgcc () {
getvars gcc/Makefile \
NOEXCEPTION_FLAGS EXTRA_HEADERS
} | sanitise_includes \
- | write_mk $_OUTDIRBASE/lib/lib$_subdir/arch/$MACHINE_ARCH/defs.mk
+ | write_mk $_OUTDIRBASE/lib/lib$_subdir/arch/$_MACHINE_ARCH/defs.mk
cd
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Sun Sep 6 02:24:38 UTC 2020 Modified Files: src/tools/gcc: Makefile mknative-gcc mknative-gcc.old Log Message: pass down earm* not earmv5* to mknative-gcc. To generate a diff of this commit: cvs rdiff -u -r1.99 -r1.100 src/tools/gcc/Makefile cvs rdiff -u -r1.108 -r1.109 src/tools/gcc/mknative-gcc cvs rdiff -u -r1.8 -r1.9 src/tools/gcc/mknative-gcc.old Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Sat Sep 5 10:58:08 UTC 2020 Modified Files: src/tools/gcc: Makefile mknative-gcc Log Message: disable fetching stuff from libsanitizer for now. it needs libstdc++ to build in mknative using gcc makefiles, and our locale changes break the "normal" build of this. make sure MKNATIVE_TARGET is always set. since mknative-gcc doesn't care about the version any more (we keep two versions for gcc/gcc.old) simply set it to "gcc". To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/tools/gcc/Makefile cvs rdiff -u -r1.107 -r1.108 src/tools/gcc/mknative-gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sat Sep 5 10:58:08 UTC 2020
Modified Files:
src/tools/gcc: Makefile mknative-gcc
Log Message:
disable fetching stuff from libsanitizer for now. it needs libstdc++
to build in mknative using gcc makefiles, and our locale changes break
the "normal" build of this.
make sure MKNATIVE_TARGET is always set. since mknative-gcc doesn't
care about the version any more (we keep two versions for gcc/gcc.old)
simply set it to "gcc".
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/tools/gcc/Makefile
cvs rdiff -u -r1.107 -r1.108 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.98 src/tools/gcc/Makefile:1.99
--- src/tools/gcc/Makefile:1.98 Thu Aug 13 10:57:53 2020
+++ src/tools/gcc/Makefile Sat Sep 5 10:58:08 2020
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.98 2020/08/13 10:57:53 mrg Exp $
+# $NetBSD: Makefile,v 1.99 2020/09/05 10:58:08 mrg Exp $
.include
@@ -95,17 +95,21 @@ MKNATIVE_CONFIG_TARGET_LIBS=
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgcc
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgomp
-.if ${HAVE_GCC} == 8
-MKNATIVE_TARGET= gcc8
-.elif ${HAVE_GCC} == 7
-MKNATIVE_TARGET= gcc7
-.endif
+MKNATIVE_TARGET= gcc
MKNATIVE_CONFIG_TARGET_LIBS+= \
configure-target-libstdc++-v3 \
configure-target-libbacktrace \
configure-target-libobjc
+.if ${HAVE_GCC} >= 9
+# XXX needs to build libstdc++ fully, which fails
+.if 0
+MKNATIVE_CONFIG_TARGET_LIBS+= \
+ configure-target-libsanitizer
+.endif
+.endif
+
BINENV= /usr/bin/env -i
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.107 src/tools/gcc/mknative-gcc:1.108
--- src/tools/gcc/mknative-gcc:1.107 Sat Sep 5 09:49:32 2020
+++ src/tools/gcc/mknative-gcc Sat Sep 5 10:58:08 2020
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.107 2020/09/05 09:49:32 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.108 2020/09/05 10:58:08 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -490,7 +490,8 @@ gcc*)
get_gcc_libiberty gcc
get_libobjc libobjc
get_libstdcxx_v3 libstdc++-v3 gcc
- get_libsanitizer libsanitizer
+ # XXX not yet
+ # get_libsanitizer libsanitizer
get_libdecnumber libdecnumber
get_libgomp libgomp
get_libbacktrace libbacktrace
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sat Sep 5 09:49:33 UTC 2020
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
pull out a few more things for GCC 9.
To generate a diff of this commit:
cvs rdiff -u -r1.106 -r1.107 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.106 src/tools/gcc/mknative-gcc:1.107
--- src/tools/gcc/mknative-gcc:1.106 Sat Sep 5 09:16:46 2020
+++ src/tools/gcc/mknative-gcc Sat Sep 5 09:49:32 2020
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.106 2020/09/05 09:16:46 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.107 2020/09/05 09:49:32 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -363,10 +363,10 @@ get_gcc () {
GCC_OBJS GCOV_OBJS GCOV_DUMP_OBJS GXX_OBJS GTM_H PROTO_OBJS ${_extravars1} \
INCLUDES md_file OBJC_OBJS OBJS out_file version \
BUILD_PREFIX RTL_H RTL_BASE_H TREE_H ${_hconfig_h} BASIC_BLOCK_H GCC_H \
- GGC_H \
+ D_TARGET_DEF \
GTFILES_SRCDIR GTFILES_FILES_FILES GTFILES_FILES_LANGS \
- GTFILES GTFILES_LANG_DIR_NAMES NOEXCEPTION_FLAGS \
- NATIVE_SYSTEM_HEADER_DIR \
+ GTFILES GTFILES_LANG_DIR_NAMES HASH_TABLE_H \
+ NOEXCEPTION_FLAGS NATIVE_SYSTEM_HEADER_DIR \
tm_defines host_xm_file host_xm_defines tm_p_file \
target_cpu_default ${_extravars} ${_extravars2} \
lang_specs_files ${_extravars3} \
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Sat Sep 5 09:49:33 UTC 2020 Modified Files: src/tools/gcc: mknative-gcc Log Message: pull out a few more things for GCC 9. To generate a diff of this commit: cvs rdiff -u -r1.106 -r1.107 src/tools/gcc/mknative-gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Sat Sep 5 09:16:46 UTC 2020 Modified Files: src/tools/gcc: mknative-gcc Log Message: port to GCC 9.3. To generate a diff of this commit: cvs rdiff -u -r1.105 -r1.106 src/tools/gcc/mknative-gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sat Sep 5 09:16:46 UTC 2020
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
port to GCC 9.3.
To generate a diff of this commit:
cvs rdiff -u -r1.105 -r1.106 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.105 src/tools/gcc/mknative-gcc:1.106
--- src/tools/gcc/mknative-gcc:1.105 Thu Aug 13 01:52:37 2020
+++ src/tools/gcc/mknative-gcc Sat Sep 5 09:16:46 2020
@@ -1,10 +1,10 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.105 2020/08/13 01:52:37 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.106 2020/09/05 09:16:46 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
#
-# This version is for GCC 8.4
+# This version is for GCC 9.3
# initialise
@@ -247,6 +247,7 @@ get_libstdcxx_v3 () {
getvars $_PLATFORM/libstdc++-v3/Makefile \
port_specific_symbol_files
getvars $_PLATFORM/libstdc++-v3/src/Makefile \
+ cxx17_sources \
cxx11_sources \
cxx98_sources
@@ -263,6 +264,9 @@ get_libstdcxx_v3 () {
# src
getvars $_PLATFORM/libstdc++-v3/src/Makefile \
libstdc___la_SOURCES | sed 's/^G_libstdc___la_SOURCES=/G_SRC_SOURCES=/'
+ getvars $_PLATFORM/libstdc++-v3/src/c++17/Makefile \
+ libc__17convenience_la_SOURCES | \
+ sed -e 's/^G_libc__17convenience_la_SOURCES=/G_CPP17_SOURCES=/'
getvars $_PLATFORM/libstdc++-v3/src/c++11/Makefile \
libc__11convenience_la_SOURCES | \
sed -e 's/^G_libc__11convenience_la_SOURCES=/G_CPP11_SOURCES=/' \
@@ -294,6 +298,27 @@ get_libstdcxx_v3 () {
| write_mk $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/defs.mk
}
+# lib/libsanitizer #
+
+get_libsanitizer () {
+ _subdir="$1"
+
+ mkdir -p $_OUTDIR/lib/$_subdir/arch/$MACHINE_ARCH
+
+ {
+ getvars $_PLATFORM/libsanitizer/asan/Makefile \
+ asan_files
+ getvars $_PLATFORM/libsanitizer/lsan/Makefile \
+ lsan_files
+ getvars $_PLATFORM/libsanitizer/tsan/Makefile \
+ tsan_plugin_files
+ getvars $_PLATFORM/libsanitizer/ubsan/Makefile \
+ ubsan_plugin_files
+
+ } | sanitise_includes \
+ | write_mk $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/defs.mk
+}
+
# usr.bin/gcc* #
get_gcc_bootstrap () {
@@ -465,6 +490,7 @@ gcc*)
get_gcc_libiberty gcc
get_libobjc libobjc
get_libstdcxx_v3 libstdc++-v3 gcc
+ get_libsanitizer libsanitizer
get_libdecnumber libdecnumber
get_libgomp libgomp
get_libbacktrace libbacktrace
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Thu Aug 13 10:57:54 UTC 2020
Modified Files:
src/tools/gcc: Makefile
Log Message:
set MODULE to ${EXTERNAL_GCC_SUBDIR} so this actually works..
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Thu Aug 13 10:57:54 UTC 2020
Modified Files:
src/tools/gcc: Makefile
Log Message:
set MODULE to ${EXTERNAL_GCC_SUBDIR} so this actually works..
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.97 src/tools/gcc/Makefile:1.98
--- src/tools/gcc/Makefile:1.97 Wed Nov 6 07:26:31 2019
+++ src/tools/gcc/Makefile Thu Aug 13 10:57:53 2020
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.97 2019/11/06 07:26:31 mrg Exp $
+# $NetBSD: Makefile,v 1.98 2020/08/13 10:57:53 mrg Exp $
.include
GCC_LANGUAGES=c c++ objc
-MODULE= gcc4
+MODULE= ${EXTERNAL_GCC_SUBDIR}
GCCDIST= ${.CURDIR}/../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/dist
GNUHOSTDIST= ${GCCDIST}
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Thu Aug 13 01:52:37 UTC 2020 Modified Files: src/tools/gcc: mknative-gcc mknative-gcc.old Log Message: set _OUTDIRBASE depending on $0, and then set _OUTDIR based on this. now you can copy mknative-gcc to mknative-gcc.old without edit. To generate a diff of this commit: cvs rdiff -u -r1.104 -r1.105 src/tools/gcc/mknative-gcc cvs rdiff -u -r1.7 -r1.8 src/tools/gcc/mknative-gcc.old Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Thu Aug 13 01:52:37 UTC 2020
Modified Files:
src/tools/gcc: mknative-gcc mknative-gcc.old
Log Message:
set _OUTDIRBASE depending on $0, and then set _OUTDIR based on this.
now you can copy mknative-gcc to mknative-gcc.old without edit.
To generate a diff of this commit:
cvs rdiff -u -r1.104 -r1.105 src/tools/gcc/mknative-gcc
cvs rdiff -u -r1.7 -r1.8 src/tools/gcc/mknative-gcc.old
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.104 src/tools/gcc/mknative-gcc:1.105
--- src/tools/gcc/mknative-gcc:1.104 Wed Aug 12 08:53:20 2020
+++ src/tools/gcc/mknative-gcc Thu Aug 13 01:52:37 2020
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.104 2020/08/12 08:53:20 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.105 2020/08/13 01:52:37 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -24,8 +24,15 @@ fi
. $_TOP/tools/gcc/mknative.common
-_OUTDIR="$_TOP/external/gpl3/gcc"
-_OUTDIRBASE="external/gpl3/gcc"
+case $0 in
+ *mknative-gcc.old)
+ _OUTDIRBASE="external/gpl3/gcc.old"
+ ;;
+ *)
+ _OUTDIRBASE="external/gpl3/gcc"
+ ;;
+esac
+_OUTDIR="$_TOP/$_OUTDIRBASE"
sanitise_includes () {
sed \
Index: src/tools/gcc/mknative-gcc.old
diff -u src/tools/gcc/mknative-gcc.old:1.7 src/tools/gcc/mknative-gcc.old:1.8
--- src/tools/gcc/mknative-gcc.old:1.7 Wed Aug 12 08:53:20 2020
+++ src/tools/gcc/mknative-gcc.old Thu Aug 13 01:52:37 2020
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc.old,v 1.7 2020/08/12 08:53:20 mrg Exp $
+# $NetBSD: mknative-gcc.old,v 1.8 2020/08/13 01:52:37 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -24,8 +24,15 @@ fi
. $_TOP/tools/gcc/mknative.common
-_OUTDIR="$_TOP/external/gpl3/gcc"
-_OUTDIRBASE="external/gpl3/gcc"
+case $0 in
+ *mknative-gcc.old)
+ _OUTDIRBASE="external/gpl3/gcc.old"
+ ;;
+ *)
+ _OUTDIRBASE="external/gpl3/gcc"
+ ;;
+esac
+_OUTDIR="$_TOP/$_OUTDIRBASE"
sanitise_includes () {
sed \
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Wed Aug 12 08:53:20 UTC 2020
Modified Files:
src/tools/gcc: mknative-gcc mknative-gcc.old
Log Message:
mknative-gcc is for GCC 8.4.
mknative-gcc.old is supposed to be for GCC 7, but is the GCC 6
version. update it and mark it for GCC 7.5.
To generate a diff of this commit:
cvs rdiff -u -r1.103 -r1.104 src/tools/gcc/mknative-gcc
cvs rdiff -u -r1.6 -r1.7 src/tools/gcc/mknative-gcc.old
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.103 src/tools/gcc/mknative-gcc:1.104
--- src/tools/gcc/mknative-gcc:1.103 Thu Oct 24 03:19:14 2019
+++ src/tools/gcc/mknative-gcc Wed Aug 12 08:53:20 2020
@@ -1,10 +1,10 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.103 2019/10/24 03:19:14 christos Exp $
+# $NetBSD: mknative-gcc,v 1.104 2020/08/12 08:53:20 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
#
-# This version is for GCC 6.4
+# This version is for GCC 8.4
# initialise
Index: src/tools/gcc/mknative-gcc.old
diff -u src/tools/gcc/mknative-gcc.old:1.6 src/tools/gcc/mknative-gcc.old:1.7
--- src/tools/gcc/mknative-gcc.old:1.6 Wed Sep 5 01:20:20 2018
+++ src/tools/gcc/mknative-gcc.old Wed Aug 12 08:53:20 2020
@@ -1,10 +1,10 @@
#!/bin/sh
-# $NetBSD: mknative-gcc.old,v 1.6 2018/09/05 01:20:20 mrg Exp $
+# $NetBSD: mknative-gcc.old,v 1.7 2020/08/12 08:53:20 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
#
-# This version is for GCC 6.4
+# This version is for GCC 7.5
# initialise
@@ -24,8 +24,8 @@ fi
. $_TOP/tools/gcc/mknative.common
-_OUTDIR="$_TOP/external/gpl3/gcc.old"
-_OUTDIRBASE="external/gpl3/gcc.old"
+_OUTDIR="$_TOP/external/gpl3/gcc"
+_OUTDIRBASE="external/gpl3/gcc"
sanitise_includes () {
sed \
@@ -82,10 +82,18 @@ get_libgcc () {
SHLIB_MAPFILES SHLIB_NM_FLAGS
getvars gcc/Makefile \
NOEXCEPTION_FLAGS EXTRA_HEADERS
- getlinks config.status libgcc
} | sanitise_includes \
| write_mk $_OUTDIRBASE/lib/lib$_subdir/arch/$MACHINE_ARCH/defs.mk
+ cd $_TMPDIR/$_PLATFORM/libgcc
+ {
+ getvars $_PLATFORM/libgcc/Makefile \
+ enable_execute_stack \
+ unwind_header md_unwind_header \
+ sfp_machine_header thread_header
+ } | sanitise_includes \
+ | write_mk $_OUTDIRBASE/lib/lib$_subdir/arch/$MACHINE_ARCH/gthr-defs.mk
+
if [ "${MACHINE_ARCH}" = "m68000" ]
then
ex <<__EOF__ $_OUTDIR/lib/lib$_subdir/arch/$MACHINE_ARCH/defs.mk
@@ -152,6 +160,11 @@ get_libgomp () {
_subdir="$1"
mkdir -p $_OUTDIR/lib/$_subdir/arch/$MACHINE_ARCH
+
+ getvars $_PLATFORM/libgomp/Makefile \
+ libgomp_la_SOURCES \
+ | write_mk $_OUTDIRBASE/lib/$_subdir/defs.mk
+
write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/config.h \
<$_TMPDIR/$_PLATFORM/libgomp/config.h
write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/libgomp_f.h \
@@ -169,9 +182,9 @@ get_libbacktrace () {
mkdir -p $_OUTDIR/lib/$_subdir/arch/$MACHINE_ARCH
write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/config.h \
- <$_TMPDIR/$_subdir/config.h
+ <$_TMPDIR/$_PLATFORM/$_subdir/config.h
write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/backtrace-supported.h \
- <$_TMPDIR/$_subdir/backtrace-supported.h
+ <$_TMPDIR/$_PLATFORM/$_subdir/backtrace-supported.h
}
# lib/libobjc #
@@ -189,7 +202,6 @@ get_libobjc () {
getvars $_PLATFORM/libobjc/Makefile \
ALL_CFLAGS INCLUDES OBJC_SOURCE_FILES C_SOURCE_FILES OBJC_H \
| sed "s,$_GNU_DIST,\${GNUHOSTDIST},g"
- getlinks $_TMPDIR/$_PLATFORM/libgcc/config.status libgcc
} | sanitise_includes \
| write_mk $_OUTDIRBASE/lib/$_subdir/defs.mk
@@ -205,7 +217,7 @@ get_libstdcxx_v3 () {
mkdir -p $_OUTDIR/lib/$_subdir/arch/$MACHINE_ARCH
- _build_headers="c++config.h cxxabi_tweaks.h gthr-posix.h gthr-single.h gthr.h"
+ _build_headers="c++config.h cxxabi_tweaks.h"
_headers1="c_base_headers_extra_install"
_headers1="$_headers1 tr1_headers tr2_headers decimal_headers c_compatibility_headers_install"
_headers1="$_headers1 debug_headers parallel_headers"
@@ -221,10 +233,15 @@ get_libstdcxx_v3 () {
write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/gstdint.h \
<$_TMPDIR/$_PLATFORM/libstdc++-v3/include/gstdint.h
+ write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/symver-config.h \
+ <$_TMPDIR/$_PLATFORM/libstdc++-v3/config.h
{
getvars $_PLATFORM/libstdc++-v3/Makefile \
port_specific_symbol_files
+ getvars $_PLATFORM/libstdc++-v3/src/Makefile \
+ cxx11_sources \
+ cxx98_sources
# libsupc++
getvars $_PLATFORM/libstdc++-v3/libsupc++/Makefile \
@@ -247,6 +264,9 @@ get_libstdcxx_v3 () {
GLIBCXX_ABI_FLAGS libc__98convenience_la_SOURCES | \
sed -e 's/^G_libc__98convenience_la_SOURCES=/G_CPP98_SOURCES=/' \
-e 's/codecvt.cc/c98-codecvt.cc/'
+ getvars
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Wed Aug 12 08:53:20 UTC 2020 Modified Files: src/tools/gcc: mknative-gcc mknative-gcc.old Log Message: mknative-gcc is for GCC 8.4. mknative-gcc.old is supposed to be for GCC 7, but is the GCC 6 version. update it and mark it for GCC 7.5. To generate a diff of this commit: cvs rdiff -u -r1.103 -r1.104 src/tools/gcc/mknative-gcc cvs rdiff -u -r1.6 -r1.7 src/tools/gcc/mknative-gcc.old Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Wed Mar 11 10:07:01 UTC 2020 Modified Files: src/tools/gcc: gcc-version.mk Log Message: update date for GCC 8.4.0 import. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 src/tools/gcc/gcc-version.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Wed Mar 11 10:07:01 UTC 2020
Modified Files:
src/tools/gcc: gcc-version.mk
Log Message:
update date for GCC 8.4.0 import.
To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/tools/gcc/gcc-version.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.17 src/tools/gcc/gcc-version.mk:1.18
--- src/tools/gcc/gcc-version.mk:1.17 Mon Sep 30 08:40:20 2019
+++ src/tools/gcc/gcc-version.mk Wed Mar 11 10:07:01 2020
@@ -1,9 +1,9 @@
-# $NetBSD: gcc-version.mk,v 1.17 2019/09/30 08:40:20 mrg Exp $
+# $NetBSD: gcc-version.mk,v 1.18 2020/03/11 10:07:01 mrg Exp $
# common location for tools and native build
.if ${HAVE_GCC} == 7
NETBSD_GCC_VERSION=nb3 20190319
.elif ${HAVE_GCC} == 8
-NETBSD_GCC_VERSION=nb1 20190930
+NETBSD_GCC_VERSION=nb1 20200311
.endif
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Wed Nov 6 07:26:31 UTC 2019
Modified Files:
src/tools/gcc: Makefile
Log Message:
add something to auto-detect when GCC has changed from gcc to gcc.old
or back and auto-cleandir tools/gcc.
based upon the code for PREVIOUSTOOLDIR in tools/Makefile.
To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.96 src/tools/gcc/Makefile:1.97
--- src/tools/gcc/Makefile:1.96 Thu Oct 24 03:19:14 2019
+++ src/tools/gcc/Makefile Wed Nov 6 07:26:31 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.96 2019/10/24 03:19:14 christos Exp $
+# $NetBSD: Makefile,v 1.97 2019/11/06 07:26:31 mrg Exp $
.include
@@ -254,6 +254,27 @@ MKENV_BUILD_MAKE=cd .native && ${MKNATIV
true
@touch $@
+.if !defined(PREV_GCC)
+. if exists(PREV_GCC)
+PREV_GCC!= cat PREV_GCC
+. else
+PREV_GCC=
+. endif
+.endif
+
+CLEANFILES+= PREV_GCC
+
+realall realdepend: .MAKE
+.if !empty(PREV_GCC) && "${PREV_GCC}" != "${EXTERNAL_GCC_SUBDIR}-${HAVE_GCC}"
+ @echo "*** WARNING: GCC has changed version?"
+ @echo "*** PREV_GCC '${PREV_GCC}'"
+ @echo "*** != EXTERNAL_GCC_SUBDIR-HAVE_GCC '${EXTERNAL_GCC_SUBDIR}-${HAVE_GCC}'"
+ @echo "*** Cleaning mis-matched tools/gcc"
+ rm -f PREV_GCC
+ (cd ${.CURDIR} && ${MAKE} cleandir)
+.endif
+ echo ${EXTERNAL_GCC_SUBDIR}-${HAVE_GCC} >PREV_GCC
+
clean: clean.native
clean.native:
-rm -r -f .native
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Wed Nov 6 07:26:31 UTC 2019 Modified Files: src/tools/gcc: Makefile Log Message: add something to auto-detect when GCC has changed from gcc to gcc.old or back and auto-cleandir tools/gcc. based upon the code for PREVIOUSTOOLDIR in tools/Makefile. To generate a diff of this commit: cvs rdiff -u -r1.96 -r1.97 src/tools/gcc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src Committed By: christos Date: Thu Oct 24 03:19:14 UTC 2019 Modified Files: src/tools/gcc: Makefile mknative-gcc Log Message: arm needs more files To generate a diff of this commit: cvs rdiff -u -r1.95 -r1.96 src/tools/gcc/Makefile cvs rdiff -u -r1.102 -r1.103 src/tools/gcc/mknative-gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: christos
Date: Thu Oct 24 03:19:14 UTC 2019
Modified Files:
src/tools/gcc: Makefile mknative-gcc
Log Message:
arm needs more files
To generate a diff of this commit:
cvs rdiff -u -r1.95 -r1.96 src/tools/gcc/Makefile
cvs rdiff -u -r1.102 -r1.103 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.95 src/tools/gcc/Makefile:1.96
--- src/tools/gcc/Makefile:1.95 Mon Sep 30 04:40:20 2019
+++ src/tools/gcc/Makefile Wed Oct 23 23:19:14 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2019/09/30 08:40:20 mrg Exp $
+# $NetBSD: Makefile,v 1.96 2019/10/24 03:19:14 christos Exp $
.include
@@ -190,6 +190,9 @@ NATIVE_CONFIGURE_ARGS+= --disable-shared
.if ${MACHINE_ARCH} == "i386" || ${MACHINE_ARCH} == "x86_64"
EXTRA_GCC_TARGETS= i386-builtin-types.inc
.endif
+.if !empty(MACHINE_ARCH:M*arm*)
+EXTRA_GCC_TARGETS= arm-cpu-data.h arm-cpu-cdata.h
+.endif
NATIVE_CONFIGURE_ARGS+= \
--disable-multilib \
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.102 src/tools/gcc/mknative-gcc:1.103
--- src/tools/gcc/mknative-gcc:1.102 Wed Oct 16 02:57:24 2019
+++ src/tools/gcc/mknative-gcc Wed Oct 23 23:19:14 2019
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.102 2019/10/16 06:57:24 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.103 2019/10/24 03:19:14 christos Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -425,8 +425,10 @@ __EOF__
case "${MACHINE_ARCH}" in
(*arm*)
- write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/arm-cpu.h <$_TMPDIR/gcc/arm-cpu.h
- write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/arm-isa.h <$_TMPDIR/gcc/arm-isa.h
+ d=$_OUTDIRBASE/usr.bin/$_subdir/arch/${MACHINE_ARCH}
+ for f in arm-cpu.h arm-cpu-cdata.h arm-cpu-data.h arm-isa.h; do
+ write_c $d/$f <$_TMPDIR/gcc/$f
+ done
;;
esac
}
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Wed Oct 16 06:57:24 UTC 2019 Modified Files: src/tools/gcc: mknative-gcc Log Message: copy arm-cpu.h and arm-isa.h for arm platforms. To generate a diff of this commit: cvs rdiff -u -r1.101 -r1.102 src/tools/gcc/mknative-gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Wed Oct 16 06:57:24 UTC 2019
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
copy arm-cpu.h and arm-isa.h for arm platforms.
To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.101 src/tools/gcc/mknative-gcc:1.102
--- src/tools/gcc/mknative-gcc:1.101 Sat Feb 23 06:54:45 2019
+++ src/tools/gcc/mknative-gcc Wed Oct 16 06:57:24 2019
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.101 2019/02/23 06:54:45 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.102 2019/10/16 06:57:24 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -422,6 +422,13 @@ __EOF__
if [ "${MACHINE_ARCH}" = "i386" -o "${MACHINE_ARCH}" = "x86_64" ]; then
write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/i386-builtin-types.inc <$_TMPDIR/gcc/i386-builtin-types.inc
fi
+
+ case "${MACHINE_ARCH}" in
+ (*arm*)
+ write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/arm-cpu.h <$_TMPDIR/gcc/arm-cpu.h
+ write_c $_OUTDIRBASE/usr.bin/$_subdir/arch/$MACHINE_ARCH/arm-isa.h <$_TMPDIR/gcc/arm-isa.h
+ ;;
+ esac
}
# main #
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Mon Sep 30 08:40:20 UTC 2019 Modified Files: src/tools/gcc: Makefile README.mknative gcc-version.mk Log Message: remove HAVE_GCC == 6 support, add HAVE_GCC == 8 support To generate a diff of this commit: cvs rdiff -u -r1.94 -r1.95 src/tools/gcc/Makefile cvs rdiff -u -r1.22 -r1.23 src/tools/gcc/README.mknative cvs rdiff -u -r1.16 -r1.17 src/tools/gcc/gcc-version.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Mon Sep 30 08:40:20 UTC 2019
Modified Files:
src/tools/gcc: Makefile README.mknative gcc-version.mk
Log Message:
remove HAVE_GCC == 6 support, add HAVE_GCC == 8 support
To generate a diff of this commit:
cvs rdiff -u -r1.94 -r1.95 src/tools/gcc/Makefile
cvs rdiff -u -r1.22 -r1.23 src/tools/gcc/README.mknative
cvs rdiff -u -r1.16 -r1.17 src/tools/gcc/gcc-version.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.94 src/tools/gcc/Makefile:1.95
--- src/tools/gcc/Makefile:1.94 Mon Sep 9 13:57:13 2019
+++ src/tools/gcc/Makefile Mon Sep 30 08:40:20 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.94 2019/09/09 13:57:13 maya Exp $
+# $NetBSD: Makefile,v 1.95 2019/09/30 08:40:20 mrg Exp $
.include
@@ -8,7 +8,7 @@ MODULE= gcc4
GCCDIST= ${.CURDIR}/../../external/gpl3/${EXTERNAL_GCC_SUBDIR}/dist
GNUHOSTDIST= ${GCCDIST}
-.if ${HAVE_GCC} == 6
+.if ${HAVE_GCC} == 7
MKNATIVE= ${.CURDIR}/mknative-gcc.old
.endif
@@ -95,10 +95,10 @@ MKNATIVE_CONFIG_TARGET_LIBS=
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgcc
MKNATIVE_CONFIG_TARGET_LIBS+= configure-target-libgomp
-.if ${HAVE_GCC} == 7
+.if ${HAVE_GCC} == 8
+MKNATIVE_TARGET= gcc8
+.elif ${HAVE_GCC} == 7
MKNATIVE_TARGET= gcc7
-.elif ${HAVE_GCC} == 6
-MKNATIVE_TARGET= gcc6
.endif
MKNATIVE_CONFIG_TARGET_LIBS+= \
Index: src/tools/gcc/README.mknative
diff -u src/tools/gcc/README.mknative:1.22 src/tools/gcc/README.mknative:1.23
--- src/tools/gcc/README.mknative:1.22 Fri Feb 2 01:02:41 2018
+++ src/tools/gcc/README.mknative Mon Sep 30 08:40:20 2019
@@ -1,4 +1,4 @@
-$NetBSD: README.mknative,v 1.22 2018/02/02 01:02:41 mrg Exp $
+$NetBSD: README.mknative,v 1.23 2019/09/30 08:40:20 mrg Exp $
This file describes how to bootstrap the native toolchain on a new NetBSD
platform (and how to update the new toolchain files, if needed). These
@@ -29,7 +29,7 @@ work.
to build.sh. Use -M instead. (The differences are in layout and pathname
prefixes in the object directory pointed to by each option.)
-3. In src/tools/gcc, do "nbmake-MACHINE HAVE_GCC=6 bootstrap-libgcc".
+3. In src/tools/gcc, do "nbmake-MACHINE HAVE_GCC=8 bootstrap-libgcc".
This will create just enough glue in src/external/gpl3/gcc/lib/libgcc/arch
to make it possible to build, based on the toolchain built in
@@ -39,9 +39,9 @@ work.
will regenerate the "proper" libgcc config files.
4. At top level, do
- "nbmake-MACHINE obj do-distrib-dirs MKGCC=no MKBINUTILS=no HAVE_GCC=6", and
- "nbmake-MACHINE includes HAVE_GCC= MKGCC=no MKBINUTILS=no HAVE_GCC=6".
- (Note: replace 6 [for GCC 6.x] with the appropriate version you are going
+ "nbmake-MACHINE obj do-distrib-dirs MKGCC=no MKBINUTILS=no HAVE_GCC=8", and
+ "nbmake-MACHINE includes HAVE_GCC= MKGCC=no MKBINUTILS=no HAVE_GCC=8".
+ (Note: replace 8 [for GCC 8.x] with the appropriate version you are going
to mknative-for, the MKGCC=no prevents the standard makefiles from picking
up any gcc version info automatically)
@@ -56,7 +56,7 @@ work.
do "nbmake-MACHINE obj dependall".
8. In src/lib, do
- "nbmake-MACHINE dependall install MKGCC=no HAVE_GCC=6".
+ "nbmake-MACHINE dependall install MKGCC=no HAVE_GCC=8".
Optionally, all of the following may be set in the environment to reduce
the amount of code needed to build at this step. Basically, it must be
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.16 src/tools/gcc/gcc-version.mk:1.17
--- src/tools/gcc/gcc-version.mk:1.16 Wed Mar 20 05:09:26 2019
+++ src/tools/gcc/gcc-version.mk Mon Sep 30 08:40:20 2019
@@ -1,9 +1,9 @@
-# $NetBSD: gcc-version.mk,v 1.16 2019/03/20 05:09:26 mrg Exp $
+# $NetBSD: gcc-version.mk,v 1.17 2019/09/30 08:40:20 mrg Exp $
# common location for tools and native build
-.if ${HAVE_GCC} == 6
-NETBSD_GCC_VERSION=nb4 20181109
-.elif ${HAVE_GCC} == 7
+.if ${HAVE_GCC} == 7
NETBSD_GCC_VERSION=nb3 20190319
+.elif ${HAVE_GCC} == 8
+NETBSD_GCC_VERSION=nb1 20190930
.endif
CVS commit: src/tools/gcc
Module Name:src
Committed By: maya
Date: Mon Sep 9 13:57:13 UTC 2019
Modified Files:
src/tools/gcc: Makefile
Log Message:
Fix bugurl. PR toolchain/48712
To generate a diff of this commit:
cvs rdiff -u -r1.93 -r1.94 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.93 src/tools/gcc/Makefile:1.94
--- src/tools/gcc/Makefile:1.93 Tue Mar 19 05:55:00 2019
+++ src/tools/gcc/Makefile Mon Sep 9 13:57:13 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.93 2019/03/19 05:55:00 mrg Exp $
+# $NetBSD: Makefile,v 1.94 2019/09/09 13:57:13 maya Exp $
.include
@@ -32,7 +32,7 @@ SOFTFLOAT_ARGS= -with-float=soft
COMMON_CONFIGURE_ARGS= --target=${MACHINE_GNU_PLATFORM} \
--enable-long-long \
--enable-threads \
- --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html \
+ --with-bugurl=http://www.NetBSD.org/support/send-pr.html \
--with-pkgversion="NetBSD ${NETBSD_GCC_VERSION}" \
--with-system-zlib \
--without-isl \
CVS commit: src/tools/gcc
Module Name:src Committed By: maya Date: Mon Sep 9 13:57:13 UTC 2019 Modified Files: src/tools/gcc: Makefile Log Message: Fix bugurl. PR toolchain/48712 To generate a diff of this commit: cvs rdiff -u -r1.93 -r1.94 src/tools/gcc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Wed Feb 27 09:11:01 UTC 2019 Modified Files: src/tools/gcc: gcc-version.mk Log Message: also bump the X in "nbX" with previous To generate a diff of this commit: cvs rdiff -u -r1.14 -r1.15 src/tools/gcc/gcc-version.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Wed Feb 27 09:11:01 UTC 2019
Modified Files:
src/tools/gcc: gcc-version.mk
Log Message:
also bump the X in "nbX" with previous
To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 src/tools/gcc/gcc-version.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.14 src/tools/gcc/gcc-version.mk:1.15
--- src/tools/gcc/gcc-version.mk:1.14 Wed Feb 27 09:10:38 2019
+++ src/tools/gcc/gcc-version.mk Wed Feb 27 09:11:01 2019
@@ -1,9 +1,9 @@
-# $NetBSD: gcc-version.mk,v 1.14 2019/02/27 09:10:38 mrg Exp $
+# $NetBSD: gcc-version.mk,v 1.15 2019/02/27 09:11:01 mrg Exp $
# common location for tools and native build
.if ${HAVE_GCC} == 6
NETBSD_GCC_VERSION=nb4 20181109
.elif ${HAVE_GCC} == 7
-NETBSD_GCC_VERSION=nb1 20190226
+NETBSD_GCC_VERSION=nb2 20190226
.endif
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Wed Feb 27 09:10:38 UTC 2019
Modified Files:
src/tools/gcc: gcc-version.mk
Log Message:
bump netbsd gcc version date.
To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/tools/gcc/gcc-version.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/gcc-version.mk
diff -u src/tools/gcc/gcc-version.mk:1.13 src/tools/gcc/gcc-version.mk:1.14
--- src/tools/gcc/gcc-version.mk:1.13 Sat Jan 19 12:58:37 2019
+++ src/tools/gcc/gcc-version.mk Wed Feb 27 09:10:38 2019
@@ -1,9 +1,9 @@
-# $NetBSD: gcc-version.mk,v 1.13 2019/01/19 12:58:37 mrg Exp $
+# $NetBSD: gcc-version.mk,v 1.14 2019/02/27 09:10:38 mrg Exp $
# common location for tools and native build
.if ${HAVE_GCC} == 6
NETBSD_GCC_VERSION=nb4 20181109
.elif ${HAVE_GCC} == 7
-NETBSD_GCC_VERSION=nb1 20190119
+NETBSD_GCC_VERSION=nb1 20190226
.endif
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Wed Feb 27 09:10:38 UTC 2019 Modified Files: src/tools/gcc: gcc-version.mk Log Message: bump netbsd gcc version date. To generate a diff of this commit: cvs rdiff -u -r1.13 -r1.14 src/tools/gcc/gcc-version.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: christos
Date: Tue Feb 26 21:09:18 UTC 2019
Modified Files:
src/tools/gcc: Makefile
Log Message:
Remove "--disable-libstdcxx-dual-abi". This option does not do what
it says: Instead of disabling the dual-abi and letting you choose
which one you want, it disables the cxx11 abi and the
"--with-default-libstdcxx-abi=OPTION" becomes a noop. Removing the
old COW compatibility ABI is not easy. For more info see:
https://gcc.gnu.org/onlinedocs/libstdc++/manual/configure.html
https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html
To generate a diff of this commit:
cvs rdiff -u -r1.91 -r1.92 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.91 src/tools/gcc/Makefile:1.92
--- src/tools/gcc/Makefile:1.91 Sat Feb 16 19:22:53 2019
+++ src/tools/gcc/Makefile Tue Feb 26 16:09:18 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.91 2019/02/17 00:22:53 mrg Exp $
+# $NetBSD: Makefile,v 1.92 2019/02/26 21:09:18 christos Exp $
.include
@@ -36,7 +36,6 @@ COMMON_CONFIGURE_ARGS= --target=${MACHIN
--with-pkgversion="NetBSD ${NETBSD_GCC_VERSION}" \
--with-system-zlib \
--without-isl \
- --disable-libstdcxx-dual-abi \
--enable-__cxa_atexit \
--enable-libstdcxx-time=rt \
--enable-libstdcxx-threads \
CVS commit: src/tools/gcc
Module Name:src Committed By: christos Date: Tue Feb 26 21:09:18 UTC 2019 Modified Files: src/tools/gcc: Makefile Log Message: Remove "--disable-libstdcxx-dual-abi". This option does not do what it says: Instead of disabling the dual-abi and letting you choose which one you want, it disables the cxx11 abi and the "--with-default-libstdcxx-abi=OPTION" becomes a noop. Removing the old COW compatibility ABI is not easy. For more info see: https://gcc.gnu.org/onlinedocs/libstdc++/manual/configure.html https://gcc.gnu.org/onlinedocs/libstdc++/manual/using_dual_abi.html To generate a diff of this commit: cvs rdiff -u -r1.91 -r1.92 src/tools/gcc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sat Feb 23 06:54:45 UTC 2019
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
pull out libstdc++ config.h as-is, for gnu.ver processing.
pull out the cxx11_sources and cxx98_sources values to avoid hard coding.
To generate a diff of this commit:
cvs rdiff -u -r1.100 -r1.101 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.100 src/tools/gcc/mknative-gcc:1.101
--- src/tools/gcc/mknative-gcc:1.100 Sat Feb 9 03:57:00 2019
+++ src/tools/gcc/mknative-gcc Sat Feb 23 06:54:45 2019
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.100 2019/02/09 03:57:00 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.101 2019/02/23 06:54:45 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -233,10 +233,15 @@ get_libstdcxx_v3 () {
write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/gstdint.h \
<$_TMPDIR/$_PLATFORM/libstdc++-v3/include/gstdint.h
+ write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/symver-config.h \
+ <$_TMPDIR/$_PLATFORM/libstdc++-v3/config.h
{
getvars $_PLATFORM/libstdc++-v3/Makefile \
port_specific_symbol_files
+ getvars $_PLATFORM/libstdc++-v3/src/Makefile \
+ cxx11_sources \
+ cxx98_sources
# libsupc++
getvars $_PLATFORM/libstdc++-v3/libsupc++/Makefile \
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Sat Feb 23 06:54:45 UTC 2019 Modified Files: src/tools/gcc: mknative-gcc Log Message: pull out libstdc++ config.h as-is, for gnu.ver processing. pull out the cxx11_sources and cxx98_sources values to avoid hard coding. To generate a diff of this commit: cvs rdiff -u -r1.100 -r1.101 src/tools/gcc/mknative-gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sun Feb 17 00:22:53 UTC 2019
Modified Files:
src/tools/gcc: Makefile
Log Message:
don't pass --disable-symver to mknative configure. this turns off
the checking for gcc 4.6 and some exception handling routines which
we need on several platforms.
this should fix missing symbol issues seen on current-users.
To generate a diff of this commit:
cvs rdiff -u -r1.90 -r1.91 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.90 src/tools/gcc/Makefile:1.91
--- src/tools/gcc/Makefile:1.90 Sun Feb 3 11:57:25 2019
+++ src/tools/gcc/Makefile Sun Feb 17 00:22:53 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.90 2019/02/03 11:57:25 mrg Exp $
+# $NetBSD: Makefile,v 1.91 2019/02/17 00:22:53 mrg Exp $
.include
@@ -187,7 +187,6 @@ EXTRA_GCC_TARGETS= i386-builtin-types.in
NATIVE_CONFIGURE_ARGS+= \
--disable-multilib \
- --disable-symvers \
--disable-libstdcxx-pch \
--build=`${GCCDIST}/config.guess` \
--host=${MACHINE_GNU_PLATFORM} \
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Sun Feb 17 00:22:53 UTC 2019 Modified Files: src/tools/gcc: Makefile Log Message: don't pass --disable-symver to mknative configure. this turns off the checking for gcc 4.6 and some exception handling routines which we need on several platforms. this should fix missing symbol issues seen on current-users. To generate a diff of this commit: cvs rdiff -u -r1.90 -r1.91 src/tools/gcc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Mon Feb 4 01:46:59 UTC 2019
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
common-target source list is MD. make it so.
To generate a diff of this commit:
cvs rdiff -u -r1.98 -r1.99 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.98 src/tools/gcc/mknative-gcc:1.99
--- src/tools/gcc/mknative-gcc:1.98 Mon Feb 4 00:55:26 2019
+++ src/tools/gcc/mknative-gcc Mon Feb 4 01:46:59 2019
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.98 2019/02/04 00:55:26 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.99 2019/02/04 01:46:59 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -302,6 +302,7 @@ get_gcc () {
mkdir -p $_OUTDIR/usr.bin/$_subdir/arch/$MACHINE_ARCH
mkdir -p $_OUTDIR/usr.bin/libcpp/arch/$MACHINE_ARCH
mkdir -p $_OUTDIR/usr.bin/include/arch
+ mkdir -p $_OUTDIR/usr.bin/common-target/arch
_buildname="BUILD_"
_libcppsubdir=""
_extravars="TM_H ALL_OPT_FILES"
@@ -357,7 +358,7 @@ get_gcc () {
| write_mk $_OUTDIRBASE/usr.bin/common/defs.mk
getvars gcc/Makefile \
OBJS-libcommon-target \
- | write_mk $_OUTDIRBASE/usr.bin/common-target/defs.mk
+ | write_mk $_OUTDIRBASE/usr.bin/common-target/arch/$MACHINE_ARCH.mk
write_c $_OUTDIRBASE/usr.bin/libcpp/arch/$MACHINE_ARCH/config.h <$_TMPDIR/libcpp/config.h
hfiles='auto-host configargs config bconfig bversion plugin-version multilib tm'
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Mon Feb 4 01:46:59 UTC 2019 Modified Files: src/tools/gcc: mknative-gcc Log Message: common-target source list is MD. make it so. To generate a diff of this commit: cvs rdiff -u -r1.98 -r1.99 src/tools/gcc/mknative-gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Mon Feb 4 00:55:26 UTC 2019
Modified Files:
src/tools/gcc: mknative-gcc
Log Message:
- don't getlinks here, they're no longer used.
- pullout the libcommon, libcommon-target and libgomp source list so they
don't have to be hard coded in the reachover makefile
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.97 src/tools/gcc/mknative-gcc:1.98
--- src/tools/gcc/mknative-gcc:1.97 Fri Feb 1 09:27:23 2019
+++ src/tools/gcc/mknative-gcc Mon Feb 4 00:55:26 2019
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.97 2019/02/01 09:27:23 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.98 2019/02/04 00:55:26 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -82,7 +82,6 @@ get_libgcc () {
SHLIB_MAPFILES SHLIB_NM_FLAGS
getvars gcc/Makefile \
NOEXCEPTION_FLAGS EXTRA_HEADERS
- getlinks config.status libgcc
} | sanitise_includes \
| write_mk $_OUTDIRBASE/lib/lib$_subdir/arch/$MACHINE_ARCH/defs.mk
@@ -161,6 +160,11 @@ get_libgomp () {
_subdir="$1"
mkdir -p $_OUTDIR/lib/$_subdir/arch/$MACHINE_ARCH
+
+ getvars $_PLATFORM/libgomp/Makefile \
+ libgomp_la_SOURCES \
+ | write_mk $_OUTDIRBASE/lib/$_subdir/defs.mk
+
write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/config.h \
<$_TMPDIR/$_PLATFORM/libgomp/config.h
write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/libgomp_f.h \
@@ -198,7 +202,6 @@ get_libobjc () {
getvars $_PLATFORM/libobjc/Makefile \
ALL_CFLAGS INCLUDES OBJC_SOURCE_FILES C_SOURCE_FILES OBJC_H \
| sed "s,$_GNU_DIST,\${GNUHOSTDIST},g"
- getlinks $_TMPDIR/$_PLATFORM/libgcc/config.status libgcc
} | sanitise_includes \
| write_mk $_OUTDIRBASE/lib/$_subdir/defs.mk
@@ -275,7 +278,6 @@ get_libstdcxx_v3 () {
$_pf_headers | sed -e 's#\${GNUHOSTDIST}/libstdc++-v3/include/profile/##g'
getvars $_PLATFORM/libstdc++-v3/include/Makefile \
BASIC_FILE_H ALLOCATOR_H CSTDIO_H CLOCALE_H CMESSAGES_H CTIME_H
- getlinks $_TMPDIR/$_PLATFORM/libgcc/config.status libgcc
} | sanitise_includes \
| write_mk $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/defs.mk
}
@@ -350,6 +352,13 @@ get_gcc () {
EXTRA_HEADERS \
| write_mk $_OUTDIRBASE/usr.bin/include/arch/$MACHINE_ARCH.mk
+ getvars gcc/Makefile \
+ OBJS-libcommon \
+ | write_mk $_OUTDIRBASE/usr.bin/common/defs.mk
+ getvars gcc/Makefile \
+ OBJS-libcommon-target \
+ | write_mk $_OUTDIRBASE/usr.bin/common-target/defs.mk
+
write_c $_OUTDIRBASE/usr.bin/libcpp/arch/$MACHINE_ARCH/config.h <$_TMPDIR/libcpp/config.h
hfiles='auto-host configargs config bconfig bversion plugin-version multilib tm'
for f in $hfiles; do
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Mon Feb 4 00:55:26 UTC 2019 Modified Files: src/tools/gcc: mknative-gcc Log Message: - don't getlinks here, they're no longer used. - pullout the libcommon, libcommon-target and libgomp source list so they don't have to be hard coded in the reachover makefile To generate a diff of this commit: cvs rdiff -u -r1.97 -r1.98 src/tools/gcc/mknative-gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Sun Feb 3 11:57:25 UTC 2019
Modified Files:
src/tools/gcc: Makefile
Log Message:
add || true to the gthr-default.h copy, it can fail first time around
To generate a diff of this commit:
cvs rdiff -u -r1.89 -r1.90 src/tools/gcc/Makefile
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.89 src/tools/gcc/Makefile:1.90
--- src/tools/gcc/Makefile:1.89 Fri Feb 1 09:27:23 2019
+++ src/tools/gcc/Makefile Sun Feb 3 11:57:25 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.89 2019/02/01 09:27:23 mrg Exp $
+# $NetBSD: Makefile,v 1.90 2019/02/03 11:57:25 mrg Exp $
.include
@@ -197,7 +197,7 @@ MKENV_BUILD_MAKE=cd .native && ${MKNATIV
.native/.configure_done: ${_GNU_CFGSRC} ${.CURDIR}/Makefile
mkdir .native .native/gcc .native/gcc/include 2>/dev/null || true
# If this fails, gthreads won't be configured initially, but reconfig will.
- -cp ${DESTDIR}/usr/include/g++/bits/gthr-default.h .native/gcc/include
+ cp ${DESTDIR}/usr/include/g++/bits/gthr-default.h .native/gcc/include || true
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native && ${MKNATIVE_ENV} \
${HOST_SH} ${GNUHOSTDIST}/configure \
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Sun Feb 3 11:57:25 UTC 2019 Modified Files: src/tools/gcc: Makefile Log Message: add || true to the gthr-default.h copy, it can fail first time around To generate a diff of this commit: cvs rdiff -u -r1.89 -r1.90 src/tools/gcc/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
CVS commit: src/tools/gcc
Module Name:src
Committed By: mrg
Date: Fri Feb 1 09:27:24 UTC 2019
Modified Files:
src/tools/gcc: Makefile mknative-gcc
Log Message:
- use --with-default-libstdcxx-abi=new for GCC, otherwise we get the
old ABI with --disable-libstdcxx-dual-abi
- fix libbacktrace mknative
- find gthr-default.h for libstdc++ mknative
- fetch FILESYSTEM_SOURCES
To generate a diff of this commit:
cvs rdiff -u -r1.88 -r1.89 src/tools/gcc/Makefile
cvs rdiff -u -r1.96 -r1.97 src/tools/gcc/mknative-gcc
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/tools/gcc/Makefile
diff -u src/tools/gcc/Makefile:1.88 src/tools/gcc/Makefile:1.89
--- src/tools/gcc/Makefile:1.88 Sat Jan 19 12:58:37 2019
+++ src/tools/gcc/Makefile Fri Feb 1 09:27:23 2019
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.88 2019/01/19 12:58:37 mrg Exp $
+# $NetBSD: Makefile,v 1.89 2019/02/01 09:27:23 mrg Exp $
.include
@@ -39,7 +39,8 @@ COMMON_CONFIGURE_ARGS= --target=${MACHIN
--disable-libstdcxx-dual-abi \
--enable-__cxa_atexit \
--enable-libstdcxx-time=rt \
- --enable-libstdcxx-threads
+ --enable-libstdcxx-threads \
+ --with-diagnostics-color=auto-if-env
.if defined(GCC_CONFIG_ARCH.${MACHINE_ARCH})
COMMON_CONFIGURE_ARGS+= --with-arch=${GCC_CONFIG_ARCH.${MACHINE_ARCH}}
.endif
@@ -47,7 +48,9 @@ COMMON_CONFIGURE_ARGS+= --with-arch=${GC
COMMON_CONFIGURE_ARGS+= --with-tune=${GCC_CONFIG_TUNE.${MACHINE_ARCH}}
.endif
-COMMON_CONFIGURE_ARGS+= --with-diagnostics-color=auto-if-env
+.if ${HAVE_GCC} >= 7
+COMMON_CONFIGURE_ARGS+= --with-default-libstdcxx-abi=new
+.endif
CONFIGURE_ARGS= ${COMMON_CONFIGURE_ARGS}
CONFIGURE_ARGS+= \
@@ -94,6 +97,7 @@ MKNATIVE_TARGET= gcc6
MKNATIVE_CONFIG_TARGET_LIBS+= \
configure-target-libstdc++-v3 \
+ configure-target-libbacktrace \
configure-target-libobjc
BINENV= /usr/bin/env -i
@@ -105,7 +109,7 @@ MKNATIVE_ENV= ${BINENV} ${CONFIGURE_ENV:
CFLAGS_FOR_BUILD="-I${TOOLDIR}/include" \
CC=${CC:Q}' '${CCADDFLAGS:Q} \
CXX=${CXX:Q}' '${CCADDFLAGS:Q}' '${CXXADDFLAGS:Q} \
- CPP=${CPP:Q}' '-I${DESTDIR}/usr/include \
+ CPP=${CPP:Q}' '-I${DESTDIR}/usr/include' '-I${DESTDIR}/usr/include/g++/bits \
CFLAGS= CPPFLAGS= CXXFLAGS= LDFLAGS= \
AS=${AS:Q} AWK=${TOOL_AWK:Q} LD=${LD:Q} \
MSGFMT=${TOOLDIR}/bin/${_TOOL_PREFIX}msgfmt \
@@ -185,14 +189,15 @@ NATIVE_CONFIGURE_ARGS+= \
--disable-multilib \
--disable-symvers \
--disable-libstdcxx-pch \
- --disable-libstdcxx-dual-abi \
--build=`${GCCDIST}/config.guess` \
--host=${MACHINE_GNU_PLATFORM} \
--with-sysroot=${DESTDIR}
MKENV_BUILD_MAKE=cd .native && ${MKNATIVE_ENV} ${BUILD_MAKE}
.native/.configure_done: ${_GNU_CFGSRC} ${.CURDIR}/Makefile
- mkdir .native 2>/dev/null || true
+ mkdir .native .native/gcc .native/gcc/include 2>/dev/null || true
+ # If this fails, gthreads won't be configured initially, but reconfig will.
+ -cp ${DESTDIR}/usr/include/g++/bits/gthr-default.h .native/gcc/include
PATH=${TOOLDIR}/bin:$$PATH; export PATH; \
(cd .native && ${MKNATIVE_ENV} \
${HOST_SH} ${GNUHOSTDIST}/configure \
Index: src/tools/gcc/mknative-gcc
diff -u src/tools/gcc/mknative-gcc:1.96 src/tools/gcc/mknative-gcc:1.97
--- src/tools/gcc/mknative-gcc:1.96 Sat Jan 19 20:02:06 2019
+++ src/tools/gcc/mknative-gcc Fri Feb 1 09:27:23 2019
@@ -1,5 +1,5 @@
#!/bin/sh
-# $NetBSD: mknative-gcc,v 1.96 2019/01/19 20:02:06 mrg Exp $
+# $NetBSD: mknative-gcc,v 1.97 2019/02/01 09:27:23 mrg Exp $
#
# Shell script for generating all the constants needed for a native
# platform build of gcc.
@@ -178,9 +178,9 @@ get_libbacktrace () {
mkdir -p $_OUTDIR/lib/$_subdir/arch/$MACHINE_ARCH
write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/config.h \
- <$_TMPDIR/$_subdir/config.h
+ <$_TMPDIR/$_PLATFORM/$_subdir/config.h
write_c $_OUTDIRBASE/lib/$_subdir/arch/$MACHINE_ARCH/backtrace-supported.h \
- <$_TMPDIR/$_subdir/backtrace-supported.h
+ <$_TMPDIR/$_PLATFORM/$_subdir/backtrace-supported.h
}
# lib/libobjc #
@@ -256,6 +256,9 @@ get_libstdcxx_v3 () {
GLIBCXX_ABI_FLAGS libc__98convenience_la_SOURCES | \
sed -e 's/^G_libc__98convenience_la_SOURCES=/G_CPP98_SOURCES=/' \
-e 's/codecvt.cc/c98-codecvt.cc/'
+ getvars $_PLATFORM/libstdc++-v3/src/filesystem/Makefile \
+ libstdc__fs_la_SOURCES | \
+ sed -e 's/^G_libstdc__fs_la_SOURCES=/G_FILESYSTEM_SOURCES=/'
getvars $_PLATFORM/libstdc++-v3/Makefile ATOMICITY_SRCDIR \
BASIC_FILE_CC CLOCALE_CC CCODECVT_CC CCOLLATE_CC \
CCTYPE_CC CMESSAGES_CC CMONEY_CC CNUMERIC_CC CTIME_CC \
CVS commit: src/tools/gcc
Module Name:src Committed By: mrg Date: Fri Feb 1 09:27:24 UTC 2019 Modified Files: src/tools/gcc: Makefile mknative-gcc Log Message: - use --with-default-libstdcxx-abi=new for GCC, otherwise we get the old ABI with --disable-libstdcxx-dual-abi - fix libbacktrace mknative - find gthr-default.h for libstdc++ mknative - fetch FILESYSTEM_SOURCES To generate a diff of this commit: cvs rdiff -u -r1.88 -r1.89 src/tools/gcc/Makefile cvs rdiff -u -r1.96 -r1.97 src/tools/gcc/mknative-gcc Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
