--- a/gcc/objcp/ChangeLog	Fri Oct 27 22:46:09 2017 +0900
+++ b/gcc/objcp/ChangeLog	Thu Oct 25 07:37:49 2018 +0900
@@ -1,3 +1,15 @@
+2018-10-17  David Malcolm  <dmalcolm@redhat.com>
+
+	* Make-lang.in (selftest-obj-c++): New.
+
+2018-05-07  Nathan Sidwell  <nathan@acm.org>
+
+	* objcp-lang.c (objcxx_init_ts): Don't call init_shadowed_var_for_decl.
+
+2018-01-03  Jakub Jelinek  <jakub@redhat.com>
+
+	Update copyright years.
+
 2017-07-03  Nathan Sidwell  <nathan@acm.org>
 
 	* config-lang.in: Source cp/config-lang.in, sort objc++ gtfiles list.
@@ -24,7 +36,7 @@
 
 	* objcp-decl.c: Remove unused header files.
 	* objcp-lang.c: Likewise.
-	
+
 2015-10-29  Andrew MacLeod  <amacleod@redhat.com>
 
 	* objcp-decl.c: Reorder #include's and remove duplicates.
@@ -39,7 +51,7 @@
 
 	* objcp-decl.c: Do not include input.h, line-map.h or is-a.h.
 	* objcp-lang.c: Likewise.
-	
+
 2015-06-08  Andrew MacLeod  <amacleod@redhat.com>
 
 	* objcp-decl.c : Adjust include files.
@@ -233,7 +245,7 @@
 
 	* Make-lang.in (cc1objplus-dummy): Remove.
 	(cc1objplus-checksum): Change to run checksum over object files
-        and options only.
+	and options only.
 
 2010-10-04  Andi Kleen  <ak@linux.intel.com>
 
@@ -380,13 +392,13 @@
 	Revert:
 
 	2008-02-07  Andreas Tobler  <andreast-list@fgznet.ch>
-	            Douglas Gregor  <doug.gregor@gmail.com>
+		    Douglas Gregor  <doug.gregor@gmail.com>
  
 	PR bootstrap/35115
 	* objcp-decl.c (objcp_comptypes): Call cp_comptypes, not comptypes.
 
 2008-02-07  Andreas Tobler  <andreast-list@fgznet.ch>
-            Douglas Gregor  <doug.gregor@gmail.com>
+	    Douglas Gregor  <doug.gregor@gmail.com>
  
 	PR bootstrap/35115
 	* objcp-decl.c (objcp_comptypes): Call cp_comptypes, not comptypes.
@@ -530,7 +542,7 @@
 	* objcp-lang.c: Likewise.
 
 
-Copyright (C) 2005-2017 Free Software Foundation, Inc.
+Copyright (C) 2005-2018 Free Software Foundation, Inc.
 
 Copying and distribution of this file, with or without modification,
 are permitted in any medium without royalty provided the copyright