From 77f7450d265f70afc32b7d9ffd0e797c102aa347 Mon Sep 17 00:00:00 2001 From: Andrew Waterman Date: Thu, 10 Sep 2015 13:28:41 -0700 Subject: [PATCH] Fix --enable-multilib for Newlib toolchain You now need to explicitly pass this flag to turn on multilib support. --- Makefile.in | 3 ++- configure | 2 +- configure.ac | 2 +- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile.in b/Makefile.in index 3c069ad5..52a83c06 100755 --- a/Makefile.in +++ b/Makefile.in @@ -159,8 +159,8 @@ stamps/build-gcc-linux-stage1: src/gcc stamps/build-binutils-linux \ --disable-libquadmath \ --disable-libgomp \ --disable-nls \ - $(MULTILIB_FLAGS) \ --disable-bootstrap \ + $(MULTILIB_FLAGS) \ $(WITH_ARCH) $(MAKE) -C $(notdir $@) inhibit-libc=true all-gcc $(MAKE) -C $(notdir $@) inhibit-libc=true install-gcc @@ -226,6 +226,7 @@ stamps/build-gcc-newlib: src/newlib-gcc stamps/build-binutils-newlib --disable-libquadmath \ --disable-libgomp \ --disable-nls \ + $(MULTILIB_FLAGS) \ $(WITH_ARCH) $(MAKE) -C $(notdir $@) inhibit-libc=true $(MAKE) -C $(notdir $@) install diff --git a/configure b/configure index 1b9a5ac5..c323c3a0 100755 --- a/configure +++ b/configure @@ -1280,7 +1280,7 @@ Optional Features: [--enable-atomic] --disable-float use software floating point in glibc [--enable-float] - --enable-multilib build multilib glibc (32 and 64 bit) + --enable-multilib build both RV32 and RV64 runtime libraries [--disable-multilib] Optional Packages: diff --git a/configure.ac b/configure.ac index 2625aa0c..6bec4fea 100644 --- a/configure.ac +++ b/configure.ac @@ -89,7 +89,7 @@ AC_SUBST(glibc_configure_flags,--without-fp)]) AC_ARG_ENABLE(multilib, [AS_HELP_STRING([--enable-multilib], - [build multilib glibc (32 and 64 bit) @<:@--disable-multilib@:>@])], + [build both RV32 and RV64 runtime libraries @<:@--disable-multilib@:>@])], [], [enable_multilib=no] )