fix the support for gcc

ARM-software · Oct 4, 2023 · ad61467 · ad61467
1 parent ed93f0f
commit ad61467
Show file tree

Hide file tree

Showing 12 changed files with 62 additions and 41 deletions.
diff --git a/ARM.Arm-2D.pdsc b/ARM.Arm-2D.pdsc
@@ -202,8 +202,8 @@
             <file category="header"      name="examples/common/controls/template/user_control_template.h"   attr="template"  select="User Control Template" version="1.0.0"/>
             <file category="sourceC"     name="examples/common/controls/template/user_control_template.c"   attr="template"  select="User Control Template" version="1.0.0"/>
 
-            <file category="sourceC"     name="Helper/Source/template/arm_2d_scene_template.c"  attr="template"  select="User Scene Template"   version="1.1.9" />
-            <file category="header"      name="Helper/Include/template/arm_2d_scene_template.h" attr="template"  select="User Scene Template"   version="1.1.9" />
+            <file category="sourceC"     name="Helper/Source/template/arm_2d_scene_template.c"  attr="template"  select="User Scene Template"   version="1.1.11" />
+            <file category="header"      name="Helper/Include/template/arm_2d_scene_template.h" attr="template"  select="User Scene Template"   version="1.1.11" />
 
           </files>
 
@@ -299,23 +299,23 @@
           </RTE_Components_h>
         </component>
 
-        <component Cclass="Acceleration" Cgroup="Arm-2D Helper" Csub="Display Adapter" Cversion="1.7.0" condition="Arm-2D-Helper" maxInstances="8">
+        <component Cclass="Acceleration" Cgroup="Arm-2D Helper" Csub="Display Adapter" Cversion="1.7.1" condition="Arm-2D-Helper" maxInstances="8">
           <description>The Display Adapter.</description>
           <files>
-            <file category="sourceC"     name="Helper/Source/template/arm_2d_disp_adapter.c" attr="config" version="1.7.0" />
-            <file category="header"      name="Helper/Include/template/arm_2d_disp_adapter.h" attr="config" version="1.7.0" />
+            <file category="sourceC"     name="Helper/Source/template/arm_2d_disp_adapter.c" attr="config" version="1.7.1" />
+            <file category="header"      name="Helper/Include/template/arm_2d_disp_adapter.h" attr="config" version="1.7.1" />
           </files>
           <RTE_Components_h>
     #define RTE_Acceleration_Arm_2D_Helper_Disp_Adapter%Instance%
     #define __RTE_ACCELERATION_ARM_2D_HELPER_DISP_ADAPTER%Instance%__  /* this macro is deprecated, please use the macro above in your code */
           </RTE_Components_h>
         </component>
 
-        <component Cclass="Acceleration" Cgroup="Arm-2D Helper" Csub="Scene" Cversion="1.1.10" condition="Arm-2D-Helper" maxInstances="1000">
+        <component Cclass="Acceleration" Cgroup="Arm-2D Helper" Csub="Scene" Cversion="1.1.11" condition="Arm-2D-Helper" maxInstances="1000">
           <description>A template for scene</description>
           <files>
-            <file category="sourceC"     name="Helper/Source/template/arm_2d_scene.c" attr="config" version="1.1.10" />
-            <file category="header"      name="Helper/Include/template/arm_2d_scene.h" attr="config" version="1.1.10" />
+            <file category="sourceC"     name="Helper/Source/template/arm_2d_scene.c" attr="config" version="1.1.11" />
+            <file category="header"      name="Helper/Include/template/arm_2d_scene.h" attr="config" version="1.1.11" />
           </files>
           <RTE_Components_h>
     #define RTE_Acceleration_Arm_2D_Scene%Instance%

diff --git a/Helper/Source/arm_2d_helper.c b/Helper/Source/arm_2d_helper.c
@@ -21,8 +21,8 @@
  * Title:        #include "arm_2d_helper.h"
  * Description:  The source code for arm-2d helper utilities
  *
- * $Date:        13. July 2023
- * $Revision:    V.1.6.4
+ * $Date:        04. Oct 2023
+ * $Revision:    V.1.6.5
  *
  * Target Processor:  Cortex-M cores
  * -------------------------------------------------------------------- */
@@ -64,6 +64,7 @@
 #   pragma GCC diagnostic push
 #   pragma GCC diagnostic ignored "-Wstrict-aliasing"
 #   pragma GCC diagnostic ignored "-Wunused-value"
