Add Oracle ol8u7 product to crosstool-ng

This commit adds support for the following Oracle products, targeting
Oracle Linux 8.7:

Binutils 2.30-117.0.1
GCC      8.5.0-15.0.2
glibc    2.28-211.1.0.1
UEK5/u4  4.14.35-2025.400.8

Sample configuration files are provided for the following triplets:

aarch64-ol8u7-linux-gnu
x86_64-ol8u7-linux-gnu
i686-ol8u7-linux-gnu

Signed-off-by: Cupertino Miranda <cupertino.miranda@oracle.com>

14 files changed, 1099 insertions, 4 deletions

diff --git a/packages/binutils-oracle/2.30/version.desc b/packages/binutils-oracle/2.30/version.desc
index edc3c4e2..3f9982b0 100644
--- a/packages/binutils-oracle/2.30/version.desc
+++ b/packages/binutils-oracle/2.30/version.desc
@@ -1,2 +1,2 @@
-repository_branch='oracle/binutils/ol8-u6'
-version_number='2.30-113.0.3'
+repository_branch='oracle/binutils/ol8-u7'
+version_number='2.30-117.0.3'
diff --git a/packages/binutils-oracle/git-43eccdca/0000-Fix-a-missing-include-of-string.patch b/packages/binutils-oracle/git-43eccdca/0000-Fix-a-missing-include-of-string.patch
new file mode 100644
index 00000000..141ddf82
--- /dev/null
+++ b/packages/binutils-oracle/git-43eccdca/0000-Fix-a-missing-include-of-string.patch
@@ -0,0 +1,24 @@
+This patch is a backport from binutils-gdb commit:
+a3972330f4: Fix a missing include of <string>
+
+This code is free software; you can redistribute it and/or modify it
+under the terms of the GNU General Public License as published by the
+Free Software Foundation; either version 3, or (at your option) any
+later version.
+
+This code is distributed in the hope that it will be useful, but WITHOUT
+ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
+for more details.
+
+diff -Nur binutils-gdb/gold/errors.h binutils-gdb-oracle/gold/errors.h
+--- binutils-gdb/gold/errors.h	2022-06-16 17:49:08.412691685 -0500
++++ binutils-gdb-oracle/gold/errors.h	2022-06-16 18:34:19.463006903 -0500
+@@ -24,6 +24,7 @@
+ #define GOLD_ERRORS_H
+ 
+ #include <cstdarg>
++#include <string>
+ 
+ #include "gold-threads.h"
+ 
diff --git a/packages/binutils-oracle/git-43eccdca/0001-revert-rpm-dd-changes.patch b/packages/binutils-oracle/git-43eccdca/0001-revert-rpm-dd-changes.patch
new file mode 100644
index 00000000..e517637f
--- /dev/null
+++ b/packages/binutils-oracle/git-43eccdca/0001-revert-rpm-dd-changes.patch
@@ -0,0 +1,940 @@
+commit 6220d114b2f28345efbcea55c1befb1f0d40c215
+Author: Cupertino Miranda <cupertino.miranda@oracle.com>
+Date:   Mon Dec 5 20:17:30 2022 +0000
+
+    Revert "LAST DIFFERENCES"
+    
+    This reverts commit 43eccdca2998f3e04c8a32590345739f3f321372.
+
+diff --git a/bfd/config.bfd b/bfd/config.bfd
+index cf02b010926..4d821d7eefc 100644
+--- a/bfd/config.bfd
++++ b/bfd/config.bfd
+@@ -53,7 +53,7 @@ case $targ in
+     echo "*** Use or1k-*-elf or or1k-*-linux as the target instead" >&2
+     exit 1
+     ;;
+- i[34567]86-*-netbsdelf* | i[34567]86-*-netbsd*-gnu* | i[34567]86-*-knetbsd*-gnu | \
++ i[3-7]86-*-netbsdelf* | i[3-7]86-*-netbsd*-gnu* | i[3-7]86-*-knetbsd*-gnu | \
+  mips*-*-irix5* | mips*-*-irix6*)
+     # Not obsolete
+     ;;
+@@ -63,24 +63,24 @@ case $targ in
+  arm*-*-coff | \
+  h8300*-*-coff | \
+  h8500*-*-coff | \
+- i[34567]86-*-sco3.2v5*coff | \
+- i[34567]86-*-sysv4* | i[34567]86-*-unixware* | \
+- i[34567]86-*-sco3.2v5* | \
+- i[34567]86-*-dgux* | i[34567]86-*-sysv5* | \
+- i[34567]86-*-chorus* | \
+- i[34567]86-*-sysv* | i[34567]86-*-isc* | i[34567]86-*-sco* | i[34567]86-*-coff | \
+- i[34567]86-*-aix* | \
+- i[34567]86-sequent-bsd* | \
+- i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd[12].* | \
+- i[34567]86-*-freebsd[12] | \
+- i[34567]86-*-netbsdaout* | i[34567]86-*-netbsd* | \
+- i[34567]86-*-openbsd[0-2].* | i[34567]86-*-openbsd3.[0-3] | \
+- i[34567]86-*-netware* | \
+- i[34567]86-*-linux*aout* | \
+- i[34567]86-*-mach* | i[34567]86-*-osf1mk* | \
+- i[34567]86-*-os9k | \
+- i[34567]86-none-* | \
+- i[34567]86-*-aout* | i[34567]86*-*-vsta* | \
++ i[3-7]86-*-sco3.2v5*coff | \
++ i[3-7]86-*-sysv4* | i[3-7]86-*-unixware* | \
++ i[3-7]86-*-sco3.2v5* | \
++ i[3-7]86-*-dgux* | i[3-7]86-*-sysv5* | \
++ i[3-7]86-*-chorus* | \
++ i[3-7]86-*-sysv* | i[3-7]86-*-isc* | i[3-7]86-*-sco* | i[3-7]86-*-coff | \
++ i[3-7]86-*-aix* | \
++ i[3-7]86-sequent-bsd* | \
++ i[3-7]86-*-freebsdaout* | i[3-7]86-*-freebsd[12].* | \
++ i[3-7]86-*-freebsd[12] | \
++ i[3-7]86-*-netbsdaout* | i[3-7]86-*-netbsd* | \
++ i[3-7]86-*-openbsd[0-2].* | i[3-7]86-*-openbsd3.[0-3] | \
++ i[3-7]86-*-netware* | \
++ i[3-7]86-*-linux*aout* | \
++ i[3-7]86-*-mach* | i[3-7]86-*-osf1mk* | \
++ i[3-7]86-*-os9k | \
++ i[3-7]86-none-* | \
++ i[3-7]86-*-aout* | i[3-7]86*-*-vsta* | \
+  i860-*-* | \
+  i960-*-* | \
+  m68*-motorola-sysv* | m68*-hp-bsd* | m68*-*-aout* | \
+@@ -170,7 +170,7 @@ crx*)		 targ_archs=bfd_crx_arch ;;
+ dlx*)		 targ_archs=bfd_dlx_arch ;;
+ fido*)		 targ_archs=bfd_m68k_arch ;;
+ hppa*)		 targ_archs=bfd_hppa_arch ;;
+-i[34567]86)	 targ_archs=bfd_i386_arch ;;
++i[3-7]86)	 targ_archs=bfd_i386_arch ;;
+ i370)		 targ_archs=bfd_i370_arch ;;
+ ia16)		 targ_archs=bfd_i386_arch ;;
+ lm32)	         targ_archs=bfd_lm32_arch ;;
+@@ -627,17 +627,17 @@ case "${targ}" in
+     targ_selvecs="i370_elf32_vec"
+     ;;
+ 
+-  i[34567]86-*-sco3.2v5*coff)
++  i[3-7]86-*-sco3.2v5*coff)
+     targ_defvec=i386_coff_vec
+     targ_selvecs=i386_elf32_vec
+     ;;
+-  i[34567]86-*-sysv4* | i[34567]86-*-unixware* | \
+-  i[34567]86-*-elf* | i[34567]86-*-sco3.2v5* | \
+-  i[34567]86-*-dgux* | i[34567]86-*-sysv5* | i[34567]86-*-rtems*)
++  i[3-7]86-*-sysv4* | i[3-7]86-*-unixware* | \
++  i[3-7]86-*-elf* | i[3-7]86-*-sco3.2v5* | \
++  i[3-7]86-*-dgux* | i[3-7]86-*-sysv5* | i[3-7]86-*-rtems*)
+     targ_defvec=i386_elf32_vec
+     targ_selvecs="iamcu_elf32_vec i386_coff_vec"
+     ;;
+-  i[34567]86-*-solaris2*)
++  i[3-7]86-*-solaris2*)
+     targ_defvec=i386_elf32_sol2_vec
+     targ_selvecs="iamcu_elf32_vec i386_coff_vec i386_pei_vec"
+     targ64_selvecs="x86_64_elf64_sol2_vec l1om_elf64_vec k1om_elf64_vec x86_64_pei_vec"
+@@ -650,23 +650,23 @@ case "${targ}" in
+     want64=true
+     ;;
+ #endif
+-  i[34567]86-*-kaos*)
++  i[3-7]86-*-kaos*)
+     targ_defvec=i386_elf32_vec
+     targ_selvecs=i386_elf32_vec
+     ;;
+-  i[34567]86-*-nto*)
++  i[3-7]86-*-nto*)
+     targ_defvec=i386_elf32_vec
+     targ_selvecs="iamcu_elf32_vec i386_coff_vec"
+     ;;
+-  i[34567]86-*-aros*)
++  i[3-7]86-*-aros*)
+     targ_defvec=i386_elf32_vec
+     targ_selvecs=iamcu_elf32_vec
+     ;;
+-  i[34567]86-*-chorus*)
++  i[3-7]86-*-chorus*)
+     targ_defvec=i386_elf32_vec
+     targ_selvecs=iamcu_elf32_vec
+     ;;
+-  i[34567]86-*-dicos*)
++  i[3-7]86-*-dicos*)
+     targ_defvec=i386_elf32_vec
+     targ_selvecs=iamcu_elf32_vec
+     targ64_selvecs="x86_64_elf64_vec l1om_elf64_vec k1om_elf64_vec"
+@@ -675,85 +675,85 @@ case "${targ}" in
+     targ_defvec=i386_coff_go32_vec
+     targ_selvecs="i386_coff_go32stubbed_vec i386_aout_vec"
+     ;;
+-  i[34567]86-*-sysv* | i[34567]86-*-isc* | i[34567]86-*-sco* | i[34567]86-*-coff | \
+-  i[34567]86-*-aix*)
++  i[3-7]86-*-sysv* | i[3-7]86-*-isc* | i[3-7]86-*-sco* | i[3-7]86-*-coff | \
++  i[3-7]86-*-aix*)
+     targ_defvec=i386_coff_vec
+     ;;
+-  i[34567]86-*-darwin* | i[34567]86-*-macos10* | i[34567]86-*-rhapsody*)
++  i[3-7]86-*-darwin* | i[3-7]86-*-macos10* | i[3-7]86-*-rhapsody*)
+     targ_defvec=i386_mach_o_vec
+     targ_selvecs="mach_o_le_vec mach_o_be_vec mach_o_fat_vec pef_vec pef_xlib_vec sym_vec"
+     targ64_selvecs=x86_64_mach_o_vec
+     targ_archs="$targ_archs bfd_powerpc_arch bfd_rs6000_arch"
+     ;;
+-  i[34567]86-sequent-bsd*)
++  i[3-7]86-sequent-bsd*)
+     targ_defvec=i386_aout_dynix_vec
+     targ_underscore=yes
+     ;;
+-  i[34567]86-*-bsd*)
++  i[3-7]86-*-bsd*)
+     targ_defvec=i386_aout_bsd_vec
+     targ_underscore=yes
+     ;;
+-  i[34567]86-*-dragonfly*)
++  i[3-7]86-*-dragonfly*)
+     targ_defvec=i386_elf32_vec
+     targ_selvecs=iamcu_elf32_vec
+     targ64_selvecs="x86_64_elf64_vec l1om_elf64_vec k1om_elf64_vec"
+     ;;
+-  i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd[12].* | \
+-  i[34567]86-*-freebsd[12])
++  i[3-7]86-*-freebsdaout* | i[3-7]86-*-freebsd[12].* | \
++  i[3-7]86-*-freebsd[12])
+     targ_defvec=i386_aout_fbsd_vec
+     targ_selvecs=i386_aout_bsd_vec
+     targ_underscore=yes
+     ;;
+-  i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu)
++  i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu)
+     targ_defvec=i386_elf32_fbsd_vec
+     targ_selvecs="i386_elf32_vec iamcu_elf32_vec i386_pei_vec i386_coff_vec"
+     targ64_selvecs="x86_64_elf64_fbsd_vec x86_64_elf64_vec x86_64_pei_vec l1om_elf64_vec l1om_elf64_fbsd_vec k1om_elf64_vec k1om_elf64_fbsd_vec"
+     # FreeBSD <= 4.0 supports only the old nonstandard way of ABI labelling.
+     case "${targ}" in
+-      i[34567]86-*-freebsd3* | i[34567]86-*-freebsd4 | i[34567]86-*-freebsd4.0*)
++      i[3-7]86-*-freebsd3* | i[3-7]86-*-freebsd4 | i[3-7]86-*-freebsd4.0*)
+ 	targ_cflags=-DOLD_FREEBSD_ABI_LABEL ;;
+     esac
+     ;;
+-  i[34567]86-*-netbsdelf* | i[34567]86-*-netbsd*-gnu* | i[34567]86-*-knetbsd*-gnu)
++  i[3-7]86-*-netbsdelf* | i[3-7]86-*-netbsd*-gnu* | i[3-7]86-*-knetbsd*-gnu)
+     targ_defvec=i386_elf32_vec
+     targ_selvecs="i386_aout_nbsd_vec iamcu_elf32_vec"
+     targ64_selvecs="x86_64_elf64_vec l1om_elf64_vec k1om_elf64_vec"
+     ;;
+-  i[34567]86-*-netbsdpe*)
++  i[3-7]86-*-netbsdpe*)
+     targ_defvec=i386_pe_vec
+     targ_selvecs="i386_pe_vec i386_pei_vec i386_elf32_vec iamcu_elf32_vec"
+     ;;
+-  i[34567]86-*-netbsdaout* | i[34567]86-*-netbsd* | \
+-  i[34567]86-*-openbsd[0-2].* | i[34567]86-*-openbsd3.[0-3])
++  i[3-7]86-*-netbsdaout* | i[3-7]86-*-netbsd* | \
++  i[3-7]86-*-openbsd[0-2].* | i[3-7]86-*-openbsd3.[0-3])
+     targ_defvec=i386_aout_nbsd_vec
+     targ_selvecs="i386_elf32_vec iamcu_elf32_vec i386_aout_bsd_vec"
+     targ_underscore=yes
+     ;;
+-  i[34567]86-*-openbsd*)
++  i[3-7]86-*-openbsd*)
+     targ_defvec=i386_elf32_vec
+     targ_selvecs="iamcu_elf32_vec i386_aout_nbsd_vec"
+     ;;
+-  i[34567]86-*-netware*)
++  i[3-7]86-*-netware*)
+     targ_defvec=i386_elf32_vec
+     targ_selvecs="iamcu_elf32_vec i386_nlm32_vec i386_coff_vec i386_aout_vec"
+     ;;
+-  i[34567]86-*-linux*aout*)
++  i[3-7]86-*-linux*aout*)
+     targ_defvec=i386_aout_linux_vec
+     targ_selvecs="i386_elf32_vec iamcu_elf32_vec"
+     targ_underscore=yes
+     ;;
+-  i[34567]86-*-linux-*)
++  i[3-7]86-*-linux-*)
+     targ_defvec=i386_elf32_vec
+     targ_selvecs="iamcu_elf32_vec i386_aout_linux_vec i386_pei_vec"
+     targ64_selvecs="x86_64_elf64_vec x86_64_elf32_vec x86_64_pei_vec l1om_elf64_vec k1om_elf64_vec"
+     ;;
+-  i[34567]86-*-nacl*)
++  i[3-7]86-*-nacl*)
+     targ_defvec=i386_elf32_nacl_vec
+     targ_selvecs="arm_elf32_nacl_be_vec arm_elf32_nacl_le_vec"
+     targ64_selvecs="x86_64_elf64_nacl_vec x86_64_elf32_nacl_vec"
+     targ_archs="$targ_archs bfd_arm_arch"
+     ;;
+-  i[34567]86-*-redox*)
++  i[3-7]86-*-redox*)
+     targ_defvec=i386_elf32_vec
+     targ_selvecs=
+     targ64_selvecs=x86_64_elf64_vec
+@@ -821,64 +821,64 @@ case "${targ}" in
+     want64=true
+     ;;
+ #endif
+-  i[34567]86-*-lynxos*)
++  i[3-7]86-*-lynxos*)
+     targ_defvec=i386_elf32_vec
+     targ_selvecs="iamcu_elf32_vec i386_coff_lynx_vec i386_aout_lynx_vec"
+     ;;
+-  i[34567]86-*-gnu*)
++  i[3-7]86-*-gnu*)
+     targ_defvec=i386_elf32_vec
+     targ_selvecs=iamcu_elf32_vec
+     ;;
+-  i[34567]86-*-mach* | i[34567]86-*-osf1mk*)
++  i[3-7]86-*-mach* | i[3-7]86-*-osf1mk*)
+     targ_defvec=i386_aout_mach3_vec
+     targ_cflags=-DSTAT_FOR_EXEC
+     targ_underscore=yes
+     ;;
+-  i[34567]86-*-os9k)
++  i[3-7]86-*-os9k)
+     targ_defvec=i386_aout_os9k_vec
+     ;;
+-  i[34567]86-*-msdos*)
++  i[3-7]86-*-msdos*)
+     targ_defvec=i386_aout_vec
+     targ_selvecs=i386_msdos_vec
+     ;;
+-  i[34567]86-*-moss*)
++  i[3-7]86-*-moss*)
+     targ_defvec=i386_elf32_vec
+     targ_selvecs="iamcu_elf32_vec i386_msdos_vec i386_aout_vec"
+     ;;
+-  i[34567]86-*-beospe*)
++  i[3-7]86-*-beospe*)
+     targ_defvec=i386_pe_vec
+     targ_selvecs="i386_pe_vec i386_pei_vec"
+     ;;
+-  i[34567]86-*-beoself* | i[34567]86-*-beos*)
++  i[3-7]86-*-beoself* | i[3-7]86-*-beos*)
+     targ_defvec=i386_elf32_vec
+     targ_selvecs="iamcu_elf32_vec i386_pe_vec i386_pei_vec"
+     ;;
+-  i[34567]86-*-interix*)
++  i[3-7]86-*-interix*)
+     targ_defvec=i386_pei_vec
+     targ_selvecs="i386_pe_vec"
+     # FIXME: This should eventually be checked at runtime.
+     targ_cflags=-DSTRICT_PE_FORMAT
+     ;;
+-  i[34567]86-*-rdos*)
++  i[3-7]86-*-rdos*)
+     targ_defvec=i386_elf32_vec
+     targ_selvecs="iamcu_elf32_vec i386_coff_vec"
+     ;;
+-  i[34567]86-*-mingw32* | i[34567]86-*-cygwin* | i[34567]86-*-winnt | i[34567]86-*-pe)
++  i[3-7]86-*-mingw32* | i[3-7]86-*-cygwin* | i[3-7]86-*-winnt | i[3-7]86-*-pe)
+     targ_defvec=i386_pe_vec
+     targ_selvecs="i386_pe_vec i386_pei_vec i386_elf32_vec iamcu_elf32_vec"
+     targ_underscore=yes
+     ;;
+-  i[34567]86-none-*)
++  i[3-7]86-none-*)
+     targ_defvec=i386_coff_vec
+     ;;
+-  i[34567]86-*-aout* | i[34567]86*-*-vsta*)
++  i[3-7]86-*-aout* | i[3-7]86*-*-vsta*)
+     targ_defvec=i386_aout_vec
+     ;;
+-  i[34567]86-*-vxworks*)
++  i[3-7]86-*-vxworks*)
+     targ_defvec=i386_elf32_vxworks_vec
+     targ_underscore=yes
+     ;;
+-  i[34567]86-*-chaos)
++  i[3-7]86-*-chaos)
+     targ_defvec=i386_elf32_vec
+     targ_selfvecs="iamcu_elf32_vec i386chaos_vec"
+     ;;
+diff --git a/bfd/configure b/bfd/configure
+index adc6cdf1c01..da810fe1c1d 100755
+--- a/bfd/configure
++++ b/bfd/configure
+@@ -11910,7 +11910,7 @@ fi
+ 
+ 
+ case "${host}" in
+-  sparc-*-solaris*|i[34567]86-*-solaris*)
++  sparc-*-solaris*|i[3-7]86-*-solaris*)
+     # On native 32bit sparc and ia32 solaris, large-file and procfs support
+     # are mutually exclusive; and without procfs support, the bfd/ elf module
+     # cannot provide certain routines such as elfcore_write_prpsinfo
+@@ -14840,45 +14840,45 @@ if test "${target}" = "${host}"; then
+ 	TRAD_HEADER='"hosts/i370linux.h"'
+ 	;;
+ 
+-  i[34567]86-sequent-bsd*)
++  i[3-7]86-sequent-bsd*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/symmetry.h"'
+ 	;;
+-  i[34567]86-sequent-sysv4*) ;;
+-  i[34567]86-sequent-sysv*)
++  i[3-7]86-sequent-sysv4*) ;;
++  i[3-7]86-sequent-sysv*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/symmetry.h"'
+ 	;;
+-  i[34567]86-*-bsdi)
++  i[3-7]86-*-bsdi)
+ 	COREFILE=
+ 	;;
+-  i[34567]86-*-bsd* | i[34567]86-*-freebsd[123] | i[34567]86-*-freebsd[123]\.* | i[34567]86-*-freebsd4\.[01234] | i[34567]86-*-freebsd4\.[01234]\.* | i[34567]86-*-freebsd*aout*)
++  i[3-7]86-*-bsd* | i[3-7]86-*-freebsd[123] | i[3-7]86-*-freebsd[123]\.* | i[3-7]86-*-freebsd4\.[01234] | i[3-7]86-*-freebsd4\.[01234]\.* | i[3-7]86-*-freebsd*aout*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/i386bsd.h"'
+ 	;;
+-  i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-dragonfly*)
++  i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu | i[3-7]86-*-dragonfly*)
+ 	COREFILE=''
+ 	TRAD_HEADER='"hosts/i386bsd.h"'
+ 	;;
+-  i[34567]86-*-netbsd* | i[34567]86-*-knetbsd*-gnu | i[34567]86-*-openbsd*)
++  i[3-7]86-*-netbsd* | i[3-7]86-*-knetbsd*-gnu | i[3-7]86-*-openbsd*)
+ 	COREFILE=netbsd-core.lo
+ 	;;
+-  i[34567]86-esix-sysv3*)
++  i[3-7]86-esix-sysv3*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/esix.h"'
+ 	;;
+-  i[34567]86-*-sco3.2v5*)
++  i[3-7]86-*-sco3.2v5*)
+ 	COREFILE=sco5-core.lo
+ 	;;
+-  i[34567]86-*-sco* | i[34567]86-*-isc*)
++  i[3-7]86-*-sco* | i[3-7]86-*-isc*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/i386sco.h"'
+ 	;;
+-  i[34567]86-*-mach3*)
++  i[3-7]86-*-mach3*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/i386mach3.h"'
+ 	;;
+-  i[34567]86-*-linux-*)
++  i[3-7]86-*-linux-*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/i386linux.h"'
+ 	case "$enable_targets"-"$want64" in
+@@ -14886,8 +14886,8 @@ if test "${target}" = "${host}"; then
+ 	  CORE_HEADER='"hosts/x86-64linux.h"'
+ 	esac
+ 	;;
+-  i[34567]86-*-isc*)	COREFILE=trad-core.lo ;;
+-  i[34567]86-*-aix*)	COREFILE=aix386-core.lo ;;
++  i[3-7]86-*-isc*)	COREFILE=trad-core.lo ;;
++  i[3-7]86-*-aix*)	COREFILE=aix386-core.lo ;;
+   i860-*-mach3* | i860-*-osf1*)
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/i860mach3.h"'
+diff --git a/bfd/configure.ac b/bfd/configure.ac
+index fa2e0ec0133..95daa5a86de 100644
+--- a/bfd/configure.ac
++++ b/bfd/configure.ac
+@@ -884,65 +884,65 @@ if test "${target}" = "${host}"; then
+ 	;;
+ 
+ changequote(,)dnl
+-  i[34567]86-sequent-bsd*)
++  i[3-7]86-sequent-bsd*)
+ changequote([,])dnl
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/symmetry.h"'
+ 	;;
+ changequote(,)dnl
+-  i[34567]86-sequent-sysv4*) ;;
+-  i[34567]86-sequent-sysv*)
++  i[3-7]86-sequent-sysv4*) ;;
++  i[3-7]86-sequent-sysv*)
+ changequote([,])dnl
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/symmetry.h"'
+ 	;;
+ changequote(,)dnl
+-  i[34567]86-*-bsdi)
++  i[3-7]86-*-bsdi)
+ changequote([,])dnl
+ 	COREFILE=
+ 	;;
+ changequote(,)dnl
+-  i[34567]86-*-bsd* | i[34567]86-*-freebsd[123] | i[34567]86-*-freebsd[123]\.* | i[34567]86-*-freebsd4\.[01234] | i[34567]86-*-freebsd4\.[01234]\.* | i[34567]86-*-freebsd*aout*)
++  i[3-7]86-*-bsd* | i[3-7]86-*-freebsd[123] | i[3-7]86-*-freebsd[123]\.* | i[3-7]86-*-freebsd4\.[01234] | i[3-7]86-*-freebsd4\.[01234]\.* | i[3-7]86-*-freebsd*aout*)
+ changequote([,])dnl
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/i386bsd.h"'
+ 	;;
+ changequote(,)dnl
+-  i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-dragonfly*)
++  i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu | i[3-7]86-*-dragonfly*)
+ changequote([,])dnl
+ 	COREFILE=''
+ 	TRAD_HEADER='"hosts/i386bsd.h"'
+ 	;;
+ changequote(,)dnl
+-  i[34567]86-*-netbsd* | i[34567]86-*-knetbsd*-gnu | i[34567]86-*-openbsd*)
++  i[3-7]86-*-netbsd* | i[3-7]86-*-knetbsd*-gnu | i[3-7]86-*-openbsd*)
+ changequote([,])dnl
+ 	COREFILE=netbsd-core.lo
+ 	;;
+ changequote(,)dnl
+-  i[34567]86-esix-sysv3*)
++  i[3-7]86-esix-sysv3*)
+ changequote([,])dnl
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/esix.h"'
+ 	;;
+ changequote(,)dnl
+-  i[34567]86-*-sco3.2v5*)
++  i[3-7]86-*-sco3.2v5*)
+ changequote([,])dnl
+ 	COREFILE=sco5-core.lo
+ 	;;
+ changequote(,)dnl
+-  i[34567]86-*-sco* | i[34567]86-*-isc*)
++  i[3-7]86-*-sco* | i[3-7]86-*-isc*)
+ changequote([,])dnl
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/i386sco.h"'
+ 	;;
+ changequote(,)dnl
+-  i[34567]86-*-mach3*)
++  i[3-7]86-*-mach3*)
+ changequote([,])dnl
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/i386mach3.h"'
+ 	;;
+ changequote(,)dnl
+-  i[34567]86-*-linux-*)
++  i[3-7]86-*-linux-*)
+ changequote([,])dnl
+ 	COREFILE=trad-core.lo
+ 	TRAD_HEADER='"hosts/i386linux.h"'
+@@ -952,8 +952,8 @@ changequote([,])dnl
+ 	esac
+ 	;;
+ changequote(,)dnl
+-  i[34567]86-*-isc*)	COREFILE=trad-core.lo ;;
+-  i[34567]86-*-aix*)	COREFILE=aix386-core.lo ;;
++  i[3-7]86-*-isc*)	COREFILE=trad-core.lo ;;
++  i[3-7]86-*-aix*)	COREFILE=aix386-core.lo ;;
+ changequote([,])dnl
+   i860-*-mach3* | i860-*-osf1*)
+ 	COREFILE=trad-core.lo
+diff --git a/bfd/configure.host b/bfd/configure.host
+index bfae19a0884..486de7f055f 100644
+--- a/bfd/configure.host
++++ b/bfd/configure.host
+@@ -54,11 +54,11 @@ ia64-*-*)		host64=true;;
+ 
+ # Workaround for limitations on win9x where file contents are
+ # not zero'd out if you seek past the end and then write.
+-i[34567]86-*-mingw32*)	HDEFINES=-D__USE_MINGW_FSEEK;;
++i[3-7]86-*-mingw32*)	HDEFINES=-D__USE_MINGW_FSEEK;;
+ 
+-i[34567]86-sequent-bsd*)	HDEFINES=-Dshared=genshared ;;
+-i[34567]86-sequent-sysv4*) ;;
+-i[34567]86-sequent-sysv*)	HDEFINES=-Dshared=genshared ;;
++i[3-7]86-sequent-bsd*)	HDEFINES=-Dshared=genshared ;;
++i[3-7]86-sequent-sysv4*) ;;
++i[3-7]86-sequent-sysv*)	HDEFINES=-Dshared=genshared ;;
+ 
+ mips*-*-netbsd*)	;;
+ mips*-*-openbsd*)	;;
+diff --git a/bfd/elf32-ppc.c b/bfd/elf32-ppc.c
+index 6d48ff5b074..9d4dbcee009 100644
+--- a/bfd/elf32-ppc.c
++++ b/bfd/elf32-ppc.c
+@@ -10738,7 +10738,7 @@ ppc_elf_finish_dynamic_sections (bfd *output_bfd,
+ #define ELF_MACHINE_CODE	EM_PPC
+ #ifdef __QNXTARGET__
+ #define ELF_MAXPAGESIZE		0x1000
+-#define ELF_COMMONPAGESIZE	0x10000
++#define ELF_COMMONPAGESIZE	0x1000
+ #else
+ #define ELF_MAXPAGESIZE		0x10000
+ #define ELF_COMMONPAGESIZE	0x10000
+diff --git a/bfd/elfnn-aarch64.c b/bfd/elfnn-aarch64.c
+index 68dc02335ab..8fa422f3ac7 100644
+--- a/bfd/elfnn-aarch64.c
++++ b/bfd/elfnn-aarch64.c
+@@ -9381,7 +9381,7 @@ const struct elf_size_info elfNN_aarch64_size_info =
+ #define ELF_MACHINE_CODE		EM_AARCH64
+ #define ELF_MAXPAGESIZE			0x10000
+ #define ELF_MINPAGESIZE			0x1000
+-#define ELF_COMMONPAGESIZE		0x10000
++#define ELF_COMMONPAGESIZE		0x1000
+ 
+ #define bfd_elfNN_close_and_cleanup		\
+   elfNN_aarch64_close_and_cleanup
+diff --git a/binutils/configure b/binutils/configure
+index df671b95788..7d76ea887bc 100755
+--- a/binutils/configure
++++ b/binutils/configure
+@@ -11706,7 +11706,7 @@ fi
+ 
+ 
+ case "${host}" in
+-  sparc-*-solaris*|i[34567]86-*-solaris*)
++  sparc-*-solaris*|i[3-7]86-*-solaris*)
+     # On native 32bit sparc and ia32 solaris, large-file and procfs support
+     # are mutually exclusive; and without procfs support, the bfd/ elf module
+     # cannot provide certain routines such as elfcore_write_prpsinfo
+@@ -14479,7 +14479,7 @@ do
+ 	od_vectors="$od_vectors objdump_private_desc_xcoff"
+     else
+ 	case $targ in
+-	i[34567]86*-*-netware*)
++	i[3-7]86*-*-netware*)
+ 	  BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
+ 	  NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_I386"
+ 	  ;;
+@@ -14539,7 +14539,7 @@ do
+ 	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+ 	  BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
+ 	  ;;
+-	i[34567]86-*-pe* | i[34567]86-*-cygwin* | i[34567]86-*-mingw32** | i[34567]86-*-netbsdpe*)
++	i[3-7]86-*-pe* | i[3-7]86-*-cygwin* | i[3-7]86-*-mingw32** | i[3-7]86-*-netbsdpe*)
+   	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+ 	  if test -z "$DLLTOOL_DEFAULT"; then
+ 	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_I386"
+@@ -14549,7 +14549,7 @@ do
+ 	  BUILD_WINDMC='$(WINDMC_PROG)$(EXEEXT)'
+ 	  BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
+ 	  ;;
+-	i[34567]86-*-interix)
++	i[3-7]86-*-interix)
+ 	  BUILD_DLLTOOL='$(DLLTOOL_PROG)'
+ 	  if test -z "$DLLTOOL_DEFAULT"; then
+ 	    DLLTOOL_DEFAULT="-DDLLTOOL_DEFAULT_I386"
+diff --git a/binutils/configure.ac b/binutils/configure.ac
+index 63466c584b6..6d3eaa31fe1 100644
+--- a/binutils/configure.ac
++++ b/binutils/configure.ac
+@@ -264,7 +264,7 @@ do
+     else
+ 	case $targ in
+ changequote(,)dnl
+-	i[34567]86*-*-netware*)
++	i[3-7]86*-*-netware*)
+ changequote([,])dnl
+ 	  BUILD_NLMCONV='$(NLMCONV_PROG)$(EXEEXT)'
+ 	  NLMCONV_DEFS="$NLMCONV_DEFS -DNLMCONV_I386"
+@@ -326,7 +326,7 @@ changequote([,])dnl
+ 	  BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
+ 	  ;;
+ changequote(,)dnl
+-	i[34567]86-*-pe* | i[34567]86-*-cygwin* | i[34567]86-*-mingw32** | i[34567]86-*-netbsdpe*)
++	i[3-7]86-*-pe* | i[3-7]86-*-cygwin* | i[3-7]86-*-mingw32** | i[3-7]86-*-netbsdpe*)
+ changequote([,])dnl
+   	  BUILD_DLLTOOL='$(DLLTOOL_PROG)$(EXEEXT)'
+ 	  if test -z "$DLLTOOL_DEFAULT"; then
+@@ -338,7 +338,7 @@ changequote([,])dnl
+ 	  BUILD_DLLWRAP='$(DLLWRAP_PROG)$(EXEEXT)'
+ 	  ;;
+ changequote(,)dnl
+-	i[34567]86-*-interix)
++	i[3-7]86-*-interix)
+ changequote([,])dnl
+ 	  BUILD_DLLTOOL='$(DLLTOOL_PROG)'
+ 	  if test -z "$DLLTOOL_DEFAULT"; then
+diff --git a/gas/configure b/gas/configure
+index f4a4b1256d6..2d7f44717e2 100755
+--- a/gas/configure
++++ b/gas/configure
+@@ -11472,7 +11472,7 @@ fi
+ 
+ 
+ case "${host}" in
+-  sparc-*-solaris*|i[34567]86-*-solaris*)
++  sparc-*-solaris*|i[3-7]86-*-solaris*)
+     # On native 32bit sparc and ia32 solaris, large-file and procfs support
+     # are mutually exclusive; and without procfs support, the bfd/ elf module
+     # cannot provide certain routines such as elfcore_write_prpsinfo
+diff --git a/gas/configure.tgt b/gas/configure.tgt
+index abf7e02e869..afe4e0608cf 100644
+--- a/gas/configure.tgt
++++ b/gas/configure.tgt
+@@ -61,7 +61,7 @@ case ${cpu} in
+   epiphany*)		cpu_type=epiphany endian=little ;;
+   fido)			cpu_type=m68k ;;
+   hppa*)		cpu_type=hppa ;;
+-  i[34567]86)		cpu_type=i386 arch=i386;;
++  i[3-7]86)		cpu_type=i386 arch=i386;;
+   ia16)			cpu_type=i386 arch=i386;;
+   ia64)			cpu_type=ia64 ;;
+   ip2k)			cpu_type=ip2k endian=big ;;
+diff --git a/gold/aarch64.cc b/gold/aarch64.cc
+index 1d11420dee7..f77c4cc3187 100644
+--- a/gold/aarch64.cc
++++ b/gold/aarch64.cc
+@@ -3554,7 +3554,7 @@ const Target::Target_info Target_aarch64<64, false>::aarch64_info =
+   "/lib/ld.so.1",	// program interpreter
+   0x400000,		// default_text_segment_address
+   0x10000,		// abi_pagesize (overridable by -z max-page-size)
+-  0x10000,		// common_pagesize (overridable by -z common-page-size)
++  0x1000,		// common_pagesize (overridable by -z common-page-size)
+   false,                // isolate_execinstr
+   0,                    // rosegment_gap
+   elfcpp::SHN_UNDEF,	// small_common_shndx
+@@ -3582,7 +3582,7 @@ const Target::Target_info Target_aarch64<32, false>::aarch64_info =
+   "/lib/ld.so.1",	// program interpreter
+   0x400000,		// default_text_segment_address
+   0x10000,		// abi_pagesize (overridable by -z max-page-size)
+-  0x10000,		// common_pagesize (overridable by -z common-page-size)
++  0x1000,		// common_pagesize (overridable by -z common-page-size)
+   false,                // isolate_execinstr
+   0,                    // rosegment_gap
+   elfcpp::SHN_UNDEF,	// small_common_shndx
+@@ -3610,7 +3610,7 @@ const Target::Target_info Target_aarch64<64, true>::aarch64_info =
+   "/lib/ld.so.1",	// program interpreter
+   0x400000,		// default_text_segment_address
+   0x10000,		// abi_pagesize (overridable by -z max-page-size)
+-  0x10000,		// common_pagesize (overridable by -z common-page-size)
++  0x1000,		// common_pagesize (overridable by -z common-page-size)
+   false,                // isolate_execinstr
+   0,                    // rosegment_gap
+   elfcpp::SHN_UNDEF,	// small_common_shndx
+@@ -3638,7 +3638,7 @@ const Target::Target_info Target_aarch64<32, true>::aarch64_info =
+   "/lib/ld.so.1",	// program interpreter
+   0x400000,		// default_text_segment_address
+   0x10000,		// abi_pagesize (overridable by -z max-page-size)
+-  0x10000,		// common_pagesize (overridable by -z common-page-size)
++  0x1000,		// common_pagesize (overridable by -z common-page-size)
+   false,                // isolate_execinstr
+   0,                    // rosegment_gap
+   elfcpp::SHN_UNDEF,	// small_common_shndx
+diff --git a/gold/powerpc.cc b/gold/powerpc.cc
+index 7869d20595b..f6d589c6ea7 100644
+--- a/gold/powerpc.cc
++++ b/gold/powerpc.cc
+@@ -1614,7 +1614,7 @@ Target::Target_info Target_powerpc<32, true>::powerpc_info =
+   "/usr/lib/ld.so.1",	// dynamic_linker
+   0x10000000,		// default_text_segment_address
+   64 * 1024,		// abi_pagesize (overridable by -z max-page-size)
+-  64 * 1024,		// common_pagesize (overridable by -z common-page-size)
++  4 * 1024,		// common_pagesize (overridable by -z common-page-size)
+   false,		// isolate_execinstr
+   0,			// rosegment_gap
+   elfcpp::SHN_UNDEF,	// small_common_shndx
+@@ -1642,7 +1642,7 @@ Target::Target_info Target_powerpc<32, false>::powerpc_info =
+   "/usr/lib/ld.so.1",	// dynamic_linker
+   0x10000000,		// default_text_segment_address
+   64 * 1024,		// abi_pagesize (overridable by -z max-page-size)
+-  64 * 1024,		// common_pagesize (overridable by -z common-page-size)
++  4 * 1024,		// common_pagesize (overridable by -z common-page-size)
+   false,		// isolate_execinstr
+   0,			// rosegment_gap
+   elfcpp::SHN_UNDEF,	// small_common_shndx
+@@ -1670,7 +1670,7 @@ Target::Target_info Target_powerpc<64, true>::powerpc_info =
+   "/usr/lib/ld.so.1",	// dynamic_linker
+   0x10000000,		// default_text_segment_address
+   64 * 1024,		// abi_pagesize (overridable by -z max-page-size)
+-  64 * 1024,		// common_pagesize (overridable by -z common-page-size)
++  4 * 1024,		// common_pagesize (overridable by -z common-page-size)
+   false,		// isolate_execinstr
+   0,			// rosegment_gap
+   elfcpp::SHN_UNDEF,	// small_common_shndx
+@@ -1698,7 +1698,7 @@ Target::Target_info Target_powerpc<64, false>::powerpc_info =
+   "/usr/lib/ld.so.1",	// dynamic_linker
+   0x10000000,		// default_text_segment_address
+   64 * 1024,		// abi_pagesize (overridable by -z max-page-size)
+-  64 * 1024,		// common_pagesize (overridable by -z common-page-size)
++  4 * 1024,		// common_pagesize (overridable by -z common-page-size)
+   false,		// isolate_execinstr
+   0,			// rosegment_gap
+   elfcpp::SHN_UNDEF,	// small_common_shndx
+diff --git a/gprof/configure b/gprof/configure
+index bbcd676c610..e0f2bef7776 100755
+--- a/gprof/configure
++++ b/gprof/configure
+@@ -11382,7 +11382,7 @@ fi
+ 
+ 
+ case "${host}" in
+-  sparc-*-solaris*|i[34567]86-*-solaris*)
++  sparc-*-solaris*|i[3-7]86-*-solaris*)
+     # On native 32bit sparc and ia32 solaris, large-file and procfs support
+     # are mutually exclusive; and without procfs support, the bfd/ elf module
+     # cannot provide certain routines such as elfcore_write_prpsinfo
+diff --git a/ld/configure b/ld/configure
+index 9431f3b6ea2..e43ddd698cf 100755
+--- a/ld/configure
++++ b/ld/configure
+@@ -15221,7 +15221,7 @@ fi
+ 
+ 
+ case "${host}" in
+-  sparc-*-solaris*|i[34567]86-*-solaris*)
++  sparc-*-solaris*|i[3-7]86-*-solaris*)
+     # On native 32bit sparc and ia32 solaris, large-file and procfs support
+     # are mutually exclusive; and without procfs support, the bfd/ elf module
+     # cannot provide certain routines such as elfcore_write_prpsinfo
+diff --git a/ld/configure.tgt b/ld/configure.tgt
+index 1a70497ae98..6183a85b3d1 100644
+--- a/ld/configure.tgt
++++ b/ld/configure.tgt
+@@ -241,32 +241,32 @@ hppa*-*-openbsd*)	targ_emul=hppaobsd
+ 			;;
+ i370-*-elf* | i370-*-linux-*) targ_emul=elf32i370
+ 			;;
+-i[34567]86-*-nto-qnx*)	targ_emul=i386nto ;;
+-i[34567]86-*-vsta)	targ_emul=vsta ;;
+-i[34567]86-*-go32)	targ_emul=i386go32 ;;
+-i[34567]86-*-msdosdjgpp*) targ_emul=i386go32 ;;
+-i[34567]86-*-aix*)	targ_emul=i386coff ;;
+-i[34567]86-*-sco*)	targ_emul=i386coff ;;
+-i[34567]86-*-isc*)	targ_emul=i386coff ;;
+-i[34567]86-*-lynxos*)	targ_emul=i386lynx ;;
+-i[34567]86-*-coff)	targ_emul=i386coff ;;
+-i[34567]86-*-aros*)	targ_emul=elf_i386
++i[3-7]86-*-nto-qnx*)	targ_emul=i386nto ;;
++i[3-7]86-*-vsta)	targ_emul=vsta ;;
++i[3-7]86-*-go32)	targ_emul=i386go32 ;;
++i[3-7]86-*-msdosdjgpp*) targ_emul=i386go32 ;;
++i[3-7]86-*-aix*)	targ_emul=i386coff ;;
++i[3-7]86-*-sco*)	targ_emul=i386coff ;;
++i[3-7]86-*-isc*)	targ_emul=i386coff ;;
++i[3-7]86-*-lynxos*)	targ_emul=i386lynx ;;
++i[3-7]86-*-coff)	targ_emul=i386coff ;;
++i[3-7]86-*-aros*)	targ_emul=elf_i386
+ 			targ_extra_emuls=elf_iamcu ;;
+-i[34567]86-*-rdos*)	targ_emul=elf_i386
++i[3-7]86-*-rdos*)	targ_emul=elf_i386
+ 			targ_extra_emuls=elf_iamcu ;;
+ x86_64-*-rdos*)		targ_emul=elf64rdos ;;
+ x86_64-*-cloudabi*)	targ_emul=elf_x86_64_cloudabi ;;
+-i[34567]86-*-bsd)		targ_emul=i386bsd ;;
+-i[34567]86-*-bsd386)	targ_emul=i386bsd ;;
+-i[34567]86-*-bsdi*)	targ_emul=i386bsd ;;
+-i[34567]86-*-aout)	targ_emul=i386aout ;;
+-i[34567]86-*-linux*aout*)	targ_emul=i386linux
++i[3-7]86-*-bsd)		targ_emul=i386bsd ;;
++i[3-7]86-*-bsd386)	targ_emul=i386bsd ;;
++i[3-7]86-*-bsdi*)	targ_emul=i386bsd ;;
++i[3-7]86-*-aout)	targ_emul=i386aout ;;
++i[3-7]86-*-linux*aout*)	targ_emul=i386linux
+ 			targ_extra_emuls="elf_i386 elf_iamcu"
+ 			tdir_elf_iamcu=`echo ${targ_alias} | sed -e 's/aout//'`
+ 			tdir_elf_i386=`echo ${targ_alias} | sed -e 's/aout//'` ;;
+-i[34567]86-*-linux*oldld)	targ_emul=i386linux
++i[3-7]86-*-linux*oldld)	targ_emul=i386linux
+ 			targ_extra_emuls="elf_i386 elf_iamcu" ;;
+-i[34567]86-*-linux-*)	targ_emul=elf_i386
++i[3-7]86-*-linux-*)	targ_emul=elf_i386
+ 			targ_extra_emuls="i386linux elf_iamcu"
+ 			targ64_extra_emuls="elf_x86_64 elf32_x86_64 elf_l1om elf_k1om"
+ 			targ64_extra_libpath="elf_x86_64 elf32_x86_64"
+@@ -282,13 +282,13 @@ x86_64-*-linux-*)	targ_emul=elf_x86_64
+ 			targ_extra_libpath="elf_i386 elf32_x86_64 elf_l1om elf_k1om"
+ 			tdir_i386linux=`echo ${targ_alias}aout | sed -e 's/x86_64/i386/'`
+ 			tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;;
+-i[34567]86-*-redox*)	targ_emul=elf_i386
++i[3-7]86-*-redox*)	targ_emul=elf_i386
+ 			targ_extra_emuls=elf_x86_64 ;;
+ x86_64-*-redox*)	targ_emul=elf_x86_64
+ 			targ_extra_emuls=elf_i386 ;;
+-i[34567]86-*-sysv[45]*)	targ_emul=elf_i386
++i[3-7]86-*-sysv[45]*)	targ_emul=elf_i386
+ 			targ_extra_emuls=elf_iamcu ;;
+-i[34567]86-*-solaris2*)	targ_emul=elf_i386_sol2
++i[3-7]86-*-solaris2*)	targ_emul=elf_i386_sol2
+ 			targ_extra_emuls="elf_i386_ldso elf_i386 elf_iamcu elf_x86_64_sol2 elf_x86_64 elf_l1om elf_k1om"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
+@@ -297,20 +297,20 @@ x86_64-*-solaris2*)
+ 			targ_extra_emuls="elf_x86_64 elf_i386_sol2 elf_i386_ldso elf_i386 elf_iamcu elf_l1om elf_k1om"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'` ;;
+-i[34567]86-*-unixware)	targ_emul=elf_i386
++i[3-7]86-*-unixware)	targ_emul=elf_i386
+ 			targ_extra_emuls=elf_iamcu ;;
+-i[34567]86-*-solaris*)	targ_emul=elf_i386_ldso
++i[3-7]86-*-solaris*)	targ_emul=elf_i386_ldso
+ 			targ_extra_emuls="elf_i386"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			;;
+-i[34567]86-*-netbsdelf* | \
+-i[34567]86-*-netbsd*-gnu* | \
+-i[34567]86-*-knetbsd*-gnu)
++i[3-7]86-*-netbsdelf* | \
++i[3-7]86-*-netbsd*-gnu* | \
++i[3-7]86-*-knetbsd*-gnu)
+ 			targ_emul=elf_i386
+ 			targ_extra_emuls="elf_iamcu i386nbsd" ;;
+-i[34567]86-*-netbsdpe*)	targ_emul=i386pe
++i[3-7]86-*-netbsdpe*)	targ_emul=i386pe
+ 			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
+-i[34567]86-*-netbsd*)	targ_emul=i386nbsd
++i[3-7]86-*-netbsd*)	targ_emul=i386nbsd
+ 			targ_extra_emuls=elf_i386 ;;
+ x86_64-*-netbsd*)	targ_emul=elf_x86_64
+ 			targ_extra_emuls="elf_i386 elf_iamcu i386nbsd elf_l1om elf_k1om"
+@@ -328,10 +328,10 @@ x86_64-*-netbsd*)	targ_emul=elf_x86_64
+ 			*)		tdir_elf_i386=`echo ${tdir_elf_i386} | \
+ 					sed -e 's/netbsd/netbsdelf/'`;;
+ 			esac ;;
+-i[34567]86-*-netware)	targ_emul=i386nw ;;
+-i[34567]86-*-elfiamcu)	targ_emul=elf_iamcu
++i[3-7]86-*-netware)	targ_emul=i386nw ;;
++i[3-7]86-*-elfiamcu)	targ_emul=elf_iamcu
+ 			targ_extra_emuls=elf_i386 ;;
+-i[34567]86-*-elf* | i[34567]86-*-rtems*)
++i[3-7]86-*-elf* | i[3-7]86-*-rtems*)
+ 			targ_emul=elf_i386
+ 			targ_extra_emuls=elf_iamcu ;;
+ x86_64-*-elf* | x86_64-*-rtems* | x86_64-*-fuchsia*)
+@@ -340,14 +340,14 @@ x86_64-*-elf* | x86_64-*-rtems* | x86_64-*-fuchsia*)
+ 			targ_extra_libpath="elf_i386 elf_iamcu elf32_x86_64 elf_l1om elf_k1om"
+ 			tdir_elf_i386=`echo ${targ_alias} | sed -e 's/x86_64/i386/'`
+ 			;;
+-i[34567]86-*-kaos*)	targ_emul=elf_i386 ;;
+-i[34567]86-*-freebsdaout* | i[34567]86-*-freebsd[12].* | i[34567]86-*-freebsd[12])
++i[3-7]86-*-kaos*)	targ_emul=elf_i386 ;;
++i[3-7]86-*-freebsdaout* | i[3-7]86-*-freebsd[12].* | i[3-7]86-*-freebsd[12])
+ 			targ_emul=i386bsd ;;
+-i[34567]86-*-dragonfly*)	targ_emul=elf_i386
++i[3-7]86-*-dragonfly*)	targ_emul=elf_i386
+ 			targ_extra_emuls="elf_iamcu i386bsd" ;;
+ x86_64-*-dragonfly*)	targ_emul=elf_x86_64
+ 			targ_extra_emuls="elf_i386 elf_iamcu elf_l1om elf_k1om" ;;
+-i[34567]86-*-freebsd* | i[34567]86-*-kfreebsd*-gnu)
++i[3-7]86-*-freebsd* | i[3-7]86-*-kfreebsd*-gnu)
+ 			targ_emul=elf_i386_fbsd
+ 			targ_extra_emuls="elf_i386 elf_iamcu i386bsd" ;;
+ x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
+@@ -360,21 +360,21 @@ x86_64-*-freebsd* | x86_64-*-kfreebsd*-gnu)
+ 			    | sed -e 's/x86_64/i386/'`
+ 			tdir_elf_i386=`echo ${targ_alias} \
+ 			    | sed -e 's/x86_64/i386/'` ;;
+-i[34567]86-*-sysv*)	targ_emul=i386coff ;;
+-i[34567]86-*-ptx*)	targ_emul=i386coff ;;
+-i[34567]86-*-mach*)	targ_emul=i386mach ;;
+-i[34567]86-*-gnu*)	targ_emul=elf_i386
++i[3-7]86-*-sysv*)	targ_emul=i386coff ;;
++i[3-7]86-*-ptx*)	targ_emul=i386coff ;;
++i[3-7]86-*-mach*)	targ_emul=i386mach ;;
++i[3-7]86-*-gnu*)	targ_emul=elf_i386
+ 			targ_extra_emuls=elf_iamcu ;;
+-i[34567]86-*-msdos*)	targ_emul=i386msdos; targ_extra_emuls=i386aout ;;
+-i[34567]86-*-moss*)	targ_emul=i386moss; targ_extra_emuls=i386msdos ;;
+-i[34567]86-*-winnt*)	targ_emul=i386pe ;
++i[3-7]86-*-msdos*)	targ_emul=i386msdos; targ_extra_emuls=i386aout ;;
++i[3-7]86-*-moss*)	targ_emul=i386moss; targ_extra_emuls=i386msdos ;;
++i[3-7]86-*-winnt*)	targ_emul=i386pe ;
+ 			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
+-i[34567]86-*-pe)		targ_emul=i386pe ;
++i[3-7]86-*-pe)		targ_emul=i386pe ;
+ 			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
+-i[34567]86-*-cygwin*)	targ_emul=i386pe ;
++i[3-7]86-*-cygwin*)	targ_emul=i386pe ;
+ 			targ_extra_ofiles="deffilep.o pe-dll.o" ;
+ 			test "$targ" != "$host" && LIB_PATH='${tooldir}/lib/w32api' ;;
+-i[34567]86-*-mingw32*)	targ_emul=i386pe ;
++i[3-7]86-*-mingw32*)	targ_emul=i386pe ;
+ 			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
+ x86_64-*-pe | x86_64-*-pep) targ_emul=i386pep ;
+ 			targ_extra_emuls=i386pe ;
+@@ -386,14 +386,14 @@ x86_64-*-cygwin)	targ_emul=i386pep ;
+ x86_64-*-mingw*)	targ_emul=i386pep ;
+ 			targ_extra_emuls=i386pe
+ 			targ_extra_ofiles="deffilep.o pep-dll.o pe-dll.o" ;;
+-i[34567]86-*-interix*)	targ_emul=i386pe_posix;
++i[3-7]86-*-interix*)	targ_emul=i386pe_posix;
+ 			targ_extra_ofiles="deffilep.o pe-dll.o" ;;
+-i[34567]86-*-beospe*)	targ_emul=i386beos ;;
+-i[34567]86-*-beos*)	targ_emul=elf_i386_be ;;
+-i[34567]86-*-vxworks*)	targ_emul=elf_i386_vxworks ;;
+-i[34567]86-*-chaos)	targ_emul=elf_i386_chaos
++i[3-7]86-*-beospe*)	targ_emul=i386beos ;;
++i[3-7]86-*-beos*)	targ_emul=elf_i386_be ;;
++i[3-7]86-*-vxworks*)	targ_emul=elf_i386_vxworks ;;
++i[3-7]86-*-chaos)	targ_emul=elf_i386_chaos
+ 			;;
+-i[34567]86-*-nacl*)	targ_emul=elf_i386_nacl
++i[3-7]86-*-nacl*)	targ_emul=elf_i386_nacl
+ 			targ_extra_emuls="armelf_nacl armelfb_nacl"
+ 			targ_extra_libpath=$targ_extra_emuls
+ 			targ64_extra_emuls="elf32_x86_64_nacl elf_x86_64_nacl"
+@@ -903,15 +903,15 @@ hppa*64*-*-hpux11*)
+   NATIVE_LIB_DIRS=/usr/lib/pa20_64
+   ;;
+ 
+-i[34567]86-*-sysv4*)
++i[3-7]86-*-sysv4*)
+   NATIVE_LIB_DIRS='/usr/local/lib /usr/ccs/lib /lib /usr/lib'
+   ;;
+ 
+-i[34567]86-*-solaris*)
++i[3-7]86-*-solaris*)
+   NATIVE_LIB_DIRS='/usr/local/lib /usr/ccs/lib /lib /usr/lib'
+   ;;
+ 
+-i[34567]86-pc-interix*)
++i[3-7]86-pc-interix*)
+   NATIVE_LIB_DIRS='/usr/local/lib $$INTERIX_ROOT/usr/lib /lib /usr/lib'
+   ;;
+ 
diff --git a/packages/binutils-oracle/git-43eccdca/0002-fix_to_patch_92.patch b/packages/binutils-oracle/git-43eccdca/0002-fix_to_patch_92.patch
new file mode 100644
index 00000000..41b3b9f5
--- /dev/null
+++ b/packages/binutils-oracle/git-43eccdca/0002-fix_to_patch_92.patch
@@ -0,0 +1,44 @@
+diff --git a/gold/i386.cc b/gold/i386.cc
+index a65f3a034df..3f1312c8640 100644
+--- a/gold/i386.cc
++++ b/gold/i386.cc
+@@ -1081,7 +1081,7 @@ Target_i386::record_gnu_property(
+ {
+   uint32_t val = 0;
+ 
+-  switch (pr_type)
++  switch ((unsigned int) pr_type)
+     {
+     case elfcpp::GNU_PROPERTY_X86_ISA_1_USED:
+     case elfcpp::GNU_PROPERTY_X86_ISA_1_NEEDED:
+@@ -1102,7 +1102,7 @@ Target_i386::record_gnu_property(
+       break;
+     }
+ 
+-  switch (pr_type)
++  switch ((unsigned int) pr_type)
+     {
+     case elfcpp::GNU_PROPERTY_X86_ISA_1_USED:
+       this->isa_1_used_ |= val;
+diff --git a/gold/x86_64.cc b/gold/x86_64.cc
+index 16bcffc9541..63b551957ef 100644
+--- a/gold/x86_64.cc
++++ b/gold/x86_64.cc
+@@ -1468,7 +1468,7 @@ Target_x86_64<size>::record_gnu_property(
+ {
+   uint32_t val = 0;
+ 
+-  switch (pr_type)
++  switch ((unsigned int) pr_type)
+     {
+     case elfcpp::GNU_PROPERTY_X86_ISA_1_USED:
+     case elfcpp::GNU_PROPERTY_X86_ISA_1_NEEDED:
+@@ -1489,7 +1489,7 @@ Target_x86_64<size>::record_gnu_property(
+       break;
+     }
+ 
+-  switch (pr_type)
++  switch ((unsigned int) pr_type)
+     {
+     case elfcpp::GNU_PROPERTY_X86_ISA_1_USED:
+       this->isa_1_used_ |= val;
diff --git a/packages/glibc-oracle/2.28/version.desc b/packages/glibc-oracle/2.28/version.desc
index 05402ba2..fd7da0a1 100644
--- a/packages/glibc-oracle/2.28/version.desc
+++ b/packages/glibc-oracle/2.28/version.desc
@@ -1,2 +1,2 @@
-repository_branch='oracle/glibc/ol8-u6'
-version_number='2.28-189.1.0.1'
+repository_branch='oracle/glibc/ol8-u7'
+version_number='2.28-211.0.1'
diff --git a/samples/aarch64-ol8u6-linux-gnu/crosstool.config b/samples/aarch64-ol8u6-linux-gnu/crosstool.config
index 0599d6ba..20715537 100644
--- a/samples/aarch64-ol8u6-linux-gnu/crosstool.config
+++ b/samples/aarch64-ol8u6-linux-gnu/crosstool.config
@@ -6,6 +6,7 @@ CT_KERNEL_LINUX=y
 CT_LINUX_USE_ORACLE=y
 CT_BINUTILS_USE_ORACLE=y
 CT_BINUTILS_ORACLE_V_2_30=y
+CT_BINUTILS_ORACLE_DEVEL_BRANCH="oracle/binutils/ol8-u6"
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
@@ -15,6 +16,7 @@ CT_GLIBC_EXTRA_CFLAGS="-Wno-missing-attributes -Wno-array-bounds -Wno-array-para
 CT_GLIBC_ENABLE_COMMON_FLAG=y
 CT_GLIBC_ENABLE_DEBUG=n
 CT_CC_LANG_CXX=y
+CT_GLIBC_ORACLE_DEVEL_BRANCH="oracle/glibc/ol8-u6"
 CT_GCC_USE_ORACLE=y
 CT_ISL_V_0_16=y
 CT_GCC_ORACLE_V_8=y
diff --git a/samples/aarch64-ol8u7-linux-gnu/crosstool.config b/samples/aarch64-ol8u7-linux-gnu/crosstool.config
new file mode 100644
index 00000000..122e982e
--- /dev/null
+++ b/samples/aarch64-ol8u7-linux-gnu/crosstool.config
@@ -0,0 +1,24 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_ARM=y
+CT_ARCH_64=y
+CT_TARGET_VENDOR="ol8u7"
+CT_KERNEL_LINUX=y
+CT_LINUX_USE_ORACLE=y
+CT_BINUTILS_USE_ORACLE=y
+CT_BINUTILS_ORACLE_V_2_30=y
+CT_BINUTILS_ORACLE_DEVEL_BRANCH="oracle/binutils/ol8-u7"
+CT_BINUTILS_LINKER_LD_GOLD=y
+CT_BINUTILS_GOLD_THREADS=y
+CT_BINUTILS_LD_WRAPPER=y
+CT_BINUTILS_PLUGINS=y
+CT_GLIBC_USE_ORACLE=y
+CT_GLIBC_EXTRA_CFLAGS="-Wno-missing-attributes -Wno-array-bounds -Wno-array-parameter -Wno-stringop-overflow -Wno-maybe-uninitialized"
+CT_GLIBC_ENABLE_COMMON_FLAG=y
+CT_GLIBC_ENABLE_DEBUG=n
+CT_CC_LANG_CXX=y
+CT_GLIBC_ORACLE_DEVEL_BRANCH="oracle/glibc/ol8-u7"
+CT_GCC_USE_ORACLE=y
+CT_ISL_V_0_16=y
+CT_GCC_ORACLE_V_8=y
+CT_GCC_ORACLE_VERSION="8.7.0"
+CT_GCC_ORACLE_DEVEL_BRANCH="oracle/gcc/ol8-u7-aarch64"
diff --git a/samples/aarch64-ol8u7-linux-gnu/reported.by b/samples/aarch64-ol8u7-linux-gnu/reported.by
new file mode 100644
index 00000000..cdb5e85c
--- /dev/null
+++ b/samples/aarch64-ol8u7-linux-gnu/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Cupertino Miranda"
+reporter_url=""
+reporter_comment="OL 8.7 toolchain configured for aarch64"
diff --git a/samples/i686-ol8u6-linux-gnu/crosstool.config b/samples/i686-ol8u6-linux-gnu/crosstool.config
index 7f937cd0..42339af2 100644
--- a/samples/i686-ol8u6-linux-gnu/crosstool.config
+++ b/samples/i686-ol8u6-linux-gnu/crosstool.config
@@ -6,6 +6,7 @@ CT_KERNEL_LINUX=y
 CT_LINUX_USE_ORACLE=y
 CT_BINUTILS_USE_ORACLE=y
 CT_BINUTILS_ORACLE_V_2_30=y
+CT_BINUTILS_ORACLE_DEVEL_BRANCH="oracle/binutils/ol8-u6"
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
@@ -15,6 +16,7 @@ CT_GLIBC_EXTRA_CFLAGS="-Wno-missing-attributes -Wno-array-bounds -Wno-array-para
 CT_GLIBC_ENABLE_COMMON_FLAG=y
 CT_GLIBC_ENABLE_DEBUG=n
 CT_CC_LANG_CXX=y
+CT_GLIBC_ORACLE_DEVEL_BRANCH="oracle/glibc/ol8-u6"
 CT_GCC_USE_ORACLE=y
 CT_ISL_V_0_16=y
 CT_GCC_ORACLE_V_8=y
diff --git a/samples/i686-ol8u7-linux-gnu/crosstool.config b/samples/i686-ol8u7-linux-gnu/crosstool.config
new file mode 100644
index 00000000..ff453dd7
--- /dev/null
+++ b/samples/i686-ol8u7-linux-gnu/crosstool.config
@@ -0,0 +1,24 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_X86=y
+CT_ARCH_ARCH="i686"
+CT_TARGET_VENDOR="ol8u7"
+CT_KERNEL_LINUX=y
+CT_LINUX_USE_ORACLE=y
+CT_BINUTILS_USE_ORACLE=y
+CT_BINUTILS_ORACLE_V_2_30=y
+CT_BINUTILS_ORACLE_DEVEL_BRANCH="oracle/binutils/ol8-u7"
+CT_BINUTILS_LINKER_LD_GOLD=y
+CT_BINUTILS_GOLD_THREADS=y
+CT_BINUTILS_LD_WRAPPER=y
+CT_BINUTILS_PLUGINS=y
+CT_GLIBC_USE_ORACLE=y
+CT_GLIBC_EXTRA_CFLAGS="-Wno-missing-attributes -Wno-array-bounds -Wno-array-parameter -Wno-stringop-overflow -Wno-maybe-uninitialized"
+CT_GLIBC_ENABLE_COMMON_FLAG=y
+CT_GLIBC_ENABLE_DEBUG=n
+CT_CC_LANG_CXX=y
+CT_GLIBC_ORACLE_DEVEL_BRANCH="oracle/glibc/ol8-u7"
+CT_GCC_USE_ORACLE=y
+CT_ISL_V_0_16=y
+CT_GCC_ORACLE_V_8=y
+CT_GCC_ORACLE_VERSION="8.5.0"
+CT_GCC_ORACLE_DEVEL_BRANCH="oracle/gcc/ol8-u7-x86"
diff --git a/samples/i686-ol8u7-linux-gnu/reported.by b/samples/i686-ol8u7-linux-gnu/reported.by
new file mode 100644
index 00000000..4e341b6d
--- /dev/null
+++ b/samples/i686-ol8u7-linux-gnu/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Cupertino Miranda"
+reporter_url=""
+reporter_comment="OL 8.7 toolchain configured for i686"
diff --git a/samples/x86_64-ol8u6-linux-gnu/crosstool.config b/samples/x86_64-ol8u6-linux-gnu/crosstool.config
index ddb41447..a314d189 100644
--- a/samples/x86_64-ol8u6-linux-gnu/crosstool.config
+++ b/samples/x86_64-ol8u6-linux-gnu/crosstool.config
@@ -6,6 +6,7 @@ CT_KERNEL_LINUX=y
 CT_LINUX_USE_ORACLE=y
 CT_BINUTILS_USE_ORACLE=y
 CT_BINUTILS_ORACLE_V_2_30=y
+CT_BINUTILS_ORACLE_DEVEL_BRANCH="oracle/binutils/ol8-u6"
 CT_BINUTILS_LINKER_LD_GOLD=y
 CT_BINUTILS_GOLD_THREADS=y
 CT_BINUTILS_LD_WRAPPER=y
@@ -15,6 +16,7 @@ CT_GLIBC_EXTRA_CFLAGS="-Wno-missing-attributes -Wno-array-bounds -Wno-array-para
 CT_GLIBC_ENABLE_COMMON_FLAG=y
 CT_GLIBC_ENABLE_DEBUG=n
 CT_CC_LANG_CXX=y
+CT_GLIBC_ORACLE_DEVEL_BRANCH="oracle/glibc/ol8-u6"
 CT_GCC_USE_ORACLE=y
 CT_ISL_V_0_16=y
 CT_GCC_ORACLE_V_8=y
diff --git a/samples/x86_64-ol8u7-linux-gnu/crosstool.config b/samples/x86_64-ol8u7-linux-gnu/crosstool.config
new file mode 100644
index 00000000..b01c7088
--- /dev/null
+++ b/samples/x86_64-ol8u7-linux-gnu/crosstool.config
@@ -0,0 +1,24 @@
+CT_CONFIG_VERSION="4"
+CT_ARCH_X86=y
+CT_ARCH_64=y
+CT_TARGET_VENDOR="ol8u7"
+CT_KERNEL_LINUX=y
+CT_LINUX_USE_ORACLE=y
+CT_BINUTILS_USE_ORACLE=y
+CT_BINUTILS_ORACLE_V_2_30=y
+CT_BINUTILS_ORACLE_DEVEL_BRANCH="oracle/binutils/ol8-u7"
+CT_BINUTILS_LINKER_LD_GOLD=y
+CT_BINUTILS_GOLD_THREADS=y
+CT_BINUTILS_LD_WRAPPER=y
+CT_BINUTILS_PLUGINS=y
+CT_GLIBC_USE_ORACLE=y
+CT_GLIBC_EXTRA_CFLAGS="-Wno-missing-attributes -Wno-array-bounds -Wno-array-parameter -Wno-stringop-overflow -Wno-maybe-uninitialized"
+CT_GLIBC_ENABLE_COMMON_FLAG=y
+CT_GLIBC_ENABLE_DEBUG=n
+CT_CC_LANG_CXX=y
+CT_GLIBC_ORACLE_DEVEL_BRANCH="oracle/glibc/ol8-u7"
+CT_GCC_USE_ORACLE=y
+CT_ISL_V_0_16=y
+CT_GCC_ORACLE_V_8=y
+CT_GCC_ORACLE_VERSION="8.7.0"
+CT_GCC_ORACLE_DEVEL_BRANCH="oracle/gcc/ol8-u7-x86"
diff --git a/samples/x86_64-ol8u7-linux-gnu/reported.by b/samples/x86_64-ol8u7-linux-gnu/reported.by
new file mode 100644
index 00000000..35d826be
--- /dev/null
+++ b/samples/x86_64-ol8u7-linux-gnu/reported.by
@@ -0,0 +1,3 @@
+reporter_name="Cupertino Miranda"
+reporter_url=""
+reporter_comment="OL 8.7 toolchain configured for x86_64"