This is the mail archive of the gcc-patches@gcc.gnu.org mailing list for the GCC project.

[PATCH] Delete GCJ

From: Andrew Haley <aph at redhat dot com>

To: GCC Patches <gcc-patches at gcc dot gnu dot org>, GCJ-patches <java-patches at gcc dot gnu dot org>

Date: Mon, 5 Sep 2016 16:13:06 +0100

Subject: [PATCH] Delete GCJ

Authentication-results: sourceware.org; auth=none

As discussed. I think I should ask a Global reviewer to approve this one. For obvious reasons I haven't included the diffs to the deleted gcc/java and libjava directories. The whole tree, post GCJ-deletion, is at svn+ssh://gcc.gnu.org/svn/gcc/branches/gcj/gcj-deletion-branch if anyone would like to try it. Andrew. 2016-09-05 Andrew Haley <aph@redhat.com> * Makefile.def: Remove libjava. * Makefile.tpl: Likewise. * Makefile.in: Regenerate. * configure.ac: Likewise. * configure: Likewise. * gcc/java: Remove. * libjava: Likewise. Index: Makefile.in =================================================================== --- Makefile.in (revision 239988) +++ Makefile.in (working copy) @@ -322,8 +322,6 @@ HOST_LIBELFLIBS = @libelflibs@ HOST_LIBELFINC = @libelfinc@ -EXTRA_CONFIGARGS_LIBJAVA = @EXTRA_CONFIGARGS_LIBJAVA@ - # ---------------------------------------------- # Programs producing files for the BUILD machine # ---------------------------------------------- @@ -1007,7 +1005,6 @@ maybe-configure-target-winsup \ maybe-configure-target-libgloss \ maybe-configure-target-libffi \ - maybe-configure-target-libjava \ maybe-configure-target-zlib \ maybe-configure-target-boehm-gc \ maybe-configure-target-rda \ @@ -1174,7 +1171,6 @@ all-target: maybe-all-target-winsup all-target: maybe-all-target-libgloss all-target: maybe-all-target-libffi -all-target: maybe-all-target-libjava all-target: maybe-all-target-zlib all-target: maybe-all-target-boehm-gc all-target: maybe-all-target-rda @@ -1268,7 +1264,6 @@ info-target: maybe-info-target-winsup info-target: maybe-info-target-libgloss info-target: maybe-info-target-libffi -info-target: maybe-info-target-libjava info-target: maybe-info-target-zlib info-target: maybe-info-target-boehm-gc info-target: maybe-info-target-rda @@ -1355,7 +1350,6 @@ dvi-target: maybe-dvi-target-winsup dvi-target: maybe-dvi-target-libgloss dvi-target: maybe-dvi-target-libffi -dvi-target: maybe-dvi-target-libjava dvi-target: maybe-dvi-target-zlib dvi-target: maybe-dvi-target-boehm-gc dvi-target: maybe-dvi-target-rda @@ -1442,7 +1436,6 @@ pdf-target: maybe-pdf-target-winsup pdf-target: maybe-pdf-target-libgloss pdf-target: maybe-pdf-target-libffi -pdf-target: maybe-pdf-target-libjava pdf-target: maybe-pdf-target-zlib pdf-target: maybe-pdf-target-boehm-gc pdf-target: maybe-pdf-target-rda @@ -1529,7 +1522,6 @@ html-target: maybe-html-target-winsup html-target: maybe-html-target-libgloss html-target: maybe-html-target-libffi -html-target: maybe-html-target-libjava html-target: maybe-html-target-zlib html-target: maybe-html-target-boehm-gc html-target: maybe-html-target-rda @@ -1616,7 +1608,6 @@ TAGS-target: maybe-TAGS-target-winsup TAGS-target: maybe-TAGS-target-libgloss TAGS-target: maybe-TAGS-target-libffi -TAGS-target: maybe-TAGS-target-libjava TAGS-target: maybe-TAGS-target-zlib TAGS-target: maybe-TAGS-target-boehm-gc TAGS-target: maybe-TAGS-target-rda @@ -1703,7 +1694,6 @@ install-info-target: maybe-install-info-target-winsup install-info-target: maybe-install-info-target-libgloss install-info-target: maybe-install-info-target-libffi -install-info-target: maybe-install-info-target-libjava install-info-target: maybe-install-info-target-zlib install-info-target: maybe-install-info-target-boehm-gc install-info-target: maybe-install-info-target-rda @@ -1790,7 +1780,6 @@ install-pdf-target: maybe-install-pdf-target-winsup install-pdf-target: maybe-install-pdf-target-libgloss install-pdf-target: maybe-install-pdf-target-libffi -install-pdf-target: maybe-install-pdf-target-libjava install-pdf-target: maybe-install-pdf-target-zlib install-pdf-target: maybe-install-pdf-target-boehm-gc install-pdf-target: maybe-install-pdf-target-rda @@ -1877,7 +1866,6 @@ install-html-target: maybe-install-html-target-winsup install-html-target: maybe-install-html-target-libgloss install-html-target: maybe-install-html-target-libffi -install-html-target: maybe-install-html-target-libjava install-html-target: maybe-install-html-target-zlib install-html-target: maybe-install-html-target-boehm-gc install-html-target: maybe-install-html-target-rda @@ -1964,7 +1952,6 @@ installcheck-target: maybe-installcheck-target-winsup installcheck-target: maybe-installcheck-target-libgloss installcheck-target: maybe-installcheck-target-libffi -installcheck-target: maybe-installcheck-target-libjava installcheck-target: maybe-installcheck-target-zlib installcheck-target: maybe-installcheck-target-boehm-gc installcheck-target: maybe-installcheck-target-rda @@ -2051,7 +2038,6 @@ mostlyclean-target: maybe-mostlyclean-target-winsup mostlyclean-target: maybe-mostlyclean-target-libgloss mostlyclean-target: maybe-mostlyclean-target-libffi -mostlyclean-target: maybe-mostlyclean-target-libjava mostlyclean-target: maybe-mostlyclean-target-zlib mostlyclean-target: maybe-mostlyclean-target-boehm-gc mostlyclean-target: maybe-mostlyclean-target-rda @@ -2138,7 +2124,6 @@ clean-target: maybe-clean-target-winsup clean-target: maybe-clean-target-libgloss clean-target: maybe-clean-target-libffi -clean-target: maybe-clean-target-libjava clean-target: maybe-clean-target-zlib clean-target: maybe-clean-target-boehm-gc clean-target: maybe-clean-target-rda @@ -2225,7 +2210,6 @@ distclean-target: maybe-distclean-target-winsup distclean-target: maybe-distclean-target-libgloss distclean-target: maybe-distclean-target-libffi -distclean-target: maybe-distclean-target-libjava distclean-target: maybe-distclean-target-zlib distclean-target: maybe-distclean-target-boehm-gc distclean-target: maybe-distclean-target-rda @@ -2312,7 +2296,6 @@ maintainer-clean-target: maybe-maintainer-clean-target-winsup maintainer-clean-target: maybe-maintainer-clean-target-libgloss maintainer-clean-target: maybe-maintainer-clean-target-libffi -maintainer-clean-target: maybe-maintainer-clean-target-libjava maintainer-clean-target: maybe-maintainer-clean-target-zlib maintainer-clean-target: maybe-maintainer-clean-target-boehm-gc maintainer-clean-target: maybe-maintainer-clean-target-rda @@ -2455,7 +2438,6 @@ maybe-check-target-winsup \ maybe-check-target-libgloss \ maybe-check-target-libffi \ - maybe-check-target-libjava \ maybe-check-target-zlib \ maybe-check-target-boehm-gc \ maybe-check-target-rda \ @@ -2638,7 +2620,6 @@ maybe-install-target-winsup \ maybe-install-target-libgloss \ maybe-install-target-libffi \ - maybe-install-target-libjava \ maybe-install-target-zlib \ maybe-install-target-boehm-gc \ maybe-install-target-rda \ @@ -2745,7 +2726,6 @@ maybe-install-strip-target-winsup \ maybe-install-strip-target-libgloss \ maybe-install-strip-target-libffi \ - maybe-install-strip-target-libjava \ maybe-install-strip-target-zlib \ maybe-install-strip-target-boehm-gc \ maybe-install-strip-target-rda \ @@ -47894,464 +47874,6 @@ -.PHONY: configure-target-libjava maybe-configure-target-libjava -maybe-configure-target-libjava: -@if gcc-bootstrap -configure-target-libjava: stage_current -@endif gcc-bootstrap -@if target-libjava -maybe-configure-target-libjava: configure-target-libjava -configure-target-libjava: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - echo "Checking multilib configuration for libjava..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libjava/multilib.tmp 2> /dev/null; \ - if test -r $(TARGET_SUBDIR)/libjava/multilib.out; then \ - if cmp -s $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; then \ - rm -f $(TARGET_SUBDIR)/libjava/multilib.tmp; \ - else \ - rm -f $(TARGET_SUBDIR)/libjava/Makefile; \ - mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \ - fi; \ - else \ - mv $(TARGET_SUBDIR)/libjava/multilib.tmp $(TARGET_SUBDIR)/libjava/multilib.out; \ - fi; \ - test ! -f $(TARGET_SUBDIR)/libjava/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libjava; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo Configuring in $(TARGET_SUBDIR)/libjava; \ - cd "$(TARGET_SUBDIR)/libjava" || exit 1; \ - case $(srcdir) in \ - /* | [A-Za-z]:[\\/]*) topdir=$(srcdir) ;; \ - *) topdir=`echo $(TARGET_SUBDIR)/libjava/ | \ - sed -e 's,\./,,g' -e 's,[^/]*/,../,g' `$(srcdir) ;; \ - esac; \ - module_srcdir=libjava; \ - rm -f no-such-file || : ; \ - CONFIG_SITE=no-such-file $(SHELL) \ - $$s/$$module_srcdir/configure \ - --srcdir=$${topdir}/$$module_srcdir \ - $(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \ - --target=${target_alias} $(EXTRA_CONFIGARGS_LIBJAVA) \ - || exit 1 -@endif target-libjava - - - - - -.PHONY: all-target-libjava maybe-all-target-libjava -maybe-all-target-libjava: -@if gcc-bootstrap -all-target-libjava: stage_current -@endif gcc-bootstrap -@if target-libjava -TARGET-target-libjava=all -maybe-all-target-libjava: all-target-libjava -all-target-libjava: configure-target-libjava - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) $(EXTRA_TARGET_FLAGS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' \ - $(TARGET-target-libjava)) -@endif target-libjava - - - - - -.PHONY: check-target-libjava maybe-check-target-libjava -maybe-check-target-libjava: -@if target-libjava -maybe-check-target-libjava: check-target-libjava - -check-target-libjava: - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) 'CXX=$$(RAW_CXX_FOR_TARGET)' 'CXX_FOR_TARGET=$$(RAW_CXX_FOR_TARGET)' check) - -@endif target-libjava - -.PHONY: install-target-libjava maybe-install-target-libjava -maybe-install-target-libjava: -@if target-libjava -maybe-install-target-libjava: install-target-libjava - -install-target-libjava: installdirs - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) install) - -@endif target-libjava - -.PHONY: install-strip-target-libjava maybe-install-strip-target-libjava -maybe-install-strip-target-libjava: -@if target-libjava -maybe-install-strip-target-libjava: install-strip-target-libjava - -install-strip-target-libjava: installdirs - @: $(MAKE); $(unstage) - @r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(TARGET_FLAGS_TO_PASS) install-strip) - -@endif target-libjava - -# Other targets (info, dvi, pdf, etc.) - -.PHONY: maybe-info-target-libjava info-target-libjava -maybe-info-target-libjava: -@if target-libjava -maybe-info-target-libjava: info-target-libjava - -info-target-libjava: \ - configure-target-libjava - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libjava"; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - info) \ - || exit 1 - -@endif target-libjava - -.PHONY: maybe-dvi-target-libjava dvi-target-libjava -maybe-dvi-target-libjava: -@if target-libjava -maybe-dvi-target-libjava: dvi-target-libjava - -dvi-target-libjava: \ - configure-target-libjava - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libjava"; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - dvi) \ - || exit 1 - -@endif target-libjava - -.PHONY: maybe-pdf-target-libjava pdf-target-libjava -maybe-pdf-target-libjava: -@if target-libjava -maybe-pdf-target-libjava: pdf-target-libjava - -pdf-target-libjava: \ - configure-target-libjava - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/libjava"; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - pdf) \ - || exit 1 - -@endif target-libjava - -.PHONY: maybe-html-target-libjava html-target-libjava -maybe-html-target-libjava: -@if target-libjava -maybe-html-target-libjava: html-target-libjava - -html-target-libjava: \ - configure-target-libjava - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libjava"; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - html) \ - || exit 1 - -@endif target-libjava - -.PHONY: maybe-TAGS-target-libjava TAGS-target-libjava -maybe-TAGS-target-libjava: -@if target-libjava -maybe-TAGS-target-libjava: TAGS-target-libjava - -TAGS-target-libjava: \ - configure-target-libjava - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libjava"; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - TAGS) \ - || exit 1 - -@endif target-libjava - -.PHONY: maybe-install-info-target-libjava install-info-target-libjava -maybe-install-info-target-libjava: -@if target-libjava -maybe-install-info-target-libjava: install-info-target-libjava - -install-info-target-libjava: \ - configure-target-libjava \ - info-target-libjava - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libjava"; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - install-info) \ - || exit 1 - -@endif target-libjava - -.PHONY: maybe-install-pdf-target-libjava install-pdf-target-libjava -maybe-install-pdf-target-libjava: -@if target-libjava -maybe-install-pdf-target-libjava: install-pdf-target-libjava - -install-pdf-target-libjava: \ - configure-target-libjava \ - pdf-target-libjava - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/libjava"; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - install-pdf) \ - || exit 1 - -@endif target-libjava - -.PHONY: maybe-install-html-target-libjava install-html-target-libjava -maybe-install-html-target-libjava: -@if target-libjava -maybe-install-html-target-libjava: install-html-target-libjava - -install-html-target-libjava: \ - configure-target-libjava \ - html-target-libjava - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/libjava"; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - install-html) \ - || exit 1 - -@endif target-libjava - -.PHONY: maybe-installcheck-target-libjava installcheck-target-libjava -maybe-installcheck-target-libjava: -@if target-libjava -maybe-installcheck-target-libjava: installcheck-target-libjava - -installcheck-target-libjava: \ - configure-target-libjava - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libjava"; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - installcheck) \ - || exit 1 - -@endif target-libjava - -.PHONY: maybe-mostlyclean-target-libjava mostlyclean-target-libjava -maybe-mostlyclean-target-libjava: -@if target-libjava -maybe-mostlyclean-target-libjava: mostlyclean-target-libjava - -mostlyclean-target-libjava: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libjava"; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - mostlyclean) \ - || exit 1 - -@endif target-libjava - -.PHONY: maybe-clean-target-libjava clean-target-libjava -maybe-clean-target-libjava: -@if target-libjava -maybe-clean-target-libjava: clean-target-libjava - -clean-target-libjava: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libjava"; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - clean) \ - || exit 1 - -@endif target-libjava - -.PHONY: maybe-distclean-target-libjava distclean-target-libjava -maybe-distclean-target-libjava: -@if target-libjava -maybe-distclean-target-libjava: distclean-target-libjava - -distclean-target-libjava: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libjava"; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - distclean) \ - || exit 1 - -@endif target-libjava - -.PHONY: maybe-maintainer-clean-target-libjava maintainer-clean-target-libjava -maybe-maintainer-clean-target-libjava: -@if target-libjava -maybe-maintainer-clean-target-libjava: maintainer-clean-target-libjava - -maintainer-clean-target-libjava: - @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libjava/Makefile ] || exit 0; \ - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(RAW_CXX_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libjava"; \ - for flag in $(EXTRA_TARGET_FLAGS); do \ - eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ - done; \ - (cd $(TARGET_SUBDIR)/libjava && \ - $(MAKE) $(BASE_FLAGS_TO_PASS) "AR=$${AR}" "AS=$${AS}" \ - "CC=$${CC}" "CXX=$${CXX}" "LD=$${LD}" "NM=$${NM}" \ - "RANLIB=$${RANLIB}" \ - "DLLTOOL=$${DLLTOOL}" "WINDRES=$${WINDRES}" "WINDMC=$${WINDMC}" \ - maintainer-clean) \ - || exit 1 - -@endif target-libjava - - - - - .PHONY: configure-target-zlib maybe-configure-target-zlib maybe-configure-target-zlib: @if gcc-bootstrap @@ -52312,14 +51834,6 @@ (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-fortran); check-fortran: check-gcc-fortran check-target-libquadmath check-target-libgfortran -.PHONY: check-gcc-java check-java -check-gcc-java: - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-java); -check-java: check-gcc-java check-target-libjava - .PHONY: check-gcc-ada check-ada check-gcc-ada: r=`${PWD_COMMAND}`; export r; \ @@ -55233,7 +54747,6 @@ configure-target-winsup: stage_last configure-target-libgloss: stage_last configure-target-libffi: stage_last -configure-target-libjava: stage_last configure-target-zlib: stage_last configure-target-boehm-gc: stage_last configure-target-rda: stage_last @@ -55269,7 +54782,6 @@ configure-target-winsup: maybe-all-gcc configure-target-libgloss: maybe-all-gcc configure-target-libffi: maybe-all-gcc -configure-target-libjava: maybe-all-gcc configure-target-zlib: maybe-all-gcc configure-target-boehm-gc: maybe-all-gcc configure-target-rda: maybe-all-gcc @@ -56294,13 +55806,6 @@ all-target-libgo: maybe-all-target-libbacktrace all-target-libgo: maybe-all-target-libffi all-target-libgo: maybe-all-target-libatomic -configure-target-libjava: maybe-configure-target-zlib -configure-target-libjava: maybe-configure-target-boehm-gc -configure-target-libjava: maybe-configure-target-libffi -all-target-libjava: maybe-all-fastjar -all-target-libjava: maybe-all-target-zlib -all-target-libjava: maybe-all-target-boehm-gc -all-target-libjava: maybe-all-target-libffi configure-target-libobjc: maybe-configure-target-boehm-gc all-target-libobjc: maybe-all-target-boehm-gc configure-target-libstdc++-v3: maybe-configure-target-libgomp @@ -56356,7 +55861,6 @@ install-target-libcilkrts: maybe-install-target-libgcc install-target-liboffloadmic: maybe-install-target-libstdc++-v3 install-target-liboffloadmic: maybe-install-target-libgcc -install-target-libjava: maybe-install-target-libgcc install-target-libitm: maybe-install-target-libgcc install-target-libobjc: maybe-install-target-libgcc install-target-libstdc++-v3: maybe-install-target-libgcc @@ -56434,7 +55938,6 @@ configure-target-winsup: maybe-all-target-libgcc configure-target-libgloss: maybe-all-target-libgcc configure-target-libffi: maybe-all-target-libgcc -configure-target-libjava: maybe-all-target-libgcc configure-target-zlib: maybe-all-target-libgcc configure-target-boehm-gc: maybe-all-target-libgcc configure-target-rda: maybe-all-target-libgcc @@ -56481,9 +55984,6 @@ configure-target-libffi: maybe-all-target-newlib maybe-all-target-libgloss configure-target-libffi: maybe-all-target-libstdc++-v3 -configure-target-libjava: maybe-all-target-newlib maybe-all-target-libgloss -configure-target-libjava: maybe-all-target-libstdc++-v3 - configure-target-zlib: maybe-all-target-newlib maybe-all-target-libgloss configure-target-boehm-gc: maybe-all-target-newlib maybe-all-target-libgloss Index: configure.ac =================================================================== --- configure.ac (revision 239988) +++ configure.ac (working copy) @@ -142,11 +142,6 @@ # If --enable-gold is used, "gold" may replace "ld". host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools" -# libgcj represents the runtime libraries only used by gcj. -libgcj="target-libffi \ - target-zlib \ - target-libjava" - # these libraries are built for the target environment, and are built after # the host libraries and the host tools (which may be a cross compiler) # Note that libiberty is not a target library. @@ -166,8 +161,6 @@ target-libssp \ target-libquadmath \ target-libgfortran \ - target-boehm-gc \ - ${libgcj} \ target-libobjc \ target-libada \ target-libgo" @@ -507,41 +500,6 @@ fi]) AC_SUBST(extra_liboffloadmic_configure_flags) -# Save it here so that, even in case of --enable-libgcj, if the Java -# front-end isn't enabled, we still get libgcj disabled. -libgcj_saved=$libgcj -case $enable_libgcj in -yes) - # If we reset it here, it won't get added to noconfigdirs in the - # target-specific build rules, so it will be forcibly enabled - # (unless the Java language itself isn't enabled). - libgcj= - ;; -no) - # Make sure we get it printed in the list of not supported target libs. - # Don't disable libffi, though, other languages use it. - noconfigdirs="$noconfigdirs `echo ${libgcj} | sed -e 's/target-libffi//'`" - # Clear libgcj_saved so that even if java is enabled libffi won't be - # built. - libgcj_saved= - ;; -esac - -AC_ARG_ENABLE(static-libjava, -[AS_HELP_STRING([[--enable-static-libjava[=ARG]]], - [build static libjava @<:@default=no@:>@])], -ENABLE_STATIC_LIBJAVA=$enableval, -ENABLE_STATIC_LIBJAVA=no) -enable_static_libjava= -if test "${ENABLE_STATIC_LIBJAVA}" = "yes" ; then - enable_static_libjava=yes -fi - -if test x$enable_static_libjava != xyes ; then - EXTRA_CONFIGARGS_LIBJAVA=--disable-static -fi -AC_SUBST(EXTRA_CONFIGARGS_LIBJAVA) - # Enable libgomp by default on hosted POSIX systems, and a few others. if test x$enable_libgomp = x ; then case "${target}" in @@ -738,166 +696,6 @@ ;; esac -# Disable Java if libffi is not supported. -case "${target}" in - aarch64-*-*) - ;; - alpha*-*-*) - ;; - arm*-*-*) - ;; - cris-*-*) - ;; - frv-*-*) - ;; - hppa*-*-linux*) - ;; - hppa*-*-hpux*) - ;; - i?86-*-*) - ;; - ia64*-*-*) - ;; - m32r*-*-*) - ;; - m68k-*-*) - ;; - mips*-*-rtems*) - ;; - mips*-*-linux*) - ;; - powerpc*-*-linux*) - ;; - powerpc-*-darwin*) - ;; - powerpc-*-aix* | rs6000-*-aix*) - ;; - powerpc-*-freebsd*) - ;; - powerpc64-*-freebsd*) - ;; - powerpc*-*-rtems*) - ;; - s390-*-* | s390x-*-*) - ;; - sh-*-* | sh[[34]]*-*-*) - ;; - sparc*-*-*) - ;; - x86_64-*-*) - ;; - *-*-*) - unsupported_languages="$unsupported_languages java" - ;; -esac - -# Disable Java, libgcj or related libraries for some systems. -case "${target}" in - powerpc-*-darwin*) - ;; - i[[3456789]]86-*-darwin*) - ;; - x86_64-*-darwin[[912]]*) - ;; - *-*-darwin*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - *-*-netware*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - *-*-phoenix*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - *-*-rtems*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - *-*-tpf*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - *-*-uclinux*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - *-*-vxworks*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - alpha*-*-*vms*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - arm*-*-freebsd*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - arm-wince-pe) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - arm*-*-symbianelf*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - bfin-*-*) - noconfigdirs="$noconfigdirs target-boehm-gc" - ;; - cris-*-* | crisv32-*-*) - unsupported_languages="$unsupported_languages java" - case "${target}" in - *-*-linux*) - ;; - *) # See PR46792 regarding target-libffi. - noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";; - esac - ;; - hppa*64*-*-linux*) - # In this case, it's because the hppa64-linux target is for - # the kernel only at this point and has no libc, and thus no - # headers, crt*.o, etc., all of which are needed by these. - unsupported_languages="$unsupported_languages java" - ;; - hppa*64*-*-hpux*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - hppa*-hp-hpux11*) - ;; - hppa*-*-hpux*) - # According to Alexandre Oliva <aoliva@redhat.com>, libjava won't - # build on HP-UX 10.20. - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - ia64*-*-*vms*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - i[[3456789]]86-w64-mingw*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - i[[3456789]]86-*-mingw*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - x86_64-*-mingw*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - mmix-*-*) - noconfigdirs="$noconfigdirs target-libffi target-boehm-gc" - ;; - powerpc-*-aix*) - # copied from rs6000-*-* entry - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - rs6000-*-aix*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - ft32-*-*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - *-*-lynxos*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; -esac - -# Disable the go frontend on systems where it is known to not work. Please keep -# this in sync with contrib/config-list.mk. -case "${target}" in -*-*-darwin* | *-*-cygwin* | *-*-mingw* | *-*-aix*) - unsupported_languages="$unsupported_languages go" - ;; -esac - # Disable libgo for some systems where it is known to not work. # For testing, you can easily override this with --enable-libgo. if test x$enable_libgo = x; then @@ -2152,30 +1950,6 @@ fi done -# Check for Boehm's garbage collector -AC_ARG_ENABLE(objc-gc, -[AS_HELP_STRING([--enable-objc-gc], - [enable use of Boehm's garbage collector with the - GNU Objective-C runtime])], -[case ,${enable_languages},:${enable_objc_gc}:${noconfigdirs} in - *,objc,*:*:yes:*target-boehm-gc*) - AC_MSG_ERROR([Boehm's garbage collector was requested yet not supported in this configuration]) - ;; -esac]) - -# Make sure we only build Boehm's garbage collector if required. -case ,${enable_languages},:${enable_objc_gc} in - *,objc,*:yes) - # Keep target-boehm-gc if requested for Objective-C. - ;; - *) - # Otherwise remove target-boehm-gc depending on target-libjava. - if echo " ${noconfigdirs} " | grep "target-libjava" >/dev/null 2>&1; then - noconfigdirs="$noconfigdirs target-boehm-gc" - fi - ;; -esac - # Disable libcilkrts, libitm, libsanitizer, libvtv, liboffloadmic if we're not building C++ case ,${enable_languages}, in *,c++,*) @@ -2260,15 +2034,6 @@ fi done -# Exclude target-zlib if target-libjava isn't built. -case ${target_configdirs} in -*target-libjava*) - ;; -*) - target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`" - ;; -esac - # libiberty-linker-plugin is special: it doesn't have its own source directory, # so we have to add it after the preceding checks. if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x Index: configure =================================================================== --- configure (revision 239988) +++ configure (working copy) @@ -674,7 +674,6 @@ LDFLAGS CFLAGS CC -EXTRA_CONFIGARGS_LIBJAVA extra_liboffloadmic_configure_flags target_subdir host_subdir @@ -761,7 +760,6 @@ enable_libssp enable_libstdcxx enable_liboffloadmic -enable_static_libjava enable_bootstrap with_mpc with_mpc_include @@ -786,7 +784,6 @@ enable_linker_plugin_configure_flags enable_linker_plugin_flags enable_stage1_languages -enable_objc_gc with_build_sysroot with_debug_prefix_map with_build_config @@ -1489,8 +1486,6 @@ --disable-libstdcxx do not build libstdc++-v3 directory --enable-liboffloadmic=ARG build liboffloadmic [ARG={no,host,target}] - --enable-static-libjava[=ARG] - build static libjava [default=no] --enable-bootstrap enable bootstrapping [yes if native build] --disable-isl-version-check disable check for isl version @@ -1504,8 +1499,6 @@ --enable-stage1-languages[=all] choose additional languages to build during stage1. Mostly useful for compiler development - --enable-objc-gc enable use of Boehm's garbage collector with the GNU - Objective-C runtime --enable-vtable-verify Enable vtable verification feature --enable-serial-[{host,target,build}-]configure force sequential configuration of sub-packages for @@ -2736,11 +2729,6 @@ # If --enable-gold is used, "gold" may replace "ld". host_tools="texinfo flex bison binutils gas ld fixincludes gcc cgen sid sim gdb gprof etc expect dejagnu m4 utils guile fastjar gnattools libcc1 gotools" -# libgcj represents the runtime libraries only used by gcj. -libgcj="target-libffi \ - target-zlib \ - target-libjava" - # these libraries are built for the target environment, and are built after # the host libraries and the host tools (which may be a cross compiler) # Note that libiberty is not a target library. @@ -2760,8 +2748,6 @@ target-libssp \ target-libquadmath \ target-libgfortran \ - target-boehm-gc \ - ${libgcj} \ target-libobjc \ target-libada \ target-libgo" @@ -3148,43 +3134,6 @@ -# Save it here so that, even in case of --enable-libgcj, if the Java -# front-end isn't enabled, we still get libgcj disabled. -libgcj_saved=$libgcj -case $enable_libgcj in -yes) - # If we reset it here, it won't get added to noconfigdirs in the - # target-specific build rules, so it will be forcibly enabled - # (unless the Java language itself isn't enabled). - libgcj= - ;; -no) - # Make sure we get it printed in the list of not supported target libs. - # Don't disable libffi, though, other languages use it. - noconfigdirs="$noconfigdirs `echo ${libgcj} | sed -e 's/target-libffi//'`" - # Clear libgcj_saved so that even if java is enabled libffi won't be - # built. - libgcj_saved= - ;; -esac - -# Check whether --enable-static-libjava was given. -if test "${enable_static_libjava+set}" = set; then : - enableval=$enable_static_libjava; ENABLE_STATIC_LIBJAVA=$enableval -else - ENABLE_STATIC_LIBJAVA=no -fi - -enable_static_libjava= -if test "${ENABLE_STATIC_LIBJAVA}" = "yes" ; then - enable_static_libjava=yes -fi - -if test x$enable_static_libjava != xyes ; then - EXTRA_CONFIGARGS_LIBJAVA=--disable-static -fi - - # Enable libgomp by default on hosted POSIX systems, and a few others. if test x$enable_libgomp = x ; then case "${target}" in @@ -3402,166 +3351,6 @@ ;; esac -# Disable Java if libffi is not supported. -case "${target}" in - aarch64-*-*) - ;; - alpha*-*-*) - ;; - arm*-*-*) - ;; - cris-*-*) - ;; - frv-*-*) - ;; - hppa*-*-linux*) - ;; - hppa*-*-hpux*) - ;; - i?86-*-*) - ;; - ia64*-*-*) - ;; - m32r*-*-*) - ;; - m68k-*-*) - ;; - mips*-*-rtems*) - ;; - mips*-*-linux*) - ;; - powerpc*-*-linux*) - ;; - powerpc-*-darwin*) - ;; - powerpc-*-aix* | rs6000-*-aix*) - ;; - powerpc-*-freebsd*) - ;; - powerpc64-*-freebsd*) - ;; - powerpc*-*-rtems*) - ;; - s390-*-* | s390x-*-*) - ;; - sh-*-* | sh[34]*-*-*) - ;; - sparc*-*-*) - ;; - x86_64-*-*) - ;; - *-*-*) - unsupported_languages="$unsupported_languages java" - ;; -esac - -# Disable Java, libgcj or related libraries for some systems. -case "${target}" in - powerpc-*-darwin*) - ;; - i[3456789]86-*-darwin*) - ;; - x86_64-*-darwin[912]*) - ;; - *-*-darwin*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - *-*-netware*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - *-*-phoenix*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - *-*-rtems*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - *-*-tpf*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - *-*-uclinux*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - *-*-vxworks*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - alpha*-*-*vms*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - arm*-*-freebsd*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - arm-wince-pe) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - arm*-*-symbianelf*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - bfin-*-*) - noconfigdirs="$noconfigdirs target-boehm-gc" - ;; - cris-*-* | crisv32-*-*) - unsupported_languages="$unsupported_languages java" - case "${target}" in - *-*-linux*) - ;; - *) # See PR46792 regarding target-libffi. - noconfigdirs="$noconfigdirs target-libffi target-boehm-gc";; - esac - ;; - hppa*64*-*-linux*) - # In this case, it's because the hppa64-linux target is for - # the kernel only at this point and has no libc, and thus no - # headers, crt*.o, etc., all of which are needed by these. - unsupported_languages="$unsupported_languages java" - ;; - hppa*64*-*-hpux*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - hppa*-hp-hpux11*) - ;; - hppa*-*-hpux*) - # According to Alexandre Oliva <aoliva@redhat.com>, libjava won't - # build on HP-UX 10.20. - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - ia64*-*-*vms*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - i[3456789]86-w64-mingw*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - i[3456789]86-*-mingw*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - x86_64-*-mingw*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - mmix-*-*) - noconfigdirs="$noconfigdirs target-libffi target-boehm-gc" - ;; - powerpc-*-aix*) - # copied from rs6000-*-* entry - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - rs6000-*-aix*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - ft32-*-*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; - *-*-lynxos*) - noconfigdirs="$noconfigdirs ${libgcj}" - ;; -esac - -# Disable the go frontend on systems where it is known to not work. Please keep -# this in sync with contrib/config-list.mk. -case "${target}" in -*-*-darwin* | *-*-cygwin* | *-*-mingw* | *-*-aix*) - unsupported_languages="$unsupported_languages go" - ;; -esac - # Disable libgo for some systems where it is known to not work. # For testing, you can easily override this with --enable-libgo. if test x$enable_libgo = x; then @@ -6497,30 +6286,6 @@ fi done -# Check for Boehm's garbage collector -# Check whether --enable-objc-gc was given. -if test "${enable_objc_gc+set}" = set; then : - enableval=$enable_objc_gc; case ,${enable_languages},:${enable_objc_gc}:${noconfigdirs} in - *,objc,*:*:yes:*target-boehm-gc*) - as_fn_error "Boehm's garbage collector was requested yet not supported in this configuration" "$LINENO" 5 - ;; -esac -fi - - -# Make sure we only build Boehm's garbage collector if required. -case ,${enable_languages},:${enable_objc_gc} in - *,objc,*:yes) - # Keep target-boehm-gc if requested for Objective-C. - ;; - *) - # Otherwise remove target-boehm-gc depending on target-libjava. - if echo " ${noconfigdirs} " | grep "target-libjava" >/dev/null 2>&1; then - noconfigdirs="$noconfigdirs target-boehm-gc" - fi - ;; -esac - # Disable libcilkrts, libitm, libsanitizer, libvtv, liboffloadmic if we're not building C++ case ,${enable_languages}, in *,c++,*) @@ -6605,15 +6370,6 @@ fi done -# Exclude target-zlib if target-libjava isn't built. -case ${target_configdirs} in -*target-libjava*) - ;; -*) - target_configdirs="`echo ${target_configdirs} | sed -e 's/target-zlib//'`" - ;; -esac - # libiberty-linker-plugin is special: it doesn't have its own source directory, # so we have to add it after the preceding checks. if test x"$extra_linker_plugin_flags$extra_linker_plugin_configure_flags" != x Index: Makefile.def =================================================================== --- Makefile.def (revision 239988) +++ Makefile.def (working copy) @@ -165,8 +165,6 @@ target_modules = { module= winsup; }; target_modules = { module= libgloss; no_check=true; }; target_modules = { module= libffi; no_install=true; }; -target_modules = { module= libjava; raw_cxx=true; - extra_configure_flags="$(EXTRA_CONFIGARGS_LIBJAVA)"; }; target_modules = { module= zlib; }; target_modules = { module= boehm-gc; }; target_modules = { module= rda; }; @@ -534,7 +532,6 @@ // Target modules. These can also have dependencies on the language // environment (e.g. on libstdc++). By default target modules depend // on libgcc and newlib/libgloss. -lang_env_dependencies = { module=libjava; cxx=true; }; lang_env_dependencies = { module=libitm; cxx=true; }; lang_env_dependencies = { module=libffi; cxx=true; }; lang_env_dependencies = { module=libcilkrts; cxx=true; }; @@ -555,13 +552,6 @@ 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=configure-target-libjava; on=configure-target-zlib; }; -dependencies = { module=configure-target-libjava; on=configure-target-boehm-gc; }; -dependencies = { module=configure-target-libjava; on=configure-target-libffi; }; -dependencies = { module=all-target-libjava; on=all-fastjar; }; -dependencies = { module=all-target-libjava; on=all-target-zlib; }; -dependencies = { module=all-target-libjava; on=all-target-boehm-gc; }; -dependencies = { module=all-target-libjava; on=all-target-libffi; }; dependencies = { module=configure-target-libobjc; on=configure-target-boehm-gc; }; dependencies = { module=all-target-libobjc; on=all-target-boehm-gc; }; dependencies = { module=configure-target-libstdc++-v3; on=configure-target-libgomp; }; @@ -585,7 +575,6 @@ dependencies = { module=install-target-libcilkrts; on=install-target-libgcc; }; dependencies = { module=install-target-liboffloadmic; on=install-target-libstdc++-v3; }; dependencies = { module=install-target-liboffloadmic; on=install-target-libgcc; }; -dependencies = { module=install-target-libjava; on=install-target-libgcc; }; dependencies = { module=install-target-libitm; on=install-target-libgcc; }; dependencies = { module=install-target-libobjc; on=install-target-libgcc; }; dependencies = { module=install-target-libstdc++-v3; on=install-target-libgcc; }; @@ -610,8 +599,6 @@ languages = { language=fortran; gcc-check-target=check-fortran; lib-check-target=check-target-libquadmath; lib-check-target=check-target-libgfortran; }; -languages = { language=java; gcc-check-target=check-java; - lib-check-target=check-target-libjava; }; languages = { language=ada; gcc-check-target=check-ada; lib-check-target=check-target-libada; }; languages = { language=objc; gcc-check-target=check-objc; Index: Makefile.tpl =================================================================== --- Makefile.tpl (revision 239988) +++ Makefile.tpl (working copy) @@ -325,8 +325,6 @@ HOST_LIBELFLIBS = @libelflibs@ HOST_LIBELFINC = @libelfinc@ -EXTRA_CONFIGARGS_LIBJAVA = @EXTRA_CONFIGARGS_LIBJAVA@ - # ---------------------------------------------- # Programs producing files for the BUILD machine # ----------------------------------------------