From 5b78f30d81d7e536df37bafb48c4cb5b6d44edb8 Mon Sep 17 00:00:00 2001 From: Michael Kinney Date: Tue, 16 May 2017 13:35:17 -0700 Subject: [PATCH] UefiCpuPkg/BaseUefiCpuLib: Use NASM read-only data section name https://bugzilla.tianocore.org/show_bug.cgi?id=556 NASM requires read-only data sections to use the section name .rodata. This fix changes .rdata to .rodata. The build failure from use of .rdata is seen when using the XCODE5 tool chain. Section "7.8.1 macho extensions to the SECTION Directive" of the NASM documentation at http://www.nasm.us/doc/ describes the section name requirements. Cc: Jeff Fan Cc: Andrew Fish Contributed-under: TianoCore Contribution Agreement 1.0 Signed-off-by: Michael Kinney Reviewed-by: Jeff Fan --- UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.nasm | 4 ++-- UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.nasm | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.nasm b/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.nasm index 55085e019f..6dac4ccfc7 100644 --- a/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.nasm +++ b/UefiCpuPkg/Library/BaseUefiCpuLib/Ia32/InitializeFpu.nasm @@ -1,6 +1,6 @@ ;------------------------------------------------------------------------------ ;* -;* Copyright (c) 2016, Intel Corporation. All rights reserved.
+;* Copyright (c) 2016 - 2017, 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 @@ -12,7 +12,7 @@ ;* ;------------------------------------------------------------------------------ - SECTION .rdata + SECTION .rodata ; ; Float control word initial value: diff --git a/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.nasm b/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.nasm index 904b64e510..404c199b35 100644 --- a/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.nasm +++ b/UefiCpuPkg/Library/BaseUefiCpuLib/X64/InitializeFpu.nasm @@ -1,6 +1,6 @@ ;------------------------------------------------------------------------------ ;* -;* Copyright (c) 2009 - 2012, Intel Corporation. All rights reserved.
+;* Copyright (c) 2009 - 2017, 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 @@ -12,7 +12,7 @@ ;* ;------------------------------------------------------------------------------ - SECTION .rdata + SECTION .rodata ; ; Float control word initial value: ; all exceptions masked, double-extended-precision, round-to-nearest