I've applied this patch to openacc-gcc-7-branch to build libffi during bootstrap whenever it's required by libgomp. This was causing the host OpenACC execution test to fail in libgomp because the struct containing the offloaded data mappings wasn't being expanded into individual variables at runtime.
Cesar
Build libffi during bootstrap. 2018-01-25 Cesar Philippidis <ce...@codesourcery.com> * Makefile.def: Bootstrap module libffi. Add libffi dependency to all-target-libgomp. * Makefile.in: Regenerate. * configure.ac: Add libffi to bootstrap_target_libs when libgomp is bootstrapped. * configure: Regenerate. diff --git a/Makefile.def b/Makefile.def index 5e94062fa75..23e3b024e40 100644 --- a/Makefile.def +++ b/Makefile.def @@ -165,7 +165,7 @@ target_modules = { module= libtermcap; no_check=true; missing=maintainer-clean; }; target_modules = { module= winsup; }; target_modules = { module= libgloss; no_check=true; }; -target_modules = { module= libffi; no_install=true; }; +target_modules = { module= libffi; bootstrap=true; no_install=true; }; target_modules = { module= zlib; }; target_modules = { module= rda; }; target_modules = { module= libada; }; @@ -550,6 +550,7 @@ dependencies = { module=configure-target-libgo; on=all-target-libstdc++-v3; }; dependencies = { module=all-target-libgo; on=all-target-libbacktrace; }; dependencies = { module=all-target-libgo; on=all-target-libffi; }; dependencies = { module=all-target-libgo; on=all-target-libatomic; }; +dependencies = { module=all-target-libgomp; on=all-target-libffi; }; dependencies = { module=configure-target-libgomp; on=configure-target-libffi; }; dependencies = { module=configure-target-libstdc++-v3; on=configure-target-libgomp; }; dependencies = { module=configure-target-liboffloadmic; on=configure-target-libgomp; }; diff --git a/Makefile.in b/Makefile.in index 9b4497e3943..ad42ffdf7ab 100644 --- a/Makefile.in +++ b/Makefile.in @@ -1161,7 +1161,9 @@ all-target: maybe-all-target-libhsail-rt all-target: maybe-all-target-libtermcap all-target: maybe-all-target-winsup all-target: maybe-all-target-libgloss +@if target-libffi-no-bootstrap all-target: maybe-all-target-libffi +@endif target-libffi-no-bootstrap all-target: maybe-all-target-zlib all-target: maybe-all-target-rda all-target: maybe-all-target-libada @@ -47882,7 +47884,6 @@ configure-target-libffi: stage_current @if target-libffi maybe-configure-target-libffi: configure-target-libffi configure-target-libffi: - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libffi..."; \ @@ -47920,6 +47921,367 @@ configure-target-libffi: +.PHONY: configure-stage1-target-libffi maybe-configure-stage1-target-libffi +maybe-configure-stage1-target-libffi: +@if target-libffi-bootstrap +maybe-configure-stage1-target-libffi: configure-stage1-target-libffi +configure-stage1-target-libffi: + @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE1_TFLAGS)"; \ + echo "Checking multilib configuration for libffi..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libffi/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libffi/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libffi/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libffi/Makefile; \ + mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \ + $(NORMAL_TARGET_EXPORTS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage 1 in $(TARGET_SUBDIR)/libffi; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi; \ + cd $(TARGET_SUBDIR)/libffi || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libffi/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libffi; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + \ + $(STAGE1_CONFIGURE_FLAGS) +@endif target-libffi-bootstrap + +.PHONY: configure-stage2-target-libffi maybe-configure-stage2-target-libffi +maybe-configure-stage2-target-libffi: +@if target-libffi-bootstrap +maybe-configure-stage2-target-libffi: configure-stage2-target-libffi +configure-stage2-target-libffi: + @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE2_TFLAGS)"; \ + echo "Checking multilib configuration for libffi..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libffi/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libffi/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libffi/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libffi/Makefile; \ + mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage 2 in $(TARGET_SUBDIR)/libffi; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi; \ + cd $(TARGET_SUBDIR)/libffi || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libffi/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libffi; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE2_CONFIGURE_FLAGS) +@endif target-libffi-bootstrap + +.PHONY: configure-stage3-target-libffi maybe-configure-stage3-target-libffi +maybe-configure-stage3-target-libffi: +@if target-libffi-bootstrap +maybe-configure-stage3-target-libffi: configure-stage3-target-libffi +configure-stage3-target-libffi: + @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE3_TFLAGS)"; \ + echo "Checking multilib configuration for libffi..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libffi/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libffi/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libffi/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libffi/Makefile; \ + mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage 3 in $(TARGET_SUBDIR)/libffi; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi; \ + cd $(TARGET_SUBDIR)/libffi || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libffi/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libffi; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE3_CONFIGURE_FLAGS) +@endif target-libffi-bootstrap + +.PHONY: configure-stage4-target-libffi maybe-configure-stage4-target-libffi +maybe-configure-stage4-target-libffi: +@if target-libffi-bootstrap +maybe-configure-stage4-target-libffi: configure-stage4-target-libffi +configure-stage4-target-libffi: + @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE4_TFLAGS)"; \ + echo "Checking multilib configuration for libffi..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libffi/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libffi/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libffi/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libffi/Makefile; \ + mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage 4 in $(TARGET_SUBDIR)/libffi; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi; \ + cd $(TARGET_SUBDIR)/libffi || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libffi/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libffi; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGE4_CONFIGURE_FLAGS) +@endif target-libffi-bootstrap + +.PHONY: configure-stageprofile-target-libffi maybe-configure-stageprofile-target-libffi +maybe-configure-stageprofile-target-libffi: +@if target-libffi-bootstrap +maybe-configure-stageprofile-target-libffi: configure-stageprofile-target-libffi +configure-stageprofile-target-libffi: + @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEprofile_TFLAGS)"; \ + echo "Checking multilib configuration for libffi..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libffi/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libffi/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libffi/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libffi/Makefile; \ + mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage profile in $(TARGET_SUBDIR)/libffi; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi; \ + cd $(TARGET_SUBDIR)/libffi || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libffi/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libffi; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGEprofile_CONFIGURE_FLAGS) +@endif target-libffi-bootstrap + +.PHONY: configure-stagefeedback-target-libffi maybe-configure-stagefeedback-target-libffi +maybe-configure-stagefeedback-target-libffi: +@if target-libffi-bootstrap +maybe-configure-stagefeedback-target-libffi: configure-stagefeedback-target-libffi +configure-stagefeedback-target-libffi: + @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEfeedback_TFLAGS)"; \ + echo "Checking multilib configuration for libffi..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libffi/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libffi/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libffi/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libffi/Makefile; \ + mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage feedback in $(TARGET_SUBDIR)/libffi; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi; \ + cd $(TARGET_SUBDIR)/libffi || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libffi/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libffi; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGEfeedback_CONFIGURE_FLAGS) +@endif target-libffi-bootstrap + +.PHONY: configure-stageautoprofile-target-libffi maybe-configure-stageautoprofile-target-libffi +maybe-configure-stageautoprofile-target-libffi: +@if target-libffi-bootstrap +maybe-configure-stageautoprofile-target-libffi: configure-stageautoprofile-target-libffi +configure-stageautoprofile-target-libffi: + @[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEautoprofile_TFLAGS)"; \ + echo "Checking multilib configuration for libffi..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libffi/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libffi/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libffi/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libffi/Makefile; \ + mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage autoprofile in $(TARGET_SUBDIR)/libffi; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi; \ + cd $(TARGET_SUBDIR)/libffi || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libffi/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libffi; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGEautoprofile_CONFIGURE_FLAGS) +@endif target-libffi-bootstrap + +.PHONY: configure-stageautofeedback-target-libffi maybe-configure-stageautofeedback-target-libffi +maybe-configure-stageautofeedback-target-libffi: +@if target-libffi-bootstrap +maybe-configure-stageautofeedback-target-libffi: configure-stageautofeedback-target-libffi +configure-stageautofeedback-target-libffi: + @[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start + @$(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEautofeedback_TFLAGS)"; \ + echo "Checking multilib configuration for libffi..."; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libffi/multilib.tmp 2> /dev/null; \ + if test -r $(TARGET_SUBDIR)/libffi/multilib.out; then \ + if cmp -s $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; then \ + rm -f $(TARGET_SUBDIR)/libffi/multilib.tmp; \ + else \ + rm -f $(TARGET_SUBDIR)/libffi/Makefile; \ + mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \ + fi; \ + else \ + mv $(TARGET_SUBDIR)/libffi/multilib.tmp $(TARGET_SUBDIR)/libffi/multilib.out; \ + fi; \ + test ! -f $(TARGET_SUBDIR)/libffi/Makefile || exit 0; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + CFLAGS="$(CFLAGS_FOR_TARGET)"; export CFLAGS; \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)"; export CXXFLAGS; \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)"; export LIBCFLAGS; \ + echo Configuring stage autofeedback in $(TARGET_SUBDIR)/libffi; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libffi; \ + cd $(TARGET_SUBDIR)/libffi || exit 1; \ + case $(srcdir) in \ + /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ + *) topdir=`echo $(TARGET_SUBDIR)/libffi/ | \ + sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ + esac; \ + module_srcdir=libffi; \ + $(SHELL) $$s/$$module_srcdir/configure \ + --srcdir=$${topdir}/$$module_srcdir \ + $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ + --target=${target_alias} \ + --with-build-libsubdir=$(HOST_SUBDIR) \ + $(STAGEautofeedback_CONFIGURE_FLAGS) +@endif target-libffi-bootstrap + + + .PHONY: all-target-libffi maybe-all-target-libffi @@ -47931,7 +48293,6 @@ all-target-libffi: stage_current TARGET-target-libffi=all maybe-all-target-libffi: all-target-libffi all-target-libffi: configure-target-libffi - @: $(MAKE); $(unstage) @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ @@ -47942,6 +48303,345 @@ all-target-libffi: configure-target-libffi +.PHONY: all-stage1-target-libffi maybe-all-stage1-target-libffi +.PHONY: clean-stage1-target-libffi maybe-clean-stage1-target-libffi +maybe-all-stage1-target-libffi: +maybe-clean-stage1-target-libffi: +@if target-libffi-bootstrap +maybe-all-stage1-target-libffi: all-stage1-target-libffi +all-stage1: all-stage1-target-libffi +TARGET-stage1-target-libffi = $(TARGET-target-libffi) +all-stage1-target-libffi: configure-stage1-target-libffi + @[ $(current_stage) = stage1 ] || $(MAKE) stage1-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE1_TFLAGS)"; \ + $(NORMAL_TARGET_EXPORTS) \ + cd $(TARGET_SUBDIR)/libffi && \ + \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) \ + \ + TFLAGS="$(STAGE1_TFLAGS)" \ + $(TARGET-stage1-target-libffi) + +maybe-clean-stage1-target-libffi: clean-stage1-target-libffi +clean-stage1: clean-stage1-target-libffi +clean-stage1-target-libffi: + @if [ $(current_stage) = stage1 ]; then \ + [ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stage1-libffi/Makefile ] || exit 0; \ + $(MAKE) stage1-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libffi && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) \ + clean +@endif target-libffi-bootstrap + + +.PHONY: all-stage2-target-libffi maybe-all-stage2-target-libffi +.PHONY: clean-stage2-target-libffi maybe-clean-stage2-target-libffi +maybe-all-stage2-target-libffi: +maybe-clean-stage2-target-libffi: +@if target-libffi-bootstrap +maybe-all-stage2-target-libffi: all-stage2-target-libffi +all-stage2: all-stage2-target-libffi +TARGET-stage2-target-libffi = $(TARGET-target-libffi) +all-stage2-target-libffi: configure-stage2-target-libffi + @[ $(current_stage) = stage2 ] || $(MAKE) stage2-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE2_TFLAGS)"; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libffi && \ + \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) \ + TFLAGS="$(STAGE2_TFLAGS)" \ + $(TARGET-stage2-target-libffi) + +maybe-clean-stage2-target-libffi: clean-stage2-target-libffi +clean-stage2: clean-stage2-target-libffi +clean-stage2-target-libffi: + @if [ $(current_stage) = stage2 ]; then \ + [ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stage2-libffi/Makefile ] || exit 0; \ + $(MAKE) stage2-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libffi && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) clean +@endif target-libffi-bootstrap + + +.PHONY: all-stage3-target-libffi maybe-all-stage3-target-libffi +.PHONY: clean-stage3-target-libffi maybe-clean-stage3-target-libffi +maybe-all-stage3-target-libffi: +maybe-clean-stage3-target-libffi: +@if target-libffi-bootstrap +maybe-all-stage3-target-libffi: all-stage3-target-libffi +all-stage3: all-stage3-target-libffi +TARGET-stage3-target-libffi = $(TARGET-target-libffi) +all-stage3-target-libffi: configure-stage3-target-libffi + @[ $(current_stage) = stage3 ] || $(MAKE) stage3-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE3_TFLAGS)"; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libffi && \ + \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) \ + TFLAGS="$(STAGE3_TFLAGS)" \ + $(TARGET-stage3-target-libffi) + +maybe-clean-stage3-target-libffi: clean-stage3-target-libffi +clean-stage3: clean-stage3-target-libffi +clean-stage3-target-libffi: + @if [ $(current_stage) = stage3 ]; then \ + [ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stage3-libffi/Makefile ] || exit 0; \ + $(MAKE) stage3-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libffi && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) clean +@endif target-libffi-bootstrap + + +.PHONY: all-stage4-target-libffi maybe-all-stage4-target-libffi +.PHONY: clean-stage4-target-libffi maybe-clean-stage4-target-libffi +maybe-all-stage4-target-libffi: +maybe-clean-stage4-target-libffi: +@if target-libffi-bootstrap +maybe-all-stage4-target-libffi: all-stage4-target-libffi +all-stage4: all-stage4-target-libffi +TARGET-stage4-target-libffi = $(TARGET-target-libffi) +all-stage4-target-libffi: configure-stage4-target-libffi + @[ $(current_stage) = stage4 ] || $(MAKE) stage4-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGE4_TFLAGS)"; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libffi && \ + \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) \ + TFLAGS="$(STAGE4_TFLAGS)" \ + $(TARGET-stage4-target-libffi) + +maybe-clean-stage4-target-libffi: clean-stage4-target-libffi +clean-stage4: clean-stage4-target-libffi +clean-stage4-target-libffi: + @if [ $(current_stage) = stage4 ]; then \ + [ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stage4-libffi/Makefile ] || exit 0; \ + $(MAKE) stage4-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libffi && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) clean +@endif target-libffi-bootstrap + + +.PHONY: all-stageprofile-target-libffi maybe-all-stageprofile-target-libffi +.PHONY: clean-stageprofile-target-libffi maybe-clean-stageprofile-target-libffi +maybe-all-stageprofile-target-libffi: +maybe-clean-stageprofile-target-libffi: +@if target-libffi-bootstrap +maybe-all-stageprofile-target-libffi: all-stageprofile-target-libffi +all-stageprofile: all-stageprofile-target-libffi +TARGET-stageprofile-target-libffi = $(TARGET-target-libffi) +all-stageprofile-target-libffi: configure-stageprofile-target-libffi + @[ $(current_stage) = stageprofile ] || $(MAKE) stageprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEprofile_TFLAGS)"; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libffi && \ + \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) \ + TFLAGS="$(STAGEprofile_TFLAGS)" \ + $(TARGET-stageprofile-target-libffi) + +maybe-clean-stageprofile-target-libffi: clean-stageprofile-target-libffi +clean-stageprofile: clean-stageprofile-target-libffi +clean-stageprofile-target-libffi: + @if [ $(current_stage) = stageprofile ]; then \ + [ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stageprofile-libffi/Makefile ] || exit 0; \ + $(MAKE) stageprofile-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libffi && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) clean +@endif target-libffi-bootstrap + + +.PHONY: all-stagefeedback-target-libffi maybe-all-stagefeedback-target-libffi +.PHONY: clean-stagefeedback-target-libffi maybe-clean-stagefeedback-target-libffi +maybe-all-stagefeedback-target-libffi: +maybe-clean-stagefeedback-target-libffi: +@if target-libffi-bootstrap +maybe-all-stagefeedback-target-libffi: all-stagefeedback-target-libffi +all-stagefeedback: all-stagefeedback-target-libffi +TARGET-stagefeedback-target-libffi = $(TARGET-target-libffi) +all-stagefeedback-target-libffi: configure-stagefeedback-target-libffi + @[ $(current_stage) = stagefeedback ] || $(MAKE) stagefeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEfeedback_TFLAGS)"; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libffi && \ + \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) \ + TFLAGS="$(STAGEfeedback_TFLAGS)" \ + $(TARGET-stagefeedback-target-libffi) + +maybe-clean-stagefeedback-target-libffi: clean-stagefeedback-target-libffi +clean-stagefeedback: clean-stagefeedback-target-libffi +clean-stagefeedback-target-libffi: + @if [ $(current_stage) = stagefeedback ]; then \ + [ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stagefeedback-libffi/Makefile ] || exit 0; \ + $(MAKE) stagefeedback-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libffi && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) clean +@endif target-libffi-bootstrap + + +.PHONY: all-stageautoprofile-target-libffi maybe-all-stageautoprofile-target-libffi +.PHONY: clean-stageautoprofile-target-libffi maybe-clean-stageautoprofile-target-libffi +maybe-all-stageautoprofile-target-libffi: +maybe-clean-stageautoprofile-target-libffi: +@if target-libffi-bootstrap +maybe-all-stageautoprofile-target-libffi: all-stageautoprofile-target-libffi +all-stageautoprofile: all-stageautoprofile-target-libffi +TARGET-stageautoprofile-target-libffi = $(TARGET-target-libffi) +all-stageautoprofile-target-libffi: configure-stageautoprofile-target-libffi + @[ $(current_stage) = stageautoprofile ] || $(MAKE) stageautoprofile-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEautoprofile_TFLAGS)"; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libffi && \ + $$s/gcc/config/i386/$(AUTO_PROFILE) \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) \ + TFLAGS="$(STAGEautoprofile_TFLAGS)" \ + $(TARGET-stageautoprofile-target-libffi) + +maybe-clean-stageautoprofile-target-libffi: clean-stageautoprofile-target-libffi +clean-stageautoprofile: clean-stageautoprofile-target-libffi +clean-stageautoprofile-target-libffi: + @if [ $(current_stage) = stageautoprofile ]; then \ + [ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stageautoprofile-libffi/Makefile ] || exit 0; \ + $(MAKE) stageautoprofile-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libffi && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) clean +@endif target-libffi-bootstrap + + +.PHONY: all-stageautofeedback-target-libffi maybe-all-stageautofeedback-target-libffi +.PHONY: clean-stageautofeedback-target-libffi maybe-clean-stageautofeedback-target-libffi +maybe-all-stageautofeedback-target-libffi: +maybe-clean-stageautofeedback-target-libffi: +@if target-libffi-bootstrap +maybe-all-stageautofeedback-target-libffi: all-stageautofeedback-target-libffi +all-stageautofeedback: all-stageautofeedback-target-libffi +TARGET-stageautofeedback-target-libffi = $(TARGET-target-libffi) +all-stageautofeedback-target-libffi: configure-stageautofeedback-target-libffi + @[ $(current_stage) = stageautofeedback ] || $(MAKE) stageautofeedback-start + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + TFLAGS="$(STAGEautofeedback_TFLAGS)"; \ + $(NORMAL_TARGET_EXPORTS) \ + \ + cd $(TARGET_SUBDIR)/libffi && \ + \ + $(MAKE) $(BASE_FLAGS_TO_PASS) \ + CFLAGS="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS="$(LIBCFLAGS_FOR_TARGET)" \ + CFLAGS_FOR_TARGET="$(CFLAGS_FOR_TARGET)" \ + CXXFLAGS_FOR_TARGET="$(CXXFLAGS_FOR_TARGET)" \ + LIBCFLAGS_FOR_TARGET="$(LIBCFLAGS_FOR_TARGET)" \ + $(EXTRA_TARGET_FLAGS) \ + TFLAGS="$(STAGEautofeedback_TFLAGS)" PERF_DATA=perf.data \ + $(TARGET-stageautofeedback-target-libffi) + +maybe-clean-stageautofeedback-target-libffi: clean-stageautofeedback-target-libffi +clean-stageautofeedback: clean-stageautofeedback-target-libffi +clean-stageautofeedback-target-libffi: + @if [ $(current_stage) = stageautofeedback ]; then \ + [ -f $(TARGET_SUBDIR)/libffi/Makefile ] || exit 0; \ + else \ + [ -f $(TARGET_SUBDIR)/stageautofeedback-libffi/Makefile ] || exit 0; \ + $(MAKE) stageautofeedback-start; \ + fi; \ + cd $(TARGET_SUBDIR)/libffi && \ + $(MAKE) $(EXTRA_TARGET_FLAGS) clean +@endif target-libffi-bootstrap + + + + .PHONY: check-target-libffi maybe-check-target-libffi @@ -54745,7 +55445,14 @@ configure-target-libhsail-rt: stage_last configure-target-libtermcap: stage_last configure-target-winsup: stage_last configure-target-libgloss: stage_last -configure-target-libffi: stage_last +configure-stage1-target-libffi: maybe-all-stage1-gcc +configure-stage2-target-libffi: maybe-all-stage2-gcc +configure-stage3-target-libffi: maybe-all-stage3-gcc +configure-stage4-target-libffi: maybe-all-stage4-gcc +configure-stageprofile-target-libffi: maybe-all-stageprofile-gcc +configure-stagefeedback-target-libffi: maybe-all-stagefeedback-gcc +configure-stageautoprofile-target-libffi: maybe-all-stageautoprofile-gcc +configure-stageautofeedback-target-libffi: maybe-all-stageautofeedback-gcc configure-target-zlib: stage_last configure-target-rda: stage_last configure-target-libada: stage_last @@ -55803,7 +56510,26 @@ configure-target-libgo: maybe-all-target-libstdc++-v3 all-target-libgo: maybe-all-target-libbacktrace all-target-libgo: maybe-all-target-libffi all-target-libgo: maybe-all-target-libatomic +all-target-libgomp: maybe-all-target-libffi + +all-stage1-target-libgomp: maybe-all-stage1-target-libffi +all-stage2-target-libgomp: maybe-all-stage2-target-libffi +all-stage3-target-libgomp: maybe-all-stage3-target-libffi +all-stage4-target-libgomp: maybe-all-stage4-target-libffi +all-stageprofile-target-libgomp: maybe-all-stageprofile-target-libffi +all-stagefeedback-target-libgomp: maybe-all-stagefeedback-target-libffi +all-stageautoprofile-target-libgomp: maybe-all-stageautoprofile-target-libffi +all-stageautofeedback-target-libgomp: maybe-all-stageautofeedback-target-libffi configure-target-libgomp: maybe-configure-target-libffi + +configure-stage1-target-libgomp: maybe-configure-stage1-target-libffi +configure-stage2-target-libgomp: maybe-configure-stage2-target-libffi +configure-stage3-target-libgomp: maybe-configure-stage3-target-libffi +configure-stage4-target-libgomp: maybe-configure-stage4-target-libffi +configure-stageprofile-target-libgomp: maybe-configure-stageprofile-target-libffi +configure-stagefeedback-target-libgomp: maybe-configure-stagefeedback-target-libffi +configure-stageautoprofile-target-libgomp: maybe-configure-stageautoprofile-target-libffi +configure-stageautofeedback-target-libgomp: maybe-configure-stageautofeedback-target-libffi configure-target-libstdc++-v3: maybe-configure-target-libgomp configure-stage1-target-libstdc++-v3: maybe-configure-stage1-target-libgomp @@ -55907,6 +56633,14 @@ configure-stageprofile-target-libvtv: maybe-all-stageprofile-target-libgcc configure-stagefeedback-target-libvtv: maybe-all-stagefeedback-target-libgcc configure-stageautoprofile-target-libvtv: maybe-all-stageautoprofile-target-libgcc configure-stageautofeedback-target-libvtv: maybe-all-stageautofeedback-target-libgcc +configure-stage1-target-libffi: maybe-all-stage1-target-libgcc +configure-stage2-target-libffi: maybe-all-stage2-target-libgcc +configure-stage3-target-libffi: maybe-all-stage3-target-libgcc +configure-stage4-target-libffi: maybe-all-stage4-target-libgcc +configure-stageprofile-target-libffi: maybe-all-stageprofile-target-libgcc +configure-stagefeedback-target-libffi: maybe-all-stagefeedback-target-libgcc +configure-stageautoprofile-target-libffi: maybe-all-stageautoprofile-target-libgcc +configure-stageautofeedback-target-libffi: maybe-all-stageautofeedback-target-libgcc configure-stage1-target-libgomp: maybe-all-stage1-target-libgcc configure-stage2-target-libgomp: maybe-all-stage2-target-libgcc configure-stage3-target-libgomp: maybe-all-stage3-target-libgcc diff --git a/configure b/configure index ed47944d8f9..1122eb802c7 100755 --- a/configure +++ b/configure @@ -7068,6 +7068,9 @@ bootstrap_fixincludes=no # If we are building libgomp, bootstrap it. if echo " ${target_configdirs} " | grep " libgomp " > /dev/null 2>&1 ; then + if echo " ${target_configdirs} " | grep " libffi " > /dev/null 2>&1 ; then + bootstrap_target_libs=${bootstrap_target_libs}target-libffi, + fi bootstrap_target_libs=${bootstrap_target_libs}target-libgomp, fi diff --git a/configure.ac b/configure.ac index a3b9e116a05..be2e848ae25 100644 --- a/configure.ac +++ b/configure.ac @@ -2658,6 +2658,9 @@ bootstrap_fixincludes=no # If we are building libgomp, bootstrap it. if echo " ${target_configdirs} " | grep " libgomp " > /dev/null 2>&1 ; then + if echo " ${target_configdirs} " | grep " libffi " > /dev/null 2>&1 ; then + bootstrap_target_libs=${bootstrap_target_libs}target-libffi, + fi bootstrap_target_libs=${bootstrap_target_libs}target-libgomp, fi