diff options
author | Gary Funck <gary@intrepid.com> | 2015-08-16 04:50:15 +0000 |
---|---|---|
committer | Gary Funck <gary@intrepid.com> | 2015-08-16 04:50:15 +0000 |
commit | 6ecafa0ff4146ab801cdf62b8d4b55ba38011f72 (patch) | |
tree | bcd115b9f0707ba024d8e4f6db7cdc8d0e186821 | |
parent | ba06aa7233a35519badacae83618e67138522e0a (diff) |
Cherry pick gupc branch updates, up to version 226919.
git-svn-id: https://gcc.gnu.org/svn/gcc/branches/gupc-5-branch@226922 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r-- | Makefile.def | 2 | ||||
-rw-r--r-- | Makefile.in | 66 | ||||
-rw-r--r-- | gcc/ChangeLog.upc | 10 |
3 files changed, 39 insertions, 39 deletions
diff --git a/Makefile.def b/Makefile.def index f898ce4660f..87c78db7cb5 100644 --- a/Makefile.def +++ b/Makefile.def @@ -609,8 +609,6 @@ languages = { language=ada; gcc-check-target=check-ada; lib-check-target=check-target-libada; }; languages = { language=objc; gcc-check-target=check-objc; lib-check-target=check-target-libobjc; }; -languages = { language=upc; gcc-check-target=check-upc; - lib-check-target=check-target-libgupc; }; languages = { language=obj-c++; gcc-check-target=check-obj-c++; }; languages = { language=go; gcc-check-target=check-go; lib-check-target=check-target-libgo; }; diff --git a/Makefile.in b/Makefile.in index e92eff3b5b1..ee6cbd59c3a 100644 --- a/Makefile.in +++ b/Makefile.in @@ -40911,8 +40911,8 @@ configure-target-libgupc: @r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ echo "Checking multilib configuration for libgupc..."; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgupc ; \ - $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgupc/multilib.tmp 2> /dev/null ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgupc; \ + $(CC_FOR_TARGET) --print-multi-lib > $(TARGET_SUBDIR)/libgupc/multilib.tmp 2> /dev/null; \ if test -r $(TARGET_SUBDIR)/libgupc/multilib.out; then \ if cmp -s $(TARGET_SUBDIR)/libgupc/multilib.tmp $(TARGET_SUBDIR)/libgupc/multilib.out; then \ rm -f $(TARGET_SUBDIR)/libgupc/multilib.tmp; \ @@ -40924,7 +40924,7 @@ configure-target-libgupc: mv $(TARGET_SUBDIR)/libgupc/multilib.tmp $(TARGET_SUBDIR)/libgupc/multilib.out; \ fi; \ test ! -f $(TARGET_SUBDIR)/libgupc/Makefile || exit 0; \ - $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgupc ; \ + $(SHELL) $(srcdir)/mkinstalldirs $(TARGET_SUBDIR)/libgupc; \ $(NORMAL_TARGET_EXPORTS) \ echo Configuring in $(TARGET_SUBDIR)/libgupc; \ cd "$(TARGET_SUBDIR)/libgupc" || exit 1; \ @@ -41024,11 +41024,11 @@ maybe-info-target-libgupc: info-target-libgupc info-target-libgupc: \ configure-target-libgupc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing info in $(TARGET_SUBDIR)/libgupc" ; \ + echo "Doing info in $(TARGET_SUBDIR)/libgupc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41050,11 +41050,11 @@ maybe-dvi-target-libgupc: dvi-target-libgupc dvi-target-libgupc: \ configure-target-libgupc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing dvi in $(TARGET_SUBDIR)/libgupc" ; \ + echo "Doing dvi in $(TARGET_SUBDIR)/libgupc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41076,11 +41076,11 @@ maybe-pdf-target-libgupc: pdf-target-libgupc pdf-target-libgupc: \ configure-target-libgupc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing pdf in $(TARGET_SUBDIR)/libgupc" ; \ + echo "Doing pdf in $(TARGET_SUBDIR)/libgupc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41102,11 +41102,11 @@ maybe-html-target-libgupc: html-target-libgupc html-target-libgupc: \ configure-target-libgupc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing html in $(TARGET_SUBDIR)/libgupc" ; \ + echo "Doing html in $(TARGET_SUBDIR)/libgupc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41128,11 +41128,11 @@ maybe-TAGS-target-libgupc: TAGS-target-libgupc TAGS-target-libgupc: \ configure-target-libgupc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing TAGS in $(TARGET_SUBDIR)/libgupc" ; \ + echo "Doing TAGS in $(TARGET_SUBDIR)/libgupc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41155,11 +41155,11 @@ install-info-target-libgupc: \ configure-target-libgupc \ info-target-libgupc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-info in $(TARGET_SUBDIR)/libgupc" ; \ + echo "Doing install-info in $(TARGET_SUBDIR)/libgupc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41182,11 +41182,11 @@ install-pdf-target-libgupc: \ configure-target-libgupc \ pdf-target-libgupc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-pdf in $(TARGET_SUBDIR)/libgupc" ; \ + echo "Doing install-pdf in $(TARGET_SUBDIR)/libgupc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41209,11 +41209,11 @@ install-html-target-libgupc: \ configure-target-libgupc \ html-target-libgupc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing install-html in $(TARGET_SUBDIR)/libgupc" ; \ + echo "Doing install-html in $(TARGET_SUBDIR)/libgupc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41235,11 +41235,11 @@ maybe-installcheck-target-libgupc: installcheck-target-libgupc installcheck-target-libgupc: \ configure-target-libgupc @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing installcheck in $(TARGET_SUBDIR)/libgupc" ; \ + echo "Doing installcheck in $(TARGET_SUBDIR)/libgupc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41260,11 +41260,11 @@ maybe-mostlyclean-target-libgupc: mostlyclean-target-libgupc mostlyclean-target-libgupc: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgupc" ; \ + echo "Doing mostlyclean in $(TARGET_SUBDIR)/libgupc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41285,11 +41285,11 @@ maybe-clean-target-libgupc: clean-target-libgupc clean-target-libgupc: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing clean in $(TARGET_SUBDIR)/libgupc" ; \ + echo "Doing clean in $(TARGET_SUBDIR)/libgupc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41310,11 +41310,11 @@ maybe-distclean-target-libgupc: distclean-target-libgupc distclean-target-libgupc: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing distclean in $(TARGET_SUBDIR)/libgupc" ; \ + echo "Doing distclean in $(TARGET_SUBDIR)/libgupc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -41335,11 +41335,11 @@ maybe-maintainer-clean-target-libgupc: maintainer-clean-target-libgupc maintainer-clean-target-libgupc: @: $(MAKE); $(unstage) - @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0 ; \ + @[ -f $(TARGET_SUBDIR)/libgupc/Makefile ] || exit 0; \ r=`${PWD_COMMAND}`; export r; \ s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ $(NORMAL_TARGET_EXPORTS) \ - echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgupc" ; \ + echo "Doing maintainer-clean in $(TARGET_SUBDIR)/libgupc"; \ for flag in $(EXTRA_TARGET_FLAGS); do \ eval `echo "$$flag" | sed -e "s|^\([^=]*\)=\(.*\)|\1='\2'; export \1|"`; \ done; \ @@ -47829,14 +47829,6 @@ check-gcc-objc: (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-objc); check-objc: check-gcc-objc check-target-libobjc -.PHONY: check-gcc-upc check-upc -check-gcc-upc: - r=`${PWD_COMMAND}`; export r; \ - s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ - $(HOST_EXPORTS) \ - (cd gcc && $(MAKE) $(GCC_FLAGS_TO_PASS) check-upc); -check-upc: check-gcc-upc check-target-libgupc - .PHONY: check-gcc-obj-c++ check-obj-c++ check-gcc-obj-c++: r=`${PWD_COMMAND}`; export r; \ diff --git a/gcc/ChangeLog.upc b/gcc/ChangeLog.upc index 20c244b69a1..343f3d942e1 100644 --- a/gcc/ChangeLog.upc +++ b/gcc/ChangeLog.upc @@ -1,3 +1,13 @@ +2015-08-15 Gary Funck <gary@intrepid.com> + + Cherry pick gupc branch updates, up to version 226919. + +2015-08-15 Gary Funck <gary@intrepid.com> + + * top-level/Makefile.def (language=upc): + Remove UPC language target. + * top-level/Makefile.in: Re-generate. + 2015-08-12 Gary Funck <gary@intrepid.com> Cherry pick gupc branch updates, up to version 226835. |