From 5dc85f7ec719a79ecfbcdd8563b07e5f0f365e65 Mon Sep 17 00:00:00 2001 From: Tom de Vries Date: Wed, 12 Aug 2015 15:13:35 +0000 Subject: [PATCH] Remove --with-host-libstdcxx 2015-08-12 Tom de Vries PR other/67092 PR other/67098 * configure.ac: Remove --with_host_libstdcxx support. * configure: Regenerate. * doc/install.texi: Remove --with_host_libstdcxx item. Update --with-stage1-libs, --with-boot-ldflags and --with-boot-libs items accordingly. Mention default for --with-stage1-ldflags. From-SVN: r226819 --- ChangeLog | 6 ++++++ configure | 24 +++--------------------- configure.ac | 19 +++---------------- gcc/ChangeLog | 8 ++++++++ gcc/doc/install.texi | 23 +++++++---------------- 5 files changed, 27 insertions(+), 53 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d3a8a04e7ca..e764c5e126c0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2015-08-12 Tom de Vries + + PR other/67092 + * configure.ac: Remove --with_host_libstdcxx support. + * configure: Regenerate. + 2015-08-10 Thomas Schwinge Jakub Jelinek diff --git a/configure b/configure index 79257fdc28ff..eca5e6f747d0 100755 --- a/configure +++ b/configure @@ -772,7 +772,6 @@ with_gmp_dir with_gmp with_gmp_include with_gmp_lib -with_host_libstdcxx with_stage1_libs with_stage1_ldflags with_boot_libs @@ -1540,8 +1539,6 @@ Optional Packages: --with-gmp-lib=PATH/lib --with-gmp-include=PATH specify directory for installed GMP include files --with-gmp-lib=PATH specify directory for the installed GMP library - --with-host-libstdcxx=L use linker arguments L to link with libstdc++ when - linking with PPL --with-stage1-libs=LIBS libraries for stage1 --with-stage1-ldflags=FLAGS linker flags for stage1 @@ -5849,20 +5846,6 @@ fi -# Allow host libstdc++ to be specified for static linking with PPL. - -# Check whether --with-host-libstdcxx was given. -if test "${with_host_libstdcxx+set}" = set; then : - withval=$with_host_libstdcxx; -fi - - -case $with_host_libstdcxx in - no|yes) - as_fn_error "-with-host-libstdcxx needs an argument" "$LINENO" 5 - ;; -esac - # Libraries to use for stage1 or when not bootstrapping. # Check whether --with-stage1-libs was given. @@ -5873,7 +5856,7 @@ if test "${with_stage1_libs+set}" = set; then : stage1_libs=$withval fi else - stage1_libs=$with_host_libstdcxx + stage1_libs= fi @@ -5899,8 +5882,7 @@ fi -# Libraries to use for stage2 and later builds. This defaults to the -# argument passed to --with-host-libstdcxx. +# Libraries to use for stage2 and later builds. # Check whether --with-boot-libs was given. if test "${with_boot_libs+set}" = set; then : @@ -5910,7 +5892,7 @@ if test "${with_boot_libs+set}" = set; then : poststage1_libs=$withval fi else - poststage1_libs=$with_host_libstdcxx + poststage1_libs= fi diff --git a/configure.ac b/configure.ac index 452fc057a31a..924126189168 100644 --- a/configure.ac +++ b/configure.ac @@ -1697,18 +1697,6 @@ AC_SUBST(extra_mpc_gmp_configure_flags) AC_SUBST(extra_mpc_mpfr_configure_flags) AC_SUBST(extra_isl_gmp_configure_flags) -# Allow host libstdc++ to be specified for static linking with PPL. -AC_ARG_WITH(host-libstdcxx, -[AS_HELP_STRING([--with-host-libstdcxx=L], - [use linker arguments L to link with libstdc++ - when linking with PPL])]) - -case $with_host_libstdcxx in - no|yes) - AC_MSG_ERROR([-with-host-libstdcxx needs an argument]) - ;; -esac - # Libraries to use for stage1 or when not bootstrapping. AC_ARG_WITH(stage1-libs, [AS_HELP_STRING([--with-stage1-libs=LIBS], [libraries for stage1])], @@ -1717,7 +1705,7 @@ AC_ARG_WITH(stage1-libs, else stage1_libs=$withval fi], -[stage1_libs=$with_host_libstdcxx]) +[stage1_libs=]) AC_SUBST(stage1_libs) # Linker flags to use for stage1 or when not bootstrapping. @@ -1737,8 +1725,7 @@ AC_ARG_WITH(stage1-ldflags, fi]) AC_SUBST(stage1_ldflags) -# Libraries to use for stage2 and later builds. This defaults to the -# argument passed to --with-host-libstdcxx. +# Libraries to use for stage2 and later builds. AC_ARG_WITH(boot-libs, [AS_HELP_STRING([--with-boot-libs=LIBS], [libraries for stage2 and later])], [if test "$withval" = "no" -o "$withval" = "yes"; then @@ -1746,7 +1733,7 @@ AC_ARG_WITH(boot-libs, else poststage1_libs=$withval fi], -[poststage1_libs=$with_host_libstdcxx]) +[poststage1_libs=]) AC_SUBST(poststage1_libs) # Linker flags to use for stage2 and later builds. diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 0fac02496226..2bb64ce2f98d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2015-08-12 Tom de Vries + + PR other/67092 + PR other/67098 + * doc/install.texi: Remove --with_host_libstdcxx item. Update + --with-stage1-libs, --with-boot-ldflags and --with-boot-libs items + accordingly. Mention default for --with-stage1-ldflags. + 2015-08-12 Matthew Wahab * config/arm/arm.h (arm_fpu_feature_set): New. diff --git a/gcc/doc/install.texi b/gcc/doc/install.texi index 0e3093f03ee8..360b0666b698 100644 --- a/gcc/doc/install.texi +++ b/gcc/doc/install.texi @@ -1853,36 +1853,27 @@ include and lib options directly. These flags are applicable to the host platform only. When building a cross compiler, they will not be used to configure target libraries. -@item --with-host-libstdcxx=@var{linker-args} -If you are linking with a static copy of PPL, you can use this option -to specify how the linker should find the standard C++ library used -internally by PPL. Typical values of @var{linker-args} might be -@samp{-lstdc++} or @samp{-Wl,-Bstatic,-lstdc++,-Bdynamic -lm}. If you are -linking with a shared copy of PPL, you probably do not need this -option; shared library dependencies will cause the linker to search -for the standard C++ library automatically. - @item --with-stage1-ldflags=@var{flags} This option may be used to set linker flags to be used when linking stage 1 of GCC. These are also used when linking GCC if configured with -@option{--disable-bootstrap}. By default no special flags are used. +@option{--disable-bootstrap}. If @option{–with-stage1-libs} is not set to a +value, then the default is @samp{-static-libstdc++ -static-libgcc}, if +supported. @item --with-stage1-libs=@var{libs} This option may be used to set libraries to be used when linking stage 1 of GCC. These are also used when linking GCC if configured with -@option{--disable-bootstrap}. The default is the argument to -@option{--with-host-libstdcxx}, if specified. +@option{--disable-bootstrap}. @item --with-boot-ldflags=@var{flags} This option may be used to set linker flags to be used when linking -stage 2 and later when bootstrapping GCC. If neither --with-boot-libs -nor --with-host-libstdcxx is set to a value, then the default is +stage 2 and later when bootstrapping GCC. If --with-boot-libs +is not is set to a value, then the default is @samp{-static-libstdc++ -static-libgcc}. @item --with-boot-libs=@var{libs} This option may be used to set libraries to be used when linking stage 2 -and later when bootstrapping GCC. The default is the argument to -@option{--with-host-libstdcxx}, if specified. +and later when bootstrapping GCC. @item --with-debug-prefix-map=@var{map} Convert source directory names using @option{-fdebug-prefix-map} when -- 2.39.5