Re: [edk2] [PATCH] MdePkg/BaseLib: Remove the unnecessary '_' before library APIs in ASM/NASM
Reviewed-by: Liming Gao -Original Message- From: Wu, Hao A Sent: Monday, October 17, 2016 7:22 PM To: edk2-devel@lists.01.org Cc: Wu, Hao A ; Gao, Liming ; Kinney, Michael D Subject: [PATCH] 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 --- MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.asm| 6 +++--- MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.nasm | 6 +++--- MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.asm | 6 +++--- MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.nasm | 6 +++--- MdePkg/Library/BaseLib/Ia32/EnableInterrupts.asm | 6 +++--- MdePkg/Library/BaseLib/Ia32/EnableInterrupts.nasm| 6 +++--- MdePkg/Library/BaseLib/Ia32/Invd.asm | 6 +++--- MdePkg/Library/BaseLib/Ia32/Invd.nasm| 6 +++--- MdePkg/Library/BaseLib/Ia32/WriteLdtr.asm| 6 +++--- MdePkg/Library/BaseLib/Ia32/WriteLdtr.nasm | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.asm b/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.asm index e436405..ab7c2cf 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 fb1dd2e..b8ae0f9 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 e54f14e..f108864 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 ; ); ;-- -_EnableDisableInterruptsPROC +EnableDisableInterruptsPROC sti cli ret -_EnableDisableInterruptsENDP +EnableDisableInterruptsENDP END diff --git a/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.nasm b/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.nasm index 7b20675..f7a4f62 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 ; ); ;--
[edk2] [PATCH] 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 --- MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.asm| 6 +++--- MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.nasm | 6 +++--- MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.asm | 6 +++--- MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.nasm | 6 +++--- MdePkg/Library/BaseLib/Ia32/EnableInterrupts.asm | 6 +++--- MdePkg/Library/BaseLib/Ia32/EnableInterrupts.nasm| 6 +++--- MdePkg/Library/BaseLib/Ia32/Invd.asm | 6 +++--- MdePkg/Library/BaseLib/Ia32/Invd.nasm| 6 +++--- MdePkg/Library/BaseLib/Ia32/WriteLdtr.asm| 6 +++--- MdePkg/Library/BaseLib/Ia32/WriteLdtr.nasm | 6 +++--- 10 files changed, 30 insertions(+), 30 deletions(-) diff --git a/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.asm b/MdePkg/Library/BaseLib/Ia32/CpuBreakpoint.asm index e436405..ab7c2cf 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 fb1dd2e..b8ae0f9 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 e54f14e..f108864 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 ; ); ;-- -_EnableDisableInterruptsPROC +EnableDisableInterruptsPROC sti cli ret -_EnableDisableInterruptsENDP +EnableDisableInterruptsENDP END diff --git a/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.nasm b/MdePkg/Library/BaseLib/Ia32/EnableDisableInterrupts.nasm index 7b20675..f7a4f62 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/Lib
