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.
Bernd
Index: ChangeLog.gomp
===================================================================
--- ChangeLog.gomp (revision 214959)
+++ ChangeLog.gomp (working copy)
@@ -1,3 +1,11 @@
+2014-09-05 Bernd Schmidt <ber...@codesourcery.com>
+
+ * Makefile.def (host_modules, flags_to_pass): Remove accel-gcc remnants.
+ * configure.ac: Don't call ACX_CANONICAL_ACCEL_TARGET. Remove
+ target-gcc-configure-flags and accelerator-gcc-configure-flags options.
+ * Makefile.in: Regenerate.
+ * configure: Regenerate.
+
2014-08-04 Bernd Schmidt <ber...@codesourcery.com>
* Makefile.def (accel-gcc host module): Remove, and all of its
Index: Makefile.def
===================================================================
--- Makefile.def (revision 214959)
+++ Makefile.def (working copy)
@@ -44,8 +44,7 @@ host_modules= { module= fixincludes; boo
host_modules= { module= flex; no_check_cross= true; };
host_modules= { module= gas; bootstrap=true; };
host_modules= { module= gcc; bootstrap=true;
- extra_configure_flags='@extra_target_gcc_configure_flags@';
- extra_make_flags="$(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS)"; };
+ extra_make_flags="$(EXTRA_GCC_FLAGS)"; };
host_modules= { module= gmp; lib_path=.libs; bootstrap=true;
extra_configure_flags='--disable-shared';
no_install= true;
@@ -221,7 +220,6 @@ 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 ; };
Index: Makefile.in
===================================================================
--- Makefile.in (revision 214959)
+++ Makefile.in (working copy)
@@ -705,7 +705,6 @@ 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)" \
@@ -10100,7 +10099,7 @@ configure-gcc:
$$s/$$module_srcdir/configure \
--srcdir=$${topdir}/$$module_srcdir \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} @extra_target_gcc_configure_flags@ \
+ --target=$${this_target} \
|| exit 1
@endif gcc
@@ -10135,8 +10134,7 @@ configure-stage1-gcc:
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} \
\
- $(STAGE1_CONFIGURE_FLAGS) \
- @extra_target_gcc_configure_flags@
+ $(STAGE1_CONFIGURE_FLAGS)
@endif gcc-bootstrap
.PHONY: configure-stage2-gcc maybe-configure-stage2-gcc
@@ -10169,8 +10167,7 @@ configure-stage2-gcc:
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} \
--with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE2_CONFIGURE_FLAGS) \
- @extra_target_gcc_configure_flags@
+ $(STAGE2_CONFIGURE_FLAGS)
@endif gcc-bootstrap
.PHONY: configure-stage3-gcc maybe-configure-stage3-gcc
@@ -10203,8 +10200,7 @@ configure-stage3-gcc:
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} \
--with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE3_CONFIGURE_FLAGS) \
- @extra_target_gcc_configure_flags@
+ $(STAGE3_CONFIGURE_FLAGS)
@endif gcc-bootstrap
.PHONY: configure-stage4-gcc maybe-configure-stage4-gcc
@@ -10237,8 +10233,7 @@ configure-stage4-gcc:
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} \
--with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE4_CONFIGURE_FLAGS) \
- @extra_target_gcc_configure_flags@
+ $(STAGE4_CONFIGURE_FLAGS)
@endif gcc-bootstrap
.PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc
@@ -10271,8 +10266,7 @@ configure-stageprofile-gcc:
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} \
--with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGEprofile_CONFIGURE_FLAGS) \
- @extra_target_gcc_configure_flags@
+ $(STAGEprofile_CONFIGURE_FLAGS)
@endif gcc-bootstrap
.PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc
@@ -10305,8 +10299,7 @@ configure-stagefeedback-gcc:
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} \
--with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGEfeedback_CONFIGURE_FLAGS) \
- @extra_target_gcc_configure_flags@
+ $(STAGEfeedback_CONFIGURE_FLAGS)
@endif gcc-bootstrap
@@ -10326,7 +10319,7 @@ all-gcc: configure-gcc
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/gcc && \
- $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) \
+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS) $(STAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
$(TARGET-gcc))
@endif gcc
@@ -10355,7 +10348,7 @@ all-stage1-gcc: configure-stage1-gcc
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
$(EXTRA_HOST_FLAGS) \
- $(STAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) \
+ $(STAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
TFLAGS="$(STAGE1_TFLAGS)" \
$(TARGET-stage1-gcc)
@@ -10370,7 +10363,7 @@ clean-stage1-gcc:
fi; \
cd $(HOST_SUBDIR)/gcc && \
$(MAKE) $(EXTRA_HOST_FLAGS) \
- $(STAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) clean
+ $(STAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
@endif gcc-bootstrap
@@ -10397,7 +10390,7 @@ all-stage2-gcc: configure-stage2-gcc
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
- $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) \
+ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
TFLAGS="$(STAGE2_TFLAGS)" \
$(TARGET-stage2-gcc)
@@ -10411,7 +10404,7 @@ clean-stage2-gcc:
$(MAKE) stage2-start; \
fi; \
cd $(HOST_SUBDIR)/gcc && \
- $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) clean
+ $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
@endif gcc-bootstrap
@@ -10438,7 +10431,7 @@ all-stage3-gcc: configure-stage3-gcc
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
- $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) \
+ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
TFLAGS="$(STAGE3_TFLAGS)" \
$(TARGET-stage3-gcc)
@@ -10452,7 +10445,7 @@ clean-stage3-gcc:
$(MAKE) stage3-start; \
fi; \
cd $(HOST_SUBDIR)/gcc && \
- $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) clean
+ $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
@endif gcc-bootstrap
@@ -10479,7 +10472,7 @@ all-stage4-gcc: configure-stage4-gcc
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
- $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) \
+ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
TFLAGS="$(STAGE4_TFLAGS)" \
$(TARGET-stage4-gcc)
@@ -10493,7 +10486,7 @@ clean-stage4-gcc:
$(MAKE) stage4-start; \
fi; \
cd $(HOST_SUBDIR)/gcc && \
- $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) clean
+ $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
@endif gcc-bootstrap
@@ -10520,7 +10513,7 @@ all-stageprofile-gcc: configure-stagepro
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
- $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) \
+ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
TFLAGS="$(STAGEprofile_TFLAGS)" \
$(TARGET-stageprofile-gcc)
@@ -10534,7 +10527,7 @@ clean-stageprofile-gcc:
$(MAKE) stageprofile-start; \
fi; \
cd $(HOST_SUBDIR)/gcc && \
- $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) clean
+ $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
@endif gcc-bootstrap
@@ -10561,7 +10554,7 @@ all-stagefeedback-gcc: configure-stagefe
CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \
CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \
LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \
- $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) \
+ $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) \
TFLAGS="$(STAGEfeedback_TFLAGS)" \
$(TARGET-stagefeedback-gcc)
@@ -10575,7 +10568,7 @@ clean-stagefeedback-gcc:
$(MAKE) stagefeedback-start; \
fi; \
cd $(HOST_SUBDIR)/gcc && \
- $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) clean
+ $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
@endif gcc-bootstrap
@@ -10593,7 +10586,7 @@ check-gcc:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/gcc && \
- $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) check)
+ $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) check)
@endif gcc
@@ -10608,7 +10601,7 @@ install-gcc: installdirs
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/gcc && \
- $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) install)
+ $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) install)
@endif gcc
@@ -10623,7 +10616,7 @@ install-strip-gcc: installdirs
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/gcc && \
- $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) install-strip)
+ $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) install-strip)
@endif gcc
@@ -10640,7 +10633,7 @@ info-gcc: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing info in gcc" ; \
@@ -10665,7 +10658,7 @@ dvi-gcc: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing dvi in gcc" ; \
@@ -10690,7 +10683,7 @@ pdf-gcc: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing pdf in gcc" ; \
@@ -10715,7 +10708,7 @@ html-gcc: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing html in gcc" ; \
@@ -10740,7 +10733,7 @@ TAGS-gcc: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing TAGS in gcc" ; \
@@ -10766,7 +10759,7 @@ install-info-gcc: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing install-info in gcc" ; \
@@ -10792,7 +10785,7 @@ install-pdf-gcc: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing install-pdf in gcc" ; \
@@ -10818,7 +10811,7 @@ install-html-gcc: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing install-html in gcc" ; \
@@ -10843,7 +10836,7 @@ installcheck-gcc: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing installcheck in gcc" ; \
@@ -10867,7 +10860,7 @@ mostlyclean-gcc:
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing mostlyclean in gcc" ; \
@@ -10891,7 +10884,7 @@ clean-gcc:
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing clean in gcc" ; \
@@ -10915,7 +10908,7 @@ distclean-gcc:
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing distclean in gcc" ; \
@@ -10939,7 +10932,7 @@ maintainer-clean-gcc:
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \
done; \
echo "Doing maintainer-clean in gcc" ; \
Index: config/ChangeLog.gomp
===================================================================
--- config/ChangeLog.gomp (revision 214959)
+++ config/ChangeLog.gomp (working copy)
@@ -1,3 +1,7 @@
+2014-09-05 Bernd Schmidt <ber...@codesourcery.com>
+
+ * acx.m4 (ACX_CANONICAL_ACCEL_TARGET): Revert previous change.
+
2014-03-20 Bernd Schmidt <ber...@codesourcery.com>
* acx.m4 (ACX_CANONICAL_ACCEL_TARGET): New macro.
Index: config/acx.m4
===================================================================
--- config/acx.m4 (revision 214959)
+++ config/acx.m4 (working copy)
@@ -61,36 +61,6 @@ 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 214959)
+++ configure (working copy)
@@ -673,14 +673,6 @@ LDFLAGS
CFLAGS
CC
EXTRA_CONFIGARGS_LIBJAVA
-extra_accelerator_gcc_configure_flags
-extra_target_gcc_configure_flags
-accel_target_os
-accel_target_vendor
-accel_target_cpu
-accel_target_alias
-accel_target
-accel_target_noncanonical
target_subdir
host_subdir
build_subdir
@@ -755,8 +747,6 @@ ac_user_opts='
enable_option_checking
with_build_libsubdir
enable_offload_targets
-enable_target_gcc_configure_flags
-enable_accelerator_gcc_configure_flags
enable_gold
enable_ld
enable_libquadmath
@@ -1478,12 +1468,6 @@ Optional Features:
--enable-FEATURE[=ARG] include FEATURE [ARG=yes]
--enable-offload-targets=LIST
enable offloading to devices from LIST
- --enable-target-gcc-configure-flags=FLAGS
- additional flags for configuring the target GCC
- [none]
- --enable-accelerator-gcc-configure-flags=FLAGS
- additional flags for configuring the accelerator GCC
- [none]
--enable-gold[=ARG] build gold [ARG={default,yes,no}]
--enable-ld[=ARG] build ld [ARG={default,yes,no}]
--disable-libquadmath do not build libquadmath directory
@@ -2967,47 +2951,6 @@ else
fi
-{ $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; }
-
-
-# Allow for specifying configure flags that apply to only the target GCC, or
-# only the accelerator GCC.
-
-# Check whether --enable-target-gcc-configure-flags was given.
-if test "${enable_target_gcc_configure_flags+set}" = set; then :
- enableval=$enable_target_gcc_configure_flags; extra_target_gcc_configure_flags=$enableval
-else
- extra_target_gcc_configure_flags=
-fi
-
-
-
-# Check whether --enable-accelerator-gcc-configure-flags was given.
-if test "${enable_accelerator_gcc_configure_flags+set}" = set; then :
- enableval=$enable_accelerator_gcc_configure_flags; extra_accelerator_gcc_configure_flags=$enableval
-else
- extra_accelerator_gcc_configure_flags=
-fi
-
-
-
# Handle --enable-gold, --enable-ld.
# --disable-gold [--enable-ld]
# Build only ld. Default option.
Index: configure.ac
===================================================================
--- configure.ac (revision 214959)
+++ configure.ac (working copy)
@@ -297,25 +297,6 @@ AC_ARG_ENABLE(offload-targets,
fi
], [enable_offload_targets=])
-ACX_CANONICAL_ACCEL_TARGET
-
-# Allow for specifying configure flags that apply to only the target GCC, or
-# only the accelerator GCC.
-
-AC_ARG_ENABLE(target-gcc-configure-flags,
- [AS_HELP_STRING([[--enable-target-gcc-configure-flags=FLAGS]],
- [additional flags for configuring the target GCC @<:@none@:>@])],
- extra_target_gcc_configure_flags=$enableval,
- extra_target_gcc_configure_flags=)
-AC_SUBST(extra_target_gcc_configure_flags)
-
-AC_ARG_ENABLE(accelerator-gcc-configure-flags,
- [AS_HELP_STRING([[--enable-accelerator-gcc-configure-flags=FLAGS]],
- [additional flags for configuring the accelerator GCC @<:@none@:>@])],
- extra_accelerator_gcc_configure_flags=$enableval,
- extra_accelerator_gcc_configure_flags=)
-AC_SUBST(extra_accelerator_gcc_configure_flags)
-
# Handle --enable-gold, --enable-ld.
# --disable-gold [--enable-ld]
# Build only ld. Default option.
Index: gcc/ChangeLog.gomp
===================================================================
--- gcc/ChangeLog.gomp (revision 214959)
+++ gcc/ChangeLog.gomp (working copy)
@@ -1,3 +1,9 @@
+2014-09-05 Bernd Schmidt <ber...@codesourcery.com>
+
+ * configure.ac (enable-accelerator): Remove option.
+ (enable_accelerator): Don't subst.
+ * configure: Regenerate.
+
2014-09-03 Thomas Schwinge <tho...@codesourcery.com>
* omp-low.c (expand_oacc_offload): Add child_fn to offload_funcs.
Index: gcc/configure
===================================================================
--- gcc/configure (revision 214959)
+++ gcc/configure (working copy)
@@ -764,7 +764,6 @@ LN_S
AWK
SET_MAKE
enable_as_accelerator
-enable_accelerator
REPORT_BUGS_TEXI
REPORT_BUGS_TO
PKGVERSION
@@ -905,7 +904,6 @@ with_specs
with_pkgversion
with_bugurl
enable_languages
-enable_accelerator
enable_as_accelerator_for
enable_offload_targets
with_multilib_list
@@ -1617,7 +1615,6 @@ Optional Features:
GNU Objective-C runtime
--disable-shared don't provide a shared libgcc
--enable-languages=LIST specify which front-ends to build
- --enable-accelerator build accelerator [ARG={no,device-triplet}]
--enable-as-accelerator-for
build compiler as accelerator target for given host
--enable-offload-targets=LIST
@@ -7407,23 +7404,6 @@ else
fi
-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
-
-else
- enable_accelerator=no
-fi
-
-
-
# Check whether --enable-as-accelerator-for was given.
if test "${enable_as_accelerator_for+set}" = set; then :
enableval=$enable_as_accelerator_for;
@@ -7456,7 +7436,7 @@ if test "${enable_offload_targets+set}"
fi
else
- enable_accelerator=no
+ offload_targets=
fi
@@ -18114,7 +18094,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 18117 "configure"
+#line 18097 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -18220,7 +18200,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<_LT_EOF
-#line 18223 "configure"
+#line 18203 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
Index: gcc/configure.ac
===================================================================
--- gcc/configure.ac (revision 214959)
+++ gcc/configure.ac (working copy)
@@ -887,19 +887,6 @@ AC_ARG_ENABLE(languages,
esac],
[enable_languages=c])
-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
-], [enable_accelerator=no])
-AC_SUBST(enable_accelerator)
-
AC_ARG_ENABLE(as-accelerator-for,
[AS_HELP_STRING([--enable-as-accelerator-for], [build compiler as accelerator target for given host])],
[
@@ -927,8 +914,8 @@ AC_ARG_ENABLE(offload-targets,
offload_targets=$offload_targets,$enable_offload_targets
fi
fi
-], [enable_accelerator=no])
-AC_SUBST(enable_accelerator)
+], [offload_targets=])
+
offload_targets=`echo $offload_targets | sed -e 's#,#:#g'`
AC_DEFINE_UNQUOTED(OFFLOAD_TARGETS, "$offload_targets",
[Define to hold the list of target names suitable for offloading.])
