Allow IAR language extensions so __weak attribute can be used.

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

diff --git a/FreeRTOS/Demo/CORTEX_STM32F103_IAR/RTOSDemo.ewd b/FreeRTOS/Demo/CORTEX_STM32F103_IAR/RTOSDemo.ewd
index c9a090a58dabe033e903ae2adc6d3cf1a68bfd4d..d04bd3e5629e4c62c82f7d9776a65c4e7bd05686 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_STM32F103_IAR/RTOSDemo.ewd
+++ b/FreeRTOS/Demo/CORTEX_STM32F103_IAR/RTOSDemo.ewd
@@ -12,7 +12,7 @@
       <name>C-SPY</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>22</version>\r
+        <version>23</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -89,7 +89,7 @@
         </option>\r
         <option>\r
           <name>OCLastSavedByProductVersion</name>\r
-          <state>6.20.1.52589</state>\r
+          <state>6.30.7.53437</state>\r
         </option>\r
         <option>\r
           <name>OCDownloadAttachToProgram</name>\r
@@ -171,6 +171,10 @@
           <name>OCImagesUse3</name>\r
           <state>0</state>\r
         </option>\r
+        <option>\r
+          <name>OCDeviceConfigMacroFile</name>\r
+          <state>1</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -313,7 +317,7 @@
       <name>JLINK_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
       <data>\r
-        <version>13</version>\r
+        <version>14</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -423,7 +427,7 @@
         </option>\r
         <option>\r
           <name>CCJLinkResetList</name>\r
-          <version>5</version>\r
+          <version>6</version>\r
           <state>7</state>\r
         </option>\r
         <option>\r
@@ -495,6 +499,14 @@
           <name>CCSwoClockEdit</name>\r
           <state>2000</state>\r
         </option>\r
+        <option>\r
+          <name>OCJLinkTraceSource</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>OCJLinkTraceSourceDummy</name>\r
+          <state>0</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r
@@ -740,6 +752,63 @@
         </option>\r
       </data>\r
     </settings>\r
+    <settings>\r
+      <name>RDIJTAGJET_ID</name>\r
+      <archiveVersion>0</archiveVersion>\r
+      <data>\r
+        <version>1</version>\r
+        <wantNonLocal>1</wantNonLocal>\r
+        <debug>1</debug>\r
+        <option>\r
+          <name>CRDILogFileCheck</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>CRDILogFileEdit</name>\r
+          <state>$PROJ_DIR$\cspycomm.log</state>\r
+        </option>\r
+        <option>\r
+          <name>CCRDIHWReset</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>CCRDICatchReset</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>CCRDICatchUndef</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>CCRDICatchSWI</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>CCRDICatchData</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>CCRDICatchPrefetch</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>CCRDICatchIRQ</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>CCRDICatchFIQ</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>OCDriverInfo</name>\r
+          <state>1</state>\r
+        </option>\r
+        <option>\r
+          <name>JTAGjetConfigure</name>\r
+          <state></state>\r
+        </option>\r
+      </data>\r
+    </settings>\r
     <settings>\r
       <name>STLINK_ID</name>\r
       <archiveVersion>2</archiveVersion>\r
@@ -803,7 +872,45 @@
         </option>\r
       </data>\r
     </settings>\r
+    <settings>\r
+      <name>XDS100_ID</name>\r
+      <archiveVersion>2</archiveVersion>\r
+      <data>\r
+        <version>1</version>\r
+        <wantNonLocal>1</wantNonLocal>\r
+        <debug>1</debug>\r
+        <option>\r
+          <name>OCDriverInfo</name>\r
+          <state>1</state>\r
+        </option>\r
+        <option>\r
+          <name>OCXDS100AttachSlave</name>\r
+          <state>1</state>\r
+        </option>\r
+        <option>\r
+          <name>TIPackageOverride</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>TIPackage</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>CCXds100InterfaceList</name>\r
+          <version>0</version>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>BoardFile</name>\r
+          <state></state>\r
+        </option>\r
+      </data>\r
+    </settings>\r
     <debuggerPlugins>\r
