[rtems commit] sparc64: Avoid SCORE_EXTERN

Sebastian Huber sebh at rtems.org
Wed Feb 17 08:44:00 UTC 2016


Module:    rtems
Branch:    master
Commit:    51dc9a6121f8d4716b8ee5849feb16f880ecb20c
Changeset: http://git.rtems.org/rtems/commit/?id=51dc9a6121f8d4716b8ee5849feb16f880ecb20c

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Feb  3 11:57:29 2016 +0100

sparc64: Avoid SCORE_EXTERN

Update #2559.

---

 cpukit/score/cpu/sparc64/cpu.c             | 6 ++++++
 cpukit/score/cpu/sparc64/rtems/score/cpu.h | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/cpukit/score/cpu/sparc64/cpu.c b/cpukit/score/cpu/sparc64/cpu.c
index 1834b34..512ab90 100644
--- a/cpukit/score/cpu/sparc64/cpu.c
+++ b/cpukit/score/cpu/sparc64/cpu.c
@@ -22,6 +22,12 @@
 #include <rtems/score/tls.h>
 #include <rtems/rtems/cache.h>
 
+#if (SPARC_HAS_FPU == 1)
+Context_Control_fp _CPU_Null_fp_context;
+#endif
+
+volatile uint32_t _CPU_ISR_Dispatch_disable;
+
 /*
  *  _CPU_Initialize
  *
diff --git a/cpukit/score/cpu/sparc64/rtems/score/cpu.h b/cpukit/score/cpu/sparc64/rtems/score/cpu.h
index 80c3466..aa756f9 100644
--- a/cpukit/score/cpu/sparc64/rtems/score/cpu.h
+++ b/cpukit/score/cpu/sparc64/rtems/score/cpu.h
@@ -547,7 +547,7 @@ typedef struct {
  *  context area during _CPU_Context_Initialize.
  */
 
-SCORE_EXTERN Context_Control_fp  _CPU_Null_fp_context;
+extern Context_Control_fp _CPU_Null_fp_context;
 
 /*
  *  This flag is context switched with each thread.  It indicates
@@ -556,7 +556,7 @@ SCORE_EXTERN Context_Control_fp  _CPU_Null_fp_context;
  *  attempts on a previously interrupted thread's stack.
  */
 
-SCORE_EXTERN volatile uint32_t _CPU_ISR_Dispatch_disable;
+extern volatile uint32_t _CPU_ISR_Dispatch_disable;
 
 /*
  *  The following type defines an entry in the SPARC's trap table.




More information about the vc mailing list