From 90390118c0eaa76da6f98ee81f775391b7bfb695 Mon Sep 17 00:00:00 2001
From: Sebastian Huber <sebastian.huber@embedded-brains.de>
Date: Mon, 11 May 2020 08:20:48 +0200
Subject: [PATCH] rtems: Move declartion of _RTEMS_version

Close #3978.
---
 cpukit/include/rtems/score/copyrt.h | 10 ++++++++++
 cpukit/include/rtems/system.h       |  6 ------
 cpukit/sapi/src/getversionstring.c  |  3 +--
 3 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/cpukit/include/rtems/score/copyrt.h b/cpukit/include/rtems/score/copyrt.h
index c7b00b4247..1d0ad09f29 100644
--- a/cpukit/include/rtems/score/copyrt.h
+++ b/cpukit/include/rtems/score/copyrt.h
@@ -41,6 +41,16 @@ extern "C" {
  */
 extern const char _Copyright_Notice[];
 
+/**
+ * @brief This constant provides the RTEMS version string.
+ *
+ * The constant name does not follow the naming conventions.  Do not change it
+ * for backward compatibility reasons.
+ *
+ * @see rtems_get_version_string()
+ */
+extern const char _RTEMS_version[];
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/cpukit/include/rtems/system.h b/cpukit/include/rtems/system.h
index 032ac56a95..3a2dff9721 100644
--- a/cpukit/include/rtems/system.h
+++ b/cpukit/include/rtems/system.h
@@ -39,12 +39,6 @@ extern "C" {
 
 #ifndef ASM
 
-/*
- * The use of this variable is deprecated, use rtems_get_version_string()
- * instead.
- */
-extern RTEMS_DEPRECATED const char _RTEMS_version[];
-
 /**
  *  The following is the extern for the RTEMS copyright string.
  */
diff --git a/cpukit/sapi/src/getversionstring.c b/cpukit/sapi/src/getversionstring.c
index f3fada9c48..a036fe2fbf 100644
--- a/cpukit/sapi/src/getversionstring.c
+++ b/cpukit/sapi/src/getversionstring.c
@@ -19,9 +19,8 @@
 #include "config.h"
 #endif
 
-#pragma GCC diagnostic ignored "-Wdeprecated-declarations"
-
 #include <rtems.h>
+#include <rtems/score/copyrt.h>
 
 const char *rtems_get_version_string(void)
 {