+#   pragma GCC diagnostic ignored "-Wnonnull-compare"
 #endif
 
 /*============================ MACROS ========================================*/

diff --git a/Helper/Source/template/arm_2d_disp_adapter.c b/Helper/Source/template/arm_2d_disp_adapter.c
@@ -679,7 +679,7 @@ void __disp_adapter%Instance%_vres_buffer_deposer (
 #else
     ARM_2D_UNUSED(pTarget);
     ARM_2D_UNUSED(ptVRES);
-    if (NULL == pBuffer) {
+    if ((intptr_t)NULL == pBuffer) {
         return ;
     }
 

diff --git a/Helper/Source/template/arm_2d_scene.c b/Helper/Source/template/arm_2d_scene.c
@@ -48,6 +48,7 @@
 #   pragma clang diagnostic ignored "-Wunused-function"
 #   pragma clang diagnostic ignored "-Wmissing-declarations"  
 #elif __IS_COMPILER_ARM_COMPILER_5__
+#   pragma diag_suppress 64,177
 #elif __IS_COMPILER_IAR__
 #   pragma diag_suppress=Pa089,Pe188,Pe177,Pe174
 #elif __IS_COMPILER_GCC__
@@ -56,7 +57,7 @@
 #   pragma GCC diagnostic ignored "-Wpedantic"
 #   pragma GCC diagnostic ignored "-Wunused-function"
 #   pragma GCC diagnostic ignored "-Wunused-variable"
-#   pragma GCC diagnostic ignored "-Wunused-value"
+#   pragma GCC diagnostic ignored "-Wincompatible-pointer-types"
 #endif
 
 /*============================ MACROS ========================================*/

diff --git a/Helper/Source/template/arm_2d_scene_template.c b/Helper/Source/template/arm_2d_scene_template.c
@@ -46,6 +46,7 @@
 #   pragma clang diagnostic ignored "-Wunused-function"
 #   pragma clang diagnostic ignored "-Wmissing-declarations"  
 #elif __IS_COMPILER_ARM_COMPILER_5__
+#   pragma diag_suppress 64,177
 #elif __IS_COMPILER_IAR__
 #   pragma diag_suppress=Pa089,Pe188,Pe177,Pe174
 #elif __IS_COMPILER_GCC__
@@ -54,7 +55,7 @@
 #   pragma GCC diagnostic ignored "-Wpedantic"
 #   pragma GCC diagnostic ignored "-Wunused-function"
 #   pragma GCC diagnostic ignored "-Wunused-variable"
-#   pragma GCC diagnostic ignored "-Wunused-value"
+#   pragma GCC diagnostic ignored "-Wincompatible-pointer-types"
 #endif
 
 /*============================ MACROS ========================================*/

diff --git a/Library/Include/arm_2d.h b/Library/Include/arm_2d.h
@@ -63,6 +63,7 @@ extern "C" {
 #elif __IS_COMPILER_GCC__
 #   pragma GCC diagnostic ignored "-Wpedantic"
 #   pragma GCC diagnostic ignored "-Wmissing-braces"
+#   pragma GCC diagnostic ignored "-Wunused-value"
 #elif defined(__IS_COMPILER_ARM_COMPILER_5__)
 #   pragma diag_suppress 1296,174,64,177
 #endif

diff --git a/Library/Source/__arm_2d_core.c b/Library/Source/__arm_2d_core.c
@@ -77,6 +77,7 @@ extern "C" {
 #   pragma GCC diagnostic ignored "-Wenum-compare"
 #   pragma GCC diagnostic ignored "-Wpedantic"
 #   pragma GCC diagnostic ignored "-Wstrict-aliasing"
+#   pragma GCC diagnostic ignored "-Wdiscarded-qualifiers"
 #endif
 
 /*============================ MACROS ========================================*/

diff --git a/examples/[template][bare-metal]/project/mdk/RTE/Acceleration/arm_2d_disp_adapter_0.c b/examples/[template][bare-metal]/project/mdk/RTE/Acceleration/arm_2d_disp_adapter_0.c
@@ -679,7 +679,7 @@ void __disp_adapter0_vres_buffer_deposer (
 #else
     ARM_2D_UNUSED(pTarget);
     ARM_2D_UNUSED(ptVRES);
-    if (NULL == pBuffer) {
+    if ((intptr_t)NULL == pBuffer) {
         return ;
     }
 

diff --git a/examples/[template][bare-metal]/project/mdk/RTE/Acceleration/arm_2d_scene_3.c b/examples/[template][bare-metal]/project/mdk/RTE/Acceleration/arm_2d_scene_3.c
@@ -55,7 +55,8 @@
 #   pragma GCC diagnostic ignored "-Wpedantic"
 #   pragma GCC diagnostic ignored "-Wunused-function"
 #   pragma GCC diagnostic ignored "-Wunused-variable"
-#   pragma GCC diagnostic ignored "-Wunused-value"
+#   pragma GCC diagnostic ignored "-Wincompatible-pointer-types"
+
 #elif __IS_COMPILER_IAR__
 #   pragma diag_suppress=Pa089,Pe188,Pe177,Pe174
 #endif

diff --git a/examples/[template][bare-metal]/project/mdk/gcc_template.uvoptx b/examples/[template][bare-metal]/project/mdk/gcc_template.uvoptx
@@ -292,6 +292,30 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>5</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\arm_2d_scene_meter.c</PathWithFileName>
+      <FilenameWithoutPath>arm_2d_scene_meter.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>6</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\..\MeterPanel.c</PathWithFileName>
+      <FilenameWithoutPath>MeterPanel.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
   <Group>
@@ -302,7 +326,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>5</FileNumber>
+      <FileNumber>7</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -314,7 +338,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>6</FileNumber>
+      <FileNumber>8</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -326,7 +350,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>7</FileNumber>
+      <FileNumber>9</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -338,7 +362,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>8</FileNumber>
+      <FileNumber>10</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -350,7 +374,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>9</FileNumber>
+      <FileNumber>11</FileNumber>
       <FileType>1</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -362,7 +386,7 @@
     </File>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>10</FileNumber>
+      <FileNumber>12</FileNumber>
       <FileType>5</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -380,18 +404,6 @@
     <tvExpOptDlg>0</tvExpOptDlg>
     <cbSel>0</cbSel>
     <RteFlg>0</RteFlg>
-    <File>
-      <GroupNumber>3</GroupNumber>
-      <FileNumber>11</FileNumber>
-      <FileType>1</FileType>
-      <tvExp>0</tvExp>
-      <tvExpOptDlg>0</tvExpOptDlg>
-      <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\common\asset\helium.c</PathWithFileName>
-      <FilenameWithoutPath>helium.c</FilenameWithoutPath>
-      <RteFlg>0</RteFlg>
-      <bShared>0</bShared>
-    </File>
   </Group>
 
   <Group>

diff --git a/examples/[template][bare-metal]/project/mdk/gcc_template.uvprojx b/examples/[template][bare-metal]/project/mdk/gcc_template.uvprojx
@@ -303,6 +303,16 @@
               <FileType>5</FileType>
               <FilePath>..\..\virtual_resource_demo.h</FilePath>
             </File>
+            <File>
+              <FileName>arm_2d_scene_meter.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\arm_2d_scene_meter.c</FilePath>
+            </File>
+            <File>
+              <FileName>MeterPanel.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\..\MeterPanel.c</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -342,13 +352,6 @@
         </Group>
         <Group>
           <GroupName>asset</GroupName>
-          <Files>
-            <File>
-              <FileName>helium.c</FileName>
-              <FileType>1</FileType>
-              <FilePath>..\..\..\common\asset\helium.c</FilePath>
-            </File>
-          </Files>
         </Group>
         <Group>
           <GroupName>::Acceleration</GroupName>

diff --git a/examples/[template][bare-metal]/project/mdk/template.uvoptx b/examples/[template][bare-metal]/project/mdk/template.uvoptx
@@ -2054,7 +2054,7 @@
           <SizeOfObject>0</SizeOfObject>
           <BreakByAccess>0</BreakByAccess>
           <BreakIfRCount>1</BreakIfRCount>
-          <Filename>&lt;1&gt;..\..\..\common\platform\app_platform.c</Filename>
+          <Filename>Y:\Work\git\Arm-2D\examples\common\platform\app_platform.c</Filename>
           <ExecCommand></ExecCommand>
           <Expression>\\template\../../../common/platform/app_platform.c\210</Expression>
         </Bp>