[rtems commit] Revert "score: Fix _ISR_Stack_area_end"

Sebastian Huber sebh at rtems.org
Sun Apr 5 07:59:10 UTC 2020


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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Sun Apr  5 09:58:24 2020 +0200

Revert "score: Fix _ISR_Stack_area_end"

This reverts commit 8e80876bdd54e36fb668eee655eec1dd588daf13
which broke several architectures.

---

 cpukit/Makefile.am                     |  1 -
 cpukit/include/rtems/confdefs/percpu.h |  5 +++++
 cpukit/score/src/isrstackareaend.c     | 36 ----------------------------------
 3 files changed, 5 insertions(+), 37 deletions(-)

diff --git a/cpukit/Makefile.am b/cpukit/Makefile.am
index 1486a41..3af69bd 100644
--- a/cpukit/Makefile.am
+++ b/cpukit/Makefile.am
@@ -1014,7 +1014,6 @@ librtemscpu_a_SOURCES += score/src/chainnodecount.c
 librtemscpu_a_SOURCES += score/src/debugisthreaddispatchingallowed.c
 librtemscpu_a_SOURCES += score/src/interr.c
 librtemscpu_a_SOURCES += score/src/isr.c
-librtemscpu_a_SOURCES += score/src/isrstackareaend.c
 librtemscpu_a_SOURCES += score/src/wkspace.c
 librtemscpu_a_SOURCES += score/src/wkspaceisunifieddefault.c
 librtemscpu_a_SOURCES += score/src/wkstringduplicate.c
diff --git a/cpukit/include/rtems/confdefs/percpu.h b/cpukit/include/rtems/confdefs/percpu.h
index a902b47..730571b 100644
--- a/cpukit/include/rtems/confdefs/percpu.h
+++ b/cpukit/include/rtems/confdefs/percpu.h
@@ -98,6 +98,11 @@ char _ISR_Stack_area_begin[
 ] RTEMS_ALIGNED( CPU_INTERRUPT_STACK_ALIGNMENT )
 RTEMS_SECTION( ".rtemsstack.interrupt.begin" );
 
+RTEMS_DEFINE_GLOBAL_SYMBOL_IN_SECTION(
+  _ISR_Stack_area_end,
+  ".rtemsstack.interrupt.end"
+);
+
 /* Thread stack size configuration */
 
 #ifndef CONFIGURE_MINIMUM_TASK_STACK_SIZE
diff --git a/cpukit/score/src/isrstackareaend.c b/cpukit/score/src/isrstackareaend.c
deleted file mode 100644
index 9d48384..0000000
--- a/cpukit/score/src/isrstackareaend.c
+++ /dev/null
@@ -1,36 +0,0 @@
-/* SPDX-License-Identifier: BSD-2-Clause */
-
-/*
- * Copyright (C) 2020 embedded brains GmbH (http://www.embedded-brains.de)
- *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- *
- * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
- * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
- * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
- * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- * POSSIBILITY OF SUCH DAMAGE.
- */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include <rtems/score/isr.h>
-
-RTEMS_SECTION( ".rtemsstack.interrupt.end" )
-RTEMS_ALIGNED( CPU_INTERRUPT_STACK_ALIGNMENT )
-const char _ISR_Stack_area_end[ 0 ];



More information about the vc mailing list