[rtems commit] or1k: Support GCC 9

Sebastian Huber sebh at rtems.org
Wed Nov 14 06:02:21 UTC 2018


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

Author:    Sebastian Huber <sebastian.huber at embedded-brains.de>
Date:      Wed Nov 14 07:00:59 2018 +0100

or1k: Support GCC 9

Close #3602.

---

 bsps/or1k/generic_or1k/start/bsp_specs | 4 ++--
 cpukit/libcsupport/src/newlibc_exit.c  | 3 ++-
 cpukit/score/src/threadhandler.c       | 3 ++-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/bsps/or1k/generic_or1k/start/bsp_specs b/bsps/or1k/generic_or1k/start/bsp_specs
index 87638cc..d059cc4 100644
--- a/bsps/or1k/generic_or1k/start/bsp_specs
+++ b/bsps/or1k/generic_or1k/start/bsp_specs
@@ -3,7 +3,7 @@
 
 *startfile:
 %{!qrtems: %(old_startfile)} \
-%{!nostdlib: %{qrtems: crti.o%s crtbegin.o%s}}
+%{!nostdlib: %{qrtems: crtbegin.o%s}}
 
 *endfile:
-%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s crtn.o%s}
+%{!qrtems: %(old_endfile)} %{qrtems: crtend.o%s}
diff --git a/cpukit/libcsupport/src/newlibc_exit.c b/cpukit/libcsupport/src/newlibc_exit.c
index 4af153f..b59f004 100644
--- a/cpukit/libcsupport/src/newlibc_exit.c
+++ b/cpukit/libcsupport/src/newlibc_exit.c
@@ -20,7 +20,8 @@
 /* FIXME: These defines are a blatant hack */
 
   #if defined(__USE_INIT_FINI__)
-    #if defined(__ARM_EABI__) || defined(__riscv)
+    #if defined(__ARM_EABI__) || defined(__riscv) \
+      || defined(__or1k__) || defined(__or1knd__)
       #define FINI_SYMBOL __libc_fini_array
     #else
       #define FINI_SYMBOL _fini
diff --git a/cpukit/score/src/threadhandler.c b/cpukit/score/src/threadhandler.c
index 31e1a3d..097c8e1 100644
--- a/cpukit/score/src/threadhandler.c
+++ b/cpukit/score/src/threadhandler.c
@@ -29,7 +29,8 @@
  *  initialization this target and compiler version uses.
  */
 #if defined(__USE_INIT_FINI__)
-  #if defined(__ARM_EABI__) || defined(__riscv)
+  #if defined(__ARM_EABI__) || defined(__riscv) \
+    || defined(__or1k__) || defined(__or1knd__)
     #define INIT_NAME __libc_init_array
   #else
     #define INIT_NAME _init




More information about the vc mailing list