Add the -fomit-frame-pointer option to GCC ARM7 builds.

git-svn-id: https://svn.code.sf.net/p/freertos/code/trunk@55 1d2547de-c912-0410-9cb9-b8ca96c0e9e2

diff --git a/Demo/ARM7_AT91FR40008_GCC/Makefile b/Demo/ARM7_AT91FR40008_GCC/Makefile
index e85f8a0b3269cff4e11541077b6fb117d5b3ce1c..b7f687afc0d34487edee119fe70e4412cb18b2e2 100644 (file)
--- a/Demo/ARM7_AT91FR40008_GCC/Makefile
+++ b/Demo/ARM7_AT91FR40008_GCC/Makefile
@@ -38,7 +38,7 @@ CRT0=boot.s
 #\r
 CFLAGS=-Wall -D $(RUN_MODE) -D GCC_AT91FR40008 -I. -I../../Source/include \\r
                -I../Common/include $(DEBUG) -mcpu=arm7tdmi -T$(LDSCRIPT) \\r
-               -Wcast-align $(OPTIM)\r
+               -Wcast-align $(OPTIM) -fomit-frame-pointer\r
 \r
 ifeq ($(USE_THUMB_MODE),YES)\r
        CFLAGS += -mthumb-interwork -D THUMB_INTERWORK\r

diff --git a/Demo/ARM7_LPC2106_GCC/Makefile b/Demo/ARM7_LPC2106_GCC/Makefile
index b5311f6ff55a49eee01861564b5f578c47cd30b1..a7b0072ffcfc987306771cfdae5b20e41451b41f 100644 (file)
--- a/Demo/ARM7_LPC2106_GCC/Makefile
+++ b/Demo/ARM7_LPC2106_GCC/Makefile
@@ -44,7 +44,7 @@ WARNINGS=-Wall -Wextra -Wshadow -Wpointer-arith -Wbad-function-cast -Wcast-align
 #\r
 CFLAGS=$(WARNINGS) -D $(RUN_MODE) -D GCC_ARM7 -I. -I../../Source/include \\r
                -I../Common/include $(DEBUG) -mcpu=arm7tdmi -T$(LDSCRIPT) \\r
-                $(OPTIM)\r
+                $(OPTIM) -fomit-frame-pointer\r
 \r
 ifeq ($(USE_THUMB_MODE),YES)\r
        CFLAGS += -mthumb-interwork -D THUMB_INTERWORK\r

diff --git a/Demo/ARM7_LPC2138_Rowley/RTOSDemo.hzp b/Demo/ARM7_LPC2138_Rowley/RTOSDemo.hzp
index 347ec08de24d9adb2e6ea4182b712092abb523d3..92c2bdc0f39356a1706b57fb60fb17e5679c86ac 100644 (file)
--- a/Demo/ARM7_LPC2138_Rowley/RTOSDemo.hzp
+++ b/Demo/ARM7_LPC2138_Rowley/RTOSDemo.hzp
@@ -40,15 +40,16 @@
       </file>
     </folder>
     <file file_name="threads.js" Name="threads.js" />
+    <configuration build_quietly="No" Name="THUMB Flash Debug" />
   </project>
   <configuration inherited_configurations="ARM;Flash;Debug" Name="ARM Flash Debug" />
   <configuration arm_library_instruction_set="ARM" c_preprocessor_definitions="__ARM" arm_instruction_set="ARM" hidden="Yes" Name="ARM" />
   <configuration c_preprocessor_definitions="__FLASH_BUILD" hidden="Yes" Name="Flash" />
   <configuration c_preprocessor_definitions="DEBUG" link_include_startup_code="No" gcc_optimization_level="None" build_debug_information="Yes" hidden="Yes" Name="Debug" />
   <configuration inherited_configurations="ARM;Flash;Release" Name="ARM Flash Release" />