+      <plugin>\r
+        <file>$TOOLKIT_DIR$\plugins\rtos\AVIX\AVIX.ENU.ewplugin</file>\r
+        <loadFlag>0</loadFlag>\r
+      </plugin>\r
       <plugin>\r
         <file>$TOOLKIT_DIR$\plugins\rtos\CMX\CmxArmPlugin.ENU.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
@@ -849,15 +956,11 @@
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>\r
-        <loadFlag>0</loadFlag>\r
-      </plugin>\r
-      <plugin>\r
-        <file>$EW_DIR$\common\plugins\FreeRTOS\FreeRTOSPlugin.ewplugin</file>\r
+        <file>$TOOLKIT_DIR$\plugins\rtos\uCOS-III\uCOS-III-KA-CSpy.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r
-        <file>$EW_DIR$\common\plugins\OpenRTOS\OpenRTOSPlugin.ewplugin</file>\r
+        <file>$EW_DIR$\common\plugins\CodeCoverage\CodeCoverage.ENU.ewplugin</file>\r
         <loadFlag>0</loadFlag>\r
       </plugin>\r
       <plugin>\r

diff --git a/FreeRTOS/Demo/CORTEX_STM32F103_IAR/RTOSDemo.ewp b/FreeRTOS/Demo/CORTEX_STM32F103_IAR/RTOSDemo.ewp
index b0ebcd31ea16f36d17c2a9b54d34f5ab423c68dc..49da436079992bf7b1b5a7776c8d2073cc76b704 100644 (file)
--- a/FreeRTOS/Demo/CORTEX_STM32F103_IAR/RTOSDemo.ewp
+++ b/FreeRTOS/Demo/CORTEX_STM32F103_IAR/RTOSDemo.ewp
@@ -87,7 +87,7 @@
         </option>\r
         <option>\r
           <name>OGLastSavedByProductVersion</name>\r
-          <state>5.11.0.50615</state>\r
+          <state>6.30.7.53437</state>\r
         </option>\r
         <option>\r
           <name>GeneralEnableMisra</name>\r
@@ -250,7 +250,7 @@
         </option>\r
         <option>\r
           <name>CCLangConformance</name>\r
-          <state>1</state>\r
+          <state>0</state>\r
         </option>\r
         <option>\r
           <name>CCSignedPlainChar</name>\r
@@ -609,7 +609,7 @@
       <name>ILINK</name>\r
       <archiveVersion>0</archiveVersion>\r
       <data>\r
-        <version>13</version>\r
+        <version>15</version>\r
         <wantNonLocal>1</wantNonLocal>\r
         <debug>1</debug>\r
         <option>\r
@@ -777,10 +777,6 @@
           <name>CrcAlign</name>\r
           <state>1</state>\r
         </option>\r
-        <option>\r
-          <name>CrcAlgo</name>\r
-          <state>1</state>\r
-        </option>\r
         <option>\r
           <name>CrcPoly</name>\r
           <state>0x11021</state>\r
@@ -871,6 +867,28 @@
           <name>IlinkOptForceVfe</name>\r
           <state>0</state>\r
         </option>\r
+        <option>\r
+          <name>IlinkStackAnalysisEnable</name>\r
+          <state>0</state>\r
+        </option>\r
+        <option>\r
+          <name>IlinkStackControlFile</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>IlinkStackCallGraphFile</name>\r
+          <state></state>\r
+        </option>\r
+        <option>\r
+          <name>CrcAlgorithm</name>\r
+          <version>0</version>\r
+          <state>1</state>\r
+        </option>\r
+        <option>\r
+          <name>CrcUnitSize</name>\r
+          <version>0</version>\r
+          <state>0</state>\r
+        </option>\r
       </data>\r
     </settings>\r
     <settings>\r