Fixed issues compiling for Apple gcc on IA-32

[mirror_edk2.git] / EdkCompatibilityPkg / Foundation / Library / EdkIIGlueLib / Library / BaseLib / X64 / EnablePaging64.S

diff --git a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/X64/EnablePaging64.S b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/X64/EnablePaging64.S
index c59b53bc9544300e2fc9c04c998867bec1e8fcfd..9c78fc9a0a9c82835e672e0c11de3666075ca164 100644 (file)
--- a/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/X64/EnablePaging64.S
+++ b/EdkCompatibilityPkg/Foundation/Library/EdkIIGlueLib/Library/BaseLib/X64/EnablePaging64.S
@@ -1,61 +1,61 @@
-#------------------------------------------------------------------------------\r
-#\r
-# Copyright (c) 2006, Intel Corporation\r
-# All rights reserved. This program and the accompanying materials\r
-# are licensed and made available under the terms and conditions of the BSD License\r
-# which accompanies this distribution.  The full text of the license may be found at\r
-# http://opensource.org/licenses/bsd-license.php\r
-#\r
-# THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-# WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
-#\r
-# Module Name:\r
-#\r
-#   EnablePaging64.S\r
-#\r
-# Abstract:\r
-#\r
-#   AsmEnablePaging64 function\r
-#\r
-# Notes:\r
-#\r
-#------------------------------------------------------------------------------\r
-\r
-#include <EdkIIGlueBase.h>\r
-#------------------------------------------------------------------------------\r
-# VOID\r
-# EFIAPI\r
-# InternalX86EnablePaging64 (\r
-#   IN      UINT16                    Cs,                      %rdi\r
-#   IN      UINT64                    EntryPoint,              %rsi\r
-#   IN      UINT64                    Context1,  OPTIONAL      %rdx\r
-#   IN      UINT64                    Context2,  OPTIONAL      %rcx\r
-#   IN      UINT64                    NewStack                 %r8\r
-#   );\r
-#------------------------------------------------------------------------------\r
-.global ASM_PFX(InternalX86EnablePaging64)\r
-ASM_PFX(InternalX86EnablePaging64):\r
-    cli    \r
-    pop    %rax\r
-    callq  Base\r
-Base:\r
-    addl   $(L1-Base),(%rsp)\r
-    mov    %cr4,%rax\r
-    or     $0x20,%al\r
-    mov    %rax,%cr4\r
-    mov    $0xc0000080,%ecx\r
-    rdmsr  \r
-    or     $0x1,%ah\r
-    wrmsr  \r
-    mov    %cr0,%rax\r
-    bts    $0x1f,%eax\r
-    mov    %rax,%cr0\r
-    lret   \r
-L1:\r
-    addr32 mov (%esp),%rbx\r
-    addr32 mov 0x8(%esp),%rcx\r
-    addr32 mov 0x10(%esp),%rdx\r
-    addr32 mov 0x18(%esp),%rsp\r
-    add    $-0x20,%rsp\r
-    callq  *%rbx\r
-    jmp    .\r
+#------------------------------------------------------------------------------
+#
+# Copyright (c) 2006, 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.
+#
+# Module Name:
+#
+#   EnablePaging64.S
+#
+# Abstract:
+#
+#   AsmEnablePaging64 function
+#
+# Notes:
+#
+#------------------------------------------------------------------------------
+
+#include <EdkIIGlueBase.h>
+#------------------------------------------------------------------------------
+# VOID
+# EFIAPI
+# InternalX86EnablePaging64 (
+#   IN      UINT16                    Cs,                      %rdi
+#   IN      UINT64                    EntryPoint,              %rsi
+#   IN      UINT64                    Context1,  OPTIONAL      %rdx
+#   IN      UINT64                    Context2,  OPTIONAL      %rcx
+#   IN      UINT64                    NewStack                 %r8
+#   );
+#------------------------------------------------------------------------------
+.globl ASM_PFX(InternalX86EnablePaging64)
+ASM_PFX(InternalX86EnablePaging64):
+    cli    
+    pop    %rax
+    callq  Base
+Base:
+    addl   $(L1-Base),(%rsp)
+    mov    %cr4,%rax
+    or     $0x20,%al
+    mov    %rax,%cr4
+    mov    $0xc0000080,%ecx
+    rdmsr  
+    or     $0x1,%ah
+    wrmsr  
+    mov    %cr0,%rax
+    bts    $0x1f,%eax
+    mov    %rax,%cr0
+    lret   
+L1:
+    addr32 mov (%esp),%rbx
+    addr32 mov 0x8(%esp),%rcx
+    addr32 mov 0x10(%esp),%rdx
+    addr32 mov 0x18(%esp),%rsp
+    add    $-0x20,%rsp
+    callq  *%rbx
+    jmp    .