Module Name: src Committed By: mrg Date: Tue Mar 19 05:55:01 UTC 2019
Modified Files: src/external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64: gstdint.h src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64: configargs.h defs.mk tm.h src/tools/gcc: Makefile Log Message: enable the workarounds for cortex a53 errata 835769 and 843419 by default. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64/gstdint.h cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/configargs.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/defs.mk cvs rdiff -u -r1.1 -r1.2 src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/tm.h cvs rdiff -u -r1.92 -r1.93 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/external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64/gstdint.h diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64/gstdint.h:1.3 src/external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64/gstdint.h:1.4 --- src/external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64/gstdint.h:1.3 Thu Jan 24 08:56:44 2019 +++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/aarch64/gstdint.h Tue Mar 19 05:55:01 2019 @@ -1,8 +1,8 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.96 2019/01/19 20:02:06 mrg Exp */ +/* Generated from: NetBSD: mknative-gcc,v 1.101 2019/02/23 06:54:45 mrg Exp */ /* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp */ -/* generated for aarch64--netbsd-gcc (NetBSD nb1 20190119) 7.4.0 */ +/* generated for aarch64--netbsd-gcc (NetBSD nb2 20190226) 7.4.0 */ #ifndef GCC_GENERATED_STDINT_H #define GCC_GENERATED_STDINT_H 1 Index: src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/configargs.h diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/configargs.h:1.8 src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/configargs.h:1.9 --- src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/configargs.h:1.8 Wed Feb 27 08:19:53 2019 +++ src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/configargs.h Tue Mar 19 05:55:01 2019 @@ -3,7 +3,7 @@ /* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp */ /* Generated automatically. */ -static const char configuration_arguments[] = "/usr/src/tools/gcc/../../external/gpl3/gcc/dist/configure --target=aarch64--netbsd --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD nb1 20190119' --with-system-zlib --without-isl --enable-__cxa_atexit --enable-libstdcxx-time=rt --enable-libstdcxx-threads --with-diagnostics-color=auto-if-env --with-default-libstdcxx-abi=new --with-mpc-lib=/var/obj/mknative/evbarm-aarch64/usr/src/external/lgpl3/mpc/lib/libmpc --with-mpfr-lib=/var/obj/mknative/evbarm-aarch64/usr/src/external/lgpl3/mpfr/lib/libmpfr --with-gmp-lib=/var/obj/mknative/evbarm-aarch64/usr/src/external/lgpl3/gmp/lib/libgmp --with-mpc-include=/usr/src/external/lgpl3/mpc/dist/src --with-mpfr-include=/usr/src/external/lgpl3/mpfr/dist/src --with-gmp-include=/usr/src/external/lgpl3/gmp/lib/libgmp/arch/aarch64 --enable-tls --disable-multilib --disable-libstdcxx-pch --build=aarch64--netbsd --host=aarch64--netbsd --with-sy sroot=/var/obj/mknative/evbarm-aarch64/usr/src/destdir.evbarm"; +static const char configuration_arguments[] = "/usr/src/tools/gcc/../../external/gpl3/gcc/dist/configure --target=aarch64--netbsd --enable-long-long --enable-threads --with-bugurl=http://www.NetBSD.org/Misc/send-pr.html --with-pkgversion='NetBSD nb2 20190226' --with-system-zlib --without-isl --enable-__cxa_atexit --enable-libstdcxx-time=rt --enable-libstdcxx-threads --with-diagnostics-color=auto-if-env --enable-fix-cortex-a53-835769 --enable-fix-cortex-a53-843419 --with-default-libstdcxx-abi=new --with-mpc-lib=/var/obj/mknative/evbarm-aarch64/usr/src/external/lgpl3/mpc/lib/libmpc --with-mpfr-lib=/var/obj/mknative/evbarm-aarch64/usr/src/external/lgpl3/mpfr/lib/libmpfr --with-gmp-lib=/var/obj/mknative/evbarm-aarch64/usr/src/external/lgpl3/gmp/lib/libgmp --with-mpc-include=/usr/src/external/lgpl3/mpc/dist/src --with-mpfr-include=/usr/src/external/lgpl3/mpfr/dist/src --with-gmp-include=/usr/src/external/lgpl3/gmp/lib/libgmp/arch/aarch64 --enable-tls --disable-multilib --disable-libstdcx x-pch --build=aarch64--netbsd --host=aarch64--netbsd --with-sysroot=/var/obj/mknative/evbarm-aarch64/usr/src/destdir.evbarm"; static const char thread_model[] = "posix"; static const struct { Index: src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/defs.mk diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/defs.mk:1.3 src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/defs.mk:1.4 --- src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/defs.mk:1.3 Thu Jan 24 08:56:44 2019 +++ src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/defs.mk Tue Mar 19 05:55:01 2019 @@ -1,5 +1,5 @@ # This file is automatically generated. DO NOT EDIT! -# Generated from: NetBSD: mknative-gcc,v 1.96 2019/01/19 20:02:06 mrg Exp +# Generated from: NetBSD: mknative-gcc,v 1.101 2019/02/23 06:54:45 mrg Exp # Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp # G_BUILD_EARLY_SUPPORT= @@ -40,7 +40,7 @@ G_GTFILES=${GNUHOSTDIST}/gcc/../libcpp/i G_GTFILES_LANG_DIR_NAMES= G_NOEXCEPTION_FLAGS=-fno-exceptions -fno-rtti -fasynchronous-unwind-tables G_NATIVE_SYSTEM_HEADER_DIR=/usr/include -G_tm_defines=LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4 NETBSD_ENABLE_PTHREADS +G_tm_defines=LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4 NETBSD_ENABLE_PTHREADS TARGET_FIX_ERR_A53_835769_DEFAULT=1 TARGET_FIX_ERR_A53_843419_DEFAULT=1 G_host_xm_file= G_host_xm_defines= G_tm_p_file= Index: src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/tm.h diff -u src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/tm.h:1.1 src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/tm.h:1.2 --- src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/tm.h:1.1 Sat Jul 14 23:47:32 2018 +++ src/external/gpl3/gcc/usr.bin/gcc/arch/aarch64/tm.h Tue Mar 19 05:55:01 2019 @@ -1,5 +1,5 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.92 2018/02/06 07:04:01 mrg Exp */ +/* Generated from: NetBSD: mknative-gcc,v 1.101 2019/02/23 06:54:45 mrg Exp */ /* Generated from: NetBSD: mknative.common,v 1.16 2018/04/15 15:13:37 christos Exp */ #ifndef GCC_TM_H @@ -19,6 +19,12 @@ #ifndef NETBSD_ENABLE_PTHREADS # define NETBSD_ENABLE_PTHREADS #endif +#ifndef TARGET_FIX_ERR_A53_835769_DEFAULT +# define TARGET_FIX_ERR_A53_835769_DEFAULT 1 +#endif +#ifndef TARGET_FIX_ERR_A53_843419_DEFAULT +# define TARGET_FIX_ERR_A53_843419_DEFAULT 1 +#endif #ifdef IN_GCC # include "options.h" # include "insn-constants.h" Index: src/tools/gcc/Makefile diff -u src/tools/gcc/Makefile:1.92 src/tools/gcc/Makefile:1.93 --- src/tools/gcc/Makefile:1.92 Tue Feb 26 21:09:18 2019 +++ src/tools/gcc/Makefile Tue Mar 19 05:55:00 2019 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.92 2019/02/26 21:09:18 christos Exp $ +# $NetBSD: Makefile,v 1.93 2019/03/19 05:55:00 mrg Exp $ .include <bsd.hostinit.mk> @@ -47,6 +47,13 @@ COMMON_CONFIGURE_ARGS+= --with-arch=${GC COMMON_CONFIGURE_ARGS+= --with-tune=${GCC_CONFIG_TUNE.${MACHINE_ARCH}} .endif +# Too many CPUs have one or both of these bugs, the common code should +# default to safety. +.if ${MACHINE_CPU} == "aarch64" +COMMON_CONFIGURE_ARGS+= --enable-fix-cortex-a53-835769 \ + --enable-fix-cortex-a53-843419 +.endif + .if ${HAVE_GCC} >= 7 COMMON_CONFIGURE_ARGS+= --with-default-libstdcxx-abi=new .endif