@@ -17,6 +17,20 @@
# <http://www.gnu.org/licenses/>.
#
-MULTILIB_OPTIONS = msoft-float mcpu=v8/mcpu=leon3
-MULTILIB_DIRNAMES = soft v8 leon3
+MULTILIB_OPTIONS = msoft-float mcpu=v8/mcpu=leon3 muser-mode
+MULTILIB_DIRNAMES = soft v8 leon3 user-mode
MULTILIB_MATCHES = msoft-float=mno-fpu
+
+# Enumeration of multilibs
+
+MULTILIB_EXCEPTIONS += msoft-float/mcpu=v8/muser-mode
+# MULTILIB_EXCEPTIONS += msoft-float/mcpu=v8
+# MULTILIB_EXCEPTIONS += msoft-float/mcpu=leon3/muser-mode
+MULTILIB_EXCEPTIONS += msoft-float/mcpu=leon3
+MULTILIB_EXCEPTIONS += msoft-float/muser-mode
+# MULTILIB_EXCEPTIONS += msoft-float
+MULTILIB_EXCEPTIONS += mcpu=v8/muser-mode
+# MULTILIB_EXCEPTIONS += mcpu=v8
+# MULTILIB_EXCEPTIONS += mcpu=leon3/muser-mode
+MULTILIB_EXCEPTIONS += mcpu=leon3
+MULTILIB_EXCEPTIONS += muser-mode