From: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
--enable-target-gcc-configure-flags, EXTRA_TARGET_GCC_FLAGS vs.
--enable-accelerator-gcc-configure-flags, EXTRA_ACCELERATOR_GCC_FLAGS.
* configure.ac (--enable-target-gcc-configure-flags)
(--enable-accelerator-gcc-configure-flags): New configure options.
* Makefile.def (gcc, accel-gcc): Handle these as well as new
EXTRA_TARGET_GCC_FLAGS and EXTRA_ACCELERATOR_GCC_FLAGS make flags.
* configure: Regenerate.
* Makefile.in: Regenerate.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gomp-4_0-branch@211513
138bc75d-0d04-0410-961f-82ee72b054a4
---
ChangeLog.gomp | 9 +++++
Makefile.def | 6 ++-
Makefile.in | 114 ++++++++++++++++++++++++++++++---------------------------
configure | 31 ++++++++++++++++
configure.ac | 17 +++++++++
5 files changed, 121 insertions(+), 56 deletions(-)
diff --git ChangeLog.gomp ChangeLog.gomp
index c264057..46892a8 100644
--- ChangeLog.gomp
+++ ChangeLog.gomp
@@ -1,3 +1,12 @@
+2014-06-12 Thomas Schwinge <tho...@codesourcery.com>
+
+ * configure.ac (--enable-target-gcc-configure-flags)
+ (--enable-accelerator-gcc-configure-flags): New configure options.
+ * Makefile.def (gcc, accel-gcc): Handle these as well as new
+ EXTRA_TARGET_GCC_FLAGS and EXTRA_ACCELERATOR_GCC_FLAGS make flags.
+ * configure: Regenerate.
+ * Makefile.in: Regenerate.
+
2014-03-20 Bernd Schmidt <ber...@codesourcery.com>
* Makefile.def (host_modules, dependencies): Add accel-gcc entries.
diff --git Makefile.def Makefile.def
index 89bfc07..e5fbd5c 100644
--- Makefile.def
+++ Makefile.def
@@ -44,10 +44,12 @@ host_modules= { module= fixincludes; bootstrap=true;
host_modules= { module= flex; no_check_cross= true; };
host_modules= { module= gas; bootstrap=true; };
host_modules= { module= gcc; bootstrap=true;
- extra_make_flags="$(EXTRA_GCC_FLAGS)"; };
+ extra_configure_flags='@extra_target_gcc_configure_flags@';
+ extra_make_flags="$(EXTRA_GCC_FLAGS)
$(EXTRA_TARGET_GCC_FLAGS)"; };
host_modules= { module= accel-gcc;
actual_module=gcc;
-
extra_configure_flags='--enable-as-accelerator-for=$(target_alias)'; };
+
extra_configure_flags='--enable-as-accelerator-for=$(target_alias)
@extra_accelerator_gcc_configure_flags@';
+ extra_make_flags="$(EXTRA_ACCELERATOR_GCC_FLAGS)"; };
host_modules= { module= gmp; lib_path=.libs; bootstrap=true;
extra_configure_flags='--disable-shared';
no_install= true;
diff --git Makefile.in Makefile.in
index 85ec2c2..9ad7a51 100644
--- Makefile.in
+++ Makefile.in
@@ -10075,7 +10075,7 @@ configure-gcc:
libsrcdir="$$s/gcc"; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
- --target=$${this_target} $${srcdiroption} \
+ --target=$${this_target} $${srcdiroption}
@extra_target_gcc_configure_flags@ \
|| exit 1
@endif gcc
@@ -10109,7 +10109,8 @@ configure-stage1-gcc:
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} $${srcdiroption} \
- $(STAGE1_CONFIGURE_FLAGS)
+ $(STAGE1_CONFIGURE_FLAGS) \
+ @extra_target_gcc_configure_flags@
@endif gcc-bootstrap
.PHONY: configure-stage2-gcc maybe-configure-stage2-gcc
@@ -10142,7 +10143,8 @@ configure-stage2-gcc:
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} $${srcdiroption} \
--with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE2_CONFIGURE_FLAGS)
+ $(STAGE2_CONFIGURE_FLAGS) \
+ @extra_target_gcc_configure_flags@
@endif gcc-bootstrap
.PHONY: configure-stage3-gcc maybe-configure-stage3-gcc
@@ -10175,7 +10177,8 @@ configure-stage3-gcc:
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} $${srcdiroption} \
--with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE3_CONFIGURE_FLAGS)
+ $(STAGE3_CONFIGURE_FLAGS) \
+ @extra_target_gcc_configure_flags@
@endif gcc-bootstrap
.PHONY: configure-stage4-gcc maybe-configure-stage4-gcc
@@ -10208,7 +10211,8 @@ configure-stage4-gcc:
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} $${srcdiroption} \
--with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGE4_CONFIGURE_FLAGS)
+ $(STAGE4_CONFIGURE_FLAGS) \
+ @extra_target_gcc_configure_flags@
@endif gcc-bootstrap
.PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc
@@ -10241,7 +10245,8 @@ configure-stageprofile-gcc:
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} $${srcdiroption} \
--with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGEprofile_CONFIGURE_FLAGS)
+ $(STAGEprofile_CONFIGURE_FLAGS) \
+ @extra_target_gcc_configure_flags@
@endif gcc-bootstrap
.PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc
@@ -10274,7 +10279,8 @@ configure-stagefeedback-gcc:
$(HOST_CONFIGARGS) --build=${build_alias} --host=${host_alias} \
--target=${target_alias} $${srcdiroption} \
--with-build-libsubdir=$(HOST_SUBDIR) \
- $(STAGEfeedback_CONFIGURE_FLAGS)
+ $(STAGEfeedback_CONFIGURE_FLAGS) \
+ @extra_target_gcc_configure_flags@
@endif gcc-bootstrap
@@ -10294,7 +10300,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) \
+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
$(STAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) \
$(TARGET-gcc))
@endif gcc
@@ -10323,7 +10329,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) \
+ $(STAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS)
$(EXTRA_TARGET_GCC_FLAGS) \
TFLAGS="$(STAGE1_TFLAGS)" \
$(TARGET-stage1-gcc)
@@ -10338,7 +10344,7 @@ clean-stage1-gcc:
fi; \
cd $(HOST_SUBDIR)/gcc && \
$(MAKE) $(EXTRA_HOST_FLAGS) \
- $(STAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) clean
+ $(STAGE1_FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS)
clean
@endif gcc-bootstrap
@@ -10365,7 +10371,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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)
$(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) \
TFLAGS="$(STAGE2_TFLAGS)" \
$(TARGET-stage2-gcc)
@@ -10379,7 +10385,7 @@ clean-stage2-gcc:
$(MAKE) stage2-start; \
fi; \
cd $(HOST_SUBDIR)/gcc && \
- $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)
$(EXTRA_GCC_FLAGS) clean
+ $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)
$(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) clean
@endif gcc-bootstrap
@@ -10406,7 +10412,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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)
$(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) \
TFLAGS="$(STAGE3_TFLAGS)" \
$(TARGET-stage3-gcc)
@@ -10420,7 +10426,7 @@ clean-stage3-gcc:
$(MAKE) stage3-start; \
fi; \
cd $(HOST_SUBDIR)/gcc && \
- $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)
$(EXTRA_GCC_FLAGS) clean
+ $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)
$(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) clean
@endif gcc-bootstrap
@@ -10447,7 +10453,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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)
$(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) \
TFLAGS="$(STAGE4_TFLAGS)" \
$(TARGET-stage4-gcc)
@@ -10461,7 +10467,7 @@ clean-stage4-gcc:
$(MAKE) stage4-start; \
fi; \
cd $(HOST_SUBDIR)/gcc && \
- $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)
$(EXTRA_GCC_FLAGS) clean
+ $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)
$(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) clean
@endif gcc-bootstrap
@@ -10488,7 +10494,7 @@ all-stageprofile-gcc: configure-stageprofile-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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)
$(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) \
TFLAGS="$(STAGEprofile_TFLAGS)" \
$(TARGET-stageprofile-gcc)
@@ -10502,7 +10508,7 @@ clean-stageprofile-gcc:
$(MAKE) stageprofile-start; \
fi; \
cd $(HOST_SUBDIR)/gcc && \
- $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)
$(EXTRA_GCC_FLAGS) clean
+ $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)
$(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) clean
@endif gcc-bootstrap
@@ -10529,7 +10535,7 @@ all-stagefeedback-gcc: configure-stagefeedback-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_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)
$(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) \
TFLAGS="$(STAGEfeedback_TFLAGS)" \
$(TARGET-stagefeedback-gcc)
@@ -10543,7 +10549,7 @@ clean-stagefeedback-gcc:
$(MAKE) stagefeedback-start; \
fi; \
cd $(HOST_SUBDIR)/gcc && \
- $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)
$(EXTRA_GCC_FLAGS) clean
+ $(MAKE) $(EXTRA_HOST_FLAGS) $(POSTSTAGE1_FLAGS_TO_PASS)
$(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS) clean
@endif gcc-bootstrap
@@ -10561,7 +10567,7 @@ check-gcc:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/gcc && \
- $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) check)
+ $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS)
check)
@endif gcc
@@ -10576,7 +10582,7 @@ install-gcc: installdirs
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/gcc && \
- $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) install)
+ $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS)
install)
@endif gcc
@@ -10591,7 +10597,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) install-strip)
+ $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_GCC_FLAGS) $(EXTRA_TARGET_GCC_FLAGS)
install-strip)
@endif gcc
@@ -10608,7 +10614,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); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
$(EXTRA_TARGET_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing info in gcc" ; \
@@ -10633,7 +10639,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); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
$(EXTRA_TARGET_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing dvi in gcc" ; \
@@ -10658,7 +10664,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); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
$(EXTRA_TARGET_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing pdf in gcc" ; \
@@ -10683,7 +10689,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); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
$(EXTRA_TARGET_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing html in gcc" ; \
@@ -10708,7 +10714,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); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
$(EXTRA_TARGET_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing TAGS in gcc" ; \
@@ -10734,7 +10740,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); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
$(EXTRA_TARGET_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing install-info in gcc" ; \
@@ -10760,7 +10766,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); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
$(EXTRA_TARGET_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing install-pdf in gcc" ; \
@@ -10786,7 +10792,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); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
$(EXTRA_TARGET_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing install-html in gcc" ; \
@@ -10811,7 +10817,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); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
$(EXTRA_TARGET_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing installcheck in gcc" ; \
@@ -10835,7 +10841,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); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
$(EXTRA_TARGET_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing mostlyclean in gcc" ; \
@@ -10859,7 +10865,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); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
$(EXTRA_TARGET_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing clean in gcc" ; \
@@ -10883,7 +10889,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); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
$(EXTRA_TARGET_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing distclean in gcc" ; \
@@ -10907,7 +10913,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); do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_GCC_FLAGS)
$(EXTRA_TARGET_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing maintainer-clean in gcc" ; \
@@ -10951,7 +10957,7 @@ configure-accel-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) \
+ --target=$${this_target} $${srcdiroption}
--enable-as-accelerator-for=$(target_alias)
@extra_accelerator_gcc_configure_flags@ \
|| exit 1
@endif accel-gcc
@@ -10973,7 +10979,7 @@ all-accel-gcc: configure-accel-gcc
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) \
+ $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_HOST_FLAGS)
$(STAGE1_FLAGS_TO_PASS) $(EXTRA_ACCELERATOR_GCC_FLAGS) \
$(TARGET-gcc))
@endif accel-gcc
@@ -10991,7 +10997,7 @@ check-accel-gcc:
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/accel-gcc && \
- $(MAKE) $(FLAGS_TO_PASS) check)
+ $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_ACCELERATOR_GCC_FLAGS) check)
@endif accel-gcc
@@ -11006,7 +11012,7 @@ install-accel-gcc: installdirs
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/accel-gcc && \
- $(MAKE) $(FLAGS_TO_PASS) install)
+ $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_ACCELERATOR_GCC_FLAGS) install)
@endif accel-gcc
@@ -11021,7 +11027,7 @@ install-strip-accel-gcc: installdirs
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
(cd $(HOST_SUBDIR)/accel-gcc && \
- $(MAKE) $(FLAGS_TO_PASS) install-strip)
+ $(MAKE) $(FLAGS_TO_PASS) $(EXTRA_ACCELERATOR_GCC_FLAGS) install-strip)
@endif accel-gcc
@@ -11039,7 +11045,7 @@ info-accel-gcc: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_ACCELERATOR_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing info in accel-gcc" ; \
@@ -11065,7 +11071,7 @@ dvi-accel-gcc: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_ACCELERATOR_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing dvi in accel-gcc" ; \
@@ -11091,7 +11097,7 @@ pdf-accel-gcc: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_ACCELERATOR_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing pdf in accel-gcc" ; \
@@ -11117,7 +11123,7 @@ html-accel-gcc: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_ACCELERATOR_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing html in accel-gcc" ; \
@@ -11143,7 +11149,7 @@ TAGS-accel-gcc: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_ACCELERATOR_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing TAGS in accel-gcc" ; \
@@ -11170,7 +11176,7 @@ install-info-accel-gcc: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_ACCELERATOR_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing install-info in accel-gcc" ; \
@@ -11197,7 +11203,7 @@ install-pdf-accel-gcc: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_ACCELERATOR_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing install-pdf in accel-gcc" ; \
@@ -11224,7 +11230,7 @@ install-html-accel-gcc: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_ACCELERATOR_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing install-html in accel-gcc" ; \
@@ -11250,7 +11256,7 @@ installcheck-accel-gcc: \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_ACCELERATOR_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing installcheck in accel-gcc" ; \
@@ -11275,7 +11281,7 @@ mostlyclean-accel-gcc:
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_ACCELERATOR_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing mostlyclean in accel-gcc" ; \
@@ -11300,7 +11306,7 @@ clean-accel-gcc:
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_ACCELERATOR_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing clean in accel-gcc" ; \
@@ -11325,7 +11331,7 @@ distclean-accel-gcc:
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_ACCELERATOR_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing distclean in accel-gcc" ; \
@@ -11350,7 +11356,7 @@ maintainer-clean-accel-gcc:
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
- for flag in $(EXTRA_HOST_FLAGS) ; do \
+ for flag in $(EXTRA_HOST_FLAGS) $(EXTRA_ACCELERATOR_GCC_FLAGS); do \
eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export
\1|"`; \
done; \
echo "Doing maintainer-clean in accel-gcc" ; \
diff --git configure configure
index 95f4931..0f99679 100755
--- configure
+++ configure
@@ -671,6 +671,8 @@ 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
@@ -751,6 +753,8 @@ ac_user_opts='
enable_option_checking
with_build_libsubdir
enable_accelerator
+enable_target_gcc_configure_flags
+enable_accelerator_gcc_configure_flags
enable_gold
enable_ld
enable_libquadmath
@@ -1471,6 +1475,12 @@ Optional Features:
--enable-accelerator[=ARG]
build accelerator
[ARG={no,auto-device-triplet,device-triplet}]
+ --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
@@ -2987,6 +2997,27 @@ accel_target_os=`echo $accel_target | sed
's/^\([^-]*\)-\([^-]*\)-\(.*\)$/\3/'`
$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.
diff --git configure.ac configure.ac
index 51c04ab..6c94c65 100644
--- configure.ac
+++ configure.ac
@@ -319,6 +319,23 @@ esac
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.
--
1.9.1
