From 1aa3d81bd88b8ffff43dd13cfaef8c101f28c668 Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Fri, 8 Feb 2019 01:29:44 +0000
Subject: [PATCH] regen to give "earm" a v5 default again.

---
 external/gpl3/gcc/usr.bin/gcc/arch/earm/configargs.h     | 2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earm/defs.mk          | 2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earm/tm.h             | 2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmeb/configargs.h   | 2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmeb/defs.mk        | 2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmeb/tm.h           | 2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmhf/configargs.h   | 2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmhf/defs.mk        | 2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmhf/tm.h           | 2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/configargs.h | 2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/defs.mk      | 2 +-
 external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/tm.h         | 2 +-
 12 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/external/gpl3/gcc/usr.bin/gcc/arch/earm/configargs.h b/external/gpl3/gcc/usr.bin/gcc/arch/earm/configargs.h
index 77f9fba8a8cc..c95846e369cb 100644
--- a/external/gpl3/gcc/usr.bin/gcc/arch/earm/configargs.h
+++ b/external/gpl3/gcc/usr.bin/gcc/arch/earm/configargs.h
@@ -8,4 +8,4 @@ static const char thread_model[] = "posix";
 
 static const struct {
   const char *name, *value;
-} configure_default_options[] = { { NULL, NULL} };
+} configure_default_options[] = { { "cpu", "arm9e" } };
diff --git a/external/gpl3/gcc/usr.bin/gcc/arch/earm/defs.mk b/external/gpl3/gcc/usr.bin/gcc/arch/earm/defs.mk
index 25b081c12c41..33fd5864845b 100644
--- a/external/gpl3/gcc/usr.bin/gcc/arch/earm/defs.mk
+++ b/external/gpl3/gcc/usr.bin/gcc/arch/earm/defs.mk
@@ -44,7 +44,7 @@ G_tm_defines=LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4 NETBSD_ENABLE_
 G_host_xm_file=
 G_host_xm_defines=
 G_tm_p_file=
-G_target_cpu_default=TARGET_CPU_arm6
+G_target_cpu_default=TARGET_CPU_arm9e
 G_TM_H=tm.h      options.h ${GNUHOSTDIST}/gcc/config/dbxelf.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-stdint.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/arm/elf.h ${GNUHOSTDIST}/gcc/config/arm/bpabi.h ${GNUHOSTDIST}/gcc/config/arm/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/arm/netbsd-eabi.h ${GNUHOSTDIST}/gcc/config/arm/aout.h ${GNUHOSTDIST}/gcc/config/arm/arm.h ${GNUHOSTDIST}/gcc/config/initfini-array.h ${GNUHOSTDIST}/gcc/defaults.h insn-constants.h insn-flags.h options.h flag-types.h  ${GNUHOSTDIST}/gcc/config/arm/arm-opts.h ${GNUHOSTDIST}/gcc/config/arm/arm-cpu.h
 G_ALL_OPT_FILES=${GNUHOSTDIST}/gcc/brig/lang.opt ${GNUHOSTDIST}/gcc/lto/lang.opt ${GNUHOSTDIST}/gcc/c-family/c.opt ${GNUHOSTDIST}/gcc/common.opt ${GNUHOSTDIST}/gcc/config/arm/arm-tables.opt ${GNUHOSTDIST}/gcc/config/arm/arm.opt ${GNUHOSTDIST}/gcc/config/netbsd.opt ${GNUHOSTDIST}/gcc/config/netbsd-elf.opt
 G_tm_file_list=options.h ${GNUHOSTDIST}/gcc/config/dbxelf.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-stdint.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/arm/elf.h ${GNUHOSTDIST}/gcc/config/arm/bpabi.h ${GNUHOSTDIST}/gcc/config/arm/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/arm/netbsd-eabi.h ${GNUHOSTDIST}/gcc/config/arm/aout.h ${GNUHOSTDIST}/gcc/config/arm/arm.h ${GNUHOSTDIST}/gcc/config/initfini-array.h ${GNUHOSTDIST}/gcc/defaults.h
