From patchwork Thu Jun 4 13:15:32 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Colin Ian King X-Patchwork-Id: 480734 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from huckleberry.canonical.com (huckleberry.canonical.com [91.189.94.19]) by ozlabs.org (Postfix) with ESMTP id CFE9B140218; Thu, 4 Jun 2015 23:17:43 +1000 (AEST) Received: from localhost ([127.0.0.1] helo=huckleberry.canonical.com) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Z0V1h-0002so-NB; Thu, 04 Jun 2015 13:17:41 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by huckleberry.canonical.com with esmtp (Exim 4.76) (envelope-from ) id 1Z0V1d-0002rB-Ff for fwts-devel@lists.ubuntu.com; Thu, 04 Jun 2015 13:17:37 +0000 Received: from 1.general.cking.uk.vpn ([10.172.193.212] helo=localhost) by youngberry.canonical.com with esmtpsa (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.76) (envelope-from ) id 1Z0V1d-0006Sd-C8 for fwts-devel@lists.ubuntu.com; Thu, 04 Jun 2015 13:17:37 +0000 From: Colin King To: fwts-devel@lists.ubuntu.com Subject: [PATCH] lib: acpica: compiler: link in missing objects (LP: #1461936) Date: Thu, 4 Jun 2015 14:15:32 +0100 Message-Id: <1433423732-30306-1-git-send-email-colin.king@canonical.com> X-Mailer: git-send-email 2.1.4 X-BeenThere: fwts-devel@lists.ubuntu.com X-Mailman-Version: 2.1.14 Precedence: list List-Id: Firmware Test Suite Development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: fwts-devel-bounces@lists.ubuntu.com Sender: fwts-devel-bounces@lists.ubuntu.com From: Colin Ian King A 32 bit version of the table printing is not being linked into the iasl fwts shared library and we are picking up the wrong one from the acpica execution engine lib instead. This is causing a segfault when printing a table header on disassembly because of a pointer size mismatch. This was causing the make check tests to fail on the disassembly test. The fix is to build in the appropriate 32 bit table code into the iasl fwts shared library so we don't have any incompatible acpica iasl and acpica exec code mixing at link time. Tested on: x86_64, i686, armhf, arm64; passes all "make check" tests. Signed-off-by: Colin Ian King Acked-by: Ivan Hu Acked-by: Alex Hung --- src/acpica/source/compiler/Makefile.am | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/acpica/source/compiler/Makefile.am b/src/acpica/source/compiler/Makefile.am index 0812652..398d2a4 100644 --- a/src/acpica/source/compiler/Makefile.am +++ b/src/acpica/source/compiler/Makefile.am @@ -227,6 +227,9 @@ libfwtsiasl_la_SOURCES = \ ../components/tables/tbinstal.c \ ../components/tables/tbutils.c \ ../components/tables/tbxface.c \ + ../components/tables/tbxfroot.c \ + ../components/tables/tbxfload.c \ + ../components/tables/tbprint.c \ ../tools/acpiexec/aeinitfile.c \ ../os_specific/service_layers/osunixxf.c