From cf10b4c23b4680fa8ed0d54452c9b12472186e59 Mon Sep 17 00:00:00 2001 From: patacongo Date: Mon, 21 Dec 2009 15:12:13 +0000 Subject: [PATCH] For fixes for stdint/stdbool build git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@2402 42af7a65-404d-4744-a932-0658087f49c3 --- arch/hc/src/common/up_internal.h | 6 ++++-- arch/hc/src/mc9s12ne64/mc9s12ne64_internal.h | 6 ++++-- configs/demo9s12ne64/README.txt | 9 +++++++-- 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/arch/hc/src/common/up_internal.h b/arch/hc/src/common/up_internal.h index fe7cac257d..1e79e743cd 100755 --- a/arch/hc/src/common/up_internal.h +++ b/arch/hc/src/common/up_internal.h @@ -41,8 +41,10 @@ ****************************************************************************/ #include -#include - +#ifndef __ASSEMBLY__ +# include +#endif + /**************************************************************************** * Definitions ****************************************************************************/ diff --git a/arch/hc/src/mc9s12ne64/mc9s12ne64_internal.h b/arch/hc/src/mc9s12ne64/mc9s12ne64_internal.h index fb8f2662a5..550580bda7 100755 --- a/arch/hc/src/mc9s12ne64/mc9s12ne64_internal.h +++ b/arch/hc/src/mc9s12ne64/mc9s12ne64_internal.h @@ -42,8 +42,10 @@ #include -#include -#include +#ifndef __ASSEMBLY__ +# include +# include +#endif #include "up_internal.h" #include "chip.h" diff --git a/configs/demo9s12ne64/README.txt b/configs/demo9s12ne64/README.txt index 72b2c581d4..cf35bc6d39 100755 --- a/configs/demo9s12ne64/README.txt +++ b/configs/demo9s12ne64/README.txt @@ -212,7 +212,7 @@ Soft Registers There are several ways that this error could be fixed: - 1. Increase the number of soft regiaters (i.e., "fake" registers defined + 1. Increase the number of soft registers (i.e., "fake" registers defined at fixed memory locations). This can be done by adding something like -msoft-reg-count=4 to the CFLAGS. This approach was not taken because: @@ -221,7 +221,8 @@ Soft Registers - All of these soft registers wouil have to be saved and restored on every interrupt and context switch. - 2. Lowering the optimization level. Also not desireable becauase 99% of the + 2. Lowering the optimization level by dropping -Os to -O2 or, more likely, + by removing -fomit-frame-pointer. Also not desireable becauase 99% of the files that do not have this problem also increase in size. Special case compilation with reduced optimization levels just for the files that need it could be done, but this would complicate the make system. @@ -233,6 +234,10 @@ Soft Registers the problem is not really eliminated -- it can and will re-occur when files are changed or new files are added. + 4. Many files are built that are needed by DEM09S12NE64. Another very simple + option if those problem files are needed is to just remove the offending + files from the Make.defs file so that they no longer cause a problem. + HCS12/DEMO9S12NEC64-specific Configuration Options ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^