--- a/gcc/config/s390/tpf.h	Fri Oct 27 22:46:09 2017 +0900
+++ b/gcc/config/s390/tpf.h	Thu Oct 25 07:37:49 2018 +0900
@@ -1,8 +1,8 @@
 /* Definitions for target OS TPF for GNU compiler, for IBM S/390 hardware
-   Copyright (C) 2003-2017 Free Software Foundation, Inc.
+   Copyright (C) 2003-2018 Free Software Foundation, Inc.
    Contributed by P.J. Darcy (darcypj@us.ibm.com),
-                  Hartmut Penner (hpenner@de.ibm.com), and
-                  Ulrich Weigand (uweigand@de.ibm.com).
+		  Hartmut Penner (hpenner@de.ibm.com), and
+		  Ulrich Weigand (uweigand@de.ibm.com).
 
 This file is part of GCC.
 
@@ -30,7 +30,6 @@
 #define ASM_APP_ON "#APP\n"
 #undef ASM_APP_OFF
 #define ASM_APP_OFF "#NO_APP\n"
-#define NO_IMPLICIT_EXTERN_C
 #define TARGET_POSIX_IO
 
 #undef  SIZE_TYPE
@@ -45,7 +44,7 @@
 
 /* TPF OS specific stack-pointer offset.  */
 #undef STACK_POINTER_OFFSET
-#define STACK_POINTER_OFFSET 		448
+#define STACK_POINTER_OFFSET		448
 
 /* When building for TPF, set a generic default target that is 64 bits. Also
    enable TPF profiling support and the standard backchain by default.  */
@@ -95,7 +94,6 @@
 #undef  ASM_SPEC
 #define ASM_SPEC					\
   "%{m31&m64}%{mesa&mzarch}%{march=z*}"			\
-  "%{march=arch3:-march=g5}"				\
   "%{march=arch5:-march=z900}"				\
   "%{march=arch6:-march=z990}"				\
   "%{march=arch7:-march=z9-ec}"				\
@@ -107,10 +105,10 @@
 
 #undef LIB_SPEC
 #define LIB_SPEC "-lCTIS -lCISO -lCLBM -lCTAL -lCFVS -lCTBX -lCTXO \
-                  -lCJ00 -lCTDF -lCOMX -lCOMS -lCTHD -lCTAD -lTPFSTUB"
+		  -lCJ00 -lCTDF -lCOMX -lCOMS -lCTHD -lCTAD -lTPFSTUB"
 
 #define ENTRY_SPEC "%{mmain:-entry=_start} \
-                    %{!mmain:-entry=0}"
+		    %{!mmain:-entry=0}"
 
 /* All linking is done shared on TPF-OS.  */
 /* FIXME: When binutils patch for new emulation is committed