diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
index fd6da0e20d..bc56709d7e 100644
--- a/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
+++ b/EdkModulePkg/Universal/DebugSupport/Dxe/DebugSupport.msa
@@ -8,11 +8,11 @@
     <Abstract>Component description file for DebugSupport module.</Abstract>
     <Description>This driver installs DebugSupport protocol for the selected processor.</Description>
     <Copyright>Copyright (c) 2006, Intel Corporation</Copyright>
-    <License>All rights reserved. This program and the accompanying materials
-      are licensed and made available under the terms and conditions of the BSD License
-      which accompanies this distribution.  The full text of the license may be found at
-      http://opensource.org/licenses/bsd-license.php
-      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
+    <License>All rights reserved. This program and the accompanying materials
+      are licensed and made available under the terms and conditions of the BSD License
+      which accompanies this distribution.  The full text of the license may be found at
+      http://opensource.org/licenses/bsd-license.php
+      THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,
       WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.</License>
     <Specification>FRAMEWORK_BUILD_PACKAGING_SPECIFICATION   0x00000052</Specification>
   </MsaHeader>
@@ -53,7 +53,8 @@
     <Filename SupArchList="IPF">ipf/ds64macros.i</Filename>
     <Filename SupArchList="IPF">ipf/plDebugSupport.c</Filename>
     <Filename SupArchList="IPF">ipf/plDebugSupport.h</Filename>
-    <Filename SupArchList="X64">x64/AsmFuncs.asm</Filename>
+    <Filename ToolChainFamily="MSFT" SupArchList="X64">x64/AsmFuncs.asm</Filename>
+    <Filename ToolChainFamily="GCC" SupArchList="X64">x64/AsmFuncs.S</Filename>
     <Filename SupArchList="X64">x64/plDebugSupport.h</Filename>
     <Filename SupArchList="X64">x64/plDebugSupport.c</Filename>
   </SourceFiles>
@@ -76,4 +77,4 @@
       <ModuleEntryPoint>InitializeDebugSupportDriver</ModuleEntryPoint>
     </Extern>
   </Externs>
-</ModuleSurfaceArea>
\ No newline at end of file
+</ModuleSurfaceArea>
diff --git a/EdkModulePkg/Universal/DebugSupport/Dxe/x64/AsmFuncs.S b/EdkModulePkg/Universal/DebugSupport/Dxe/x64/AsmFuncs.S
new file mode 100644
index 0000000000..f59a5b355c
--- /dev/null
+++ b/EdkModulePkg/Universal/DebugSupport/Dxe/x64/AsmFuncs.S
@@ -0,0 +1,57 @@
+#******************************************************************************
+#*
+#* Copyright (c) 2007, Intel Corporation                                                         
+#* All rights reserved. This program and the accompanying materials                          
+#* are licensed and made available under the terms and conditions of the BSD License         
+#* which accompanies this distribution.  The full text of the license may be found at        
+#* http://opensource.org/licenses/bsd-license.php                                            
+#*                                                                                           
+#* THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,                     
+#* WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.             
+#*
+#******************************************************************************
+
+.globl _OrigVector
+.globl _InterruptEntryStub
+.globl _StubSize
+.globl _CommonIdtEntry
+.globl _FxStorSupport
+
+_AppEsp:         .long   0x11111111 # ?
+_DebugEsp:       .long   0x22222222 # ?
+_ExtraPush:      .long   0x33333333 # ?
+_ExceptData:     .long   0x44444444 # ?
+_Eflags:         .long   0x55555555 # ?
+_OrigVector:     .long   0x66666666 # ?
+_StubSize:       .long   _InterruptEntryStubEnd - _InterruptEntryStub
+
+.globl _FxStorSupport
+_FxStorSupport:
+        ret    
+
+.globl _GetIdtr
+_GetIdtr:
+        ret    
+
+.globl _WriteInterruptFlag
+_WriteInterruptFlag:
+        ret    
+
+.globl _Vect2Desc
+_Vect2Desc:
+        ret    
+
+.globl _InterruptEntryStub
+_InterruptEntryStub:
+        ret    
+
+.globl _InterruptEntryStubEnd
+_InterruptEntryStubEnd:
+        ret    
+
+.globl _CommonIdtEntry
+_CommonIdtEntry:
+        ret    
+
+PhonyIretd:
+        iret