From patchwork Wed Aug 12 13:36:35 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 506602 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 62ED41401AF for ; Wed, 12 Aug 2015 23:37:03 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=MPYr+tWc; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:content-type; q=dns; s=default; b=wyTh82FKn4plNMqGGggGY54s/2p57mDmEEQak1ZnKrH AssRzopQ5niHEmpT7w3EAjvajpzVKJ13881/+Ej8KkE0jFFMPYtOSzfQ4aOZgMip IdDux+fTmorMcP/nXRUz+ECBm+jJTq9I4fNbS1L7/Agn+0dbS+xf5y1agNnWBd1o = DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:content-type; s=default; bh=G0QqLWc6lDL1/K+V12Z7k2UrVpQ=; b=MPYr+tWc61L91OXFF +qQ9ITwBHxqTs2HwFkhKRClMK5+FG1fjokV9Jv/O2KcZ6yVQoufQbMc4bjR6A151 ThUvPYc/BkEU57ejOoEyjKC1HFgp7+nHAL3oTUS7RjSH6DXus1A8RL54vWT7liWy QJcoYnN122iHbtcaw8WV4oZKag= Received: (qmail 56507 invoked by alias); 12 Aug 2015 13:36:56 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 56488 invoked by uid 89); 12 Aug 2015 13:36:56 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.0 required=5.0 tests=AWL, BAYES_00, RP_MATCHES_RCVD, SPF_PASS autolearn=ham version=3.3.2 X-HELO: fencepost.gnu.org Received: from fencepost.gnu.org (HELO fencepost.gnu.org) (208.118.235.10) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-SHA encrypted) ESMTPS; Wed, 12 Aug 2015 13:36:54 +0000 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47576) by fencepost.gnu.org with esmtps (TLS1.0:RSA_AES_256_CBC_SHA1:256) (Exim 4.82) (envelope-from ) id 1ZPWD6-0000sJ-8b for gcc-patches@gnu.org; Wed, 12 Aug 2015 09:36:52 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ZPWD0-0002Mj-QH for gcc-patches@gnu.org; Wed, 12 Aug 2015 09:36:51 -0400 Received: from relay1.mentorg.com ([192.94.38.131]:61952) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ZPWD0-0002Ma-Ic for gcc-patches@gnu.org; Wed, 12 Aug 2015 09:36:46 -0400 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-01.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1ZPWCx-0005fE-Pj from Tom_deVries@mentor.com ; Wed, 12 Aug 2015 06:36:44 -0700 Received: from [127.0.0.1] (137.202.0.76) by SVR-IES-FEM-01.mgc.mentorg.com (137.202.0.104) with Microsoft SMTP Server id 14.3.224.2; Wed, 12 Aug 2015 14:36:41 +0100 Message-ID: <55CB4BE3.7090300@mentor.com> Date: Wed, 12 Aug 2015 15:36:35 +0200 From: Tom de Vries User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.8.0 MIME-Version: 1.0 To: "gcc-patches@gnu.org" CC: Richard Biener , Joseph Myers Subject: [PATCH, PR67092, PR67098 ] Remove --with-host-libstdcxx X-detected-operating-system: by eggs.gnu.org: Windows NT kernel [generic] [fuzzy] X-Received-From: 192.94.38.131 Hi, this patch removes configure option --with-host-libstdcxx. [ As suggested here ( https://gcc.gnu.org/bugzilla/show_bug.cgi?id=67092#c13 ): ... I think we can no longer reliably support host libstdc++ as includes are not picked up from its location and GCC is C++ now. I suggest to remove that entirely. ... ] The option was originally introduced to support linking with a static version of ppl, but we no longer support using ppl. The behaviour of --with-host-libstdcxx is implemented in terms of other configure options, so we're not losing any functionality. Furthermore, the patch adds the missing documentation of the default behaviour of --with-stage1-ldflags. Bootstrapped and reg-tested on x86_64. OK for trunk? Thanks, - Tom Remove --with-host-libstdcxx 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. * configure.ac: Remove --with_host_libstdcxx support. * configure: Regenerate. --- configure | 24 +++--------------------- configure.ac | 19 +++---------------- gcc/doc/install.texi | 23 +++++++---------------- 3 files changed, 13 insertions(+), 53 deletions(-) diff --git a/configure b/configure index 79257fd..eca5e6f 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 452fc05..9241261 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/doc/install.texi b/gcc/doc/install.texi index 0e3093f..360b066 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 -- 1.9.1