diff --git a/external/gpl3/gcc/usr.bin/gcc/arch/earm/tm.h b/external/gpl3/gcc/usr.bin/gcc/arch/earm/tm.h
index 1600577a1c53..9a3e36f7a625 100644
--- a/external/gpl3/gcc/usr.bin/gcc/arch/earm/tm.h
+++ b/external/gpl3/gcc/usr.bin/gcc/arch/earm/tm.h
@@ -4,7 +4,7 @@
 
 #ifndef GCC_TM_H
 #define GCC_TM_H
-#define TARGET_CPU_DEFAULT (TARGET_CPU_arm6)
+#define TARGET_CPU_DEFAULT (TARGET_CPU_arm9e)
 #ifndef LIBC_GLIBC
 # define LIBC_GLIBC 1
 #endif
diff --git a/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/configargs.h b/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/configargs.h
index 3573e2f21e9b..b4fd6478b3a6 100644
--- a/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/configargs.h
+++ b/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/configargs.h
@@ -8,4 +8,4 @@ static const char thread_model[] = "posix";
 
 static const struct {
   const char *name, *value;
-} configure_default_options[] = { { NULL, NULL} };
+} configure_default_options[] = { { "cpu", "arm9e" } };
diff --git a/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/defs.mk b/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/defs.mk
index 31a8fd1fe8d7..11c8659e78cc 100644
--- a/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/defs.mk
+++ b/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/defs.mk
@@ -44,7 +44,7 @@ G_tm_defines=LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4 NETBSD_ENABLE_
 G_host_xm_file=
 G_host_xm_defines=
 G_tm_p_file=
-G_target_cpu_default=TARGET_CPU_arm6
+G_target_cpu_default=TARGET_CPU_arm9e
 G_TM_H=tm.h      options.h ${GNUHOSTDIST}/gcc/config/dbxelf.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-stdint.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/arm/elf.h ${GNUHOSTDIST}/gcc/config/arm/bpabi.h ${GNUHOSTDIST}/gcc/config/arm/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/arm/netbsd-eabi.h ${GNUHOSTDIST}/gcc/config/arm/aout.h ${GNUHOSTDIST}/gcc/config/arm/arm.h ${GNUHOSTDIST}/gcc/config/initfini-array.h ${GNUHOSTDIST}/gcc/defaults.h insn-constants.h insn-flags.h options.h flag-types.h  ${GNUHOSTDIST}/gcc/config/arm/arm-opts.h ${GNUHOSTDIST}/gcc/config/arm/arm-cpu.h
 G_ALL_OPT_FILES=${GNUHOSTDIST}/gcc/brig/lang.opt ${GNUHOSTDIST}/gcc/lto/lang.opt ${GNUHOSTDIST}/gcc/c-family/c.opt ${GNUHOSTDIST}/gcc/common.opt ${GNUHOSTDIST}/gcc/config/arm/arm-tables.opt ${GNUHOSTDIST}/gcc/config/arm/arm.opt ${GNUHOSTDIST}/gcc/config/netbsd.opt ${GNUHOSTDIST}/gcc/config/netbsd-elf.opt
 G_tm_file_list=options.h ${GNUHOSTDIST}/gcc/config/dbxelf.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-stdint.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/arm/elf.h ${GNUHOSTDIST}/gcc/config/arm/bpabi.h ${GNUHOSTDIST}/gcc/config/arm/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/arm/netbsd-eabi.h ${GNUHOSTDIST}/gcc/config/arm/aout.h ${GNUHOSTDIST}/gcc/config/arm/arm.h ${GNUHOSTDIST}/gcc/config/initfini-array.h ${GNUHOSTDIST}/gcc/defaults.h
