diff mbox

[edk2,3/5] UefiCpuPkg/PiSmmCpuDxeSmm: remove superfluous ENDs from NASM source

Message ID 1468570456-15031-4-git-send-email-lersek@redhat.com
State Accepted
Commit 09a85f6eebf208e8c5435130e11caf0843cb7219
Headers show

Commit Message

Laszlo Ersek July 15, 2016, 8:14 a.m. UTC 
Commits 28ee5816465b1 and 246cd9085f806 added these ENDs as part of the
manual conversion from *.asm files. However, the ENDs makes no sense for
NASM. Although they don't break the build, NASM complains about them:

  label alone on a line without a colon might be in error

(This NASM warning category dates back to NASM 0.95, commit
6768eb71d8deb.)

Remove the ENDs.

Cc: Jeff Fan <jeff.fan@intel.com>
Cc: Liming Gao <liming.gao@intel.com>
Cc: Michael Kinney <michael.d.kinney@intel.com>
Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Laszlo Ersek <lersek@redhat.com>

---
 UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm | 2 --
 UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm      | 1 -
 2 files changed, 3 deletions(-)

-- 
1.8.3.1


_______________________________________________
edk2-devel mailing list
edk2-devel@lists.01.org
https://lists.01.org/mailman/listinfo/edk2-devel
diff mbox

Patch

diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm
index f9f3986ea1cc..6a328289a8af 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmiException.nasm
@@ -733,5 +733,3 @@  ASM_PFX(InitializeIDTSmmStackGuard):
     mov     [ebx + 4], eax
     pop     ebx
     ret
-
-    END
diff --git a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm
index c2295e48e2ee..d9df3626c754 100644
--- a/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm
+++ b/UefiCpuPkg/PiSmmCpuDxeSmm/Ia32/SmmInit.nasm
@@ -85,4 +85,3 @@  ASM_PFX(SmmRelocationSemaphoreComplete):
     mov     byte [eax], 1
     pop     eax
     jmp     [ASM_PFX(mSmmRelocationOriginalAddress)]
-    END