From 12fd7183e7bc448619a76985b249c671aca846e8 Mon Sep 17 00:00:00 2001
From: David Malcolm <dmalcolm@redhat.com>
Date: Fri, 12 May 2017 14:44:10 -0400
Subject: [PATCH 10/14] FIXME: fix C++ build

---
 gcc/cp/parser.h | 4 ++--
 gcc/cp/typeck.c | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/gcc/cp/parser.h b/gcc/cp/parser.h
index d7e37af..470bbcd 100644
--- a/gcc/cp/parser.h
+++ b/gcc/cp/parser.h
@@ -416,10 +416,10 @@ struct GTY(()) cp_parser {
   int prevent_constrained_type_specifiers;
 
   /* FIXME.  */
-  ast_node *ast_root_node;
+  ast_node * GTY((skip)) ast_root_node;
 
   /* FIXME.  */
-  ast_node *ast_current_node;
+  ast_node * GTY((skip)) ast_current_node;
 };
 
 /* In parser.c  */
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index ced08c7..1abb50f 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -3490,7 +3490,8 @@ build_function_call (location_t /*loc*/,
 tree
 build_function_call_vec (location_t /*loc*/, vec<location_t> /*arg_loc*/,
 			 tree function, vec<tree, va_gc> *params,
-			 vec<tree, va_gc> * /*origtypes*/)
+			 vec<tree, va_gc> * /*origtypes*/,
+			 ast_node *)
 {
   vec<tree, va_gc> *orig_params = params;
   tree ret = cp_build_function_call_vec (function, &params,
-- 
1.8.5.3