diff --git a/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/tm.h b/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/tm.h
index 4aa71754184e..4986be3db6d5 100644
--- a/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/tm.h
+++ b/external/gpl3/gcc/usr.bin/gcc/arch/earmeb/tm.h
@@ -4,7 +4,7 @@
 
 #ifndef GCC_TM_H
 #define GCC_TM_H
-#define TARGET_CPU_DEFAULT (TARGET_CPU_arm6)
+#define TARGET_CPU_DEFAULT (TARGET_CPU_arm9e)
 #ifndef LIBC_GLIBC
 # define LIBC_GLIBC 1
 #endif
diff --git a/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/configargs.h b/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/configargs.h
index 01d646d5187a..01c363e5da2d 100644
--- a/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/configargs.h
+++ b/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/configargs.h
@@ -8,4 +8,4 @@ static const char thread_model[] = "posix";
 
 static const struct {
   const char *name, *value;
-} configure_default_options[] = { { NULL, NULL} };
+} configure_default_options[] = { { "cpu", "arm9e" } };
diff --git a/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/defs.mk b/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/defs.mk
index c8094f7dddb5..8c596f5cb6c8 100644
--- a/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/defs.mk
+++ b/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/defs.mk
@@ -44,7 +44,7 @@ G_tm_defines=LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4 NETBSD_ENABLE_
 G_host_xm_file=
 G_host_xm_defines=
 G_tm_p_file=
-G_target_cpu_default=TARGET_CPU_arm6
+G_target_cpu_default=TARGET_CPU_arm9e
 G_TM_H=tm.h      options.h ${GNUHOSTDIST}/gcc/config/dbxelf.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-stdint.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/arm/elf.h ${GNUHOSTDIST}/gcc/config/arm/bpabi.h ${GNUHOSTDIST}/gcc/config/arm/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/arm/netbsd-eabi.h ${GNUHOSTDIST}/gcc/config/arm/aout.h ${GNUHOSTDIST}/gcc/config/arm/arm.h ${GNUHOSTDIST}/gcc/config/initfini-array.h ${GNUHOSTDIST}/gcc/defaults.h insn-constants.h insn-flags.h options.h flag-types.h  ${GNUHOSTDIST}/gcc/config/arm/arm-opts.h ${GNUHOSTDIST}/gcc/config/arm/arm-cpu.h
 G_ALL_OPT_FILES=${GNUHOSTDIST}/gcc/brig/lang.opt ${GNUHOSTDIST}/gcc/lto/lang.opt ${GNUHOSTDIST}/gcc/c-family/c.opt ${GNUHOSTDIST}/gcc/common.opt ${GNUHOSTDIST}/gcc/config/arm/arm-tables.opt ${GNUHOSTDIST}/gcc/config/arm/arm.opt ${GNUHOSTDIST}/gcc/config/netbsd.opt ${GNUHOSTDIST}/gcc/config/netbsd-elf.opt
 G_tm_file_list=options.h ${GNUHOSTDIST}/gcc/config/dbxelf.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-stdint.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/arm/elf.h ${GNUHOSTDIST}/gcc/config/arm/bpabi.h ${GNUHOSTDIST}/gcc/config/arm/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/arm/netbsd-eabi.h ${GNUHOSTDIST}/gcc/config/arm/aout.h ${GNUHOSTDIST}/gcc/config/arm/arm.h ${GNUHOSTDIST}/gcc/config/initfini-array.h ${GNUHOSTDIST}/gcc/defaults.h
diff --git a/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/tm.h b/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/tm.h
index 1fa552568e83..e059ebfb2e93 100644
--- a/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/tm.h
+++ b/external/gpl3/gcc/usr.bin/gcc/arch/earmhf/tm.h
@@ -4,7 +4,7 @@
 
 #ifndef GCC_TM_H
 #define GCC_TM_H
-#define TARGET_CPU_DEFAULT (TARGET_CPU_arm6)
+#define TARGET_CPU_DEFAULT (TARGET_CPU_arm9e)
 #ifndef LIBC_GLIBC
 # define LIBC_GLIBC 1
 #endif
