[gomp4] Revert more old Makefile/configure bits
Thomas Schwinge
thomas@codesourcery.com
Mon Sep 8 09:42:00 GMT 2014
Hi!
On Fri, 5 Sep 2014 18:35:23 +0200, Bernd Schmidt <bernds@codesourcery.com> wrote:
> This removes some remnants from the accel-gcc support that turned out
> not to be viable for ptx. Ilya Verbin has confirmed the patch doesn't
> break their setup either, so I've committed it on the branch.
In gomp-4_0-branch's rr215009, I committed some more build system cleanup
as follows:
commit fcdb38e02f606c0c0a8288097b60481a8c337d0d
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Mon Sep 8 09:40:24 2014 +0000
Some more build system cleanup.
* Makefile.tpl (accel_target_alias, accel_target_vendor)
(accel_target_os, accel_target): Remove.
(configure-[+prefix+][+module+]): Remove "accel-gcc" case.
* Makefile.in: Regenerate.
* configure.ac (offload_targets): Remove.
* configure: Regenerate.
gcc/
* configure.ac (offload_targets): Remove.
* configure: Regenerate.
libgcc/
* configure.ac (enable_accelerator, offload_targets): Remove.
* configure: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@215009 138bc75d-0d04-0410-961f-82ee72b054a4
---
ChangeLog.gomp | 9 ++
Makefile.in | 379 ++++++++++----------------------------------------
Makefile.tpl | 11 +-
configure | 5 +-
configure.ac | 5 +-
gcc/ChangeLog.gomp | 5 +
gcc/configure | 21 +--
gcc/configure.ac | 17 +--
libgcc/ChangeLog.gomp | 5 +
libgcc/configure | 31 +----
libgcc/configure.ac | 26 +---
11 files changed, 117 insertions(+), 397 deletions(-)
diff --git ChangeLog.gomp ChangeLog.gomp
index d3da977..a64bf25 100644
--- ChangeLog.gomp
+++ ChangeLog.gomp
@@ -1,3 +1,12 @@
+2014-09-08 Thomas Schwinge <thomas@codesourcery.com>
+
+ * Makefile.tpl (accel_target_alias, accel_target_vendor)
+ (accel_target_os, accel_target): Remove.
+ (configure-[+prefix+][+module+]): Remove "accel-gcc" case.
+ * Makefile.in: Regenerate.
+ * configure.ac (offload_targets): Remove.
+ * configure: Regenerate.
+
2014-09-05 Bernd Schmidt <bernds@codesourcery.com>
* Makefile.def (host_modules, flags_to_pass): Remove accel-gcc remnants.
diff --git Makefile.in Makefile.in
index 336908c..329af7f 100644
--- Makefile.in
+++ Makefile.in
@@ -46,10 +46,6 @@ 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@
@@ -2678,9 +2674,6 @@ 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) ;; \
@@ -2693,7 +2686,7 @@ configure-build-libiberty:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif build-libiberty
@@ -2738,9 +2731,6 @@ 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) ;; \
@@ -2753,7 +2743,7 @@ configure-build-bison:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif build-bison
@@ -2798,9 +2788,6 @@ 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) ;; \
@@ -2813,7 +2800,7 @@ configure-build-flex:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif build-flex
@@ -2858,9 +2845,6 @@ 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) ;; \
@@ -2873,7 +2857,7 @@ configure-build-m4:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif build-m4
@@ -2918,9 +2902,6 @@ 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) ;; \
@@ -2933,7 +2914,7 @@ configure-build-texinfo:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif build-texinfo
@@ -2978,9 +2959,6 @@ 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) ;; \
@@ -2993,7 +2971,7 @@ configure-build-fixincludes:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(BUILD_CONFIGARGS) --build=${build_alias} --host=${build_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif build-fixincludes
@@ -3042,9 +3020,6 @@ 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) ;; \
@@ -3056,7 +3031,7 @@ configure-bfd:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif bfd
@@ -3919,9 +3894,6 @@ 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) ;; \
@@ -3933,7 +3905,7 @@ configure-opcodes:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif opcodes
@@ -4796,9 +4768,6 @@ 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) ;; \
@@ -4810,7 +4779,7 @@ configure-binutils:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif binutils
@@ -5674,9 +5643,6 @@ 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) ;; \
@@ -5688,7 +5654,7 @@ configure-bison:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif bison
@@ -6121,9 +6087,6 @@ 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) ;; \
@@ -6135,7 +6098,7 @@ configure-cgen:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif cgen
@@ -6565,9 +6528,6 @@ 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) ;; \
@@ -6579,7 +6539,7 @@ configure-dejagnu:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif dejagnu
@@ -7009,9 +6969,6 @@ 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) ;; \
@@ -7023,7 +6980,7 @@ configure-etc:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif etc
@@ -7453,9 +7410,6 @@ 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) ;; \
@@ -7467,7 +7421,7 @@ configure-fastjar:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif fastjar
@@ -7899,9 +7853,6 @@ 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) ;; \
@@ -7913,7 +7864,7 @@ configure-fixincludes:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif fixincludes
@@ -8762,9 +8713,6 @@ 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) ;; \
@@ -8776,7 +8724,7 @@ configure-flex:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif flex
@@ -9208,9 +9156,6 @@ 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) ;; \
@@ -9222,7 +9167,7 @@ configure-gas:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif gas
@@ -10085,9 +10030,6 @@ 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) ;; \
@@ -10099,7 +10041,7 @@ configure-gcc:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif gcc
@@ -10962,9 +10904,6 @@ 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) ;; \
@@ -10976,7 +10915,7 @@ configure-gmp:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=none-${host_vendor}-${host_os} \
- --target=$${this_target} --disable-shared \
+ --target=none-${host_vendor}-${host_os} --disable-shared \
|| exit 1
@endif gmp
@@ -11833,9 +11772,6 @@ 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) ;; \
@@ -11847,7 +11783,7 @@ configure-mpfr:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} --disable-shared @extra_mpfr_configure_flags@ \
+ --target=${target_alias} --disable-shared @extra_mpfr_configure_flags@ \
|| exit 1
@endif mpfr
@@ -12704,9 +12640,6 @@ 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) ;; \
@@ -12718,7 +12651,7 @@ configure-mpc:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \
+ --target=${target_alias} --disable-shared @extra_mpc_gmp_configure_flags@ @extra_mpc_mpfr_configure_flags@ \
|| exit 1
@endif mpc
@@ -13575,9 +13508,6 @@ 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) ;; \
@@ -13589,7 +13519,7 @@ configure-isl:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} --disable-shared @extra_isl_gmp_configure_flags@ \
+ --target=${target_alias} --disable-shared @extra_isl_gmp_configure_flags@ \
|| exit 1
@endif isl
@@ -14446,9 +14376,6 @@ 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) ;; \
@@ -14460,7 +14387,7 @@ configure-cloog:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system \
+ --target=${target_alias} --disable-shared --with-gmp=system --with-bits=gmp --with-isl=system \
|| exit 1
@endif cloog
@@ -15317,9 +15244,6 @@ 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) ;; \
@@ -15331,7 +15255,7 @@ configure-libelf:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} --disable-shared \
+ --target=${target_alias} --disable-shared \
|| exit 1
@endif libelf
@@ -16188,9 +16112,6 @@ 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) ;; \
@@ -16202,7 +16123,7 @@ configure-gold:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif gold
@@ -17066,9 +16987,6 @@ 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) ;; \
@@ -17080,7 +16998,7 @@ configure-gprof:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif gprof
@@ -17509,9 +17427,6 @@ 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) ;; \
@@ -17523,7 +17438,7 @@ configure-intl:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif intl
@@ -18387,9 +18302,6 @@ 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) ;; \
@@ -18401,7 +18313,7 @@ configure-tcl:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif tcl
@@ -18816,9 +18728,6 @@ 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) ;; \
@@ -18830,7 +18739,7 @@ configure-itcl:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif itcl
@@ -19259,9 +19168,6 @@ 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) ;; \
@@ -19273,7 +19179,7 @@ configure-ld:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif ld
@@ -20136,9 +20042,6 @@ 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) ;; \
@@ -20150,7 +20053,7 @@ configure-libbacktrace:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif libbacktrace
@@ -21013,9 +20916,6 @@ 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) ;; \
@@ -21027,7 +20927,7 @@ configure-libcpp:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif libcpp
@@ -21890,9 +21790,6 @@ 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) ;; \
@@ -21904,7 +21801,7 @@ configure-libdecnumber:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif libdecnumber
@@ -22768,9 +22665,6 @@ 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) ;; \
@@ -22782,7 +22676,7 @@ configure-libgui:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif libgui
@@ -23211,9 +23105,6 @@ 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) ;; \
@@ -23225,7 +23116,7 @@ configure-libiberty:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} @extra_host_libiberty_configure_flags@ \
+ --target=${target_alias} @extra_host_libiberty_configure_flags@ \
|| exit 1
@endif libiberty
@@ -24094,9 +23985,6 @@ configure-libiberty-linker-plugin:
$(SHELL) $(srcdir)/mkinstalldirs $(HOST_SUBDIR)/libiberty-linker-plugin ; \
$(HOST_EXPORTS) \
echo Configuring in $(HOST_SUBDIR)/libiberty-linker-plugin; \
- \
- this_target="${target_alias}"; \
- \
cd "$(HOST_SUBDIR)/libiberty-linker-plugin" || exit 1; \
case $(srcdir) in \
/* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \
@@ -24108,7 +23996,7 @@ configure-libiberty-linker-plugin:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ \
+ --target=${target_alias} @extra_host_libiberty_configure_flags@ --disable-install-libiberty @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ \
|| exit 1
@endif libiberty-linker-plugin
@@ -24978,9 +24866,6 @@ 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) ;; \
@@ -24992,7 +24877,7 @@ configure-libiconv:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} --disable-shared \
+ --target=${target_alias} --disable-shared \
|| exit 1
@endif libiconv
@@ -25359,9 +25244,6 @@ 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) ;; \
@@ -25373,7 +25255,7 @@ configure-m4:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif m4
@@ -25803,9 +25685,6 @@ 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) ;; \
@@ -25817,7 +25696,7 @@ configure-readline:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif readline
@@ -26247,9 +26126,6 @@ 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) ;; \
@@ -26261,7 +26137,7 @@ configure-sid:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif sid
@@ -26691,9 +26567,6 @@ 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) ;; \
@@ -26705,7 +26578,7 @@ configure-sim:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif sim
@@ -27135,9 +27008,6 @@ 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) ;; \
@@ -27149,7 +27019,7 @@ configure-texinfo:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif texinfo
@@ -27566,9 +27436,6 @@ 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) ;; \
@@ -27580,7 +27447,7 @@ configure-zlib:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif zlib
@@ -28426,9 +28293,6 @@ 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) ;; \
@@ -28440,7 +28304,7 @@ configure-gdb:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif gdb
@@ -28870,9 +28734,6 @@ 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) ;; \
@@ -28884,7 +28745,7 @@ configure-expect:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif expect
@@ -29314,9 +29175,6 @@ 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) ;; \
@@ -29328,7 +29186,7 @@ configure-guile:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif guile
@@ -29758,9 +29616,6 @@ 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) ;; \
@@ -29772,7 +29627,7 @@ configure-tk:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif tk
@@ -30202,9 +30057,6 @@ 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) ;; \
@@ -30216,7 +30068,7 @@ configure-libtermcap:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif libtermcap
@@ -30580,9 +30432,6 @@ 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) ;; \
@@ -30594,7 +30443,7 @@ configure-utils:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif utils
@@ -31018,9 +30867,6 @@ 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) ;; \
@@ -31032,7 +30878,7 @@ configure-gnattools:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif gnattools
@@ -31461,9 +31307,6 @@ 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) ;; \
@@ -31475,7 +31318,7 @@ configure-lto-plugin:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ \
+ --target=${target_alias} --enable-shared @extra_linker_plugin_flags@ @extra_linker_plugin_configure_flags@ \
|| exit 1
@endif lto-plugin
@@ -32364,9 +32207,6 @@ 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) ;; \
@@ -32379,7 +32219,7 @@ configure-target-libstdc++-v3:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-libstdc++-v3
@@ -33343,9 +33183,6 @@ 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) ;; \
@@ -33358,7 +33195,7 @@ configure-target-libsanitizer:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-libsanitizer
@@ -34322,9 +34159,6 @@ 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) ;; \
@@ -34337,7 +34171,7 @@ configure-target-libvtv:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-libvtv
@@ -35302,9 +35136,6 @@ 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) ;; \
@@ -35317,7 +35148,7 @@ configure-target-libcilkrts:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-libcilkrts
@@ -35763,9 +35594,6 @@ 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) ;; \
@@ -35778,7 +35606,7 @@ configure-target-libssp:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-libssp
@@ -36224,9 +36052,6 @@ 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) ;; \
@@ -36239,7 +36064,7 @@ configure-target-newlib:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-newlib
@@ -36684,9 +36509,6 @@ 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) ;; \
@@ -36699,7 +36521,7 @@ configure-target-libgcc:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-libgcc
@@ -37659,9 +37481,6 @@ 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) ;; \
@@ -37674,7 +37493,7 @@ configure-target-libbacktrace:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-libbacktrace
@@ -38120,9 +37939,6 @@ 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) ;; \
@@ -38135,7 +37951,7 @@ configure-target-libquadmath:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-libquadmath
@@ -38581,9 +38397,6 @@ 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) ;; \
@@ -38596,7 +38409,7 @@ configure-target-libgfortran:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-libgfortran
@@ -39042,9 +38855,6 @@ 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) ;; \
@@ -39057,7 +38867,7 @@ configure-target-libobjc:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-libobjc
@@ -39503,9 +39313,6 @@ 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) ;; \
@@ -39518,7 +39325,7 @@ configure-target-libgo:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-libgo
@@ -39964,9 +39771,6 @@ 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) ;; \
@@ -39979,7 +39783,7 @@ configure-target-libtermcap:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-libtermcap
@@ -40360,9 +40164,6 @@ 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) ;; \
@@ -40375,7 +40176,7 @@ configure-target-winsup:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-winsup
@@ -40821,9 +40622,6 @@ 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) ;; \
@@ -40836,7 +40634,7 @@ configure-target-libgloss:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-libgloss
@@ -41277,9 +41075,6 @@ 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) ;; \
@@ -41292,7 +41087,7 @@ configure-target-libffi:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-libffi
@@ -41728,9 +41523,6 @@ 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) ;; \
@@ -41743,7 +41535,7 @@ configure-target-libjava:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} $(EXTRA_CONFIGARGS_LIBJAVA) \
+ --target=${target_alias} $(EXTRA_CONFIGARGS_LIBJAVA) \
|| exit 1
@endif target-libjava
@@ -42189,9 +41981,6 @@ 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) ;; \
@@ -42204,7 +41993,7 @@ configure-target-zlib:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-zlib
@@ -42650,9 +42439,6 @@ 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) ;; \
@@ -42665,7 +42451,7 @@ configure-target-boehm-gc:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-boehm-gc
@@ -43111,9 +42897,6 @@ 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) ;; \
@@ -43126,7 +42909,7 @@ configure-target-rda:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-rda
@@ -43572,9 +43355,6 @@ 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) ;; \
@@ -43587,7 +43367,7 @@ configure-target-libada:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-libada
@@ -44032,9 +43812,6 @@ 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) ;; \
@@ -44047,7 +43824,7 @@ configure-target-libgomp:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-libgomp
@@ -45012,9 +44789,6 @@ 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) ;; \
@@ -45027,7 +44801,7 @@ configure-target-libitm:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-libitm
@@ -45473,9 +45247,6 @@ 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) ;; \
@@ -45488,7 +45259,7 @@ configure-target-libatomic:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=$${this_target} \
+ --target=${target_alias} \
|| exit 1
@endif target-libatomic
diff --git Makefile.tpl Makefile.tpl
index eef404b..4822c32 100644
--- Makefile.tpl
+++ Makefile.tpl
@@ -49,10 +49,6 @@ 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@
@@ -1000,11 +996,6 @@ configure-[+prefix+][+module+]: [+ IF bootstrap +][+ ELSE +]
$(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) ;; \
@@ -1017,7 +1008,7 @@ configure-[+prefix+][+module+]: [+ IF bootstrap +][+ ELSE +]
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
[+args+] --build=${build_alias} --host=[+host_alias+] \
- --target=$${this_target} [+extra_configure_flags+] \
+ --target=[+target_alias+] [+extra_configure_flags+] \
|| exit 1
@endif [+prefix+][+module+]
diff --git configure configure
index c37ec4b..e2d65c9 100755
--- configure
+++ configure
@@ -2937,12 +2937,10 @@ case ${with_newlib} in
yes) skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` ;;
esac
-offload_targets=
-
# Check whether --enable-offload-targets was given.
if test "${enable_offload_targets+set}" = set; then :
enableval=$enable_offload_targets;
- if test x$enable_offload_targets = x; then
+ if test x"$enable_offload_targets" = x; then
as_fn_error "no offload targets specified" "$LINENO" 5
fi
@@ -8157,6 +8155,7 @@ case " $configdirs " in
;;
esac
+
# Host tools.
ncn_tool_prefix=
test -n "$host_alias" && ncn_tool_prefix=$host_alias-
diff --git configure.ac configure.ac
index 1c05027..96a2126 100644
--- configure.ac
+++ configure.ac
@@ -286,13 +286,11 @@ case ${with_newlib} in
yes) skipdirs=`echo " ${skipdirs} " | sed -e 's/ target-newlib / /'` ;;
esac
-offload_targets=
-
AC_ARG_ENABLE(offload-targets,
[AS_HELP_STRING([--enable-offload-targets=LIST],
[enable offloading to devices from LIST])],
[
- if test x$enable_offload_targets = x; then
+ if test x"$enable_offload_targets" = x; then
AC_MSG_ERROR([no offload targets specified])
fi
], [enable_offload_targets=])
@@ -3219,6 +3217,7 @@ case " $configdirs " in
;;
esac
+
# Host tools.
NCN_STRICT_CHECK_TOOLS(AR, ar)
NCN_STRICT_CHECK_TOOLS(AS, as)
diff --git gcc/ChangeLog.gomp gcc/ChangeLog.gomp
index 0764c69..ef9a81d 100644
--- gcc/ChangeLog.gomp
+++ gcc/ChangeLog.gomp
@@ -1,3 +1,8 @@
+2014-09-08 Thomas Schwinge <thomas@codesourcery.com>
+
+ * configure.ac (offload_targets): Remove.
+ * configure: Regenerate.
+
2014-09-05 Bernd Schmidt <bernds@codesourcery.com>
* configure.ac (enable-accelerator): Remove option.
diff --git gcc/configure gcc/configure
index f606e24..6630dc2 100755
--- gcc/configure
+++ gcc/configure
@@ -7425,28 +7425,21 @@ fi
# Check whether --enable-offload-targets was given.
if test "${enable_offload_targets+set}" = set; then :
enableval=$enable_offload_targets;
- if test x$enable_offload_targets = x; then
+ if test x"$enable_offload_targets" = x; then
as_fn_error "no offload targets specified" "$LINENO" 5
- else
- if test x$offload_targets = x; then
- offload_targets=$enable_offload_targets
- else
- offload_targets=$offload_targets,$enable_offload_targets
- fi
fi
else
- offload_targets=
+ enable_offload_targets=
fi
-
-offload_targets=`echo $offload_targets | sed -e 's#,#:#g'`
+enable_offload_targets=`echo "$enable_offload_targets" | sed -e 's#,#:#g'`
cat >>confdefs.h <<_ACEOF
-#define OFFLOAD_TARGETS "$offload_targets"
+#define OFFLOAD_TARGETS "$enable_offload_targets"
_ACEOF
-if test x$offload_targets != x; then
+if test x"$enable_offload_targets" != x; then
$as_echo "#define ENABLE_OFFLOADING 1" >>confdefs.h
@@ -18094,7 +18087,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 18097 "configure"
+#line 18090 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18200,7 +18193,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 18203 "configure"
+#line 18196 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
diff --git gcc/configure.ac gcc/configure.ac
index 203de5d..e543bae 100644
--- gcc/configure.ac
+++ gcc/configure.ac
@@ -905,21 +905,14 @@ AC_ARG_ENABLE(offload-targets,
[AS_HELP_STRING([--enable-offload-targets=LIST],
[enable offloading to devices from LIST])],
[
- if test x$enable_offload_targets = x; then
+ if test x"$enable_offload_targets" = x; then
AC_MSG_ERROR([no offload targets specified])
- else
- if test x$offload_targets = x; then
- offload_targets=$enable_offload_targets
- else
- offload_targets=$offload_targets,$enable_offload_targets
- fi
fi
-], [offload_targets=])
-
-offload_targets=`echo $offload_targets | sed -e 's#,#:#g'`
-AC_DEFINE_UNQUOTED(OFFLOAD_TARGETS, "$offload_targets",
+], [enable_offload_targets=])
+enable_offload_targets=`echo "$enable_offload_targets" | sed -e 's#,#:#g'`
+AC_DEFINE_UNQUOTED(OFFLOAD_TARGETS, "$enable_offload_targets",
[Define to hold the list of target names suitable for offloading.])
-if test x$offload_targets != x; then
+if test x"$enable_offload_targets" != x; then
AC_DEFINE(ENABLE_OFFLOADING, 1,
[Define this to enable support for offloading.])
fi
diff --git libgcc/ChangeLog.gomp libgcc/ChangeLog.gomp
index 573caa5..7c56fe5 100644
--- libgcc/ChangeLog.gomp
+++ libgcc/ChangeLog.gomp
@@ -1,3 +1,8 @@
+2014-09-08 Thomas Schwinge <thomas@codesourcery.com>
+
+ * configure.ac (enable_accelerator, offload_targets): Remove.
+ * configure: Regenerate.
+
2014-05-12 Bernd Schmidt <bernds@codesourcery.com>
* ompstuff.c (_omp_func_table, _omp_var_table, _omp_funcs_end,
diff --git libgcc/configure libgcc/configure
index 2a21be7..832f82c 100644
--- libgcc/configure
+++ libgcc/configure
@@ -566,7 +566,6 @@ sfp_machine_header
set_use_emutls
set_have_cc_tls
vis_hide
-enable_accelerator
fixed_point
enable_decimal_float
decimal_float
@@ -665,7 +664,6 @@ with_build_libsubdir
enable_decimal_float
with_system_libunwind
enable_sjlj_exceptions
-enable_accelerator
enable_offload_targets
enable_tls
'
@@ -1304,7 +1302,6 @@ Optional Features:
to use
--enable-sjlj-exceptions
force use of builtin_setjmp for exceptions
- --enable-accelerator build accelerator [ARG={no,device-triplet}]
--enable-offload-targets=LIST
enable offloading to devices from LIST
--enable-tls Use thread-local storage [default=yes]
@@ -4363,40 +4360,18 @@ esac
# Collect host-machine-specific information.
. ${srcdir}/config.host
-offload_targets=
-# Check whether --enable-accelerator was given.
-if test "${enable_accelerator+set}" = set; then :
- enableval=$enable_accelerator;
- case $enable_accelerator in
- no) ;;
- *)
- offload_targets=$enable_accelerator
- ;;
- esac
-
-fi
-
-
-
# Check whether --enable-offload-targets was given.
if test "${enable_offload_targets+set}" = set; then :
enableval=$enable_offload_targets;
- if test x$enable_offload_targets = x; then
+ if test x"$enable_offload_targets" = x; then
as_fn_error "no offload targets specified" "$LINENO" 5
- else
- if test x$offload_targets = x; then
- offload_targets=$enable_offload_targets
- else
- offload_targets=$offload_targets,$enable_offload_targets
- fi
fi
else
- enable_accelerator=no
+ enable_offload_targets=
fi
-
-if test x$offload_targets != x; then
+if test x"$enable_offload_targets" != x; then
extra_parts="${extra_parts} crtompbegin.o crtompend.o"
fi
diff --git libgcc/configure.ac libgcc/configure.ac
index 1db09b9..8f29f6a 100644
--- libgcc/configure.ac
+++ libgcc/configure.ac
@@ -307,35 +307,15 @@ esac
# Collect host-machine-specific information.
. ${srcdir}/config.host
-offload_targets=
-AC_ARG_ENABLE(accelerator,
-[AS_HELP_STRING([--enable-accelerator], [build accelerator @<:@ARG={no,device-triplet}@:>@])],
-[
- case $enable_accelerator in
- no) ;;
- *)
- offload_targets=$enable_accelerator
- ;;
- esac
-], [])
-AC_SUBST(enable_accelerator)
-
AC_ARG_ENABLE(offload-targets,
[AS_HELP_STRING([--enable-offload-targets=LIST],
[enable offloading to devices from LIST])],
[
- if test x$enable_offload_targets = x; then
+ if test x"$enable_offload_targets" = x; then
AC_MSG_ERROR([no offload targets specified])
- else
- if test x$offload_targets = x; then
- offload_targets=$enable_offload_targets
- else
- offload_targets=$offload_targets,$enable_offload_targets
- fi
fi
-], [enable_accelerator=no])
-AC_SUBST(enable_accelerator)
-if test x$offload_targets != x; then
+], [enable_offload_targets=])
+if test x"$enable_offload_targets" != x; then
extra_parts="${extra_parts} crtompbegin.o crtompend.o"
fi
Grüße,
Thomas
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 472 bytes
Desc: not available
URL: <http://gcc.gnu.org/pipermail/gcc-patches/attachments/20140908/ba3184be/attachment.sig>
More information about the Gcc-patches
mailing list