diff options
author | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-03-13 16:24:16 +0100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-03-19 07:00:20 +0100 |
commit | bd1508019cfb219b41da7cb6f1a9895a69c64534 (patch) | |
tree | 6c3f15e745ef11dc3d7c3b706fde54c95dac055d /c/src/lib/libcpu | |
parent | bsps/powerpc: Remove unused files (diff) | |
download | rtems-bd1508019cfb219b41da7cb6f1a9895a69c64534.tar.bz2 |
bsps/powerpc: Move exceptions support to bsps
This patch is a part of the BSP source reorganization.
Update #3285.
Diffstat (limited to '')
-rw-r--r-- | bsps/powerpc/shared/exceptions/README (renamed from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/README) | 0 | ||||
-rw-r--r-- | bsps/powerpc/shared/exceptions/ppc-code-copy.c (renamed from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc-code-copy.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/shared/exceptions/ppc_exc.S (renamed from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc.S) | 8 | ||||
-rw-r--r-- | bsps/powerpc/shared/exceptions/ppc_exc_address.c (renamed from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_address.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/shared/exceptions/ppc_exc_alignment.c (renamed from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_alignment.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/shared/exceptions/ppc_exc_asm_macros.h (renamed from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_asm_macros.h) | 0 | ||||
-rw-r--r-- | bsps/powerpc/shared/exceptions/ppc_exc_async_normal.S (renamed from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_async_normal.S) | 0 | ||||
-rw-r--r--[-rwxr-xr-x] | bsps/powerpc/shared/exceptions/ppc_exc_categories.c (renamed from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_categories.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/shared/exceptions/ppc_exc_fatal.S (renamed from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_fatal.S) | 0 | ||||
-rw-r--r-- | bsps/powerpc/shared/exceptions/ppc_exc_global_handler.c (renamed from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_global_handler.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/shared/exceptions/ppc_exc_hdl.c (renamed from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_hdl.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/shared/exceptions/ppc_exc_initialize.c (renamed from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_initialize.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/shared/exceptions/ppc_exc_naked.S (renamed from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_naked.S) | 0 | ||||
-rw-r--r-- | bsps/powerpc/shared/exceptions/ppc_exc_print.c (renamed from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_print.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/shared/exceptions/ppc_exc_prologue.c (renamed from c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_prologue.c) | 0 | ||||
-rw-r--r-- | bsps/powerpc/ss555/start/vectors.S (renamed from c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors.S) | 0 | ||||
-rw-r--r-- | bsps/powerpc/ss555/start/vectors_init.c (renamed from c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors_init.c) | 0 | ||||
-rw-r--r-- | c/src/lib/libcpu/powerpc/Makefile.am | 34 |
18 files changed, 8 insertions, 34 deletions
diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/README b/bsps/powerpc/shared/exceptions/README index eb5f9c7cb7..eb5f9c7cb7 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/README +++ b/bsps/powerpc/shared/exceptions/README diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc-code-copy.c b/bsps/powerpc/shared/exceptions/ppc-code-copy.c index 07f5234076..07f5234076 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc-code-copy.c +++ b/bsps/powerpc/shared/exceptions/ppc-code-copy.c diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc.S b/bsps/powerpc/shared/exceptions/ppc_exc.S index 511601d9ff..c606c0da30 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc.S +++ b/bsps/powerpc/shared/exceptions/ppc_exc.S @@ -17,6 +17,12 @@ #include <rtems/system.h> #include <rtems/score/percpu.h> +/* + * This code uses the small-data area which is not available in the 64-bit + * PowerPC ELFv2 ABI. + */ +#ifndef __powerpc64__ + #include "ppc_exc_asm_macros.h" /******************************************************/ @@ -175,3 +181,5 @@ ppc_exc_wrap_auto_async: .global __ppc_exc_wrappers_end __ppc_exc_wrappers_end = . + +#endif /* !__powerpc64__ */ diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_address.c b/bsps/powerpc/shared/exceptions/ppc_exc_address.c index fc944177a8..fc944177a8 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_address.c +++ b/bsps/powerpc/shared/exceptions/ppc_exc_address.c diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_alignment.c b/bsps/powerpc/shared/exceptions/ppc_exc_alignment.c index 732ff96b18..732ff96b18 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_alignment.c +++ b/bsps/powerpc/shared/exceptions/ppc_exc_alignment.c diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_asm_macros.h b/bsps/powerpc/shared/exceptions/ppc_exc_asm_macros.h index c89046619b..c89046619b 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_asm_macros.h +++ b/bsps/powerpc/shared/exceptions/ppc_exc_asm_macros.h diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_async_normal.S b/bsps/powerpc/shared/exceptions/ppc_exc_async_normal.S index 4b318e5e16..4b318e5e16 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_async_normal.S +++ b/bsps/powerpc/shared/exceptions/ppc_exc_async_normal.S diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_categories.c b/bsps/powerpc/shared/exceptions/ppc_exc_categories.c index 46508abcdf..46508abcdf 100755..100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_categories.c +++ b/bsps/powerpc/shared/exceptions/ppc_exc_categories.c diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_fatal.S b/bsps/powerpc/shared/exceptions/ppc_exc_fatal.S index 1cb97e350a..1cb97e350a 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_fatal.S +++ b/bsps/powerpc/shared/exceptions/ppc_exc_fatal.S diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_global_handler.c b/bsps/powerpc/shared/exceptions/ppc_exc_global_handler.c index 9597f8719a..9597f8719a 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_global_handler.c +++ b/bsps/powerpc/shared/exceptions/ppc_exc_global_handler.c diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_hdl.c b/bsps/powerpc/shared/exceptions/ppc_exc_hdl.c index ce1f326438..ce1f326438 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_hdl.c +++ b/bsps/powerpc/shared/exceptions/ppc_exc_hdl.c diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_initialize.c b/bsps/powerpc/shared/exceptions/ppc_exc_initialize.c index 4891ddcaa0..4891ddcaa0 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_initialize.c +++ b/bsps/powerpc/shared/exceptions/ppc_exc_initialize.c diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_naked.S b/bsps/powerpc/shared/exceptions/ppc_exc_naked.S index 1c27575fea..1c27575fea 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_naked.S +++ b/bsps/powerpc/shared/exceptions/ppc_exc_naked.S diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_print.c b/bsps/powerpc/shared/exceptions/ppc_exc_print.c index 5a3aad9f73..5a3aad9f73 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_print.c +++ b/bsps/powerpc/shared/exceptions/ppc_exc_print.c diff --git a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_prologue.c b/bsps/powerpc/shared/exceptions/ppc_exc_prologue.c index 09307cd944..09307cd944 100644 --- a/c/src/lib/libcpu/powerpc/new-exceptions/bspsupport/ppc_exc_prologue.c +++ b/bsps/powerpc/shared/exceptions/ppc_exc_prologue.c diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors.S b/bsps/powerpc/ss555/start/vectors.S index 35d2f23a30..35d2f23a30 100644 --- a/c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors.S +++ b/bsps/powerpc/ss555/start/vectors.S diff --git a/c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors_init.c b/bsps/powerpc/ss555/start/vectors_init.c index 342ca5509a..342ca5509a 100644 --- a/c/src/lib/libcpu/powerpc/mpc5xx/vectors/vectors_init.c +++ b/bsps/powerpc/ss555/start/vectors_init.c diff --git a/c/src/lib/libcpu/powerpc/Makefile.am b/c/src/lib/libcpu/powerpc/Makefile.am index fa4498b674..724dfea710 100644 --- a/c/src/lib/libcpu/powerpc/Makefile.am +++ b/c/src/lib/libcpu/powerpc/Makefile.am @@ -6,33 +6,6 @@ EXTRA_DIST = noinst_PROGRAMS = -if !mpc5xx -noinst_PROGRAMS += new-exceptions/exc_bspsupport.rel -new_exceptions_exc_bspsupport_rel_SOURCES = \ - new-exceptions/bspsupport/ppc_exc_async_normal.S \ - new-exceptions/bspsupport/ppc_exc_fatal.S \ - new-exceptions/bspsupport/ppc_exc_print.c -if !qoriq -new_exceptions_exc_bspsupport_rel_SOURCES += \ - new-exceptions/bspsupport/ppc-code-copy.c \ - new-exceptions/bspsupport/ppc_exc.S \ - new-exceptions/bspsupport/ppc_exc_naked.S \ - new-exceptions/bspsupport/ppc_exc_hdl.c \ - new-exceptions/bspsupport/ppc_exc_initialize.c \ - new-exceptions/bspsupport/ppc_exc_global_handler.c \ - new-exceptions/bspsupport/ppc_exc_categories.c \ - new-exceptions/bspsupport/ppc_exc_address.c \ - new-exceptions/bspsupport/ppc_exc_alignment.c \ - new-exceptions/bspsupport/ppc_exc_prologue.c -endif - -new_exceptions_exc_bspsupport_rel_CPPFLAGS = $(AM_CPPFLAGS) -new_exceptions_exc_bspsupport_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) -endif - -EXTRA_DIST += new-exceptions/bspsupport/README -EXTRA_DIST += new-exceptions/bspsupport/ppc_exc_test.c - EXTRA_DIST += ppc403/README ppc403/vectors/README if ppc4xx # ppc403/clock @@ -105,13 +78,6 @@ noinst_PROGRAMS += mpc5xx/timer.rel mpc5xx_timer_rel_SOURCES = mpc5xx/timer/timer.c mpc5xx_timer_rel_CPPFLAGS = $(AM_CPPFLAGS) mpc5xx_timer_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) - -# mpc5xx/vectors -noinst_PROGRAMS += mpc5xx/vectors.rel -mpc5xx_vectors_rel_SOURCES = mpc5xx/vectors/vectors_init.c mpc5xx/vectors/vectors.S \ - new-exceptions/bspsupport/ppc_exc_print.c -mpc5xx_vectors_rel_CPPFLAGS = $(AM_CPPFLAGS) -mpc5xx_vectors_rel_LDFLAGS = $(RTEMS_RELLDFLAGS) endif if mpc6xx |