--- build-toolchain.sh.orig	2020-06-19 05:16:56.012202933 +0100
+++ build-toolchain.sh	2020-06-19 05:16:21.489672387 +0100
@@ -272,7 +272,8 @@
 pushd $BUILDDIR_NATIVE/gcc-first
 $SRCDIR/$GCC/configure --target=$TARGET \
     --prefix=$INSTALLDIR_NATIVE \
-    --libexecdir=$INSTALLDIR_NATIVE/lib \
+    --libexecdir=$INSTALLDIR_NATIVE/libexec \
+    --libdir=$INSTALLDIR_NATIVE/lib64 \
     --infodir=$INSTALLDIR_NATIVE_DOC/info \
     --mandir=$INSTALLDIR_NATIVE_DOC/man \
     --htmldir=$INSTALLDIR_NATIVE_DOC/html \
@@ -308,7 +309,7 @@
 
 pushd $INSTALLDIR_NATIVE
 rm -rf bin/arm-none-eabi-gccbug
-rm -rf ./lib/libiberty.a
+rm -rf ./lib64/libiberty.a
 rm -rf  include
 popd
 
@@ -323,6 +324,7 @@
     $NEWLIB_CONFIG_OPTS \
     --target=$TARGET \
     --prefix=$INSTALLDIR_NATIVE \
+    --libdir=$INSTALLDIR_NATIVE/lib64 \
     --infodir=$INSTALLDIR_NATIVE_DOC/info \
     --mandir=$INSTALLDIR_NATIVE_DOC/man \
     --htmldir=$INSTALLDIR_NATIVE_DOC/html \
@@ -392,7 +394,8 @@
 
 $SRCDIR/$GCC/configure --target=$TARGET \
     --prefix=$INSTALLDIR_NATIVE \
-    --libexecdir=$INSTALLDIR_NATIVE/lib \
+    --libexecdir=$INSTALLDIR_NATIVE/libexec \
+    --libdir=$INSTALLDIR_NATIVE/lib64 \
     --infodir=$INSTALLDIR_NATIVE_DOC/info \
     --mandir=$INSTALLDIR_NATIVE_DOC/man \
     --htmldir=$INSTALLDIR_NATIVE_DOC/html \
@@ -589,7 +592,7 @@
     if [ "x$BUILD" == "xx86_64-apple-darwin10" ]; then
         STRIP_BINARIES=$(find $INSTALLDIR_NATIVE/lib/gcc/arm-none-eabi/$GCC_VER/ -maxdepth 1 -name \* -perm +111 -and ! -type d)
     else
-        STRIP_BINARIES=$(find $INSTALLDIR_NATIVE/lib/gcc/arm-none-eabi/$GCC_VER/ -maxdepth 1 -name \* -perm /111 -and ! -type d)
+        STRIP_BINARIES=$(find $INSTALLDIR_NATIVE/libexec/gcc/arm-none-eabi/$GCC_VER/ -maxdepth 1 -name \* -perm /111 -and ! -type d)
     fi
     for bin in $STRIP_BINARIES ; do
         strip_binary strip $bin
@@ -609,12 +612,12 @@
     arm-none-eabi-objcopy -R .comment -R .note -R .debug_info -R .debug_aranges -R .debug_pubnames -R .debug_pubtypes -R .debug_abbrev -R .debug_line -R .debug_str -R .debug_ranges -R .debug_loc $target_obj || true
 done
 
-TARGET_LIBRARIES=$(find $INSTALLDIR_NATIVE/lib/gcc/arm-none-eabi/$GCC_VER -name \*.a)
+TARGET_LIBRARIES=$(find $INSTALLDIR_NATIVE/lib64/gcc/arm-none-eabi/$GCC_VER -name \*.a)
 for target_lib in $TARGET_LIBRARIES ; do
     arm-none-eabi-objcopy -R .comment -R .note -R .debug_info -R .debug_aranges -R .debug_pubnames -R .debug_pubtypes -R .debug_abbrev -R .debug_line -R .debug_str -R .debug_ranges -R .debug_loc $target_lib || true
 done
 
-TARGET_OBJECTS=$(find $INSTALLDIR_NATIVE/lib/gcc/arm-none-eabi/$GCC_VER -name \*.o)
+TARGET_OBJECTS=$(find $INSTALLDIR_NATIVE/lib64/gcc/arm-none-eabi/$GCC_VER -name \*.o)
 for target_obj in $TARGET_OBJECTS ; do
     arm-none-eabi-objcopy -R .comment -R .note -R .debug_info -R .debug_aranges -R .debug_pubnames -R .debug_pubtypes -R .debug_abbrev -R .debug_line -R .debug_str -R .debug_ranges -R .debug_loc $target_obj || true
 done
@@ -651,7 +654,7 @@
     --exclude=host-$HOST_MINGW              \
     $INSTALL_PACKAGE_NAME/arm-none-eabi     \
     $INSTALL_PACKAGE_NAME/bin               \
-    $INSTALL_PACKAGE_NAME/lib               \
+    $INSTALL_PACKAGE_NAME/lib64             \
     $INSTALL_PACKAGE_NAME/share
 
 # Remove stale links.