diff options
author | Palmer Dabbelt <palmer@dabbelt.com> | 2017-08-20 13:51:22 -0700 |
---|---|---|
committer | Palmer Dabbelt <palmer@dabbelt.com> | 2017-08-20 13:51:22 -0700 |
commit | d0f8935bfac067d41d22d573644c8469fa12381e (patch) | |
tree | 8065773c81befd76530977f71fcfddc5d53ff468 | |
parent | e62c25a77927e43bc4f1a7f95b591d2fd24d0fab (diff) | |
download | riscv-gnu-toolchain-d0f8935bfac067d41d22d573644c8469fa12381e.zip riscv-gnu-toolchain-d0f8935bfac067d41d22d573644c8469fa12381e.tar.gz riscv-gnu-toolchain-d0f8935bfac067d41d22d573644c8469fa12381e.tar.bz2 |
Always set the multilib list
-rw-r--r-- | Makefile.in | 9 | ||||
-rwxr-xr-x | configure | 17 | ||||
-rw-r--r-- | configure.ac | 2 |
3 files changed, 22 insertions, 6 deletions
diff --git a/Makefile.in b/Makefile.in index cbbe218..87f21bc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40,10 +40,6 @@ ifneq ($(XLEN),32) XLEN := 64 endif -ifeq ($(MULTILIB_NAMES),) - MULTILIB_NAMES := $(XLEN) -endif - make_tuple = riscv$(1)-unknown-$(2) LINUX_TUPLE ?= $(call make_tuple,$(XLEN),linux-gnu) NEWLIB_TUPLE ?= $(call make_tuple,$(XLEN),elf) @@ -119,8 +115,13 @@ stamps/build-glibc-linux-headers: $(srcdir)/riscv-glibc stamps/build-gcc-linux-s mkdir -p $(dir $@) && touch $@ stamps/build-glibc-linux-%: $(srcdir)/riscv-glibc stamps/build-gcc-linux-stage1 +ifeq ($(MULTILIB_FLAGS),--enable-multilib) $(eval $@_ARCH := $(word 4,$(subst -, ,$@))) $(eval $@_ABI := $(word 5,$(subst -, ,$@))) +else + $(eval $@_ARCH := ) + $(eval $@_ABI := ) +endif $(eval $@_LIBDIRSUFFIX := $(if $($@_ABI),$(shell echo $($@_ARCH) | sed 's/.*rv\([0-9]*\).*/\1/')/$($@_ABI),)) $(eval $@_XLEN := $(if $($@_ABI),$(shell echo $($@_ARCH) | sed 's/.*rv\([0-9]*\).*/\1/'),$(XLEN))) $(eval $@_CFLAGS := $(if $($@_ABI),-march=$($@_ARCH) -mabi=$($@_ABI),)) @@ -630,6 +630,7 @@ infodir docdir oldincludedir includedir +runstatedir localstatedir sharedstatedir sysconfdir @@ -709,6 +710,7 @@ datadir='${datarootdir}' sysconfdir='${prefix}/etc' sharedstatedir='${prefix}/com' localstatedir='${prefix}/var' +runstatedir='${localstatedir}/run' includedir='${prefix}/include' oldincludedir='/usr/include' docdir='${datarootdir}/doc/${PACKAGE_TARNAME}' @@ -961,6 +963,15 @@ do | -silent | --silent | --silen | --sile | --sil) silent=yes ;; + -runstatedir | --runstatedir | --runstatedi | --runstated \ + | --runstate | --runstat | --runsta | --runst | --runs \ + | --run | --ru | --r) + ac_prev=runstatedir ;; + -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \ + | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \ + | --run=* | --ru=* | --r=*) + runstatedir=$ac_optarg ;; + -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb) ac_prev=sbindir ;; -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \ @@ -1098,7 +1109,7 @@ fi for ac_var in exec_prefix prefix bindir sbindir libexecdir datarootdir \ datadir sysconfdir sharedstatedir localstatedir includedir \ oldincludedir docdir infodir htmldir dvidir pdfdir psdir \ - libdir localedir mandir + libdir localedir mandir runstatedir do eval ac_val=\$$ac_var # Remove trailing slashes. @@ -1251,6 +1262,7 @@ Fine tuning of the installation directories: --sysconfdir=DIR read-only single-machine data [PREFIX/etc] --sharedstatedir=DIR modifiable architecture-independent data [PREFIX/com] --localstatedir=DIR modifiable single-machine data [PREFIX/var] + --runstatedir=DIR modifiable per-process data [LOCALSTATEDIR/run] --libdir=DIR object code libraries [EPREFIX/lib] --includedir=DIR C header files [PREFIX/include] --oldincludedir=DIR C header files for non-gcc [/usr/include] @@ -3289,6 +3301,9 @@ fi if test "x$enable_multilib" != xno; then : multilib_names="rv32imac-ilp32 rv32imafdc-ilp32d rv64imac-lp64 rv64imafdc-lp64d" +else + multilib_names="$with_arch-$with_abi" + fi # Check whether --enable-gcc-checking was given. diff --git a/configure.ac b/configure.ac index f9c7733..949c73d 100644 --- a/configure.ac +++ b/configure.ac @@ -98,7 +98,7 @@ AS_IF([test "x$enable_multilib" != xno], AS_IF([test "x$enable_multilib" != xno], [AC_SUBST(multilib_names,"rv32imac-ilp32 rv32imafdc-ilp32d rv64imac-lp64 rv64imafdc-lp64d")], - []) + [AC_SUBST(multilib_names,"$with_arch-$with_abi")]) AC_ARG_ENABLE(gcc-checking, [AS_HELP_STRING([--enable-gcc-checking], |