diff options
author | Chris Johns <chrisj@rtems.org> | 2017-12-23 18:18:56 +1100 |
---|---|---|
committer | Sebastian Huber <sebastian.huber@embedded-brains.de> | 2018-01-25 08:45:26 +0100 |
commit | 2afb22b7e1ebcbe40373ff7e0efae7d207c655a9 (patch) | |
tree | 44759efe9374f13200a97e96d91bd9a2b7e5ce2a /cpukit/score/cpu/arm/rtems/score/armv4.h | |
parent | MAINTAINERS: Add myself to Write After Approval. (diff) | |
download | rtems-2afb22b7e1ebcbe40373ff7e0efae7d207c655a9.tar.bz2 |
Remove make preinstall
A speciality of the RTEMS build system was the make preinstall step. It
copied header files from arbitrary locations into the build tree. The
header files were included via the -Bsome/build/tree/path GCC command
line option.
This has at least seven problems:
* The make preinstall step itself needs time and disk space.
* Errors in header files show up in the build tree copy. This makes it
hard for editors to open the right file to fix the error.
* There is no clear relationship between source and build tree header
files. This makes an audit of the build process difficult.
* The visibility of all header files in the build tree makes it
difficult to enforce API barriers. For example it is discouraged to
use BSP-specifics in the cpukit.
* An introduction of a new build system is difficult.
* Include paths specified by the -B option are system headers. This
may suppress warnings.
* The parallel build had sporadic failures on some hosts.
This patch removes the make preinstall step. All installed header
files are moved to dedicated include directories in the source tree.
Let @RTEMS_CPU@ be the target architecture, e.g. arm, powerpc, sparc,
etc. Let @RTEMS_BSP_FAMILIY@ be a BSP family base directory, e.g.
erc32, imx, qoriq, etc.
The new cpukit include directories are:
* cpukit/include
* cpukit/score/cpu/@RTEMS_CPU@/include
* cpukit/libnetworking
The new BSP include directories are:
* bsps/include
* bsps/@RTEMS_CPU@/include
* bsps/@RTEMS_CPU@/@RTEMS_BSP_FAMILIY@/include
There are build tree include directories for generated files.
The include directory order favours the most general header file, e.g.
it is not possible to override general header files via the include path
order.
The "bootstrap -p" option was removed. The new "bootstrap -H" option
should be used to regenerate the "headers.am" files.
Update #3254.
Diffstat (limited to 'cpukit/score/cpu/arm/rtems/score/armv4.h')
-rw-r--r-- | cpukit/score/cpu/arm/rtems/score/armv4.h | 98 |
1 files changed, 0 insertions, 98 deletions
diff --git a/cpukit/score/cpu/arm/rtems/score/armv4.h b/cpukit/score/cpu/arm/rtems/score/armv4.h deleted file mode 100644 index caeaa3e553..0000000000 --- a/cpukit/score/cpu/arm/rtems/score/armv4.h +++ /dev/null @@ -1,98 +0,0 @@ -/* - * Copyright (c) 2013 embedded brains GmbH. All rights reserved. - * - * embedded brains GmbH - * Dornierstr. 4 - * 82178 Puchheim - * Germany - * <rtems@embedded-brains.de> - * - * The license and distribution terms for this file may be - * found in the file LICENSE in this distribution or at - * http://www.rtems.org/license/LICENSE. - */ - -#ifndef RTEMS_SCORE_ARMV4_H -#define RTEMS_SCORE_ARMV4_H - -#include <rtems/score/cpu.h> - -#ifdef __cplusplus -extern "C" { -#endif /* __cplusplus */ - -#ifdef ARM_MULTILIB_ARCH_V4 - -void bsp_interrupt_dispatch( void ); - -void _ARMV4_Exception_interrupt( void ); - -typedef void ARMV4_Exception_abort_handler( CPU_Exception_frame *frame ); - -void _ARMV4_Exception_data_abort_set_handler( - ARMV4_Exception_abort_handler handler -); - -void _ARMV4_Exception_data_abort( void ); - -void _ARMV4_Exception_prefetch_abort_set_handler( - ARMV4_Exception_abort_handler handler -); - -void _ARMV4_Exception_prefetch_abort( void ); - -void _ARMV4_Exception_undef_default( void ); - -void _ARMV4_Exception_swi_default( void ); - -void _ARMV4_Exception_data_abort_default( void ); - -void _ARMV4_Exception_pref_abort_default( void ); - -void _ARMV4_Exception_reserved_default( void ); - -void _ARMV4_Exception_irq_default( void ); - -void _ARMV4_Exception_fiq_default( void ); - -static inline uint32_t _ARMV4_Status_irq_enable( void ) -{ - uint32_t arm_switch_reg; - uint32_t psr; - - RTEMS_COMPILER_MEMORY_BARRIER(); - - __asm__ volatile ( - ARM_SWITCH_TO_ARM - "mrs %[psr], cpsr\n" - "bic %[arm_switch_reg], %[psr], #0x80\n" - "msr cpsr, %[arm_switch_reg]\n" - ARM_SWITCH_BACK - : [arm_switch_reg] "=&r" (arm_switch_reg), [psr] "=&r" (psr) - ); - - return psr; -} - -static inline void _ARMV4_Status_restore( uint32_t psr ) -{ - ARM_SWITCH_REGISTERS; - - __asm__ volatile ( - ARM_SWITCH_TO_ARM - "msr cpsr, %[psr]\n" - ARM_SWITCH_BACK - : ARM_SWITCH_OUTPUT - : [psr] "r" (psr) - ); - - RTEMS_COMPILER_MEMORY_BARRIER(); -} - -#endif /* ARM_MULTILIB_ARCH_V4 */ - -#ifdef __cplusplus -} -#endif /* __cplusplus */ - -#endif /* RTEMS_SCORE_ARMV4_H */ |