Fix GCC build issue

git-svn-id: https://edk2.svn.sourceforge.net/svnroot/edk2/trunk/edk2@10517 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmEbPkg/ArmEbPkg.dsc b/ArmEbPkg/ArmEbPkg.dsc
index 911d7ae3022bdf2b505010ca731439b1281cef4f..023269f022efdc70ff768d69804fbee622be42fd 100644 (file)
--- a/ArmEbPkg/ArmEbPkg.dsc
+++ b/ArmEbPkg/ArmEbPkg.dsc
@@ -189,14 +189,20 @@
 
 
 [BuildOptions]
+  RVCT:*_*_ARM_ARCHCC_FLAGS  == --cpu Cortex-A8 --thumb
+  RVCT:*_*_ARM_ARCHASM_FLAGS == --cpu Cortex-A8 
+  RVCT:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG 
+
+  GCC:*_*_ARM_ARCHCC_FLAGS    == -march=armv7-a -mthumb \r
+  GCC:*_*_ARM_ARCHASM_FLAGS   == -march=armv7-a\r
+  GCC:*_*_ARM_ARCHDLINK_FLAGS == -arch armv7-a
+  GCC:RELEASE_*_*_CC_FLAGS    = -DMDEPKG_NDEBUG 
+\r
   XCODE:*_*_ARM_ARCHCC_FLAGS     == -arch armv7 -march=armv7
   XCODE:*_*_ARM_ARCHASM_FLAGS    == -arch armv7
   XCODE:*_*_ARM_ARCHDLINK_FLAGS  == -arch armv7
   XCODE:RELEASE_*_*_CC_FLAGS     = -DMDEPKG_NDEBUG 
 
-  RVCT:*_*_ARM_ARCHCC_FLAGS  == --cpu Cortex-A8 --thumb
-  RVCT:*_*_ARM_ARCHASM_FLAGS == --cpu Cortex-A8 
-  RVCT:RELEASE_*_*_CC_FLAGS  = -DMDEPKG_NDEBUG 
 
 ################################################################################
 #

diff --git a/ArmEbPkg/Sec/ModuleEntryPoint.asm b/ArmEbPkg/Sec/ModuleEntryPoint.asm
index d9d5bb64f2e9d4e12471e83d36a0c1105055f9d7..e77b5057a87d611ddce87e32f1b4aaa2d51e3a60 100755 (executable)
--- a/ArmEbPkg/Sec/ModuleEntryPoint.asm
+++ b/ArmEbPkg/Sec/ModuleEntryPoint.asm
@@ -37,8 +37,7 @@ _ModuleEntryPoint
   orr     r0, r0, #0x00f00000   // Enable VPF access (V* instructions)\r
   mcr     p15, 0, r0, c1, c0, 2\r
   mov     r0, #0x40000000       // Set EN bit in FPEXC\r
-  msr     FPEXC,r0\r
-  \r
+  mcr     p10,#0x7,r0,c8,c0,#0  // msr     FPEXC,r0 in ARM assembly\r
    \r
   // Set CPU vectors to start of DRAM\r
   LoadConstantToReg (FixedPcdGet32(PcdCpuVectorBaseAddress) ,r0) // Get vector base\r