Add --enable-host-debug-info, --with-host-cflags and --with-host-cxxflags options

1. --enable-host-debug-info builds host tools (Binutils, GDB
   and GCC) with debug symbols.
2. --with-host-cflags and --with-host-cxxflags adds extra
   CFLAGS/CXXFLAGS for building host tools (Binutils, GDB and
   GCC). Maybe useful for debugging host tools.

Note that these options affect only baremetal toolchains and
they have not been tested for Linux host and native
toolchains.

Signed-off-by: Yuriy Kolerov <[email protected]>

Author: kolerov

Makefile.in

@@ -16,6 +16,7 @@ PK_SRCDIR := @with_pk_src@
 LLVM_SRCDIR := @with_llvm_src@
 DEJAGNU_SRCDIR := @with_dejagnu_src@
 DEBUG_INFO := @debug_info@
+HOST_DEBUG_INFO := @host_debug_info@
 ENABLE_DEFAULT_PIE := @enable_default_pie@
 DEJAGNU_SRCDIR := @with_dejagnu_src@
 
@@ -108,6 +109,8 @@ else
 CMODEL_FOR_TARGET := @cmodel@
 endif
 
+CFLAGS_FOR_HOST := $(CFLAGS_FOR_HOST_EXTRA) $(HOST_DEBUG_INFO) @host_cflags@
+CXXFLAGS_FOR_HOST := $(CXXFLAGS_FOR_HOST_EXTRA) $(HOST_DEBUG_INFO) @host_cxxflags@
 CFLAGS_FOR_TARGET := $(CFLAGS_FOR_TARGET_EXTRA) $(DEBUG_INFO) @target_cflags@ $(CMODEL_FOR_TARGET)
 CXXFLAGS_FOR_TARGET := $(CXXFLAGS_FOR_TARGET_EXTRA) $(DEBUG_INFO) @target_cxxflags@ $(CMODEL_FOR_TARGET)
 ASFLAGS_FOR_TARGET := $(ASFLAGS_FOR_TARGET_EXTRA) $(DEBUG_INFO) $(CMODEL_FOR_TARGET)
