--- a/gcc/objc/ChangeLog	Fri Oct 27 22:46:09 2017 +0900
+++ b/gcc/objc/ChangeLog	Thu Oct 25 07:37:49 2018 +0900
@@ -1,3 +1,31 @@
+2018-10-17  David Malcolm  <dmalcolm@redhat.com>
+
+	* Make-lang.in (selftest-objc): New.
+
+2018-04-20  Martin Liska  <mliska@suse.cz>
+
+	PR objc/85476
+	* objc-act.c (finish_class): Do not overflow string buffer.
+
+2018-01-03  Jakub Jelinek  <jakub@redhat.com>
+
+	Update copyright years.
+
+2017-11-30  Jakub Jelinek  <jakub@redhat.com>
+
+	* objc-next-runtime-abi-01.c (generate_dispatch_table): Use ; instead
+	of ;;.
+
+2017-11-10  Martin Sebor  <msebor@redhat.com>
+
+	PR c/81117
+	* objc-encoding.c (encode_type): Use memcpy instead of strncpy.
+
+2017-10-31  David Malcolm  <dmalcolm@redhat.com>
+
+	* objc-gnu-runtime-abi-01.c (objc_gnu_runtime_abi_01_init): Use
+	UNKNOWN_LOCATION rather than 0.
+
 2017-10-17  Nathan Sidwell  <nathan@acm.org>
 
 	* objc-act.c (objc_common_tree_size): Return size of TYPE nodes.
@@ -2025,7 +2053,7 @@
 	Merge from 'apple/trunk' branch on FSF servers.
 
 	2005-08-23  Stuart Hastings  <stuart@apple.com>
-	            Ziemowit Laski  <zlaski@apple.com>
+		    Ziemowit Laski  <zlaski@apple.com>
 
 	Radar 4209854
 	* objc-act.c (objc_decay_parm_type): New function.
@@ -3771,7 +3799,7 @@
 	Move to c-objc-common.h.
 
 
-Copyright (C) 2004-2017 Free Software Foundation, Inc.
+Copyright (C) 2004-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