# <http://www.gnu.org/licenses/>.
#
-MULTILIB_OPTIONS = msoft-float mcpu=v8/mcpu=leon3/mcpu=leon3v7/mcpu=leon \
- mfix-ut699/mfix-at697f/mfix-gr712rc
-MULTILIB_DIRNAMES = soft v8 leon3 leon3v7 leon ut699 at697f gr712rc
+MULTILIB_OPTIONS =
+MULTILIB_DIRNAMES =
+
+MULTILIB_OPTIONS += msoft-float
+MULTILIB_DIRNAMES += soft
+
+MULTILIB_OPTIONS += mcpu=v8/mcpu=leon3/mcpu=leon3v7/mcpu=leon/mcpu=leon5
+MULTILIB_DIRNAMES += v8 leon3 leon3v7 leon leon5
+
+MULTILIB_OPTIONS += mfix-ut699/mfix-at697f/mfix-gr712rc
+MULTILIB_DIRNAMES += ut699 at697f gr712rc
+
MULTILIB_MATCHES = msoft-float=mno-fpu mfix-gr712rc=mfix-ut700
MULTILIB_REQUIRED =
MULTILIB_REQUIRED += mcpu=leon3v7/mfix-gr712rc
MULTILIB_REQUIRED += mcpu=leon/mfix-ut699
MULTILIB_REQUIRED += mcpu=leon/mfix-at697f
+MULTILIB_REQUIRED += mcpu=leon5
MULTILIB_REQUIRED += msoft-float/mcpu=v8
MULTILIB_REQUIRED += msoft-float/mcpu=leon3
MULTILIB_REQUIRED += msoft-float/mcpu=leon3v7
MULTILIB_REQUIRED += msoft-float/mcpu=leon3v7/mfix-gr712rc
MULTILIB_REQUIRED += msoft-float/mcpu=leon/mfix-ut699
MULTILIB_REQUIRED += msoft-float/mcpu=leon/mfix-at697f
+MULTILIB_REQUIRED += msoft-float/mcpu=leon5