From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ml01.01.org (Postfix) with ESMTPS id 292291A1E24 for ; Mon, 17 Oct 2016 04:22:27 -0700 (PDT) Received: from fmsmga003.fm.intel.com ([10.253.24.29]) by orsmga104.jf.intel.com with ESMTP; 17 Oct 2016 04:22:26 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.31,357,1473145200"; d="scan'208";a="773537416" Received: from shwdeopenpsi014.ccr.corp.intel.com ([10.239.9.34]) by FMSMGA003.fm.intel.com with ESMTP; 17 Oct 2016 04:22:26 -0700 From: Hao Wu To: edk2-devel@lists.01.org Cc: Hao Wu , Liming Gao , Michael Kinney Date: Mon, 17 Oct 2016 19:22:23 +0800 Message-Id: <1476703343-14488-1-git-send-email-hao.a.wu@intel.com> X-Mailer: git-send-email 1.9.5.msysgit.0 Subject: [PATCH] MdePkg/BaseLib: Remove the unnecessary '_' before library APIs in ASM/NASM X-BeenThere: edk2-devel@lists.01.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: EDK II Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 17 Oct 2016 11:22:27 -0000 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 ; ); ;------------------------------------------------------------------------------ -_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 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/Library/BaseLib/Ia32/EnableInterrupts.asm b/MdePkg/Library/BaseLib/Ia32/EnableInterrupts.asm index 58fc72d..b43d451 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 85ea692..ff8bbe45 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 fadf3df..a34e217 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 2d10cd8..c029eea 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 abcd74d..adec67d 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 40fbbad..692f1cc 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 -- 1.9.5.msysgit.0