From 70f3acf98aa7b8c9584e8ab84f0b6d2b683420fb Mon Sep 17 00:00:00 2001 From: Liming Gao Date: Tue, 14 Jun 2016 16:15:13 +0800 Subject: [PATCH] UefiCpuPkg CpuExceptionHandlerLib: Add nasm source files into INF files. Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Liming Gao --- .../CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf | 6 ++++-- .../SecPeiCpuExceptionHandlerLib.inf | 8 +++++--- .../CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf | 6 ++++-- 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf index 2d321494c2..630b25dab7 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/DxeCpuExceptionHandlerLib.inf @@ -29,13 +29,15 @@ [Sources.Ia32] Ia32/ExceptionHandlerAsm.asm - Ia32/ExceptionHandlerAsm.S |GCC + Ia32/ExceptionHandlerAsm.nasm + Ia32/ExceptionHandlerAsm.S Ia32/ArchExceptionHandler.c Ia32/ArchInterruptDefs.h [Sources.X64] X64/ExceptionHandlerAsm.asm - X64/ExceptionHandlerAsm.S |GCC + X64/ExceptionHandlerAsm.nasm + X64/ExceptionHandlerAsm.S X64/ArchExceptionHandler.c X64/ArchInterruptDefs.h diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf index 951a6fe62c..fba60a769f 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SecPeiCpuExceptionHandlerLib.inf @@ -1,7 +1,7 @@ ## @file # CPU Exception Handler library instance for SEC/PEI modules. # -# Copyright (c) 2012 - 2015, Intel Corporation. All rights reserved.
+# Copyright (c) 2012 - 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,13 +29,15 @@ [Sources.Ia32] Ia32/ExceptionHandlerAsm.asm - Ia32/ExceptionHandlerAsm.S |GCC + Ia32/ExceptionHandlerAsm.nasm + Ia32/ExceptionHandlerAsm.S Ia32/ArchExceptionHandler.c Ia32/ArchInterruptDefs.h [Sources.X64] X64/ExceptionHandlerAsm.asm - X64/ExceptionHandlerAsm.S |GCC + X64/ExceptionHandlerAsm.nasm + X64/ExceptionHandlerAsm.S X64/ArchExceptionHandler.c X64/ArchInterruptDefs.h diff --git a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf index 549c74748d..c23c6181b9 100644 --- a/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf +++ b/UefiCpuPkg/Library/CpuExceptionHandlerLib/SmmCpuExceptionHandlerLib.inf @@ -29,13 +29,15 @@ [Sources.Ia32] Ia32/ExceptionHandlerAsm.asm - Ia32/ExceptionHandlerAsm.S |GCC + Ia32/ExceptionHandlerAsm.nasm + Ia32/ExceptionHandlerAsm.S Ia32/ArchExceptionHandler.c Ia32/ArchInterruptDefs.h [Sources.X64] X64/ExceptionHandlerAsm.asm - X64/ExceptionHandlerAsm.S |GCC + X64/ExceptionHandlerAsm.nasm + X64/ExceptionHandlerAsm.S X64/ArchExceptionHandler.c X64/ArchInterruptDefs.h -- 2.39.2