From patchwork Thu Mar 20 16:31:21 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Bernd Schmidt X-Patchwork-Id: 332305 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 DAE5C2C0096 for ; Fri, 21 Mar 2014 03:34:03 +1100 (EST) 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=QfdLZ9Rbg5B00aKqK1ijUvF6Kzub5rt+3CeKL2yOIAi RbRBVj5OSDqDCpLDhpSO8h9ibpBLFNs5SUbGlCVG6S/V2m/0iWrenz7eT88SD6LE 7upNj/D+ReZdBJcknLHA98CTsEyoXqjcVUi7tYDngNEIXfeA6dccmKGww2ZcRpZo = 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=Xo+Fx1OK2JUOlyxbU3uxBpPKQok=; b=NqvZri8/t22UQ7He4 S2Xz16UewOTZ5w+M0rK8VJNTymXKTusOCcrq//w5o3nc/vlbdec+lXDnC5Md1tD3 hNC22yGNLSp7YOarCK9Q6zMTK2Gd07qn2r6xpnNV9idu3DszqWXy1oXh1H7zOwI9 7v0xSWXDtWouFQuRm3AO2zDwEo= Received: (qmail 7201 invoked by alias); 20 Mar 2014 16:33:37 -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 7124 invoked by uid 89); 20 Mar 2014 16:33:36 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00 autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Thu, 20 Mar 2014 16:33:29 +0000 Received: from svr-orw-exc-10.mgc.mentorg.com ([147.34.98.58]) by relay1.mentorg.com with esmtp id 1WQfuH-0002Hg-KE from Bernd_Schmidt@mentor.com ; Thu, 20 Mar 2014 09:33:25 -0700 Received: from SVR-IES-FEM-01.mgc.mentorg.com ([137.202.0.104]) by SVR-ORW-EXC-10.mgc.mentorg.com with Microsoft SMTPSVC(6.0.3790.4675); Thu, 20 Mar 2014 09:33:25 -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.2.247.3; Thu, 20 Mar 2014 16:33:22 +0000 Message-ID: <532B17D9.60906@codesourcery.com> Date: Thu, 20 Mar 2014 17:31:21 +0100 From: Bernd Schmidt User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:24.0) Gecko/20100101 Thunderbird/24.3.0 MIME-Version: 1.0 To: GCC Patches CC: Ilya Verbin Subject: [gomp4] Accelerator configury and paths changes 3/3 This enables us to build an accelerator gcc alongside its host compiler, inside an accel-gcc directory. This is expected to be useful only for things like ptx where we won't want to build target libraries as well. Committed on gomp-4_0-branch. Bernd Index: ChangeLog =================================================================== --- ChangeLog (revision 208710) +++ ChangeLog (working copy) @@ -1,5 +1,16 @@ 2014-03-20 Bernd Schmidt + * Makefile.def (host_modules, dependencies): Add accel-gcc entries. + (flags_to_pass): Add accel_target_alias). + * Makefile.tpl (accel_target_alias, accel_target_vendor, + accel_target_os, accel_target): New variables. + (configure-[+prefix+][+module+]): Special case accel-gcc module. + * configure.ac (host_tools): Add accel-gcc. + (ENABLE_ACCELERATOR handling): Set skipdirs and + accel_target_noncanonical, then use ACX_CANONICAL_ACCEL_TARGET. + * configure: Regenerate. + * Makefile.in: Regenerate. + From Nathan Sidwell and Thomas Schwinge. * configure.ac: Add --enable-accelerator. * configure: Rebuilt. Index: Makefile.def =================================================================== --- Makefile.def (revision 208706) +++ Makefile.def (working copy) @@ -45,6 +45,9 @@ host_modules= { module= flex; no_check_c host_modules= { module= gas; bootstrap=true; }; host_modules= { module= gcc; bootstrap=true; extra_make_flags="$(EXTRA_GCC_FLAGS)"; }; +host_modules= { module= accel-gcc; + actual_module=gcc; + extra_configure_flags='--enable-as-accelerator-for=$(target_alias)'; }; host_modules= { module= gmp; lib_path=.libs; bootstrap=true; extra_configure_flags='--disable-shared'; no_install= true; @@ -211,6 +214,7 @@ flags_to_pass = { flag= sysconfdir ; }; flags_to_pass = { flag= tooldir ; }; flags_to_pass = { flag= build_tooldir ; }; flags_to_pass = { flag= target_alias ; }; +flags_to_pass = { flag= accel_target_alias ; }; // Build tools flags_to_pass = { flag= AWK ; }; @@ -307,6 +311,7 @@ dependencies = { module=all-gcc; on=all- dependencies = { module=all-gcc; on=all-mpfr; }; dependencies = { module=all-gcc; on=all-mpc; }; dependencies = { module=all-gcc; on=all-cloog; }; +dependencies = { module=all-gcc; on=all-accel-gcc; }; dependencies = { module=all-gcc; on=all-build-texinfo; }; dependencies = { module=all-gcc; on=all-build-bison; }; dependencies = { module=all-gcc; on=all-build-flex; }; @@ -319,6 +324,24 @@ dependencies = { module=all-gcc; on=all- dependencies = { module=all-gcc; on=all-libiberty; }; dependencies = { module=all-gcc; on=all-fixincludes; }; dependencies = { module=all-gcc; on=all-lto-plugin; }; +dependencies = { module=all-accel-gcc; on=all-libiberty; hard=true; }; +dependencies = { module=all-accel-gcc; on=all-intl; }; +dependencies = { module=all-accel-gcc; on=all-mpfr; }; +dependencies = { module=all-accel-gcc; on=all-mpc; }; +dependencies = { module=all-accel-gcc; on=all-cloog; }; +dependencies = { module=all-accel-gcc; on=all-accel-gcc; }; +dependencies = { module=all-accel-gcc; on=all-build-texinfo; }; +dependencies = { module=all-accel-gcc; on=all-build-bison; }; +dependencies = { module=all-accel-gcc; on=all-build-flex; }; +dependencies = { module=all-accel-gcc; on=all-build-libiberty; }; +dependencies = { module=all-accel-gcc; on=all-build-fixincludes; }; +dependencies = { module=all-accel-gcc; on=all-zlib; }; +dependencies = { module=all-accel-gcc; on=all-libbacktrace; hard=true; }; +dependencies = { module=all-accel-gcc; on=all-libcpp; hard=true; }; +dependencies = { module=all-accel-gcc; on=all-libdecnumber; hard=true; }; +dependencies = { module=all-accel-gcc; on=all-libiberty; }; +dependencies = { module=all-accel-gcc; on=all-fixincludes; }; +dependencies = { module=all-accel-gcc; on=all-lto-plugin; }; dependencies = { module=info-gcc; on=all-build-libiberty; }; dependencies = { module=dvi-gcc; on=all-build-libiberty; }; dependencies = { module=pdf-gcc; on=all-build-libiberty; }; Index: Makefile.in =================================================================== --- Makefile.in (revision 208706) +++ Makefile.in (working copy) @@ -46,6 +46,10 @@ target_alias=@target_noncanonical@ target_vendor=@target_vendor@ target_os=@target_os@ target=@target@ +accel_target_alias=@accel_target_noncanonical@ +accel_target_vendor=@accel_target_vendor@ +accel_target_os=@accel_target_os@ +accel_target=@accel_target@ program_transform_name = @program_transform_name@ @@ -701,6 +705,7 @@ BASE_FLAGS_TO_PASS = \ "tooldir=$(tooldir)" \ "build_tooldir=$(build_tooldir)" \ "target_alias=$(target_alias)" \ + "accel_target_alias=$(accel_target_alias)" \ "AWK=$(AWK)" \ "BISON=$(BISON)" \ "CC_FOR_BUILD=$(CC_FOR_BUILD)" \ @@ -894,6 +899,7 @@ configure-host: \ maybe-configure-flex \ maybe-configure-gas \ maybe-configure-gcc \ + maybe-configure-accel-gcc \ maybe-configure-gmp \ maybe-configure-mpfr \ maybe-configure-mpc \ @@ -1011,6 +1017,7 @@ all-host: maybe-all-gas @if gcc-no-bootstrap all-host: maybe-all-gcc @endif gcc-no-bootstrap +all-host: maybe-all-accel-gcc @if gmp-no-bootstrap all-host: maybe-all-gmp @endif gmp-no-bootstrap @@ -1139,6 +1146,7 @@ info-host: maybe-info-fixincludes info-host: maybe-info-flex info-host: maybe-info-gas info-host: maybe-info-gcc +info-host: maybe-info-accel-gcc info-host: maybe-info-gmp info-host: maybe-info-mpfr info-host: maybe-info-mpc @@ -1222,6 +1230,7 @@ dvi-host: maybe-dvi-fixincludes dvi-host: maybe-dvi-flex dvi-host: maybe-dvi-gas dvi-host: maybe-dvi-gcc +dvi-host: maybe-dvi-accel-gcc dvi-host: maybe-dvi-gmp dvi-host: maybe-dvi-mpfr dvi-host: maybe-dvi-mpc @@ -1305,6 +1314,7 @@ pdf-host: maybe-pdf-fixincludes pdf-host: maybe-pdf-flex pdf-host: maybe-pdf-gas pdf-host: maybe-pdf-gcc +pdf-host: maybe-pdf-accel-gcc pdf-host: maybe-pdf-gmp pdf-host: maybe-pdf-mpfr pdf-host: maybe-pdf-mpc @@ -1388,6 +1398,7 @@ html-host: maybe-html-fixincludes html-host: maybe-html-flex html-host: maybe-html-gas html-host: maybe-html-gcc +html-host: maybe-html-accel-gcc html-host: maybe-html-gmp html-host: maybe-html-mpfr html-host: maybe-html-mpc @@ -1471,6 +1482,7 @@ TAGS-host: maybe-TAGS-fixincludes TAGS-host: maybe-TAGS-flex TAGS-host: maybe-TAGS-gas TAGS-host: maybe-TAGS-gcc +TAGS-host: maybe-TAGS-accel-gcc TAGS-host: maybe-TAGS-gmp TAGS-host: maybe-TAGS-mpfr TAGS-host: maybe-TAGS-mpc @@ -1554,6 +1566,7 @@ install-info-host: maybe-install-info-fi install-info-host: maybe-install-info-flex install-info-host: maybe-install-info-gas install-info-host: maybe-install-info-gcc +install-info-host: maybe-install-info-accel-gcc install-info-host: maybe-install-info-gmp install-info-host: maybe-install-info-mpfr install-info-host: maybe-install-info-mpc @@ -1637,6 +1650,7 @@ install-pdf-host: maybe-install-pdf-fixi install-pdf-host: maybe-install-pdf-flex install-pdf-host: maybe-install-pdf-gas install-pdf-host: maybe-install-pdf-gcc +install-pdf-host: maybe-install-pdf-accel-gcc install-pdf-host: maybe-install-pdf-gmp install-pdf-host: maybe-install-pdf-mpfr install-pdf-host: maybe-install-pdf-mpc @@ -1720,6 +1734,7 @@ install-html-host: maybe-install-html-fi install-html-host: maybe-install-html-flex install-html-host: maybe-install-html-gas install-html-host: maybe-install-html-gcc +install-html-host: maybe-install-html-accel-gcc install-html-host: maybe-install-html-gmp install-html-host: maybe-install-html-mpfr install-html-host: maybe-install-html-mpc @@ -1803,6 +1818,7 @@ installcheck-host: maybe-installcheck-fi installcheck-host: maybe-installcheck-flex installcheck-host: maybe-installcheck-gas installcheck-host: maybe-installcheck-gcc +installcheck-host: maybe-installcheck-accel-gcc installcheck-host: maybe-installcheck-gmp installcheck-host: maybe-installcheck-mpfr installcheck-host: maybe-installcheck-mpc @@ -1886,6 +1902,7 @@ mostlyclean-host: maybe-mostlyclean-fixi mostlyclean-host: maybe-mostlyclean-flex mostlyclean-host: maybe-mostlyclean-gas mostlyclean-host: maybe-mostlyclean-gcc +mostlyclean-host: maybe-mostlyclean-accel-gcc mostlyclean-host: maybe-mostlyclean-gmp mostlyclean-host: maybe-mostlyclean-mpfr mostlyclean-host: maybe-mostlyclean-mpc @@ -1969,6 +1986,7 @@ clean-host: maybe-clean-fixincludes clean-host: maybe-clean-flex clean-host: maybe-clean-gas clean-host: maybe-clean-gcc +clean-host: maybe-clean-accel-gcc clean-host: maybe-clean-gmp clean-host: maybe-clean-mpfr clean-host: maybe-clean-mpc @@ -2052,6 +2070,7 @@ distclean-host: maybe-distclean-fixinclu distclean-host: maybe-distclean-flex distclean-host: maybe-distclean-gas distclean-host: maybe-distclean-gcc +distclean-host: maybe-distclean-accel-gcc distclean-host: maybe-distclean-gmp distclean-host: maybe-distclean-mpfr distclean-host: maybe-distclean-mpc @@ -2135,6 +2154,7 @@ maintainer-clean-host: maybe-maintainer- maintainer-clean-host: maybe-maintainer-clean-flex maintainer-clean-host: maybe-maintainer-clean-gas maintainer-clean-host: maybe-maintainer-clean-gcc +maintainer-clean-host: maybe-maintainer-clean-accel-gcc maintainer-clean-host: maybe-maintainer-clean-gmp maintainer-clean-host: maybe-maintainer-clean-mpfr maintainer-clean-host: maybe-maintainer-clean-mpc @@ -2273,6 +2293,7 @@ check-host: \ maybe-check-flex \ maybe-check-gas \ maybe-check-gcc \ + maybe-check-accel-gcc \ maybe-check-gmp \ maybe-check-mpfr \ maybe-check-mpc \ @@ -2382,6 +2403,7 @@ install-host-nogcc: \ maybe-install-fixincludes \ maybe-install-flex \ maybe-install-gas \ + maybe-install-accel-gcc \ maybe-install-gmp \ maybe-install-mpfr \ maybe-install-mpc \ @@ -2429,6 +2451,7 @@ install-host: \ maybe-install-flex \ maybe-install-gas \ maybe-install-gcc \ + maybe-install-accel-gcc \ maybe-install-gmp \ maybe-install-mpfr \ maybe-install-mpc \ @@ -2532,6 +2555,7 @@ install-strip-host: \ maybe-install-strip-flex \ maybe-install-strip-gas \ maybe-install-strip-gcc \ + maybe-install-strip-accel-gcc \ maybe-install-strip-gmp \ maybe-install-strip-mpfr \ maybe-install-strip-mpc \ @@ -2651,6 +2675,9 @@ configure-build-libiberty: $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/libiberty ; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/libiberty; \ + \ + this_target="${target_alias}"; \ + \ cd "$(BUILD_SUBDIR)/libiberty" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -2662,7 +2689,7 @@ configure-build-libiberty: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif build-libiberty @@ -2707,6 +2734,9 @@ configure-build-bison: $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/bison ; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/bison; \ + \ + this_target="${target_alias}"; \ + \ cd "$(BUILD_SUBDIR)/bison" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -2718,7 +2748,7 @@ configure-build-bison: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif build-bison @@ -2763,6 +2793,9 @@ configure-build-flex: $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/flex ; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/flex; \ + \ + this_target="${target_alias}"; \ + \ cd "$(BUILD_SUBDIR)/flex" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -2774,7 +2807,7 @@ configure-build-flex: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif build-flex @@ -2819,6 +2852,9 @@ configure-build-m4: $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/m4 ; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/m4; \ + \ + this_target="${target_alias}"; \ + \ cd "$(BUILD_SUBDIR)/m4" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -2830,7 +2866,7 @@ configure-build-m4: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif build-m4 @@ -2875,6 +2911,9 @@ configure-build-texinfo: $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/texinfo ; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/texinfo; \ + \ + this_target="${target_alias}"; \ + \ cd "$(BUILD_SUBDIR)/texinfo" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -2886,7 +2925,7 @@ configure-build-texinfo: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif build-texinfo @@ -2931,6 +2970,9 @@ configure-build-fixincludes: $(SHELL) $(srcdir)/mkinstalldirs $(BUILD_SUBDIR)/fixincludes ; \ $(BUILD_EXPORTS) \ echo Configuring in $(BUILD_SUBDIR)/fixincludes; \ + \ + this_target="${target_alias}"; \ + \ cd "$(BUILD_SUBDIR)/fixincludes" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -2942,7 +2984,7 @@ configure-build-fixincludes: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif build-fixincludes @@ -2991,6 +3033,9 @@ configure-bfd: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bfd ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/bfd; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/bfd" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -3001,7 +3046,7 @@ configure-bfd: libsrcdir="$$s/bfd"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif bfd @@ -3863,6 +3908,9 @@ configure-opcodes: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/opcodes ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/opcodes; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/opcodes" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -3873,7 +3921,7 @@ configure-opcodes: libsrcdir="$$s/opcodes"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif opcodes @@ -4735,6 +4783,9 @@ configure-binutils: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/binutils ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/binutils; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/binutils" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -4745,7 +4796,7 @@ configure-binutils: libsrcdir="$$s/binutils"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif binutils @@ -5608,6 +5659,9 @@ configure-bison: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/bison ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/bison; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/bison" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -5618,7 +5672,7 @@ configure-bison: libsrcdir="$$s/bison"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif bison @@ -6051,6 +6105,9 @@ configure-cgen: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cgen ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/cgen; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/cgen" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -6061,7 +6118,7 @@ configure-cgen: libsrcdir="$$s/cgen"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif cgen @@ -6491,6 +6548,9 @@ configure-dejagnu: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/dejagnu ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/dejagnu; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/dejagnu" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -6501,7 +6561,7 @@ configure-dejagnu: libsrcdir="$$s/dejagnu"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif dejagnu @@ -6931,6 +6991,9 @@ configure-etc: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/etc ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/etc; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/etc" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -6941,7 +7004,7 @@ configure-etc: libsrcdir="$$s/etc"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif etc @@ -7371,6 +7434,9 @@ configure-fastjar: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fastjar ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/fastjar; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/fastjar" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -7381,7 +7447,7 @@ configure-fastjar: libsrcdir="$$s/fastjar"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif fastjar @@ -7814,6 +7880,9 @@ configure-fixincludes: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/fixincludes ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/fixincludes; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/fixincludes" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -7824,7 +7893,7 @@ configure-fixincludes: libsrcdir="$$s/fixincludes"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif fixincludes @@ -8238,6 +8307,9 @@ configure-flex: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/flex ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/flex; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/flex" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -8248,7 +8320,7 @@ configure-flex: libsrcdir="$$s/flex"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif flex @@ -8680,6 +8752,9 @@ configure-gas: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gas ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gas; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/gas" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -8690,7 +8765,7 @@ configure-gas: libsrcdir="$$s/gas"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif gas @@ -9552,6 +9627,9 @@ configure-gcc: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gcc ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gcc; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/gcc" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -9562,7 +9640,7 @@ configure-gcc: libsrcdir="$$s/gcc"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif gcc @@ -10410,6 +10488,449 @@ maintainer-clean-gcc: +.PHONY: configure-accel-gcc maybe-configure-accel-gcc +maybe-configure-accel-gcc: +@if gcc-bootstrap +configure-accel-gcc: stage_current +@endif gcc-bootstrap +@if accel-gcc +maybe-configure-accel-gcc: configure-accel-gcc +configure-accel-gcc: + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + test ! -f $(HOST_SUBDIR)/accel-gcc/Makefile || exit 0; \ + $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/accel-gcc ; \ + $(HOST_EXPORTS) \ + echo Configuring in $(HOST_SUBDIR)/accel-gcc; \ + \ + this_target="$(accel_target_alias)"; \ + \ + cd "$(HOST_SUBDIR)/accel-gcc" || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(HOST_SUBDIR)/gcc/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + srcdiroption="--srcdir=$${topdir}/gcc"; \ + libsrcdir="$$s/gcc"; \ + $(SHELL) $${libsrcdir}/configure \ + $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ + --target=$${this_target} $${srcdiroption} --enable-as-accelerator-for=$(target_alias) \ + || exit 1 +@endif accel-gcc + + + + + +.PHONY: all-accel-gcc maybe-all-accel-gcc +maybe-all-accel-gcc: +@if gcc-bootstrap +all-accel-gcc: stage_current +@endif gcc-bootstrap +@if accel-gcc +TARGET-accel-gcc=all +maybe-all-accel-gcc: all-accel-gcc +all-accel-gcc: configure-accel-gcc + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/accel-gcc && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) \ + $(TARGET-gcc)) +@endif accel-gcc + + + + +.PHONY: check-accel-gcc maybe-check-accel-gcc +maybe-check-accel-gcc: +@if accel-gcc +maybe-check-accel-gcc: check-accel-gcc + +check-accel-gcc: + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/accel-gcc && \ + $(MAKE) $(FLAGS_TO_PASS) check) + +@endif accel-gcc + +.PHONY: install-accel-gcc maybe-install-accel-gcc +maybe-install-accel-gcc: +@if accel-gcc +maybe-install-accel-gcc: install-accel-gcc + +install-accel-gcc: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/accel-gcc && \ + $(MAKE) $(FLAGS_TO_PASS) install) + +@endif accel-gcc + +.PHONY: install-strip-accel-gcc maybe-install-strip-accel-gcc +maybe-install-strip-accel-gcc: +@if accel-gcc +maybe-install-strip-accel-gcc: install-strip-accel-gcc + +install-strip-accel-gcc: installdirs + @: $(MAKE); $(unstage) + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + (cd $(HOST_SUBDIR)/accel-gcc && \ + $(MAKE) $(FLAGS_TO_PASS) install-strip) + +@endif accel-gcc + +# Other targets (info, dvi, pdf, etc.) + +.PHONY: maybe-info-accel-gcc info-accel-gcc +maybe-info-accel-gcc: +@if accel-gcc +maybe-info-accel-gcc: info-accel-gcc + +info-accel-gcc: \ + configure-accel-gcc + @: $(MAKE); $(unstage) + @[ -f ./accel-gcc/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing info in accel-gcc" ; \ + (cd $(HOST_SUBDIR)/accel-gcc && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + info) \ + || exit 1 + +@endif accel-gcc + +.PHONY: maybe-dvi-accel-gcc dvi-accel-gcc +maybe-dvi-accel-gcc: +@if accel-gcc +maybe-dvi-accel-gcc: dvi-accel-gcc + +dvi-accel-gcc: \ + configure-accel-gcc + @: $(MAKE); $(unstage) + @[ -f ./accel-gcc/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing dvi in accel-gcc" ; \ + (cd $(HOST_SUBDIR)/accel-gcc && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + dvi) \ + || exit 1 + +@endif accel-gcc + +.PHONY: maybe-pdf-accel-gcc pdf-accel-gcc +maybe-pdf-accel-gcc: +@if accel-gcc +maybe-pdf-accel-gcc: pdf-accel-gcc + +pdf-accel-gcc: \ + configure-accel-gcc + @: $(MAKE); $(unstage) + @[ -f ./accel-gcc/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing pdf in accel-gcc" ; \ + (cd $(HOST_SUBDIR)/accel-gcc && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + pdf) \ + || exit 1 + +@endif accel-gcc + +.PHONY: maybe-html-accel-gcc html-accel-gcc +maybe-html-accel-gcc: +@if accel-gcc +maybe-html-accel-gcc: html-accel-gcc + +html-accel-gcc: \ + configure-accel-gcc + @: $(MAKE); $(unstage) + @[ -f ./accel-gcc/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing html in accel-gcc" ; \ + (cd $(HOST_SUBDIR)/accel-gcc && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + html) \ + || exit 1 + +@endif accel-gcc + +.PHONY: maybe-TAGS-accel-gcc TAGS-accel-gcc +maybe-TAGS-accel-gcc: +@if accel-gcc +maybe-TAGS-accel-gcc: TAGS-accel-gcc + +TAGS-accel-gcc: \ + configure-accel-gcc + @: $(MAKE); $(unstage) + @[ -f ./accel-gcc/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing TAGS in accel-gcc" ; \ + (cd $(HOST_SUBDIR)/accel-gcc && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + TAGS) \ + || exit 1 + +@endif accel-gcc + +.PHONY: maybe-install-info-accel-gcc install-info-accel-gcc +maybe-install-info-accel-gcc: +@if accel-gcc +maybe-install-info-accel-gcc: install-info-accel-gcc + +install-info-accel-gcc: \ + configure-accel-gcc \ + info-accel-gcc + @: $(MAKE); $(unstage) + @[ -f ./accel-gcc/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing install-info in accel-gcc" ; \ + (cd $(HOST_SUBDIR)/accel-gcc && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-info) \ + || exit 1 + +@endif accel-gcc + +.PHONY: maybe-install-pdf-accel-gcc install-pdf-accel-gcc +maybe-install-pdf-accel-gcc: +@if accel-gcc +maybe-install-pdf-accel-gcc: install-pdf-accel-gcc + +install-pdf-accel-gcc: \ + configure-accel-gcc \ + pdf-accel-gcc + @: $(MAKE); $(unstage) + @[ -f ./accel-gcc/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing install-pdf in accel-gcc" ; \ + (cd $(HOST_SUBDIR)/accel-gcc && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-pdf) \ + || exit 1 + +@endif accel-gcc + +.PHONY: maybe-install-html-accel-gcc install-html-accel-gcc +maybe-install-html-accel-gcc: +@if accel-gcc +maybe-install-html-accel-gcc: install-html-accel-gcc + +install-html-accel-gcc: \ + configure-accel-gcc \ + html-accel-gcc + @: $(MAKE); $(unstage) + @[ -f ./accel-gcc/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing install-html in accel-gcc" ; \ + (cd $(HOST_SUBDIR)/accel-gcc && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + install-html) \ + || exit 1 + +@endif accel-gcc + +.PHONY: maybe-installcheck-accel-gcc installcheck-accel-gcc +maybe-installcheck-accel-gcc: +@if accel-gcc +maybe-installcheck-accel-gcc: installcheck-accel-gcc + +installcheck-accel-gcc: \ + configure-accel-gcc + @: $(MAKE); $(unstage) + @[ -f ./accel-gcc/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing installcheck in accel-gcc" ; \ + (cd $(HOST_SUBDIR)/accel-gcc && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + installcheck) \ + || exit 1 + +@endif accel-gcc + +.PHONY: maybe-mostlyclean-accel-gcc mostlyclean-accel-gcc +maybe-mostlyclean-accel-gcc: +@if accel-gcc +maybe-mostlyclean-accel-gcc: mostlyclean-accel-gcc + +mostlyclean-accel-gcc: + @: $(MAKE); $(unstage) + @[ -f ./accel-gcc/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing mostlyclean in accel-gcc" ; \ + (cd $(HOST_SUBDIR)/accel-gcc && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + mostlyclean) \ + || exit 1 + +@endif accel-gcc + +.PHONY: maybe-clean-accel-gcc clean-accel-gcc +maybe-clean-accel-gcc: +@if accel-gcc +maybe-clean-accel-gcc: clean-accel-gcc + +clean-accel-gcc: + @: $(MAKE); $(unstage) + @[ -f ./accel-gcc/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing clean in accel-gcc" ; \ + (cd $(HOST_SUBDIR)/accel-gcc && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + clean) \ + || exit 1 + +@endif accel-gcc + +.PHONY: maybe-distclean-accel-gcc distclean-accel-gcc +maybe-distclean-accel-gcc: +@if accel-gcc +maybe-distclean-accel-gcc: distclean-accel-gcc + +distclean-accel-gcc: + @: $(MAKE); $(unstage) + @[ -f ./accel-gcc/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing distclean in accel-gcc" ; \ + (cd $(HOST_SUBDIR)/accel-gcc && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + distclean) \ + || exit 1 + +@endif accel-gcc + +.PHONY: maybe-maintainer-clean-accel-gcc maintainer-clean-accel-gcc +maybe-maintainer-clean-accel-gcc: +@if accel-gcc +maybe-maintainer-clean-accel-gcc: maintainer-clean-accel-gcc + +maintainer-clean-accel-gcc: + @: $(MAKE); $(unstage) + @[ -f ./accel-gcc/Makefile ] || exit 0; \ + r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(HOST_EXPORTS) \ + for flag in $(EXTRA_HOST_FLAGS) ; do \ + eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ + done; \ + echo "Doing maintainer-clean in accel-gcc" ; \ + (cd $(HOST_SUBDIR)/accel-gcc && \ + $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ + "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ + "RANLIB=$${RANLIB}" \ + "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ + maintainer-clean) \ + || exit 1 + +@endif accel-gcc + + + .PHONY: configure-gmp maybe-configure-gmp maybe-configure-gmp: @if gcc-bootstrap @@ -10424,6 +10945,9 @@ configure-gmp: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gmp ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gmp; \ + \ + this_target="none-${host_vendor}-${host_os}"; \ + \ cd "$(HOST_SUBDIR)/gmp" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -10434,7 +10958,7 @@ configure-gmp: libsrcdir="$$s/gmp"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \ - --target=none-${host_vendor}-${host_os} $${srcdiroption} --disable-shared \ + --target=$${this_target} $${srcdiroption} --disable-shared \ || exit 1 @endif gmp @@ -11290,6 +11814,9 @@ configure-mpfr: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpfr ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/mpfr; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/mpfr" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -11300,7 +11827,7 @@ configure-mpfr: libsrcdir="$$s/mpfr"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} --disable-shared @extra_mpfr_configure_flags@ \ + --target=$${this_target} $${srcdiroption} --disable-shared @extra_mpfr_configure_flags@ \ || exit 1 @endif mpfr @@ -12156,6 +12683,9 @@ configure-mpc: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/mpc ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/mpc; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/mpc" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -12166,7 +12696,7 @@ configure-mpc: libsrcdir="$$s/mpc"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \ + --target=$${this_target} $${srcdiroption} --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \ || exit 1 @endif mpc @@ -13022,6 +13552,9 @@ configure-isl: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/isl ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/isl; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/isl" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -13032,7 +13565,7 @@ configure-isl: libsrcdir="$$s/isl"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} --disable-shared @extra_isl_gmp_configure_flags@ \ + --target=$${this_target} $${srcdiroption} --disable-shared @extra_isl_gmp_configure_flags@ \ || exit 1 @endif isl @@ -13888,6 +14421,9 @@ configure-cloog: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/cloog ; \ $(HOST_EXPORTS) CPPFLAGS="$(HOST_GMPINC) $(HOST_ISLINC) $$CPPFLAGS"; export CPPFLAGS; LDFLAGS="-L$$r/$(HOST_SUBDIR)/gmp/.libs -L$$r/$(HOST_SUBDIR)/isl/.libs $$LDFLAGS"; export LDFLAGS; \ echo Configuring in $(HOST_SUBDIR)/cloog; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/cloog" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -13898,7 +14434,7 @@ configure-cloog: libsrcdir="$$s/cloog"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system \ + --target=$${this_target} $${srcdiroption} --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system \ || exit 1 @endif cloog @@ -14754,6 +15290,9 @@ configure-libelf: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libelf ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libelf; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/libelf" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -14764,7 +15303,7 @@ configure-libelf: libsrcdir="$$s/libelf"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} --disable-shared \ + --target=$${this_target} $${srcdiroption} --disable-shared \ || exit 1 @endif libelf @@ -15620,6 +16159,9 @@ configure-gold: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gold ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gold; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/gold" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -15630,7 +16172,7 @@ configure-gold: libsrcdir="$$s/gold"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif gold @@ -16493,6 +17035,9 @@ configure-gprof: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gprof ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gprof; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/gprof" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -16503,7 +17048,7 @@ configure-gprof: libsrcdir="$$s/gprof"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif gprof @@ -16932,6 +17477,9 @@ configure-intl: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/intl ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/intl; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/intl" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -16942,7 +17490,7 @@ configure-intl: libsrcdir="$$s/intl"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif intl @@ -17805,6 +18353,9 @@ configure-tcl: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tcl ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/tcl; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/tcl" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -17815,7 +18366,7 @@ configure-tcl: libsrcdir="$$s/tcl"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif tcl @@ -18230,6 +18781,9 @@ configure-itcl: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/itcl ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/itcl; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/itcl" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -18240,7 +18794,7 @@ configure-itcl: libsrcdir="$$s/itcl"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif itcl @@ -18669,6 +19223,9 @@ configure-ld: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/ld ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/ld; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/ld" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -18679,7 +19236,7 @@ configure-ld: libsrcdir="$$s/ld"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif ld @@ -19541,6 +20098,9 @@ configure-libbacktrace: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libbacktrace ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libbacktrace; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/libbacktrace" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -19551,7 +20111,7 @@ configure-libbacktrace: libsrcdir="$$s/libbacktrace"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif libbacktrace @@ -20413,6 +20973,9 @@ configure-libcpp: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libcpp ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libcpp; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/libcpp" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -20423,7 +20986,7 @@ configure-libcpp: libsrcdir="$$s/libcpp"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif libcpp @@ -21285,6 +21848,9 @@ configure-libdecnumber: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libdecnumber ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libdecnumber; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/libdecnumber" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -21295,7 +21861,7 @@ configure-libdecnumber: libsrcdir="$$s/libdecnumber"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif libdecnumber @@ -22158,6 +22724,9 @@ configure-libgui: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libgui ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libgui; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/libgui" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -22168,7 +22737,7 @@ configure-libgui: libsrcdir="$$s/libgui"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif libgui @@ -22597,6 +23166,9 @@ configure-libiberty: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libiberty; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/libiberty" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -22607,7 +23179,7 @@ configure-libiberty: libsrcdir="$$s/libiberty"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} @extra_host_libiberty_configure_flags@ \ + --target=$${this_target} $${srcdiroption} @extra_host_libiberty_configure_flags@ \ || exit 1 @endif libiberty @@ -23476,6 +24048,9 @@ configure-libiconv: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiconv ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libiconv; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/libiconv" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -23486,7 +24061,7 @@ configure-libiconv: libsrcdir="$$s/libiconv"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} --disable-shared \ + --target=$${this_target} $${srcdiroption} --disable-shared \ || exit 1 @endif libiconv @@ -23853,6 +24428,9 @@ configure-m4: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/m4 ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/m4; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/m4" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -23863,7 +24441,7 @@ configure-m4: libsrcdir="$$s/m4"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif m4 @@ -24293,6 +24871,9 @@ configure-readline: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/readline ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/readline; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/readline" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -24303,7 +24884,7 @@ configure-readline: libsrcdir="$$s/readline"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif readline @@ -24733,6 +25314,9 @@ configure-sid: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sid ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/sid; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/sid" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -24743,7 +25327,7 @@ configure-sid: libsrcdir="$$s/sid"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif sid @@ -25173,6 +25757,9 @@ configure-sim: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/sim ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/sim; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/sim" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -25183,7 +25770,7 @@ configure-sim: libsrcdir="$$s/sim"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif sim @@ -25613,6 +26200,9 @@ configure-texinfo: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/texinfo ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/texinfo; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/texinfo" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -25623,7 +26213,7 @@ configure-texinfo: libsrcdir="$$s/texinfo"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif texinfo @@ -26040,6 +26630,9 @@ configure-zlib: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/zlib ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/zlib; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/zlib" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -26050,7 +26643,7 @@ configure-zlib: libsrcdir="$$s/zlib"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif zlib @@ -26895,6 +27488,9 @@ configure-gdb: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gdb ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gdb; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/gdb" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -26905,7 +27501,7 @@ configure-gdb: libsrcdir="$$s/gdb"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif gdb @@ -27335,6 +27931,9 @@ configure-expect: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/expect ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/expect; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/expect" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -27345,7 +27944,7 @@ configure-expect: libsrcdir="$$s/expect"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif expect @@ -27775,6 +28374,9 @@ configure-guile: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/guile ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/guile; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/guile" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -27785,7 +28387,7 @@ configure-guile: libsrcdir="$$s/guile"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif guile @@ -28215,6 +28817,9 @@ configure-tk: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/tk ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/tk; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/tk" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -28225,7 +28830,7 @@ configure-tk: libsrcdir="$$s/tk"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif tk @@ -28655,6 +29260,9 @@ configure-libtermcap: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libtermcap ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/libtermcap; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/libtermcap" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -28665,7 +29273,7 @@ configure-libtermcap: libsrcdir="$$s/libtermcap"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif libtermcap @@ -29029,6 +29637,9 @@ configure-utils: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/utils ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/utils; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/utils" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -29039,7 +29650,7 @@ configure-utils: libsrcdir="$$s/utils"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif utils @@ -29463,6 +30074,9 @@ configure-gnattools: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/gnattools ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/gnattools; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/gnattools" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -29473,7 +30087,7 @@ configure-gnattools: libsrcdir="$$s/gnattools"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif gnattools @@ -29902,6 +30516,9 @@ configure-lto-plugin: $(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/lto-plugin ; \ $(HOST_EXPORTS) \ echo Configuring in $(HOST_SUBDIR)/lto-plugin; \ + \ + this_target="${target_alias}"; \ + \ cd "$(HOST_SUBDIR)/lto-plugin" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -29912,7 +30529,7 @@ configure-lto-plugin: libsrcdir="$$s/lto-plugin"; \ $(SHELL) $${libsrcdir}/configure \ $(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \ - --target=${target_alias} $${srcdiroption} --enable-shared \ + --target=$${this_target} $${srcdiroption} --enable-shared \ || exit 1 @endif lto-plugin @@ -30800,6 +31417,9 @@ configure-target-libstdc++-v3: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libstdc++-v3 ; \ $(RAW_CXX_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libstdc++-v3; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/libstdc++-v3" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -30811,7 +31431,7 @@ configure-target-libstdc++-v3: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-libstdc++-v3 @@ -31774,6 +32394,9 @@ configure-target-libsanitizer: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libsanitizer ; \ $(RAW_CXX_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libsanitizer; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/libsanitizer" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -31785,7 +32408,7 @@ configure-target-libsanitizer: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-libsanitizer @@ -32748,6 +33371,9 @@ configure-target-libvtv: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libvtv ; \ $(RAW_CXX_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libvtv; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/libvtv" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -32759,7 +33385,7 @@ configure-target-libvtv: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-libvtv @@ -33723,6 +34349,9 @@ configure-target-libcilkrts: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libcilkrts ; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libcilkrts; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/libcilkrts" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -33734,7 +34363,7 @@ configure-target-libcilkrts: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-libcilkrts @@ -34180,6 +34809,9 @@ configure-target-libssp: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libssp ; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libssp; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/libssp" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -34191,7 +34823,7 @@ configure-target-libssp: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-libssp @@ -34637,6 +35269,9 @@ configure-target-newlib: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/newlib ; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/newlib; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/newlib" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -34648,7 +35283,7 @@ configure-target-newlib: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-newlib @@ -35093,6 +35728,9 @@ configure-target-libgcc: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgcc ; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libgcc; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/libgcc" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -35104,7 +35742,7 @@ configure-target-libgcc: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-libgcc @@ -36063,6 +36701,9 @@ configure-target-libbacktrace: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libbacktrace ; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libbacktrace; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/libbacktrace" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -36074,7 +36715,7 @@ configure-target-libbacktrace: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-libbacktrace @@ -36520,6 +37161,9 @@ configure-target-libquadmath: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libquadmath ; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libquadmath; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/libquadmath" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -36531,7 +37175,7 @@ configure-target-libquadmath: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-libquadmath @@ -36977,6 +37621,9 @@ configure-target-libgfortran: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgfortran ; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libgfortran; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/libgfortran" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -36988,7 +37635,7 @@ configure-target-libgfortran: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-libgfortran @@ -37434,6 +38081,9 @@ configure-target-libobjc: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libobjc ; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libobjc; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/libobjc" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -37445,7 +38095,7 @@ configure-target-libobjc: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-libobjc @@ -37891,6 +38541,9 @@ configure-target-libgo: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgo ; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libgo; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/libgo" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -37902,7 +38555,7 @@ configure-target-libgo: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-libgo @@ -38348,6 +39001,9 @@ configure-target-libtermcap: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libtermcap ; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libtermcap; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/libtermcap" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -38359,7 +39015,7 @@ configure-target-libtermcap: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-libtermcap @@ -38740,6 +39396,9 @@ configure-target-winsup: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/winsup ; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/winsup; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/winsup" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -38751,7 +39410,7 @@ configure-target-winsup: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-winsup @@ -39197,6 +39856,9 @@ configure-target-libgloss: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgloss ; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libgloss; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/libgloss" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -39208,7 +39870,7 @@ configure-target-libgloss: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-libgloss @@ -39649,6 +40311,9 @@ configure-target-libffi: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi ; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libffi; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/libffi" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -39660,7 +40325,7 @@ configure-target-libffi: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-libffi @@ -40096,6 +40761,9 @@ configure-target-libjava: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava ; \ $(RAW_CXX_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libjava; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/libjava" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -40107,7 +40775,7 @@ configure-target-libjava: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} $(EXTRA_CONFIGARGS_LIBJAVA) \ + --target=$${this_target} $${srcdiroption} $(EXTRA_CONFIGARGS_LIBJAVA) \ || exit 1 @endif target-libjava @@ -40553,6 +41221,9 @@ configure-target-zlib: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/zlib ; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/zlib; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/zlib" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -40564,7 +41235,7 @@ configure-target-zlib: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-zlib @@ -41010,6 +41681,9 @@ configure-target-boehm-gc: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/boehm-gc ; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/boehm-gc; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/boehm-gc" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -41021,7 +41695,7 @@ configure-target-boehm-gc: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-boehm-gc @@ -41467,6 +42141,9 @@ configure-target-rda: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/rda ; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/rda; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/rda" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -41478,7 +42155,7 @@ configure-target-rda: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-rda @@ -41924,6 +42601,9 @@ configure-target-libada: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libada ; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libada; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/libada" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -41935,7 +42615,7 @@ configure-target-libada: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-libada @@ -42380,6 +43060,9 @@ configure-target-libgomp: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgomp ; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libgomp; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/libgomp" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -42391,7 +43074,7 @@ configure-target-libgomp: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-libgomp @@ -43355,6 +44038,9 @@ configure-target-libitm: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libitm ; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libitm; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/libitm" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -43366,7 +44052,7 @@ configure-target-libitm: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-libitm @@ -43812,6 +44498,9 @@ configure-target-libatomic: $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libatomic ; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libatomic; \ + \ + this_target="${target_alias}"; \ + \ cd "$(TARGET_SUBDIR)/libatomic" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ @@ -43823,7 +44512,7 @@ configure-target-libatomic: rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \ $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $${srcdiroption} \ + --target=$${this_target} $${srcdiroption} \ || exit 1 @endif target-libatomic @@ -46571,6 +47260,7 @@ all-stage3-gcc: maybe-all-stage3-cloog all-stage4-gcc: maybe-all-stage4-cloog all-stageprofile-gcc: maybe-all-stageprofile-cloog all-stagefeedback-gcc: maybe-all-stagefeedback-cloog +all-gcc: maybe-all-accel-gcc all-gcc: maybe-all-build-texinfo all-stage1-gcc: maybe-all-build-texinfo @@ -46660,6 +47350,24 @@ all-stage3-gcc: maybe-all-stage3-lto-plu all-stage4-gcc: maybe-all-stage4-lto-plugin all-stageprofile-gcc: maybe-all-stageprofile-lto-plugin all-stagefeedback-gcc: maybe-all-stagefeedback-lto-plugin +all-accel-gcc: all-libiberty +all-accel-gcc: maybe-all-intl +all-accel-gcc: maybe-all-mpfr +all-accel-gcc: maybe-all-mpc +all-accel-gcc: maybe-all-cloog +all-accel-gcc: maybe-all-accel-gcc +all-accel-gcc: maybe-all-build-texinfo +all-accel-gcc: maybe-all-build-bison +all-accel-gcc: maybe-all-build-flex +all-accel-gcc: maybe-all-build-libiberty +all-accel-gcc: maybe-all-build-fixincludes +all-accel-gcc: maybe-all-zlib +all-accel-gcc: all-libbacktrace +all-accel-gcc: all-libcpp +all-accel-gcc: all-libdecnumber +all-accel-gcc: maybe-all-libiberty +all-accel-gcc: maybe-all-fixincludes +all-accel-gcc: maybe-all-lto-plugin info-gcc: maybe-all-build-libiberty info-stage1-gcc: maybe-all-build-libiberty Index: Makefile.tpl =================================================================== --- Makefile.tpl (revision 208706) +++ Makefile.tpl (working copy) @@ -49,6 +49,10 @@ target_alias=@target_noncanonical@ target_vendor=@target_vendor@ target_os=@target_os@ target=@target@ +accel_target_alias=@accel_target_noncanonical@ +accel_target_vendor=@accel_target_vendor@ +accel_target_os=@accel_target_os@ +accel_target=@accel_target@ program_transform_name = @program_transform_name@ @@ -996,18 +1000,23 @@ configure-[+prefix+][+module+]: [+ IF bo $(SHELL) $(srcdir)/mkinstalldirs [+subdir+]/[+module+] ; \ [+exports+] [+extra_exports+] \ echo Configuring in [+subdir+]/[+module+]; \ + [+ IF (= (get "module") "accel-gcc") +] \ + this_target="$(accel_target_alias)"; \ + [+ ELSE +] \ + this_target="[+target_alias+]"; \ + [+ ENDIF +] \ cd "[+subdir+]/[+module+]" || exit 1; \ case $(srcdir) in \ /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo [+subdir+]/[+module+]/ | \ + *) topdir=`echo [+subdir+]/[+? actual_module (get "actual_module") (get "module")+]/ | \ sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ esac; \ - srcdiroption="--srcdir=$${topdir}/[+module+]"; \ - libsrcdir="$$s/[+module+]"; \ + srcdiroption="--srcdir=$${topdir}/[+? actual_module (get "actual_module") (get "module")+]"; \ + libsrcdir="$$s/[+? actual_module (get "actual_module") (get "module")+]"; \ [+ IF no-config-site +]rm -f no-such-file || : ; \ CONFIG_SITE=no-such-file [+ ENDIF +]$(SHELL) $${libsrcdir}/configure \ [+args+] --build=${build_alias} --host=[+host_alias+] \ - --target=[+target_alias+] $${srcdiroption} [+extra_configure_flags+] \ + --target=$${this_target} $${srcdiroption} [+extra_configure_flags+] \ || exit 1 @endif [+prefix+][+module+] @@ -1085,7 +1094,7 @@ all-[+prefix+][+module+]: configure-[+pr [+exports+] [+extra_exports+] \ (cd [+subdir+]/[+module+] && \ $(MAKE) $(BASE_FLAGS_TO_PASS) [+args+] [+stage1_args+] [+extra_make_flags+] \ - $(TARGET-[+prefix+][+module+])) + $(TARGET-[+prefix+][+? actual_module (get "actual_module") (get "module")+])) @endif [+prefix+][+module+] [+ IF bootstrap +] Index: config/ChangeLog =================================================================== --- config/ChangeLog (revision 208706) +++ config/ChangeLog (working copy) @@ -1,3 +1,7 @@ +2014-03-20 Bernd Schmidt + + * acx.m4 (ACX_CANONICAL_ACCEL_TARGET): New macro. + 2013-11-29 Marek Polacek * bootstrap-ubsan.mk (POSTSTAGE1_LDFLAGS): Remove -lpthread -ldl. Index: config/acx.m4 =================================================================== --- config/acx.m4 (revision 208706) +++ config/acx.m4 (working copy) @@ -61,6 +61,36 @@ AC_DEFUN([ACX_NONCANONICAL_TARGET], AC_SUBST(target_noncanonical) ]) []dnl # ACX_NONCANONICAL_TARGET +AC_DEFUN([ACX_CANONICAL_ACCEL_TARGET], +[AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl +AC_MSG_CHECKING(accelerator target system type) + +dnl Set accel_target_alias. +accel_target_alias=$accel_target_noncanonical +case "$accel_target_alias" in +NONE) + accel_target=NONE + ;; +*) + accel_target=`$ac_config_sub $accel_target_alias` + ;; +esac + +dnl Set the other accel_target vars. +changequote(<<, >>)dnl +accel_target_cpu=`echo $accel_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +accel_target_vendor=`echo $accel_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +accel_target_os=`echo $accel_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +changequote([, ])dnl +AC_MSG_RESULT($accel_target) +AC_SUBST(accel_target_noncanonical)dnl +AC_SUBST(accel_target)dnl +AC_SUBST(accel_target_alias)dnl +AC_SUBST(accel_target_cpu)dnl +AC_SUBST(accel_target_vendor)dnl +AC_SUBST(accel_target_os)dnl +]) + dnl #### dnl # GCC_TOPLEV_SUBDIRS dnl # GCC & friends build 'build', 'host', and 'target' tools. These must Index: configure =================================================================== --- configure (revision 208710) +++ configure (working copy) @@ -671,6 +671,12 @@ LDFLAGS CFLAGS CC EXTRA_CONFIGARGS_LIBJAVA +accel_target_os +accel_target_vendor +accel_target_cpu +accel_target_alias +accel_target +accel_target_noncanonical target_subdir host_subdir build_subdir @@ -2761,7 +2767,7 @@ host_libs="intl libiberty opcodes bfd re # binutils, gas and ld appear in that order because it makes sense to run # "make check" in that particular order. # If --enable-gold is used, "gold" may replace "ld". -host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools" +host_tools="texinfo flex bison binutils gas ld fixincludes accel-gcc gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools" # libgcj represents the runtime libraries only used by gcj. libgcj="target-libffi \ @@ -2959,6 +2965,26 @@ case "${ENABLE_ACCELERATOR}" in ;; esac +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking accelerator target system type" >&5 +$as_echo_n "checking accelerator target system type... " >&6; } + +accel_target_alias=$accel_target_noncanonical +case "$accel_target_alias" in +NONE) + accel_target=NONE + ;; +*) + accel_target=`$ac_config_sub $accel_target_alias` + ;; +esac + +accel_target_cpu=`echo $accel_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\1/'` +accel_target_vendor=`echo $accel_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\2/'` +accel_target_os=`echo $accel_target | sed 's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'` +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $accel_target" >&5 +$as_echo "$accel_target" >&6; } + + # Handle --enable-gold, --enable-ld. # --disable-gold [--enable-ld] # Build only ld. Default option. @@ -6725,7 +6751,15 @@ done configdirs_all="$configdirs" configdirs= for i in ${configdirs_all} ; do - if test -f ${srcdir}/$i/configure ; then + case $i in + accel-gcc) + confsrcdir=gcc + ;; + *) + confsrcdir=$i + ;; + esac + if test -f ${srcdir}/${confsrcdir}/configure ; then configdirs="${configdirs} $i" fi done @@ -8142,7 +8176,6 @@ case " $configdirs " in ;; esac - # Host tools. ncn_tool_prefix= test -n "$host_alias" && ncn_tool_prefix=$host_alias- Index: configure.ac =================================================================== --- configure.ac (revision 208710) +++ configure.ac (working copy) @@ -141,7 +141,7 @@ host_libs="intl libiberty opcodes bfd re # binutils, gas and ld appear in that order because it makes sense to run # "make check" in that particular order. # If --enable-gold is used, "gold" may replace "ld". -host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools" +host_tools="texinfo flex bison binutils gas ld fixincludes accel-gcc gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools" # libgcj represents the runtime libraries only used by gcj. libgcj="target-libffi \ @@ -317,6 +317,8 @@ case "${ENABLE_ACCELERATOR}" in ;; esac +ACX_CANONICAL_ACCEL_TARGET + # Handle --enable-gold, --enable-ld. # --disable-gold [--enable-ld] # Build only ld. Default option. @@ -2150,7 +2152,15 @@ done configdirs_all="$configdirs" configdirs= for i in ${configdirs_all} ; do - if test -f ${srcdir}/$i/configure ; then + case $i in + accel-gcc) + confsrcdir=gcc + ;; + *) + confsrcdir=$i + ;; + esac + if test -f ${srcdir}/${confsrcdir}/configure ; then configdirs="${configdirs} $i" fi done @@ -3179,7 +3189,6 @@ case " $configdirs " in ;; esac - # Host tools. NCN_STRICT_CHECK_TOOLS(AR, ar) NCN_STRICT_CHECK_TOOLS(AS, as)