diff --git a/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/configargs.h b/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/configargs.h
index 5042cb54e18b..847d41ff0e66 100644
--- a/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/configargs.h
+++ b/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/configargs.h
@@ -8,4 +8,4 @@ static const char thread_model[] = "posix";
 
 static const struct {
   const char *name, *value;
-} configure_default_options[] = { { NULL, NULL} };
+} configure_default_options[] = { { "cpu", "arm9e" } };
diff --git a/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/defs.mk b/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/defs.mk
index bf7f09789031..79a7714715ae 100644
--- a/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/defs.mk
+++ b/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/defs.mk
@@ -44,7 +44,7 @@ G_tm_defines=LIBC_GLIBC=1 LIBC_UCLIBC=2 LIBC_BIONIC=3 LIBC_MUSL=4 NETBSD_ENABLE_
 G_host_xm_file=
 G_host_xm_defines=
 G_tm_p_file=
-G_target_cpu_default=TARGET_CPU_arm6
+G_target_cpu_default=TARGET_CPU_arm9e
 G_TM_H=tm.h      options.h ${GNUHOSTDIST}/gcc/config/dbxelf.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-stdint.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/arm/elf.h ${GNUHOSTDIST}/gcc/config/arm/bpabi.h ${GNUHOSTDIST}/gcc/config/arm/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/arm/netbsd-eabi.h ${GNUHOSTDIST}/gcc/config/arm/aout.h ${GNUHOSTDIST}/gcc/config/arm/arm.h ${GNUHOSTDIST}/gcc/config/initfini-array.h ${GNUHOSTDIST}/gcc/defaults.h insn-constants.h insn-flags.h options.h flag-types.h  ${GNUHOSTDIST}/gcc/config/arm/arm-opts.h ${GNUHOSTDIST}/gcc/config/arm/arm-cpu.h
 G_ALL_OPT_FILES=${GNUHOSTDIST}/gcc/brig/lang.opt ${GNUHOSTDIST}/gcc/lto/lang.opt ${GNUHOSTDIST}/gcc/c-family/c.opt ${GNUHOSTDIST}/gcc/common.opt ${GNUHOSTDIST}/gcc/config/arm/arm-tables.opt ${GNUHOSTDIST}/gcc/config/arm/arm.opt ${GNUHOSTDIST}/gcc/config/netbsd.opt ${GNUHOSTDIST}/gcc/config/netbsd-elf.opt
 G_tm_file_list=options.h ${GNUHOSTDIST}/gcc/config/dbxelf.h ${GNUHOSTDIST}/gcc/config/elfos.h ${GNUHOSTDIST}/gcc/config/netbsd.h ${GNUHOSTDIST}/gcc/config/netbsd-stdint.h ${GNUHOSTDIST}/gcc/config/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/arm/elf.h ${GNUHOSTDIST}/gcc/config/arm/bpabi.h ${GNUHOSTDIST}/gcc/config/arm/netbsd-elf.h ${GNUHOSTDIST}/gcc/config/arm/netbsd-eabi.h ${GNUHOSTDIST}/gcc/config/arm/aout.h ${GNUHOSTDIST}/gcc/config/arm/arm.h ${GNUHOSTDIST}/gcc/config/initfini-array.h ${GNUHOSTDIST}/gcc/defaults.h
diff --git a/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/tm.h b/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/tm.h
index 0ce812a398aa..fdacbe9a3566 100644
--- a/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/tm.h
+++ b/external/gpl3/gcc/usr.bin/gcc/arch/earmhfeb/tm.h
@@ -4,7 +4,7 @@
 
 #ifndef GCC_TM_H
 #define GCC_TM_H
-#define TARGET_CPU_DEFAULT (TARGET_CPU_arm6)
+#define TARGET_CPU_DEFAULT (TARGET_CPU_arm9e)
 #ifndef LIBC_GLIBC
 # define LIBC_GLIBC 1
 #endif