From 0e688b113d7fd98dfdb69cd0a407c8efcd968456 Mon Sep 17 00:00:00 2001 From: Arthur Heymans Date: Mon, 15 Mar 2021 14:59:27 +0100 Subject: [PATCH] arch/x86/id.S: Fix building with clang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The following error message is now gone: CC bootblock/arch/x86/id.o /tmp/id-35b17a.s:35:7: error: expected relocatable expression .long - ver ^ /tmp/id-35b17a.s:36:7: error: expected relocatable expression .long - vendor ^ /tmp/id-35b17a.s:37:7: error: expected relocatable expression .long - part ^ Tested with BUILD_TIMELESS=1 on x86_32 with gcc. The binary stays the same. Change-Id: I930e7b96c4428bcb95ff1903e6a3e7679171ffee Signed-off-by: Arthur Heymans Reviewed-on: https://review.coreboot.org/c/coreboot/+/51500 Tested-by: build bot (Jenkins) Reviewed-by: Kyösti Mälkki --- src/arch/x86/id.S | 6 ------ 1 file changed, 6 deletions(-) diff --git a/src/arch/x86/id.S b/src/arch/x86/id.S index b569178ab8..4a171cc7f6 100644 --- a/src/arch/x86/id.S +++ b/src/arch/x86/id.S @@ -11,14 +11,8 @@ vendor: part: .asciz CONFIG_MAINBOARD_PART_NUMBER -#if ENV_X86_64 .long 0xffffffff - ver + 1 /* Reverse offset to the version */ .long 0xffffffff - vendor + 1 /* Reverse offset to the vendor id */ .long 0xffffffff - part + 1 /* Reverse offset to the part number */ -#else -.long - ver /* Reverse offset to the version */ -.long - vendor /* Reverse offset to the vendor id */ -.long - part /* Reverse offset to the part number */ -#endif .long CONFIG_ROM_SIZE /* Size of this romimage */