-  <configuration c_preprocessor_definitions="NDEBUG" link_include_startup_code="No" gcc_optimization_level="Level 1" build_debug_information="No" hidden="Yes" Name="Release" />
+  <configuration c_preprocessor_definitions="NDEBUG;STARTUP_FROM_RESET" link_include_startup_code="No" gcc_optimization_level="Level 1" build_debug_information="No" hidden="Yes" Name="Release" />
   <configuration inherited_configurations="THUMB;Flash;Debug" Name="THUMB Flash Debug" />
   <configuration arm_library_instruction_set="THUMB" c_preprocessor_definitions="__THUMB;THUMB_INTERWORK" arm_instruction_set="THUMB" hidden="Yes" Name="THUMB" />
   <configuration inherited_configurations="THUMB;Flash;Release" Name="THUMB Flash Release" />
-  <configuration c_preprocessor_definitions="GCC_ARM7;SUPERVISOR_START;VECTORED_IRQ_INTERRUPTS" c_user_include_directories=".;..\\..\\Source\\include;..\\..\\Source\\GCC\\ARM7_LPC2000;..\\Common\\Include" Name="Common" c_system_include_directories="$(StudioDir)/include;$(StudioDir)/include/targets" />
+  <configuration c_preprocessor_definitions="GCC_ARM7;SUPERVISOR_START;VECTORED_IRQ_INTERRUPTS" c_user_include_directories=".;..\\..\\Source\\include;..\\..\\Source\\GCC\\ARM7_LPC2000;..\\Common\\Include" c_additional_options="-fomit-frame-pointer" Name="Common" c_system_include_directories="$(StudioDir)/include;$(StudioDir)/include/targets" />
 </solution>

diff --git a/Demo/ARM7_LPC2138_Rowley/RTOSDemo.hzs b/Demo/ARM7_LPC2138_Rowley/RTOSDemo.hzs
index 9b458a7539d86ee8a3b7d4a13e085cd5442eb986..0d0ff0a1df1a4ebaf0777abea86da994f7267fcb 100644 (file)
--- a/Demo/ARM7_LPC2138_Rowley/RTOSDemo.hzs
+++ b/Demo/ARM7_LPC2138_Rowley/RTOSDemo.hzs
@@ -5,7 +5,7 @@
  </Autos>
  <Bookmarks/>
  <Breakpoints>
-  <BreakpointListItem actiontype="0" chainFrom="" line="144" length="0" triggertype="0" useHWbreakpoint="false" group="Breakpoints" breakdatatype="0" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="" filename="C:\E\Dev\_FreeRTOS\Demo\ARM7_LPC2138_Rowley\main.c" />
+  <BreakpointListItem actiontype="0" chainFrom="" line="144" length="0" triggertype="0" useHWbreakpoint="false" group="Breakpoints" breakdatatype="0" value="0" name="unnamed" counter="0" state="4" mask="0" comparison="0" expression="" filename="C:\E\Dev\_FreeRTOS\Demo\ARM7_LPC2138_Rowley\main.c" />
   <BreakpointListItem actiontype="0" chainFrom="" line="-1" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="2" mask="0" comparison="0" expression="D_Abort" filename="" />
   <BreakpointListItem actiontype="0" chainFrom="" line="-1" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="FIQ" filename="" />
   <BreakpointListItem actiontype="0" chainFrom="" line="-1" length="0" triggertype="0" useHWbreakpoint="false" group="ARM Exceptions" breakdatatype="5" value="0" name="unnamed" counter="0" state="3" mask="0" comparison="0" expression="IRQ" filename="" />
@@ -38,8 +38,6 @@
  <Project>
   <ProjectSessionItem path="RTOSDemo" name="unnamed" />
   <ProjectSessionItem path="RTOSDemo;RTOSDemo" name="unnamed" />
-  <ProjectSessionItem path="RTOSDemo;RTOSDemo;Source Files" name="unnamed" />
-  <ProjectSessionItem path="RTOSDemo;RTOSDemo;Source Files;RTOS Source" name="unnamed" />
  </Project>
  <Register1>
   <RegisterWindow unsignedDisplays="" asciiDisplays="" octalDisplays="" openGroups="CPU - Current Mode" visibleGroups="CPU - Current Mode" decimalDisplays="" binaryDisplays="" />
