Merge pull request #54 from palmer-dabbelt/with-base-isa

Add "--with-base-isa" to configure

Makefile.in

@@ -16,6 +16,7 @@ glibc_url := $(GNU_MIRROR)/glibc/glibc-$(glibc_version).tar.gz
 newlib_url := ftp://sourceware.org/pub/newlib/newlib-$(newlib_version).tar.gz
 
 XLEN ?= @XLEN@
+BASE_ISA ?= @BASE_ISA@
 SYSROOT := $(INSTALL_DIR)/sysroot
 
 SHELL := /bin/sh
@@ -159,7 +160,8 @@ stamps/build-gcc-linux-stage1: src/gcc stamps/build-binutils-linux \
 		--disable-libgomp \
 		--disable-nls \
 		$(MULTILIB_FLAGS) \
-		--disable-bootstrap
+		--disable-bootstrap \
+		--with-arch=RV$(XLEN)$(BASE_ISA)
 	$(MAKE) -C $(notdir $@) inhibit-libc=true all-gcc
 	$(MAKE) -C $(notdir $@) inhibit-libc=true install-gcc
 	$(MAKE) -C $(notdir $@) inhibit-libc=true all-target-libgcc
@@ -182,7 +184,8 @@ stamps/build-gcc-linux-stage2: src/gcc stamps/build-glibc-linux$(XLEN) \
 		--disable-libquadmath \
 		--disable-nls \
 		$(MULTILIB_FLAGS) \
-		--disable-bootstrap
+		--disable-bootstrap \
+		--with-arch=RV$(XLEN)$(BASE_ISA)
 	$(MAKE) -C $(notdir $@)
 	$(MAKE) -C $(notdir $@) install
 	mkdir -p $(dir $@) && touch $@
@@ -222,7 +225,8 @@ stamps/build-gcc-newlib: src/newlib-gcc stamps/build-binutils-newlib
 		--disable-libssp \
 		--disable-libquadmath \
 		--disable-libgomp \
-		--disable-nls
+		--disable-nls \
+		--with-arch=RV$(XLEN)$(BASE_ISA)
 	$(MAKE) -C $(notdir $@) inhibit-libc=true
 	$(MAKE) -C $(notdir $@) install
 	mkdir -p $(dir $@) && touch $@

configure

@@ -589,6 +589,7 @@ glibc_configure_flags
 float_asflags
 float_cflags
 atomic_cflags
+BASE_ISA
 XLEN
 default_target
 FETCHER
@@ -651,6 +652,7 @@ ac_user_opts='
 enable_option_checking
 enable_linux
 with_xlen
+with_base_isa
 enable_atomic
 enable_float
 enable_multilib
@@ -1285,6 +1287,8 @@ Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-xlen=XLEN        Set XLEN, the X-register bit width (default is 64)
+  --with-base-isa=G/I     Sets the base RISC-V ISA to either G or I, defaults
+                          to G
 
 Some influential environment variables:
   CC          C compiler command
@@ -3147,6 +3151,18 @@ else
 fi
 
 
+
+# Check whether --with-base-isa was given.
+if test "${with_base_isa+set}" = set; then :
+  withval=$with_base_isa; BASE_ISA=$withval
+
+else
+  BASE_ISA=G
+
+
+fi
+
+
 # Check whether --enable-atomic was given.
 if test "${enable_atomic+set}" = set; then :
   enableval=$enable_atomic;

configure.ac

@@ -56,6 +56,13 @@ AC_ARG_WITH(xlen,
 	AC_SUBST(XLEN, 64)
 	)
 
+AC_ARG_WITH(base-isa,
+	[AS_HELP_STRING([--with-base-isa=G/I],
+		[Sets the base RISC-V ISA to either G or I, defaults to G])],
+	AC_SUBST(BASE_ISA, $withval),
+	AC_SUBST(BASE_ISA, G)
+	)
+
 AC_ARG_ENABLE(atomic,
 	[AS_HELP_STRING([--disable-atomic],
 		[disable use of atomic memory instructions in glibc @<:@--enable-atomic@:>@])],