summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Huber <sebastian.huber@embedded-brains.de>2018-11-14 07:00:59 +0100
committerSebastian Huber <sebastian.huber@embedded-brains.de>2018-11-14 07:02:03 +0100
commit28bf4cae7878f4e47cc24c114fc9c5567247ecc1 (patch)
tree3c6872dd8c735e4cb41ce8b1736f670987866fea
parentbsps/irq: Use rtems_malloc() (diff)
downloadrtems-28bf4cae7878f4e47cc24c114fc9c5567247ecc1.tar.bz2
or1k: Support GCC 9
Close #3602.
-rw-r--r--bsps/or1k/generic_or1k/start/bsp_specs4
-rw-r--r--cpukit/libcsupport/src/newlibc_exit.c3
-rw-r--r--cpukit/score/src/threadhandler.c3
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 87638cc027..d059cc4673 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 4af153fa2f..b59f00446e 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 31e1a3de49..097c8e1a2d 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