@@ -71,14 +69,6 @@
  <Watch4>
   <Watches active="0" />
  </Watch4>
- <Files>
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" x="19" debugPath="C:\Devtools\Rowley Associates Limited\CrossWorks for ARM 1.6\source\crt0.s" y="27" useHTMLEdit="0" path="C:\Devtools\Rowley Associates Limited\CrossWorks for ARM 1.6\source\crt0.s" left="0" selected="0" name="unnamed" top="60" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" x="0" debugPath="C:\Devtools\Rowley Associates Limited\CrossWorks for ARM 1.6\targets\Philips_LPC210X\Philips_LPC210X_Startup.s" y="142" useHTMLEdit="0" path="C:\Devtools\Rowley Associates Limited\CrossWorks for ARM 1.6\targets\Philips_LPC210X\Philips_LPC210X_Startup.s" left="0" selected="0" name="unnamed" top="120" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" x="0" debugPath="C:\E\Dev\FreeRTOS\Source\portable\GCC\ARM7_LPC2000\port.c" y="0" useHTMLEdit="0" path="C:\E\Dev\FreeRTOS\Source\portable\GCC\ARM7_LPC2000\port.c" left="0" selected="0" name="unnamed" top="0" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" x="22" debugPath="C:\E\Dev\FreeRTOS\\Source\portable\GCC\ARM7_LPC2000\portmacro.h" y="223" useHTMLEdit="0" path="C:\E\Dev\FreeRTOS\\Source\portable\GCC\ARM7_LPC2000\portmacro.h" left="0" selected="0" name="unnamed" top="0" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" x="57" debugPath="C:\E\Dev\FreeRTOS\Source\list.c" y="93" useHTMLEdit="0" path="C:\E\Dev\FreeRTOS\Source\list.c" left="0" selected="0" name="unnamed" top="72" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" x="0" debugPath="C:\E\Dev\FreeRTOS\\Source\\include\list.h" y="0" useHTMLEdit="0" path="C:\E\Dev\FreeRTOS\\Source\\include\list.h" left="0" selected="0" name="unnamed" top="65" />
-  <SessionOpenFile useTextEdit="1" useBinaryEdit="0" x="0" debugPath="C:\E\Dev\FreeRTOS\Source\tasks.c" y="0" useHTMLEdit="0" path="C:\E\Dev\FreeRTOS\Source\tasks.c" left="0" selected="1" name="unnamed" top="156" />
- </Files>
+ <Files/>
  <ARMCrossStudioWindow activeProject="RTOSDemo" autoConnectTarget="/USB CrossConnect for ARM" debugSearchFileMap="" fileDialogInitialDirectory="C:\E\Dev\FreeRTOS\Demo\ARM7_LPC2138_Rowley" fileDialogDefaultFilter="*.js" autoConnectCapabilities="1407" debugSearchPath="" buildConfiguration="THUMB Flash Debug" />
 </session>

diff --git a/Demo/CORTEX_LM3S811_KEIL/main.c b/Demo/CORTEX_LM3S811_KEIL/main.c
index 448eae16e0f19797450f39584667d81b5f3208db..76f8ca2e4fcabb07066f91e9974922c296ea931b 100644 (file)
--- a/Demo/CORTEX_LM3S811_KEIL/main.c
+++ b/Demo/CORTEX_LM3S811_KEIL/main.c
@@ -75,7 +75,7 @@
 \r
 /* Scheduler includes. */\r
 #include "FreeRTOS.h"\r
-#include "Task.h"\r
+#include "task.h"\r
 #include "queue.h"\r
 #include "semphr.h"\r
 \r

diff --git a/Demo/Common/Minimal/PollQ.c b/Demo/Common/Minimal/PollQ.c
index 3ba950d34645a6880ccfa13444d955a496a5b894..e0b5400d6cda8f08883325a2f14b67d1674fa45b 100644 (file)
--- a/Demo/Common/Minimal/PollQ.c
+++ b/Demo/Common/Minimal/PollQ.c
@@ -73,7 +73,7 @@ Changes from V2.0.0
 #define pollqSTACK_SIZE                        configMINIMAL_STACK_SIZE\r
 #define pollqQUEUE_SIZE                        ( 10 )\r
 #define pollqPRODUCER_DELAY            ( ( portTickType ) 200 / portTICK_RATE_MS )\r
