Merge pull request #404 from riscv/with-tune-patch

Add toplevel --with-tune= configure option.

Makefile.in

@@ -21,6 +21,7 @@ newlib_url := ftp://sourceware.org/pub/newlib/newlib-$(newlib_version).tar.gz
 
 WITH_ARCH ?= @WITH_ARCH@
 WITH_ABI ?= @WITH_ABI@
+WITH_TUNE ?= @WITH_TUNE@
 SYSROOT := $(INSTALL_DIR)/sysroot
 
 SHELL := /bin/sh
@@ -299,6 +300,7 @@ stamps/build-gcc-linux-stage1: $(srcdir)/riscv-gcc stamps/build-binutils-linux \
 		$(MULTILIB_FLAGS) \
 		$(WITH_ABI) \
 		$(WITH_ARCH) \
+		$(WITH_TUNE) \
 		CFLAGS_FOR_TARGET="-O2 $(CFLAGS_FOR_TARGET)" \
 		CXXFLAGS_FOR_TARGET="-O2 $(CXXFLAGS_FOR_TARGET)"
 	$(MAKE) -C $(notdir $@) inhibit-libc=true all-gcc
@@ -330,6 +332,7 @@ stamps/build-gcc-linux-stage2: $(srcdir)/riscv-gcc $(addprefix stamps/build-glib
 		$(MULTILIB_FLAGS) \
 		$(WITH_ABI) \
 		$(WITH_ARCH) \
+		$(WITH_TUNE) \
 		CFLAGS_FOR_TARGET="-O2 $(CFLAGS_FOR_TARGET)" \
 		CXXFLAGS_FOR_TARGET="-O2 $(CXXFLAGS_FOR_TARGET)"
 	$(MAKE) -C $(notdir $@)
@@ -380,7 +383,8 @@ stamps/build-gcc-linux-native: $(srcdir)/riscv-gcc stamps/build-gcc-linux-stage2
 		$(GCC_CHECKING_FLAGS) \
 		$(MULTILIB_FLAGS) \
 		$(WITH_ABI) \
-		$(WITH_ARCH)
+		$(WITH_ARCH) \
+		$(WITH_TUNE)
 	$(MAKE) -C $(notdir $@)
 	$(MAKE) -C $(notdir $@) install
 	cp -a $(INSTALL_DIR)/$(LINUX_TUPLE)/lib* $(SYSROOT)
@@ -455,6 +459,7 @@ stamps/build-gcc-newlib-stage1: $(srcdir)/riscv-gcc stamps/build-binutils-newlib
 		$(MULTILIB_FLAGS) \
 		$(WITH_ABI) \
 		$(WITH_ARCH) \
+		$(WITH_TUNE) \
 		CFLAGS_FOR_TARGET="-Os $(CFLAGS_FOR_TARGET)" \
 		CXXFLAGS_FOR_TARGET="-Os $(CXXFLAGS_FOR_TARGET)"
 	$(MAKE) -C $(notdir $@) all-gcc
@@ -547,6 +552,7 @@ stamps/build-gcc-newlib-stage2: $(srcdir)/riscv-gcc stamps/build-newlib \
 		$(MULTILIB_FLAGS) \
 		$(WITH_ABI) \
 		$(WITH_ARCH) \
+		$(WITH_TUNE) \
 		CFLAGS_FOR_TARGET="-Os $(CFLAGS_FOR_TARGET)" \
 		CXXFLAGS_FOR_TARGET="-Os $(CXXFLAGS_FOR_TARGET)"
 	$(MAKE) -C $(notdir $@)
@@ -606,6 +612,7 @@ stamps/build-gcc-musl-stage1: $(srcdir)/riscv-gcc stamps/build-binutils-musl \
 		--disable-multilib \
 		$(WITH_ABI) \
 		$(WITH_ARCH) \
+		$(WITH_TUNE) \
 		CFLAGS_FOR_TARGET="-O2 $(CFLAGS_FOR_TARGET)" \
 		CXXFLAGS_FOR_TARGET="-O2 $(CXXFLAGS_FOR_TARGET)"
 	$(MAKE) -C $(notdir $@) inhibit-libc=true all-gcc
@@ -669,6 +676,7 @@ stamps/build-gcc-musl-stage2: $(srcdir)/riscv-gcc stamps/build-musl-linux \
 		--disable-multilib \
 		$(WITH_ABI) \
 		$(WITH_ARCH) \
+		$(WITH_TUNE) \
 		CFLAGS_FOR_TARGET="-O2 $(CFLAGS_FOR_TARGET)" \
 		CXXFLAGS_FOR_TARGET="-O2 $(CXXFLAGS_FOR_TARGET)"
 	$(MAKE) -C $(notdir $@)
@@ -677,7 +685,6 @@ stamps/build-gcc-musl-stage2: $(srcdir)/riscv-gcc stamps/build-musl-linux \
 	mkdir -p $(dir $@) && touch $@
 
 
-
 stamps/build-qemu: $(srcdir)/riscv-qemu
 	rm -rf $@ $(notdir $@)
 	mkdir $(notdir $@)

configure

@@ -593,6 +593,7 @@ gcc_checking
 newlib_multilib_names
 glibc_multilib_names
 multilib_flags
+WITH_TUNE
 WITH_ABI
 WITH_ARCH
 default_target
@@ -658,6 +659,7 @@ enable_option_checking
 enable_linux
 with_arch
 with_abi
+with_tune
 enable_multilib
 enable_gcc_checking
 with_cmodel
@@ -1308,6 +1310,7 @@ Optional Packages:
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-arch=rv64imafdc  Sets the base RISC-V ISA, defaults to rv64imafdc
   --with-abi=lp64d        Sets the base RISC-V ABI, defaults to lp64d
+  --with-tune=rocket      Set the base RISC-V CPU, defaults to rocket
   --with-cmodel           Select the code model to use when building libc and
                           libgcc [--with-cmodel=medlow]
   --with-host=x86_64-w64-mingw32
@@ -3248,6 +3251,16 @@ else
 fi
 
 
+
+# Check whether --with-tune was given.
+if test "${with_tune+set}" = set; then :
+  withval=$with_tune;
+else
+  with_tune=rocket
+
+fi
+
+
 if test "x$with_abi" == xdefault; then :
   case $with_arch in #(
   *rv64g* | *rv64*d*) :
@@ -3274,6 +3287,8 @@ WITH_ARCH=--with-arch=$with_arch
 
 WITH_ABI=--with-abi=$with_abi
 
+WITH_TUNE=--with-tune=$with_tune
+
 
 # Check whether --enable-multilib was given.
 if test "${enable_multilib+set}" = set; then :

configure.ac

@@ -64,6 +64,13 @@ AC_ARG_WITH(abi,
 	[with_abi=default]
 	)
 
+AC_ARG_WITH(tune,
+	[AS_HELP_STRING([--with-tune=rocket],
+		[Set the base RISC-V CPU, defaults to rocket])],
+	[],
+	[with_tune=rocket]
+	)
+
 AS_IF([test "x$with_abi" == xdefault],
 	[AS_CASE([$with_arch],
 		[*rv64g* | *rv64*d*], [with_abi=lp64d],
@@ -78,6 +85,7 @@ AS_IF([test "x$with_abi" == xdefault],
 
 AC_SUBST(WITH_ARCH, --with-arch=$with_arch)
 AC_SUBST(WITH_ABI, --with-abi=$with_abi)
+AC_SUBST(WITH_TUNE, --with-tune=$with_tune)
 
 AC_ARG_ENABLE(multilib,
 	[AS_HELP_STRING([--enable-multilib],