From: Jakub Jelinek <jakub@gcc.gnu.org>
Date: Wed, 7 Nov 2018 20:38:59 +0000 (+0100)
Subject: svn merge -r262815:265884 svn+ssh://gcc.gnu.org/svn/gcc/trunk
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c3bd406f92e7b698948d159002fa33fd077b74ea;p=thirdparty%2Fgcc.git

svn merge -r262815:265884 svn+ssh://gcc.gnu.org/svn/gcc/trunk

From-SVN: r265886
---

c3bd406f92e7b698948d159002fa33fd077b74ea
diff --cc gcc/cp/parser.c
index e3c36b3dca67,30a47662f556..deaca5cc9749
--- a/gcc/cp/parser.c
+++ b/gcc/cp/parser.c
@@@ -43,8 -43,7 +43,8 @@@ along with GCC; see the file COPYING3
  #include "context.h"
  #include "gcc-rich-location.h"
  #include "tree-iterator.h"
- #include "c-family/name-hint.h"
+ #include "cp-name-hint.h"
 +#include "memmodel.h"
  
  
  /* The lexer.  */
diff --cc gcc/gengtype.c
index 1bbc6636c280,4339456e9c67..40406dfa88f5
--- a/gcc/gengtype.c
+++ b/gcc/gengtype.c
@@@ -1721,11 -1721,10 +1721,11 @@@ open_base_files (void
        "tree-vrp.h", "tree-phinodes.h", "ssa-iterators.h", "stringpool.h",
        "tree-ssanames.h", "tree-ssa-loop.h", "tree-ssa-loop-ivopts.h",
        "tree-ssa-loop-manip.h", "tree-ssa-loop-niter.h", "tree-into-ssa.h",
-       "tree-dfa.h", "tree-ssa.h", "reload.h", "cpp-id-data.h", "tree-chrec.h",
+       "tree-dfa.h", "tree-ssa.h", "reload.h", "cpplib.h", "tree-chrec.h",
        "except.h", "output.h",  "cfgloop.h", "target.h", "lto-streamer.h",
        "target-globals.h", "ipa-ref.h", "cgraph.h", "symbol-summary.h",
 -      "ipa-prop.h", "ipa-fnsummary.h", "dwarf2out.h", "omp-offload.h", NULL
 +      "ipa-prop.h", "ipa-fnsummary.h", "dwarf2out.h", "omp-general.h",
 +      "omp-offload.h", NULL
      };
      const char *const *ifp;
      outf_p gtype_desc_c;
diff --cc gcc/tree-pretty-print.h
index f8bee6d74552,4de0e090cbaa..ea4ebee2301b
--- a/gcc/tree-pretty-print.h
+++ b/gcc/tree-pretty-print.h
@@@ -38,9 -38,8 +38,10 @@@ extern void print_generic_decl (FILE *
  extern void print_generic_stmt (FILE *, tree, dump_flags_t = TDF_NONE);
  extern void print_generic_stmt_indented (FILE *, tree, dump_flags_t, int);
  extern void print_generic_expr (FILE *, tree, dump_flags_t = TDF_NONE);
+ extern char *print_generic_expr_to_str (tree);
  extern void dump_omp_clauses (pretty_printer *, tree, int, dump_flags_t);
 +extern void dump_omp_atomic_memory_order (pretty_printer *,
 +					  enum omp_memory_order);
  extern int dump_generic_node (pretty_printer *, tree, int, dump_flags_t, bool);
  extern void print_declaration (pretty_printer *, tree, int, dump_flags_t);
  extern int op_code_prio (enum tree_code);
diff --cc libgomp/Makefile.in
index 365e4fd85e99,dfd087927152..98499b8dc8f6
--- a/libgomp/Makefile.in
+++ b/libgomp/Makefile.in
@@@ -180,9 -216,20 +216,21 @@@ am_libgomp_la_OBJECTS = alloc.lo atomic
  	sem.lo bar.lo ptrlock.lo time.lo fortran.lo affinity.lo \
  	target.lo splay-tree.lo libgomp-plugin.lo oacc-parallel.lo \
  	oacc-host.lo oacc-init.lo oacc-mem.lo oacc-async.lo \
 -	oacc-plugin.lo oacc-cuda.lo priority_queue.lo $(am__objects_1)
 +	oacc-plugin.lo oacc-cuda.lo priority_queue.lo affinity-fmt.lo \
 +	teams.lo $(am__objects_1)
  libgomp_la_OBJECTS = $(am_libgomp_la_OBJECTS)
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+ am__v_P_0 = false
+ am__v_P_1 = :
+ AM_V_GEN = $(am__v_GEN_@AM_V@)
+ am__v_GEN_ = $(am__v_GEN_@AM_DEFAULT_V@)
+ am__v_GEN_0 = @echo "  GEN     " $@;
+ am__v_GEN_1 = 
+ AM_V_at = $(am__v_at_@AM_V@)
+ am__v_at_ = $(am__v_at_@AM_DEFAULT_V@)
+ am__v_at_0 = @
+ am__v_at_1 = 
  DEFAULT_INCLUDES = -I.@am__isrc@
  depcomp = $(SHELL) $(top_srcdir)/../depcomp
  am__depfiles_maybe = depfiles