@@ -661,7 +664,9 @@ stamps/build-binutils-newlib: $(BINUTILS_SRCDIR) $(BINUTILS_SRC_GIT) $(PREPARATI
 		--disable-sim \
 		--disable-libdecnumber \
 		--disable-readline \
-		$(WITH_ISA_SPEC)
+		$(WITH_ISA_SPEC) \
+		CFLAGS="$(CFLAGS_FOR_HOST)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_HOST)"
 	$(MAKE) -C $(notdir $@)
 	$(MAKE) -C $(notdir $@) install
 	mkdir -p $(dir $@) && touch $@
@@ -682,7 +687,9 @@ stamps/build-gdb-newlib: $(GDB_SRCDIR) $(GDB_SRC_GIT) $(PREPARATION_STAMP)
 		--disable-binutils \
 		--disable-ld \
 		--disable-gold \
-		--disable-gprof
+		--disable-gprof \
+		CFLAGS="$(CFLAGS_FOR_HOST)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_HOST)"
 	$(MAKE) -C $(notdir $@)
 	$(MAKE) -C $(notdir $@) install
 	mkdir -p $(dir $@) && touch $@
@@ -716,6 +723,8 @@ stamps/build-gcc-newlib-stage1: $(GCC_SRCDIR) $(GCC_SRC_GIT) stamps/build-binuti
 		$(WITH_TUNE) \
 		$(WITH_ISA_SPEC) \
 		$(GCC_EXTRA_CONFIGURE_FLAGS) \
+		CFLAGS="$(CFLAGS_FOR_HOST)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_HOST)" \
 		CFLAGS_FOR_TARGET="-Os $(CFLAGS_FOR_TARGET)" \
 		CXXFLAGS_FOR_TARGET="-Os $(CXXFLAGS_FOR_TARGET)"
 	$(MAKE) -C $(notdir $@) all-gcc
@@ -830,6 +839,8 @@ stamps/build-gcc-newlib-stage2: $(GCC_SRCDIR) $(GCC_SRC_GIT) stamps/build-newlib
 		$(WITH_TUNE) \
 		$(WITH_ISA_SPEC) \
 		$(GCC_EXTRA_CONFIGURE_FLAGS) \
+		CFLAGS="$(CFLAGS_FOR_HOST)" \
+		CXXFLAGS="$(CXXFLAGS_FOR_HOST)" \
 		CFLAGS_FOR_TARGET="-Os $(CFLAGS_FOR_TARGET)" \
 		CXXFLAGS_FOR_TARGET="-Os $(CXXFLAGS_FOR_TARGET)"
 	$(MAKE) -C $(notdir $@)

configure

@@ -636,6 +636,8 @@ enable_gdb
 with_guile
 with_system_zlib
 configure_host
+host_cxxflags
+host_cflags
 target_cxxflags
 target_cflags
 cmodel
@@ -652,9 +654,10 @@ WITH_ISA_SPEC
 WITH_TUNE
 WITH_ABI
 WITH_ARCH
-enable_default_pie
 vendor_alias
 vendor
+enable_default_pie
+host_debug_info
 debug_info
 default_target
 FETCHER
@@ -718,6 +721,7 @@ ac_user_opts='
 enable_option_checking
 enable_linux
 enable_debug_info
+enable_host_debug_info
 enable_default_pie
 with_vendor
 with_vendor_alias
@@ -734,6 +738,8 @@ enable_gcc_checking
 with_cmodel
 with_target_cflags
 with_target_cxxflags
+with_host_cflags
+with_host_cxxflags
 with_host
 with_system_zlib
 with_guile
@@ -1386,6 +1392,9 @@ Optional Features:
                           [--disable-linux]
   --enable-debug-info     build glibc/musl/newlibc/libgcc with debug
                           information
+  --enable-host-debug-info
+                          build host Binutils, GDB and GCC with debug
+                          information
   --enable-default-pie    build linux toolchain with default PIE
                           [--enable-default-pie]
   --enable-multilib       build both RV32 and RV64 runtime libraries
@@ -1402,10 +1411,10 @@ Optional Features:
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-arch=rv64gc      Sets the base RISC-V ISA, defaults to rv64gc
   --with-vendor=unknown   Sets the vendor part of the triplet
   --with-vendor-alias=unknown
                           Sets the vendor part of the triplet alias
+  --with-arch=rv64gc      Sets the base RISC-V ISA, defaults to rv64gc
   --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-isa-spec=20191213
@@ -1431,6 +1440,9 @@ Optional Packages:
                           libgcc [--with-cmodel=medlow]
   --with-target-cflags    Add extra target flags for C for library code
   --with-target-cxxflags  Add extra target flags for C++ for library code
+  --with-host-cflags      Add extra flags for C for host Binutils, GDB and GCC
+  --with-host-cxxflags    Add extra flags for C++ for host Binutils, GDB and
+                          GCC
   --with-host=x86_64-w64-mingw32
                           Sets the host for the tools, you probably want
                           nothing
@@ -3974,6 +3986,33 @@ else $as_nop
 
 fi
 
+# Check whether --enable-host_debug_info was given.
+if test ${enable_host_debug_info+y}
+then :
+  enableval=$enable_host_debug_info; enable_host_debug_info=yes
+else $as_nop
+  enable_host_debug_info=no
+
+fi
+
+
+if test "x$enable_host_debug_info" != xyes
+then :
+  disable_host_debug_info=yes
+else $as_nop
+  disable_host_debug_info=no
+
+fi
+
+if test "x$enable_host_debug_info" != xyes
+then :
+  host_debug_info=""
+
+else $as_nop
+  host_debug_info="-g"
+
+fi
+
 # Check whether --enable-default-pie was given.
 if test ${enable_default_pie+y}
 then :
@@ -3994,21 +4033,22 @@ else $as_nop
 fi
 
 
-
 # Check whether --with-vendor was given.
-if test "${with_vendor+set}" = set; then :
+if test ${with_vendor+y}
+then :
   withval=$with_vendor;
-else
+else $as_nop
   with_vendor=unknown
 
 fi
 
 
 
 # Check whether --with-vendor_alias was given.
-if test "${with_vendor_alias+set}" = set; then :
+if test ${with_vendor_alias+y}
+then :
   withval=$with_vendor_alias;
-else
+else $as_nop
   with_vendor_alias=unknown
 
 fi
@@ -4254,6 +4294,25 @@ fi
 target_cxxflags=$with_target_cxxflags
 
 
+
+# Check whether --with-host_cflags was given.
+if test ${with_host_cflags+y}
+then :
+  withval=$with_host_cflags;
+fi
+
+host_cflags=$with_host_cflags
+
+
+# Check whether --with-host_cxxflags was given.
+if test ${with_host_cxxflags+y}
+then :
+  withval=$with_host_cxxflags;
+fi
+
+host_cxxflags=$with_host_cxxflags
+
+
 ac_config_files="$ac_config_files Makefile"
 
 ac_config_files="$ac_config_files scripts/wrapper/awk/awk"

configure.ac

@@ -67,6 +67,22 @@ AS_IF([test "x$enable_debug_info" != xyes],
 	[AC_SUBST(debug_info, "")],
 	[AC_SUBST(debug_info, "-g")])
 
+AC_ARG_ENABLE(host_debug_info,
+        [AS_HELP_STRING([--enable-host-debug-info],
+		[build host Binutils, GDB and GCC with debug information])],
+        [enable_host_debug_info=yes],
+        [enable_host_debug_info=no]
+        )
+
+AS_IF([test "x$enable_host_debug_info" != xyes],
+        [disable_host_debug_info=yes],
+        [disable_host_debug_info=no]
+        )
+
+AS_IF([test "x$enable_host_debug_info" != xyes],
+	[AC_SUBST(host_debug_info, "")],
+	[AC_SUBST(host_debug_info, "-g")])
+
 AC_ARG_ENABLE(default-pie,
         [AS_HELP_STRING([--enable-default-pie],
 		[build linux toolchain with default PIE @<:@--enable-default-pie@:>@])],
@@ -234,6 +250,21 @@ AC_ARG_WITH(target_cxxflags,
 	)
 AC_SUBST(target_cxxflags, $with_target_cxxflags)
 
+AC_ARG_WITH(host_cflags,
+	[AS_HELP_STRING([--with-host-cflags],
+		[Add extra flags for C for host Binutils, GDB and GCC])],
+	[],
+	[]
+	)
+AC_SUBST(host_cflags, $with_host_cflags)
+AC_ARG_WITH(host_cxxflags,
+	[AS_HELP_STRING([--with-host-cxxflags],
+		[Add extra flags for C++ for host Binutils, GDB and GCC])],
+	[],
+	[]
+	)
+AC_SUBST(host_cxxflags, $with_host_cxxflags)
+
 AC_CONFIG_FILES([Makefile])
 AC_CONFIG_FILES([scripts/wrapper/awk/awk], [chmod +x scripts/wrapper/awk/awk])
 AC_CONFIG_FILES([scripts/wrapper/sed/sed], [chmod +x scripts/wrapper/sed/sed])