From patchwork Tue Oct 16 15:38:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 984824 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.ubuntu.com (client-ip=91.189.94.19; helo=huckleberry.canonical.com; envelope-from=fwts-devel-bounces@lists.ubuntu.com; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=canonical.com Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 42ZKGh1dlqz9s8F; Wed, 17 Oct 2018 02:38:52 +1100 (AEDT) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.86_2) (envelope-from ) id 1gCRQn-0004I3-L5; Tue, 16 Oct 2018 15:38:49 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:128) (Exim 4.86_2) (envelope-from ) id 1gCRQl-0004HJ-UD for fwts-devel@lists.ubuntu.com; Tue, 16 Oct 2018 15:38:47 +0000 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_256_CBC_SHA1:32) (Exim 4.76) (envelope-from ) id 1gCRQl-0002un-JB; Tue, 16 Oct 2018 15:38:47 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] acpica: fix linker issues when building with ACPI disabled Date: Tue, 16 Oct 2018 16:38:46 +0100 Message-Id: <20181016153846.28424-1-colin.king@canonical.com> X-Mailer: git-send-email 2.19.1 MIME-Version: 1.0 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.20 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: "fwts-devel" From: Colin Ian King Some toolchains hit linker issues with missing symbols when building with ACPI disabled. Work around this by declaring these symbols even though they are never referenced. Works around PPC REHL 7.6 build issue: /root/fwts/src/acpica/.libs/libfwtsacpica.so: undefined reference to `AcpiGbl_InitEntries' /root/fwts/src/acpica/.libs/libfwtsacpica.so: undefined reference to `AcpiGbl_InitFileLineCount' Fixes: 24f2f2bfbb8f ("ACPICA: Update to version 20180810") Signed-off-by: Colin Ian King Acked-by: Alex Hung Acked-by: Ivan Hu --- src/acpica/fwts_acpica.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/acpica/fwts_acpica.c b/src/acpica/fwts_acpica.c index 4ffe80fd..d0c6ed7c 100644 --- a/src/acpica/fwts_acpica.c +++ b/src/acpica/fwts_acpica.c @@ -1373,5 +1373,7 @@ VOID_FUNC(MpSaveSerialInfo) */ unsigned char AcpiGbl_AbortLoopOnTimeout = FALSE; unsigned char AcpiGbl_VerboseHandlers = FALSE; +void *AcpiGbl_InitEntries = NULL; +uint32_t AcpiGbl_InitFileLineCount = 0; #endif