From: Francois-Xavier Coudert <fxcoudert@gcc.gnu.org>
Date: Mon, 19 Dec 2016 16:09:12 +0000 (+0000)
Subject: trans.h: Remove gfor_fndecl_stop_numeric_f08.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=03506f8cc3da48ed9303ebbd435eeaacee6629e6;p=gcc.git

trans.h: Remove gfor_fndecl_stop_numeric_f08.

	* trans.h: Remove gfor_fndecl_stop_numeric_f08.
	* trans-decl.c: Remove gfor_fndecl_stop_numeric_f08.
	* trans-stmt.c (gfc_trans_stop): Use gfor_fndecl_stop_numeric
	instead of gfor_fndecl_stop_numeric_f08.

	* gfortran.map: Remove _gfortran_stop_numeric_f08.
	* runtime/stop.c: Rename stop_numeric_f08 into stop_numeric.

From-SVN: r243803
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 7b653ce61cd..8149bf927a5 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,10 @@
+2016-12-19  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
+	* trans.h: Remove gfor_fndecl_stop_numeric_f08.
+	* trans-decl.c: Remove gfor_fndecl_stop_numeric_f08.
+	* trans-stmt.c (gfc_trans_stop): Use gfor_fndecl_stop_numeric
+	instead of gfor_fndecl_stop_numeric_f08.
+
 2016-12-19  Janus Weil  <janus@gcc.gnu.org>
 
 	PR fortran/78545
diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c
index a7a5e2a4b6b..403f543a808 100644
--- a/gcc/fortran/trans-decl.c
+++ b/gcc/fortran/trans-decl.c
@@ -98,7 +98,6 @@ static int seen_ieee_symbol;
 tree gfor_fndecl_pause_numeric;
 tree gfor_fndecl_pause_string;
 tree gfor_fndecl_stop_numeric;
-tree gfor_fndecl_stop_numeric_f08;
 tree gfor_fndecl_stop_string;
 tree gfor_fndecl_error_stop_numeric;
 tree gfor_fndecl_error_stop_string;
@@ -3470,12 +3469,6 @@ gfc_build_builtin_function_decls (void)
   /* STOP doesn't return.  */
   TREE_THIS_VOLATILE (gfor_fndecl_stop_numeric) = 1;
 
-  gfor_fndecl_stop_numeric_f08 = gfc_build_library_function_decl (
-	get_identifier (PREFIX("stop_numeric_f08")),
-	void_type_node, 1, gfc_int4_type_node);
-  /* STOP doesn't return.  */
-  TREE_THIS_VOLATILE (gfor_fndecl_stop_numeric_f08) = 1;
-
   gfor_fndecl_stop_string = gfc_build_library_function_decl_with_spec (
 	get_identifier (PREFIX("stop_string")), ".R.",
 	void_type_node, 2, pchar_type_node, gfc_int4_type_node);
diff --git a/gcc/fortran/trans-stmt.c b/gcc/fortran/trans-stmt.c
index d9e185f2927..ccfaee6213c 100644
--- a/gcc/fortran/trans-stmt.c
+++ b/gcc/fortran/trans-stmt.c
@@ -650,7 +650,7 @@ gfc_trans_stop (gfc_code *code, bool error_stop)
 				    : gfor_fndecl_error_stop_numeric)
 				 : (flag_coarray == GFC_FCOARRAY_LIB
 				    ? gfor_fndecl_caf_stop_numeric
-				    : gfor_fndecl_stop_numeric_f08), 1,
+				    : gfor_fndecl_stop_numeric), 1,
 				 fold_convert (gfc_int4_type_node, se.expr));
     }
   else
diff --git a/gcc/fortran/trans.h b/gcc/fortran/trans.h
index bfc2a24d0fa..3095f4c0dea 100644
--- a/gcc/fortran/trans.h
+++ b/gcc/fortran/trans.h
@@ -784,7 +784,6 @@ void gfc_omp_firstprivatize_type_sizes (struct gimplify_omp_ctx *, tree);
 extern GTY(()) tree gfor_fndecl_pause_numeric;
 extern GTY(()) tree gfor_fndecl_pause_string;
 extern GTY(()) tree gfor_fndecl_stop_numeric;
-extern GTY(()) tree gfor_fndecl_stop_numeric_f08;
 extern GTY(()) tree gfor_fndecl_stop_string;
 extern GTY(()) tree gfor_fndecl_error_stop_numeric;
 extern GTY(()) tree gfor_fndecl_error_stop_string;
diff --git a/libgfortran/ChangeLog b/libgfortran/ChangeLog
index 114b006b409..36c994ae417 100644
--- a/libgfortran/ChangeLog
+++ b/libgfortran/ChangeLog
@@ -1,3 +1,8 @@
+2016-12-19  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
+
+	* gfortran.map: Remove _gfortran_stop_numeric_f08.
+	* runtime/stop.c: Rename stop_numeric_f08 into stop_numeric.
+
 2016-12-19  Francois-Xavier Coudert  <fxcoudert@gcc.gnu.org>
 
 	* Makefile.am: Remove ISO_C_BINDING runtime functions.
diff --git a/libgfortran/gfortran.map b/libgfortran/gfortran.map
index 80cf29ad843..c2b491af3cc 100644
--- a/libgfortran/gfortran.map
+++ b/libgfortran/gfortran.map
@@ -1108,7 +1108,6 @@ GFORTRAN_1.4 {
     _gfortran_parity_l8;
     _gfortran_parity_l16;
     _gfortran_selected_real_kind2008;
-    _gfortran_stop_numeric_f08;
     _gfortran_transfer_array_write;
     _gfortran_transfer_character_write;
     _gfortran_transfer_character_wide_write;
diff --git a/libgfortran/runtime/stop.c b/libgfortran/runtime/stop.c
index 26896e8511e..8f5431b2e97 100644
--- a/libgfortran/runtime/stop.c
+++ b/libgfortran/runtime/stop.c
@@ -88,24 +88,6 @@ export_proto(stop_numeric);
 
 void
 stop_numeric (GFC_INTEGER_4 code)
-{
-  report_exception ();
-  if (code == -1)
-    code = 0;
-  else
-    st_printf ("STOP %d\n", (int)code);
-
-  exit (code);
-}
-
-
-/* A Fortran 2008 numeric STOP statement.  */
-
-extern _Noreturn void stop_numeric_f08 (GFC_INTEGER_4);
-export_proto(stop_numeric_f08);
-
-void
-stop_numeric_f08 (GFC_INTEGER_4 code)
 {
   report_exception ();
   st_printf ("STOP %d\n", (int)code);