-#define pollqCONSUMER_DELAY            ( pollqPRODUCER_DELAY - ( portTickType ) 20 )\r
+#define pollqCONSUMER_DELAY            ( pollqPRODUCER_DELAY - ( portTickType ) ( 20 / portTICK_RATE_MS ) )\r
 #define pollqNO_DELAY                  ( ( portTickType ) 0 )\r
 #define pollqVALUES_TO_PRODUCE ( ( signed portBASE_TYPE ) 3 )\r
 #define pollqINITIAL_VALUE             ( ( signed portBASE_TYPE ) 0 )\r

diff --git a/Demo/Common/Minimal/blocktim.c b/Demo/Common/Minimal/blocktim.c
index c4719cab4eb8bfdf3fa2de883967a5ff6640bee3..132db42f4c29ea90b82f351db14ae2dfb6768c08 100644 (file)
--- a/Demo/Common/Minimal/blocktim.c
+++ b/Demo/Common/Minimal/blocktim.c
@@ -81,8 +81,8 @@ void vCreateBlockTimeTasks( void )
     xTestQueue = xQueueCreate( bktQUEUE_LENGTH, sizeof( portBASE_TYPE ) );\r
 \r
        /* Create the two test tasks. */\r
-       xTaskCreate( vPrimaryBlockTimeTestTask, "BTest1", configMINIMAL_STACK_SIZE, NULL, bktPRIMARY_PRIORITY, NULL );\r
-       xTaskCreate( vSecondaryBlockTimeTestTask, "BTest2", configMINIMAL_STACK_SIZE, NULL, bktSECONDARY_PRIORITY, &xSecondary );\r
+       xTaskCreate( vPrimaryBlockTimeTestTask, ( signed portCHAR * )"BTest1", configMINIMAL_STACK_SIZE, NULL, bktPRIMARY_PRIORITY, NULL );\r
+       xTaskCreate( vSecondaryBlockTimeTestTask, ( signed portCHAR * )"BTest2", configMINIMAL_STACK_SIZE, NULL, bktSECONDARY_PRIORITY, &xSecondary );\r
 }\r
 /*-----------------------------------------------------------*/\r
 \r

diff --git a/Demo/WizNET_DEMO_GCC_ARM7/Makefile b/Demo/WizNET_DEMO_GCC_ARM7/Makefile
index fd9651880fd293d5d3e850596f5339d4ad917b4c..ec1e608b917ffe2ec71a07873750ae388e61e1aa 100644 (file)
--- a/Demo/WizNET_DEMO_GCC_ARM7/Makefile
+++ b/Demo/WizNET_DEMO_GCC_ARM7/Makefile
@@ -45,7 +45,7 @@ LDSCRIPT=lpc2106-rom.ld
 #\r
 CFLAGS=-Wall -D $(RUN_MODE) -D GCC_ARM7 -I. -I../../Source/include \\r
                -I../Common/include $(DEBUG) -mcpu=arm7tdmi -T$(LDSCRIPT) \\r
-               -Wcast-align $(OPTIM)\r
+               -Wcast-align $(OPTIM) -fomit-frame-pointer\r
 \r
 ifeq ($(USE_THUMB_MODE),YES)\r
        CFLAGS += -mthumb-interwork -D THUMB_INTERWORK\r

diff --git a/Demo/lwIP_Demo_Rowley_ARM7/rtosdemo.hzp b/Demo/lwIP_Demo_Rowley_ARM7/rtosdemo.hzp
index 8cb2ecbd2df9a1382dbf921af31db734f010331a..0c26e03ef716796d63987ed60bd725ca04752bbf 100644 (file)
--- a/Demo/lwIP_Demo_Rowley_ARM7/rtosdemo.hzp
+++ b/Demo/lwIP_Demo_Rowley_ARM7/rtosdemo.hzp
@@ -82,5 +82,5 @@
   <configuration c_preprocessor_definitions="DEBUG" link_include_startup_code="No" gcc_optimization_level="None" build_debug_information="Yes" Name="Debug" />
   <configuration inherited_configurations="THUMB;Flash;Release" gcc_optimization_level="Level 2" Name="THUMB Flash Release" />
   <configuration c_preprocessor_definitions="NDEBUG" link_include_startup_code="No" gcc_optimization_level="Level 1" build_debug_information="No" Name="Release" />
