From: Hao Wu Date: Mon, 17 Oct 2016 06:54:24 +0000 (+0800) Subject: MdePkg/BaseLib: Remove the unnecessary '_' before library APIs in ASM/NASM X-Git-Tag: edk2-stable201903~5599 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=bfa97024df7c0c4bd94157a1e9c3eb5e89cba656 MdePkg/BaseLib: Remove the unnecessary '_' before library APIs in ASM/NASM The leading underscore (i.e. '_') before the names of some BaseLib library API in ASM/NASM files is unnecessary. It will cause link error with GCC tool chains. Cc: Liming Gao Cc: Michael Kinney Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Hao Wu Reviewed-by: Liming Gao --- diff --git a/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.asm b/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.asm index e4364055e8..ab7c2cf406 100644 --- a/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.asm +++ b/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.asm @@ -1,5 +1,5 @@ ;------------------------------------------------------------------------------ ; -; Copyright (c) 2006, Intel Corporation. All rights reserved.
+; Copyright (c) 2006 - 2016, 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 @@ -32,9 +32,9 @@ ; VOID ; ); ;------------------------------------------------------------------------------ -_CpuBreakpoint PROC +CpuBreakpoint PROC int 3 ret -_CpuBreakpoint ENDP +CpuBreakpoint ENDP END diff --git a/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.nasm b/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.nasm index fb1dd2e47f..b8ae0f9cf0 100644 --- a/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.nasm +++ b/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.nasm @@ -1,5 +1,5 @@ ;------------------------------------------------------------------------------ ; -; Copyright (c) 2006, Intel Corporation. All rights reserved.
+; Copyright (c) 2006 - 2016, 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 @@ -29,8 +29,8 @@ ; VOID ; ); ;------------------------------------------------------------------------------ -global ASM_PFX(_CpuBreakpoint) -ASM_PFX(_CpuBreakpoint): +global ASM_PFX(CpuBreakpoint) +ASM_PFX(CpuBreakpoint): int 3 ret diff --git a/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.asm b/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.asm index e54f14e9fd..f10886490b 100644 --- a/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.asm +++ b/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.asm @@ -1,6 +1,6 @@ ;------------------------------------------------------------------------------ ; -; Copyright (c) 2006, Intel Corporation. All rights reserved.
+; Copyright (c) 2006 - 2016, 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 @@ -32,10 +32,10 @@ ; VOID ; ); ;------------------------------------------------------------------------------ -_EnableDisableInterrupts PROC +EnableDisableInterrupts PROC sti cli ret -_EnableDisableInterrupts ENDP +EnableDisableInterrupts ENDP END diff --git a/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.nasm b/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.nasm index 7b206757bd..f7a4f6213a 100644 --- a/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.nasm +++ b/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.nasm @@ -1,6 +1,6 @@ ;------------------------------------------------------------------------------ ; -; Copyright (c) 2006, Intel Corporation. All rights reserved.
+; Copyright (c) 2006 - 2016, 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 @@ -30,8 +30,8 @@ ; VOID ; ); ;------------------------------------------------------------------------------ -global ASM_PFX(_EnableDisableInterrupts) -ASM_PFX(_EnableDisableInterrupts): +global ASM_PFX(EnableDisableInterrupts) +ASM_PFX(EnableDisableInterrupts): sti cli ret diff --git a/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.asm b/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.asm index 58fc72d6a4..b43d451a15 100644 --- a/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.asm +++ b/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.asm @@ -1,6 +1,6 @@ ;------------------------------------------------------------------------------ ; -; Copyright (c) 2006, Intel Corporation. All rights reserved.
+; Copyright (c) 2006 - 2016, 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 @@ -32,9 +32,9 @@ ; VOID ; ); ;------------------------------------------------------------------------------ -_EnableInterrupts PROC +EnableInterrupts PROC sti ret -_EnableInterrupts ENDP +EnableInterrupts ENDP END diff --git a/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.nasm b/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.nasm index 85ea692954..ff8bbe45ca 100644 --- a/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.nasm +++ b/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.nasm @@ -1,6 +1,6 @@ ;------------------------------------------------------------------------------ ; -; Copyright (c) 2006, Intel Corporation. All rights reserved.
+; Copyright (c) 2006 - 2016, 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 @@ -30,8 +30,8 @@ ; VOID ; ); ;------------------------------------------------------------------------------ -global ASM_PFX(_EnableInterrupts) -ASM_PFX(_EnableInterrupts): +global ASM_PFX(EnableInterrupts) +ASM_PFX(EnableInterrupts): sti ret diff --git a/MdePkg/Library/BaseLib/Ia32/Invd.asm b/MdePkg/Library/BaseLib/Ia32/Invd.asm index fadf3dfcfd..a34e217883 100644 --- a/MdePkg/Library/BaseLib/Ia32/Invd.asm +++ b/MdePkg/Library/BaseLib/Ia32/Invd.asm @@ -1,6 +1,6 @@ ;------------------------------------------------------------------------------ ; -; Copyright (c) 2006, Intel Corporation. All rights reserved.
+; Copyright (c) 2006 - 2016, 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 @@ -32,9 +32,9 @@ ; VOID ; ); ;------------------------------------------------------------------------------ -_AsmInvd PROC +AsmInvd PROC invd ret -_AsmInvd ENDP +AsmInvd ENDP END diff --git a/MdePkg/Library/BaseLib/Ia32/Invd.nasm b/MdePkg/Library/BaseLib/Ia32/Invd.nasm index 2d10cd85a6..c029eeaaa7 100644 --- a/MdePkg/Library/BaseLib/Ia32/Invd.nasm +++ b/MdePkg/Library/BaseLib/Ia32/Invd.nasm @@ -1,6 +1,6 @@ ;------------------------------------------------------------------------------ ; -; Copyright (c) 2006, Intel Corporation. All rights reserved.
+; Copyright (c) 2006 - 2016, 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 @@ -30,8 +30,8 @@ ; VOID ; ); ;------------------------------------------------------------------------------ -global ASM_PFX(_AsmInvd) -ASM_PFX(_AsmInvd): +global ASM_PFX(AsmInvd) +ASM_PFX(AsmInvd): invd ret diff --git a/MdePkg/Library/BaseLib/Ia32/WriteLdtr.asm b/MdePkg/Library/BaseLib/Ia32/WriteLdtr.asm index abcd74dc7b..adec67da3e 100644 --- a/MdePkg/Library/BaseLib/Ia32/WriteLdtr.asm +++ b/MdePkg/Library/BaseLib/Ia32/WriteLdtr.asm @@ -1,6 +1,6 @@ ;------------------------------------------------------------------------------ ; -; Copyright (c) 2006, Intel Corporation. All rights reserved.
+; Copyright (c) 2006 - 2016, 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 @@ -32,10 +32,10 @@ ; IN UINT16 Ldtr ; ); ;------------------------------------------------------------------------------ -_AsmWriteLdtr PROC +AsmWriteLdtr PROC mov eax, [esp + 4] lldt ax ret -_AsmWriteLdtr ENDP +AsmWriteLdtr ENDP END diff --git a/MdePkg/Library/BaseLib/Ia32/WriteLdtr.nasm b/MdePkg/Library/BaseLib/Ia32/WriteLdtr.nasm index 40fbbad767..692f1cc2ed 100644 --- a/MdePkg/Library/BaseLib/Ia32/WriteLdtr.nasm +++ b/MdePkg/Library/BaseLib/Ia32/WriteLdtr.nasm @@ -1,6 +1,6 @@ ;------------------------------------------------------------------------------ ; -; Copyright (c) 2006, Intel Corporation. All rights reserved.
+; Copyright (c) 2006 - 2016, 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 @@ -30,8 +30,8 @@ ; IN UINT16 Ldtr ; ); ;------------------------------------------------------------------------------ -global ASM_PFX(_AsmWriteLdtr) -ASM_PFX(_AsmWriteLdtr): +global ASM_PFX(AsmWriteLdtr) +ASM_PFX(AsmWriteLdtr): mov eax, [esp + 4] lldt ax ret