From 7ab9108c07cff87c60f3dcf472cf7d887d7e930b Mon Sep 17 00:00:00 2001
From: Hugo Villeneuve <hugo@hugovil.com>
Date: Sat, 19 Sep 2015 20:48:06 -0400
Subject: [PATCH] Add multilib support for avr5 architecture

---
 stage0/pkg/binutils | 9 +++++++--
 stage0/pkg/gcc      | 9 +++++++--
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/stage0/pkg/binutils b/stage0/pkg/binutils
index 5a057a1..d4c51e6 100644
--- a/stage0/pkg/binutils
+++ b/stage0/pkg/binutils
@@ -15,8 +15,13 @@ hvconfig_pre()
         --with-sysroot=${CLFS} \
         --with-lib-path=${CLFS}/dummy-directory/ \
         --disable-nls \
-        --enable-shared \
-        --disable-multilib"
+        --enable-shared"
+
+    if [ x"${HVL_TARGET}" == x"avr" ]; then
+        CONFIGURE_OPTS+="--enable-multilib"
+    else
+        CONFIGURE_OPTS+="--disable-multilib"
+    fi
 
     # --enable-64-bit-bfd:
     # bfd = Binary File Descriptor
diff --git a/stage0/pkg/gcc b/stage0/pkg/gcc
index fab1a51..7fe5c65 100644
--- a/stage0/pkg/gcc
+++ b/stage0/pkg/gcc
@@ -34,8 +34,13 @@ hvconfig_pre()
         --with-cloog=${CROSS_TOOLS_DIR} \
         --with-mpc=${CROSS_TOOLS_DIR}
         --with-system-zlib \
-        --enable-checking=release \
-        --disable-multilib"
+        --enable-checking=release"
+
+    if [ x"${HVL_TARGET}" == x"avr" ]; then
+        CONFIGURE_OPTS+="--enable-multilib"
+    else
+        CONFIGURE_OPTS+="--disable-multilib"
+    fi
 
     if [ "x${HVLABEL}" = "x${GCC}-pass1" ]; then
         # --without-headers:
-- 
2.20.1