-  <configuration arm_library_instruction_set="THUMB" gcc_entry_point="0x100000" build_quietly="Yes" c_preprocessor_definitions="SAM7_GCC;THUMB_INTERWORK;SUPERVISOR_START" c_user_include_directories=".;$(ProjectDir)/EMAC;$(ProjectDir)/../common/include;$(ProjectDir)/USB" link_include_startup_code="Yes" arm_instruction_set="THUMB" c_preprocessor_undefinitions="" c_additional_options="-Wall;-Wextra;-Wstrict-prototypes;-Wmissing-prototypes;-Wmissing-declarations;-Wno-strict-aliasing" arm_linker_stack_size="0" Name="Common" c_system_include_directories="$(StudioDir)/include;$(ProjectDir)/lwip-1.1.0/src/include;$(ProjectDir)/lwip-1.1.0/contrib/port/FreeRTOS/AT91SAM7X;$(ProjectDir);$(ProjectDir)/../../source/include;$(ProjectDir)/../../source/portable/GCC/ARM7_AT91SAM7S;$(ProjectDir)/lwip-1.1.0\\src\\include\\ipv4" arm_linker_heap_size="0" />
+  <configuration arm_library_instruction_set="THUMB" gcc_entry_point="0x100000" build_quietly="Yes" c_preprocessor_definitions="SAM7_GCC;THUMB_INTERWORK;SUPERVISOR_START" c_user_include_directories=".;$(ProjectDir)/EMAC;$(ProjectDir)/../common/include;$(ProjectDir)/USB" link_include_startup_code="Yes" arm_instruction_set="THUMB" c_preprocessor_undefinitions="" c_additional_options="-Wall;-Wextra;-Wstrict-prototypes;-Wmissing-prototypes;-Wmissing-declarations;-Wno-strict-aliasing;-fomit-frame-pointer" arm_linker_stack_size="0" Name="Common" c_system_include_directories="$(StudioDir)/include;$(ProjectDir)/lwip-1.1.0/src/include;$(ProjectDir)/lwip-1.1.0/contrib/port/FreeRTOS/AT91SAM7X;$(ProjectDir);$(ProjectDir)/../../source/include;$(ProjectDir)/../../source/portable/GCC/ARM7_AT91SAM7S;$(ProjectDir)/lwip-1.1.0\\src\\include\\ipv4" arm_linker_heap_size="0" />
 </solution>

diff --git a/Demo/uIP_Demo_Rowley_ARM7/rtosdemo.hzp b/Demo/uIP_Demo_Rowley_ARM7/rtosdemo.hzp
index e995765da3c0c468440765a4257c7844040dd53c..e5d235ed2b4ae8c34cfd1f83d919e955b0148738 100644 (file)
--- a/Demo/uIP_Demo_Rowley_ARM7/rtosdemo.hzp
+++ b/Demo/uIP_Demo_Rowley_ARM7/rtosdemo.hzp
@@ -52,5 +52,5 @@
   <configuration c_preprocessor_definitions="__FLASH_BUILD" hidden="Yes" Name="Flash" />
   <configuration c_preprocessor_definitions="DEBUG" link_include_startup_code="No" gcc_optimization_level="None" build_debug_information="Yes" Name="Debug" />
   <configuration c_preprocessor_definitions="NDEBUG" link_include_startup_code="No" gcc_optimization_level="Level 1" build_debug_information="No" Name="Release" />
-  <configuration c_preprocessor_definitions="" Name="Common" />
+  <configuration c_preprocessor_definitions="" c_additional_options="-fomit-frame-pointer" Name="Common" />
 </solution>