Update remaining ARM .S files with INTERWORK_FUNC macro. This is the 2nd half of...

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

diff --git a/ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.S b/ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.S
index 9db6756c7ba1371fe99227427e4b145e8c80fcbe..1c2bb62605f297053d7956f7867c47938a91ed58 100644 (file)
--- a/ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.S
+++ b/ArmPkg/Drivers/CpuDxe/ExceptionSupport.ARMv6.S
@@ -51,10 +51,15 @@ This is the stack constructed by the exception handler (low address to high addr
  
 
 .globl ASM_PFX(ExceptionHandlersStart)
+INTERWORK_FUNC(ExceptionHandlersStart)
 .globl ASM_PFX(ExceptionHandlersEnd)
+INTERWORK_FUNC(ExceptionHandlersEnd)
 .globl ASM_PFX(CommonExceptionEntry)
+INTERWORK_FUNC(CommonExceptionEntry)
 .globl ASM_PFX(AsmCommonExceptionEntry)
+INTERWORK_FUNC(AsmCommonExceptionEntry)
 .globl ASM_PFX(CommonCExceptionHandler)
+INTERWORK_FUNC(CommonCExceptionHandler)
 
 .text
 #if !defined(__APPLE__)

diff --git a/ArmPkg/Library/ArmLib/Arm11/Arm11Support.S b/ArmPkg/Library/ArmLib/Arm11/Arm11Support.S
index 885043414c67bbedbd649e0bfd689c12436d8258..8c2ce60f5a6a08e56c9b1a289782d85dd09f0976 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm11/Arm11Support.S
+++ b/ArmPkg/Library/ArmLib/Arm11/Arm11Support.S
@@ -15,24 +15,43 @@
 .text
 .align 2
 .globl ASM_PFX(ArmCleanInvalidateDataCache)
+INTERWORK_FUNC(ArmCleanInvalidateDataCache)
 .globl ASM_PFX(ArmCleanDataCache)
+INTERWORK_FUNC(ArmCleanDataCache)
 .globl ASM_PFX(ArmInvalidateDataCache)
+INTERWORK_FUNC(ArmInvalidateDataCache)
 .globl ASM_PFX(ArmInvalidateInstructionCache)
+INTERWORK_FUNC(ArmInvalidateInstructionCache)
 .globl ASM_PFX(ArmInvalidateDataCacheEntryByMVA)
+INTERWORK_FUNC(ArmInvalidateDataCacheEntryByMVA)
 .globl ASM_PFX(ArmCleanDataCacheEntryByMVA)
+INTERWORK_FUNC(ArmCleanDataCacheEntryByMVA)
 .globl ASM_PFX(ArmCleanInvalidateDataCacheEntryByMVA)
+INTERWORK_FUNC(ArmCleanInvalidateDataCacheEntryByMVA)
 .globl ASM_PFX(ArmEnableMmu)
+INTERWORK_FUNC(ArmEnableMmu)
 .globl ASM_PFX(ArmDisableMmu)
+INTERWORK_FUNC(ArmDisableMmu)
 .globl ASM_PFX(ArmMmuEnabled)
+INTERWORK_FUNC(ArmMmuEnabled)
 .globl ASM_PFX(ArmEnableDataCache)
+INTERWORK_FUNC(ArmEnableDataCache)
 .globl ASM_PFX(ArmDisableDataCache)
+INTERWORK_FUNC(ArmDisableDataCache)
 .globl ASM_PFX(ArmEnableInstructionCache)
+INTERWORK_FUNC(ArmEnableInstructionCache)
 .globl ASM_PFX(ArmDisableInstructionCache)
+INTERWORK_FUNC(ArmDisableInstructionCache)
 .globl ASM_PFX(ArmEnableBranchPrediction)
+INTERWORK_FUNC(ArmEnableBranchPrediction)
 .globl ASM_PFX(ArmDisableBranchPrediction)
+INTERWORK_FUNC(ArmDisableBranchPrediction)
 .globl ASM_PFX(ArmDataMemoryBarrier)
+INTERWORK_FUNC(ArmDataMemoryBarrier)
 .globl ASM_PFX(ArmDataSyncronizationBarrier) 
+INTERWORK_FUNC(ArmDataSyncronizationBarrier)
 .globl ASM_PFX(ArmInstructionSynchronizationBarrier)
+INTERWORK_FUNC(ArmInstructionSynchronizationBarrier)
 
 
 .set DC_ON, (0x1<<2)

diff --git a/ArmPkg/Library/ArmLib/Arm9/Arm9Support.S b/ArmPkg/Library/ArmLib/Arm9/Arm9Support.S
index 281603b117c93dd2922c057da0059511e301c64e..f570f750594b4eac9bd9d0e40d5d5a5fd6b286ac 100644 (file)
--- a/ArmPkg/Library/ArmLib/Arm9/Arm9Support.S
+++ b/ArmPkg/Library/ArmLib/Arm9/Arm9Support.S
@@ -15,24 +15,43 @@
 .text
 .align 2
 .globl ASM_PFX(ArmCleanInvalidateDataCache)
+INTERWORK_FUNC(ArmCleanInvalidateDataCache)
 .globl ASM_PFX(ArmCleanDataCache)
+INTERWORK_FUNC(ArmCleanDataCache)
 .globl ASM_PFX(ArmInvalidateDataCache)
+INTERWORK_FUNC(ArmInvalidateDataCache)
 .globl ASM_PFX(ArmInvalidateInstructionCache)
+INTERWORK_FUNC(ArmInvalidateInstructionCache)
 .globl ASM_PFX(ArmInvalidateDataCacheEntryByMVA)
+INTERWORK_FUNC(ArmInvalidateDataCacheEntryByMVA)
 .globl ASM_PFX(ArmCleanDataCacheEntryByMVA)
+INTERWORK_FUNC(ArmCleanDataCacheEntryByMVA)
 .globl ASM_PFX(ArmCleanInvalidateDataCacheEntryByMVA)
+INTERWORK_FUNC(ArmCleanInvalidateDataCacheEntryByMVA)
 .globl ASM_PFX(ArmEnableMmu)
+INTERWORK_FUNC(ArmEnableMmu)
 .globl ASM_PFX(ArmDisableMmu)
+INTERWORK_FUNC(ArmDisableMmu)
 .globl ASM_PFX(ArmMmuEnabled)
+INTERWORK_FUNC(ArmMmuEnabled)
 .globl ASM_PFX(ArmEnableDataCache)
+INTERWORK_FUNC(ArmEnableDataCache)
 .globl ASM_PFX(ArmDisableDataCache)
+INTERWORK_FUNC(ArmDisableDataCache)
 .globl ASM_PFX(ArmEnableInstructionCache)
+INTERWORK_FUNC(ArmEnableInstructionCache)
 .globl ASM_PFX(ArmDisableInstructionCache)
+INTERWORK_FUNC(ArmDisableInstructionCache)
 .globl ASM_PFX(ArmEnableBranchPrediction)
+INTERWORK_FUNC(ArmEnableBranchPrediction)
 .globl ASM_PFX(ArmDisableBranchPrediction)
+INTERWORK_FUNC(ArmDisableBranchPrediction)
 .globl ASM_PFX(ArmDataMemoryBarrier)
+INTERWORK_FUNC(ArmDataMemoryBarrier)
 .globl ASM_PFX(ArmDataSyncronizationBarrier) 
+INTERWORK_FUNC(ArmDataSyncronizationBarrier)
 .globl ASM_PFX(ArmInstructionSynchronizationBarrier)
+INTERWORK_FUNC(ArmInstructionSynchronizationBarrier)
 
 
 .set DC_ON, (1<<2)

diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupport.S b/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupport.S
index 83ecdba8e1adc81100cd062cb494675b8f1ec432..8ca37f0be0441540ffc9f01a60bf816e073eec65 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupport.S
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmLibSupport.S
@@ -13,22 +13,39 @@
 #------------------------------------------------------------------------------
 
 .globl ASM_PFX(Cp15IdCode)
+INTERWORK_FUNC(Cp15IdCode)
 .globl ASM_PFX(Cp15CacheInfo)
+INTERWORK_FUNC(Cp15CacheInfo)
 .globl ASM_PFX(ArmEnableInterrupts)
+INTERWORK_FUNC(ArmEnableInterrupts)
 .globl ASM_PFX(ArmDisableInterrupts)
+INTERWORK_FUNC(ArmDisableInterrupts)
 .globl ASM_PFX(ArmGetInterruptState)
+INTERWORK_FUNC(ArmGetInterruptState)
 .globl ASM_PFX(ArmEnableFiq)
+INTERWORK_FUNC(ArmEnableFiq)
 .globl ASM_PFX(ArmDisableFiq)
+INTERWORK_FUNC(ArmDisableFiq)
 .globl ASM_PFX(ArmGetFiqState)
+INTERWORK_FUNC(ArmGetFiqState)
 .globl ASM_PFX(ArmInvalidateTlb)
+INTERWORK_FUNC(ArmInvalidateTlb)
 .globl ASM_PFX(ArmSetTranslationTableBaseAddress)
+INTERWORK_FUNC(ArmSetTranslationTableBaseAddress)
 .globl ASM_PFX(ArmGetTranslationTableBaseAddress)
+INTERWORK_FUNC(ArmGetTranslationTableBaseAddress)
 .globl ASM_PFX(ArmSetDomainAccessControl)
+INTERWORK_FUNC(ArmSetDomainAccessControl)
 .globl ASM_PFX(ArmUpdateTranslationTableEntry)
+INTERWORK_FUNC(ArmUpdateTranslationTableEntry)
 .globl ASM_PFX(CPSRMaskInsert)
+INTERWORK_FUNC(CPSRMaskInsert)
 .globl ASM_PFX(CPSRRead)
+INTERWORK_FUNC(CPSRRead)
 .globl ASM_PFX(ReadCCSIDR)
+INTERWORK_FUNC(ReadCCSIDR)
 .globl ASM_PFX(ReadCLIDR)
+INTERWORK_FUNC(ReadCLIDR)
 
 .text
 .align 2

diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S
index d071c1ac01daaf6ace6c784c082b5ceef926b694..991de89a9606699a0755634c19ff7be0cda43687 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S
@@ -13,26 +13,47 @@
 #------------------------------------------------------------------------------
 
 .globl ASM_PFX(ArmInvalidateInstructionCache)
+INTERWORK_FUNC(ArmInvalidateInstructionCache)
 .globl ASM_PFX(ArmInvalidateDataCacheEntryByMVA)
+INTERWORK_FUNC(ArmInvalidateDataCacheEntryByMVA)
 .globl ASM_PFX(ArmCleanDataCacheEntryByMVA)
+INTERWORK_FUNC(ArmCleanDataCacheEntryByMVA)
 .globl ASM_PFX(ArmCleanInvalidateDataCacheEntryByMVA)
+INTERWORK_FUNC(ArmCleanInvalidateDataCacheEntryByMVA)
 .globl ASM_PFX(ArmInvalidateDataCacheEntryBySetWay)
+INTERWORK_FUNC(ArmInvalidateDataCacheEntryBySetWay)
 .globl ASM_PFX(ArmCleanDataCacheEntryBySetWay)
+INTERWORK_FUNC(ArmCleanDataCacheEntryBySetWay)
 .globl ASM_PFX(ArmCleanInvalidateDataCacheEntryBySetWay)
+INTERWORK_FUNC(ArmCleanInvalidateDataCacheEntryBySetWay)
 .globl ASM_PFX(ArmDrainWriteBuffer)
+INTERWORK_FUNC(ArmDrainWriteBuffer)
 .globl ASM_PFX(ArmEnableMmu)
+INTERWORK_FUNC(ArmEnableMmu)
 .globl ASM_PFX(ArmDisableMmu)
+INTERWORK_FUNC(ArmDisableMmu)
 .globl ASM_PFX(ArmMmuEnabled)
+INTERWORK_FUNC(ArmMmuEnabled)
 .globl ASM_PFX(ArmEnableDataCache)
+INTERWORK_FUNC(ArmEnableDataCache)
 .globl ASM_PFX(ArmDisableDataCache)
+INTERWORK_FUNC(ArmDisableDataCache)
 .globl ASM_PFX(ArmEnableInstructionCache)
+INTERWORK_FUNC(ArmEnableInstructionCache)
 .globl ASM_PFX(ArmDisableInstructionCache)
+INTERWORK_FUNC(ArmDisableInstructionCache)
 .globl ASM_PFX(ArmEnableBranchPrediction)
+INTERWORK_FUNC(ArmEnableBranchPrediction)
 .globl ASM_PFX(ArmDisableBranchPrediction)
+INTERWORK_FUNC(ArmDisableBranchPrediction)
 .globl ASM_PFX(ArmV7AllDataCachesOperation)
+INTERWORK_FUNC(ArmV7AllDataCachesOperation)
 .globl ASM_PFX(ArmDataMemoryBarrier)
+INTERWORK_FUNC(ArmDataMemoryBarrier)
 .globl ASM_PFX(ArmDataSyncronizationBarrier) 
+INTERWORK_FUNC(ArmDataSyncronizationBarrier)
 .globl ASM_PFX(ArmInstructionSynchronizationBarrier)
+INTERWORK_FUNC(ArmInstructionSynchronizationBarrier)
 
 .text
 .align 2

diff --git a/ArmPkg/Library/ArmLib/Common/ArmLibSupport.S b/ArmPkg/Library/ArmLib/Common/ArmLibSupport.S
index e5e9b54fc2c9ed5c5db826dc54c1ebd5ae004594..a432acbb808bd15f0ccfd06c3a0f17089842229e 100644 (file)
--- a/ArmPkg/Library/ArmLib/Common/ArmLibSupport.S
+++ b/ArmPkg/Library/ArmLib/Common/ArmLibSupport.S
@@ -15,19 +15,34 @@
 .text
 .align 2
 .globl ASM_PFX(Cp15IdCode)
+INTERWORK_FUNC(Cp15IdCode)
 .globl ASM_PFX(Cp15CacheInfo)
+INTERWORK_FUNC(Cp15CacheInfo)
 .globl ASM_PFX(ArmEnableInterrupts)
+INTERWORK_FUNC(ArmEnableInterrupts)
 .globl ASM_PFX(ArmDisableInterrupts)
+INTERWORK_FUNC(ArmDisableInterrupts)
 .globl ASM_PFX(ArmGetInterruptState)
+INTERWORK_FUNC(ArmGetInterruptState)
 .globl ASM_PFX(ArmEnableFiq)
+INTERWORK_FUNC(ArmEnableFiq)
 .globl ASM_PFX(ArmDisableFiq)
+INTERWORK_FUNC(ArmDisableFiq)
 .globl ASM_PFX(ArmGetFiqState)
+INTERWORK_FUNC(ArmGetFiqState)
 .globl ASM_PFX(ArmInvalidateTlb)
+INTERWORK_FUNC(ArmInvalidateTlb)
 .globl ASM_PFX(ArmSetTranslationTableBaseAddress)
+INTERWORK_FUNC(ArmSetTranslationTableBaseAddress)
 .globl ASM_PFX(ArmGetTranslationTableBaseAddress)
+INTERWORK_FUNC(ArmGetTranslationTableBaseAddress)
 .globl ASM_PFX(ArmSetDomainAccessControl)
+INTERWORK_FUNC(ArmSetDomainAccessControl)
 .globl ASM_PFX(CPSRMaskInsert)
+INTERWORK_FUNC(CPSRMaskInsert)
 .globl ASM_PFX(CPSRRead)
+INTERWORK_FUNC(CPSRRead)
+
 
 #------------------------------------------------------------------------------
 

diff --git a/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S b/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S
index 9d0d389a13d0c2da6f11eb7cca9b8f9abc2d0509..1cd1dae54ffee051f2e8a4975c9b2cd2d1b3fb83 100755 (executable)
--- a/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S
+++ b/ArmPkg/Library/BaseMemoryLibStm/Arm/CopyMem.S
@@ -40,6 +40,7 @@ InternalMemCopyMem (
 .text\r
 .align 2\r
 .globl ASM_PFX(InternalMemCopyMem)\r
+INTERWORK_FUNC(InternalMemCopyMem)\r
 \r
 ASM_PFX(InternalMemCopyMem):\r
        stmfd   sp!, {r4-r11, lr}\r

diff --git a/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S b/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
index 94aa0ca3db63f113b248aeaa1d5fe4255a434890..29a50f5a49d5b6ad9e36c06afe97529815f766ec 100755 (executable)
--- a/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
+++ b/ArmPkg/Library/BaseMemoryLibStm/Arm/SetMem.S
@@ -38,6 +38,7 @@ InternalMemSetMem (
 .text\r
 .align 2\r
 .globl ASM_PFX(InternalMemSetMem)\r
+INTERWORK_FUNC(InternalMemSetMem)\r
 \r
 ASM_PFX(InternalMemSetMem):\r
        stmfd   sp!, {r4-r11, lr}\r

diff --git a/ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.S b/ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.S
index f340146373d9134f43c44515956cb677f6a85652..69db9365557f58dcb170a3fbeb4ba14569d50d28 100755 (executable)
--- a/ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.S
+++ b/ArmPkg/Library/BaseMemoryLibVstm/Arm/CopyMem.S
@@ -40,6 +40,7 @@ InternalMemCopyMem (
 .text\r
 .align 2\r
 .globl ASM_PFX(InternalMemCopyMem)\r
+INTERWORK_FUNC(InternalMemCopyMem)\r
 \r
 ASM_PFX(InternalMemCopyMem):\r
        stmfd   sp!, {r4, r9, lr}\r

diff --git a/ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S b/ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S
index 3b4a03d559bb8c749489d6018cfee44ec35f0526..3eb901b58f8c040c79a7251f9959fde5797a27ea 100755 (executable)
--- a/ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S
+++ b/ArmPkg/Library/BaseMemoryLibVstm/Arm/SetMem.S
@@ -38,6 +38,7 @@ InternalMemSetMem (
 .text\r
 .align 2\r
 .globl ASM_PFX(InternalMemSetMem)\r
+INTERWORK_FUNC(InternalMemSetMem)\r
 \r
 ASM_PFX(InternalMemSetMem):\r
        stmfd   sp!, {r4-r7, lr}\r

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S
index 669e3963da7df4a45c20ba10f7177ab4ce117053..64d0a33c267dc32215ffd0a6c9d094971e42bcee 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashldi3.S
@@ -15,6 +15,7 @@
        .text
        .align 2
        .globl ASM_PFX(__ashldi3)
+  INTERWORK_FUNC(__ashldi3)\r
        
 ASM_PFX(__ashldi3):
        cmp     r2, #31

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S
index a55c7824dd8dbf0c059614e792a60b40420dee4d..3cb0e68f62f339aa748aa2ba675cf74d808f6188 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ashrdi3.S
@@ -15,6 +15,7 @@
        .text
        .align 2
        .globl ASM_PFX(__ashrdi3)
+  INTERWORK_FUNC(__ashrdi3)\r
 
 ASM_PFX(__ashrdi3):
        cmp     r2, #31

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S
index fedad749580130a5ff71dc303802e05c4a225663..2f9dcd42973b2e300090c5615fa18d7efb06624a 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/clzsi2.S
@@ -15,6 +15,7 @@
        .text
        .align 2
        .globl ASM_PFX(__clzsi2)
+  INTERWORK_FUNC(__clzsi2)\r
 
 ASM_PFX(__clzsi2):
        @ frame_needed = 1, uses_anonymous_args = 0

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S
index 0f26c4ad3eb93378c6e629a8828afc6c490ace38..b776ef43e1e2de75b01c6de562a220bf333f2f1a 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ctzsi2.S
@@ -15,6 +15,7 @@
        .text
        .align 2
        .globl ASM_PFX(__ctzsi2)
+  INTERWORK_FUNC(__ctzsi2)\r
        
 ASM_PFX(__ctzsi2):
        uxth    r3, r0

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S
index d6a5add8f8bb5409538e1829992d9567c6f8b63d..c6a889a8b45187083f9c101e2d69f0ffb5842557 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divdi3.S
@@ -15,6 +15,7 @@
        .text
        .align 2
        .globl ASM_PFX(__divdi3)
+  INTERWORK_FUNC(__divdi3)\r
        
 ASM_PFX(__divdi3):
        @ args = 0, pretend = 0, frame = 0

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S
index df07e721666381a7ae271939267f50a8c0a50f4e..3d9b78c6b12f0d665dc2ec13a230ac68b1aa8338 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/divsi3.S
@@ -15,6 +15,7 @@
        .text
        .align 2
        .globl ASM_PFX(__divsi3)
+  INTERWORK_FUNC(__divsi3)\r
        
 ASM_PFX(__divsi3):
        eor     r3, r0, r0, asr #31

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S
index d5a68ae28588dd2a07593842309214e8ab4a50cd..f8cd1aa9e273b3c3b01d6a99c31bc23244e73c31 100755 (executable)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ldivmod.S
@@ -16,6 +16,7 @@
        .text
        .align 2
        .globl ASM_PFX(__aeabi_ldivmod)
+  INTERWORK_FUNC(__aeabi_ldivmod)\r
 
 //
 // A pair of (unsigned) long longs is returned in {{r0, r1}, {r2, r3}}, 

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S
index 2f0341cb7369368db07fb7e5dab5bd3f47cd8913..8d8c98b602203dc074e12f96d5c3d2dcec725c3b 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/lshrdi3.S
@@ -15,6 +15,7 @@
        .text
        .align 2
        .globl ASM_PFX(__lshrdi3)
+  INTERWORK_FUNC(__lshrdi3)\r
        
 ASM_PFX(__lshrdi3):
        cmp     r2, #31

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.S
index 3c26981e1cc3dfcc5a30c1128c24d3743d12be8c..ae2059894331da6f158a3f35864a787b1694d72b 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memcpy.S
@@ -15,6 +15,7 @@
        .text
        .align 2
        .globl ASM_PFX(memcpy)
+  INTERWORK_FUNC(memcpy)\r
 
 ASM_PFX(memcpy):
        stmfd   sp!, {r7, lr}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memset.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memset.S
index 6992832aa0a1093717b87cfa8a96bf931eedf554..040bbf1fdc888fa9d5b07694213fdeadd3b88df3 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memset.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/memset.S
@@ -15,8 +15,10 @@
 
   .text
        .align 2
-       .globl _memset
-_memset:
+       .globl ASM_PFX(memset)
+  INTERWORK_FUNC(memset)\r
+\r
+ASM_PFX(memset):\r
        @ args = 0, pretend = 0, frame = 0
        @ frame_needed = 1, uses_anonymous_args = 0
        stmfd   sp!, {r7, lr}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S
index a872b63a90136da57f70be96d0173f03f1d65151..c7eb4b5f0e93306f295e32c6f485456be0483258 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/moddi3.S
@@ -15,6 +15,7 @@
        .text
        .align 2
        .globl ASM_PFX(__moddi3)
+  INTERWORK_FUNC(__moddi3)\r
 
 ASM_PFX(__moddi3):
        stmfd   sp!, {r4, r5, r7, lr}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S
index 8924e7ba7bb16ef28fb6019a9b3b22eabee1dac4..93ba234ccbdc743cd61f91013b97d5f59c68b3b5 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/modsi3.S
@@ -15,6 +15,7 @@
        .text
        .align 2
        .globl ASM_PFX(__modsi3)
+  INTERWORK_FUNC(__modsi3)\r
 
 ASM_PFX(__modsi3):
        stmfd   sp!, {r4, r5, r7, lr}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S
index c4059024aa0d0d77458df3139afb6f6c0c32b6b0..5c9aeef4ab3aa2d1b9121fc73fe2311d19c3042e 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/muldi3.S
@@ -15,7 +15,8 @@
        .text
        .align 2
        .globl ASM_PFX(__muldi3)
-       
+       INTERWORK_FUNC(__muldi3)\r
+
 ASM_PFX(__muldi3):
        stmfd   sp!, {r4, r5, r6, r7, lr}
        add     r7, sp, #12

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/sourcery.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/sourcery.S
index 6791050937b6245ba4aadcde41b8cc48bbfd5ea3..68cc974fd956e3430022d8c0e41d255ccddd9297 100755 (executable)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/sourcery.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/sourcery.S
@@ -16,6 +16,8 @@
        .text\r
        .align 2\r
        .globl ASM_PFX(__aeabi_ulcmp)\r
+            INTERWORK_FUNC(__aeabi_ulcmp)\r
+\r
 ASM_PFX(__aeabi_ulcmp):\r
        stmfd   sp!, {r4, r5, r8}\r
        cmp     r3, r1\r

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S
index 88419db27e3df59d1f6e50567d60bb83d744f1d4..8c38a7af47512955f1ec58f2aaafcf23c01a8eb7 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch16.S
@@ -17,7 +17,7 @@
 .p2align 2
 
 .globl ASM_PFX(__switch16)
-
+INTERWORK_FUNC(__switch16)\r
 
 ASM_PFX(__switch16):
     ldrh      ip, [lr, #-1]

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S
index d6be556874d81926e4f3321d08c121c421d6afa9..d9bf800fd76f0945638eaef6a8d962fc9419bc28 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch32.S
@@ -17,7 +17,7 @@
 .p2align 2
 
 .globl ASM_PFX(__switch32)
-
+INTERWORK_FUNC(__switch32)
 
 ASM_PFX(__switch32):    
     ldr     ip, [lr, #-1]

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S
index a526d599fe9f6e846ea520f3f6ecad0ec6d592d1..1fbd48aa35c8bb8acbf35395c039fa56d1a23b3c 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switch8.S
@@ -17,6 +17,7 @@
 .p2align 2
 
 .globl ASM_PFX(__switch8)
+INTERWORK_FUNC(__switch8)
 
 
 ASM_PFX(__switch8):

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S
index 8f057b85f3e5b6f9377129946a9d191430df1059..ed0c115817ef5da3ac15f2845fc67b811324d283 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/switchu8.S
@@ -17,6 +17,7 @@
 .p2align 2
 
 .globl ASM_PFX(__switchu8)
+INTERWORK_FUNC(__switchu8)
 
 
 ASM_PFX(__switchu8):

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S
index 18fccc6a0e7091ea7f5583f12484679fe40ab1a0..5b7f5b70b76a8ba8c1c24b2e7197db75c973d982 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/ucmpdi2.S
@@ -15,6 +15,7 @@
        .text
        .align 2
        .globl ASM_PFX(__ucmpdi2)
+  INTERWORK_FUNC(__ucmpdi2)
        
 ASM_PFX(__ucmpdi2):
        stmfd   sp!, {r4, r5, r8, lr}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S
index b03f65322cf32fbacb8c335fb4aef70aed873e3e..fc9240e135d79059a943538108330fe36ee6557f 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivdi3.S
@@ -15,6 +15,7 @@
        .text
        .align 2
        .globl ASM_PFX(__udivdi3)
+  INTERWORK_FUNC(__udivdi3)
 
 ASM_PFX(__udivdi3):
        stmfd   sp!, {r7, lr}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
index 77507e3441a895e83da44db46aca99e679ac6319..816e66a12ab9a813f32b071ff51f9c4fe4185387 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivmoddi4.S
@@ -15,7 +15,8 @@
        .text
        .align 2
        .globl ASM_PFX(__udivmoddi4)
-       
+       INTERWORK_FUNC(__udivmoddi4)
+
 ASM_PFX(__udivmoddi4):
        stmfd   sp!, {r4, r5, r6, r7, lr}
        add     r7, sp, #12

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
index 452cfe5f1baddb833582ce58193269652ea3e7f3..77cfa726c0a163deaa82508b2e44d9ee423826dc 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/udivsi3.S
@@ -15,6 +15,7 @@
        .text
        .align 2
        .globl ASM_PFX(__udivsi3)
+       INTERWORK_FUNC(__udivsi3)
 
 ASM_PFX(__udivsi3):
        cmp     r1, #0

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.S
index 75761deca0957edbd73af9c7827f08adb344abfc..81e824cc83b6687516b1a25264b295d05783db57 100755 (executable)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/uldiv.S
@@ -17,6 +17,7 @@
        .text
        .align 2
        .globl ASM_PFX(__aeabi_uldivmod)
+       INTERWORK_FUNC(__aeabi_uldivmod)
 
 //        
 //UINT64

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S
index b83d7b1978ed4bb20065312d1e2fe26bcc16ffae..c801ba06dde5b2aedcd261ca8882f9d0fd839998 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umoddi3.S
@@ -15,6 +15,7 @@
        .text
        .align 2
        .globl ASM_PFX(__umoddi3)
+       INTERWORK_FUNC(__umoddi3)
        
 ASM_PFX(__umoddi3):
        stmfd   sp!, {r7, lr}

diff --git a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S
index 919018ab888c6ceeba42f1f082947d5875e327c6..30dc55193bcd73534cf34bd8ce0138d32660a629 100644 (file)
--- a/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S
+++ b/ArmPkg/Library/CompilerIntrinsicsLib/Arm/umodsi3.S
@@ -15,6 +15,7 @@
        .text
        .align 2
        .globl  ASM_PFX(__umodsi3)
+        INTERWORK_FUNC(__umodsi3)
        
 ASM_PFX(__umodsi3):
        stmfd   sp!, {r4, r5, r7, lr}

diff --git a/BeagleBoardPkg/BeagleBoardPkg.dsc b/BeagleBoardPkg/BeagleBoardPkg.dsc
index 5e460c757489c66a1f8d117101a3c2066637df9a..1a7b2cc280dca5c275dba5792c9fdc1e9a5f58b3 100644 (file)
--- a/BeagleBoardPkg/BeagleBoardPkg.dsc
+++ b/BeagleBoardPkg/BeagleBoardPkg.dsc
@@ -364,7 +364,14 @@
   MdeModulePkg/Universal/CapsuleRuntimeDxe/CapsuleRuntimeDxe.inf
   MdeModulePkg/Universal/Variable/EmuRuntimeDxe/EmuVariableRuntimeDxe.inf
   EmbeddedPkg/EmbeddedMonotonicCounter/EmbeddedMonotonicCounter.inf
-  EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf
+  
+  EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf 
+#
+# This version uses semi-hosting console  
+#  EmbeddedPkg/SimpleTextInOutSerial/SimpleTextInOutSerial.inf {
+#    <LibraryClasses>
+#      SerialPortLib|ArmPkg/Library/SemiHostingSerialPortLib/SemiHostingSerialPortLib.inf
+#  }
   
   EmbeddedPkg/ResetRuntimeDxe/ResetRuntimeDxe.inf
   EmbeddedPkg/RealTimeClockRuntimeDxe/RealTimeClockRuntimeDxe.inf

diff --git a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S
index e51a779ed062bfcbec714389244406dddfa87fe7..c8deed83b476df5697c863dc69598f2892afd044 100644 (file)
--- a/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S
+++ b/BeagleBoardPkg/Sec/Arm/ModuleEntryPoint.S
@@ -20,6 +20,7 @@
 \r
 .globl ASM_PFX(CEntryPoint)\r
 .globl ASM_PFX(_ModuleEntryPoint)\r
+INTERWORK_FUNC(_ModuleEntryPoint)
 \r
 ASM_PFX(_ModuleEntryPoint):\r
 \r

diff --git a/EmbeddedPkg/Library/GdbDebugAgent/Arm/ExceptionSupport.ARMv6.S b/EmbeddedPkg/Library/GdbDebugAgent/Arm/ExceptionSupport.ARMv6.S
index 4b7b5c95c89353f6d93ac3c8d1d385d1c1ee584f..2682581ea9d2777f9ceb8f2901d0f8e1e10c9f20 100755 (executable)
--- a/EmbeddedPkg/Library/GdbDebugAgent/Arm/ExceptionSupport.ARMv6.S
+++ b/EmbeddedPkg/Library/GdbDebugAgent/Arm/ExceptionSupport.ARMv6.S
@@ -51,10 +51,15 @@ This is the stack constructed by the exception handler (low address to high addr
  
 
 .globl ASM_PFX(ExceptionHandlersStart)
+INTERWORK_FUNC(ExceptionHandlersStart)
 .globl ASM_PFX(ExceptionHandlersEnd)
+INTERWORK_FUNC(ExceptionHandlersEnd)
 .globl ASM_PFX(CommonExceptionEntry)
+INTERWORK_FUNC(CommonExceptionEntry)
 .globl ASM_PFX(AsmCommonExceptionEntry)
+INTERWORK_FUNC(AsmCommonExceptionEntry)
 .globl ASM_PFX(GdbExceptionHandler)
+INTERWORK_FUNC(GdbExceptionHandler)
 
 .text
 .align 3