From 57cea2b3bc9cc19bc3d14007cef0393f5bf70823 Mon Sep 17 00:00:00 2001
From: Nathan Sidwell <nathan@acm.org>
Date: Mon, 21 Aug 2017 17:06:26 +0000
Subject: [PATCH] pr81899.C: Fix c++03.

	* g++.dg/template/pr81899.C: Fix c++03.
	* g++.dg/debug/debug9.C: Add -fno-reorder-blocks-and-partition"

From-SVN: r251240
---
 gcc/testsuite/ChangeLog                 | 5 +++++
 gcc/testsuite/g++.dg/debug/debug9.C     | 5 +++++
 gcc/testsuite/g++.dg/template/pr81899.C | 2 +-
 3 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 48f041e0828..b3466cdf7af 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2017-08-21  Nathan Sidwell  <nathan@acm.org>
+
+	* g++.dg/template/pr81899.C: Fix c++03.
+	* g++.dg/debug/debug9.C: Add -fno-reorder-blocks-and-partition"
+
 2017-08-21  David Malcolm  <dmalcolm@redhat.com>
 
 	* gcc.dg/format/diagnostic-ranges.c (test_mismatching_types):
diff --git a/gcc/testsuite/g++.dg/debug/debug9.C b/gcc/testsuite/g++.dg/debug/debug9.C
index aa328ee6f79..8cf2327e069 100644
--- a/gcc/testsuite/g++.dg/debug/debug9.C
+++ b/gcc/testsuite/g++.dg/debug/debug9.C
@@ -1,4 +1,9 @@
 /* { dg-do assemble } */
+/* Partitioning causes hot/cold section emission and breaks stabs
+   debugging.  */
+/* { dg-additional-options "-fno-reorder-blocks-and-partition" } */
+
+
 /* This testcase requires entries in the debug_range section in DWARF which
    refer to a vague linkage function.  */
 
diff --git a/gcc/testsuite/g++.dg/template/pr81899.C b/gcc/testsuite/g++.dg/template/pr81899.C
index 2db57cf7504..317a0468466 100644
--- a/gcc/testsuite/g++.dg/template/pr81899.C
+++ b/gcc/testsuite/g++.dg/template/pr81899.C
@@ -2,7 +2,7 @@
 
 template <template <typename> class FunctorData>
 struct functor {
-  friend FunctorData<int>;
+  friend class FunctorData<int>;
   void foo();
 };
 
-- 
2.30.2