From patchwork Tue Jan 20 13:36:37 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Cercueil X-Patchwork-Id: 431065 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from whitealder.osuosl.org (whitealder.osuosl.org [140.211.166.138]) by ozlabs.org (Postfix) with ESMTP id 59D531402C6 for ; Wed, 21 Jan 2015 00:36:58 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id 67DE492CBA; Tue, 20 Jan 2015 13:36:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 5K0VJTedqEGJ; Tue, 20 Jan 2015 13:36:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by whitealder.osuosl.org (Postfix) with ESMTP id 1896F92CC6; Tue, 20 Jan 2015 13:36:56 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from hemlock.osuosl.org (hemlock.osuosl.org [140.211.166.133]) by ash.osuosl.org (Postfix) with ESMTP id 907FD1C21AC for ; Tue, 20 Jan 2015 13:36:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 8CC34939DC for ; Tue, 20 Jan 2015 13:36:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 6ApcUiY+YClt for ; Tue, 20 Jan 2015 13:36:53 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from marvin.crapouillou.net (rev33.vpn.fdn.fr [80.67.179.33]) by hemlock.osuosl.org (Postfix) with ESMTPS id 6408E939CB for ; Tue, 20 Jan 2015 13:36:53 +0000 (UTC) Received: from p4fc460df.dip0.t-ipconnect.de ([79.196.96.223] helo=carl.fritz.box) by marvin.crapouillou.net with esmtpsa (TLS1.2:RSA_AES_128_CBC_SHA256:128) (Exim 4.80) (envelope-from ) id 1YDYz9-0000PZ-Jb; Tue, 20 Jan 2015 14:36:47 +0100 From: Paul Cercueil To: buildroot@uclibc.org Date: Tue, 20 Jan 2015 14:36:37 +0100 Message-Id: <1421760997-31684-1-git-send-email-paul@crapouillou.net> X-Mailer: git-send-email 2.1.4 Cc: Paul Cercueil Subject: [Buildroot] [PATCH] lightning: Add a patch to fix PPC build when disassembler is enabled X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch is backported from upstream. Signed-off-by: Paul Cercueil --- .../0002-ppc-disassembler-build-fix.patch | 53 ++++++++++++++++++++++ 1 file changed, 53 insertions(+) create mode 100644 package/lightning/0002-ppc-disassembler-build-fix.patch diff --git a/package/lightning/0002-ppc-disassembler-build-fix.patch b/package/lightning/0002-ppc-disassembler-build-fix.patch new file mode 100644 index 0000000..4c812b3 --- /dev/null +++ b/package/lightning/0002-ppc-disassembler-build-fix.patch @@ -0,0 +1,53 @@ +From 361caf28545aa0c2b2ab8d1cbd334fbdd952f373 Mon Sep 17 00:00:00 2001 +From: Paulo Andrade +Date: Thu, 15 Jan 2015 14:56:38 -0200 +Subject: [PATCH 4/4] PPC: Only call binutils function if it is available + + * configure.ac, lib/jit_disasm.c: Rewrite workaround + to apparent problem to initialize powerpc disassembler. +--- +diff --git a/configure.ac b/configure.ac +index 749659b..d26e777 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -230,6 +230,13 @@ elif test $cpu = arm; then + return 1; + } + ]])],[ac_cv_test_arm_swf=yes],[],[ac_cv_test_arm_swf=no]) ++elif test $cpu = ppc; then ++ if test "x$DISASSEMBLER" != "xno"; then ++ save_LIBS="$LIBS" ++ LIBS="$LIBS $SHLIB" ++ AC_CHECK_FUNCS(disassemble_init_for_target disassemble_init_powerpc) ++ LIBS="$save_LIBS" ++ fi + fi + CFLAGS=$save_CFLAGS + +diff --git a/lib/jit_disasm.c b/lib/jit_disasm.c +index 01158de..86e5441 100644 +--- a/lib/jit_disasm.c ++++ b/lib/jit_disasm.c +@@ -91,11 +91,19 @@ jit_init_debug(const char *progname) + # if defined(__powerpc__) + disasm_info.arch = bfd_arch_powerpc; + disasm_info.mach = bfd_mach_ppc64; ++# if HAVE_DISASSEMBLE_INIT_FOR_TARGET ++ disassemble_init_for_target(&disasm_info); ++# elif HAVE_DISASSEMBLE_INIT_POWERPC + disassemble_init_powerpc(&disasm_info); ++# endif + # if defined(__powerpc64__) + disasm_info.disassembler_options = "64"; + # endif ++# if HAVE_DISASSEMBLE_INIT_FOR_TARGET ++ disassemble_init_for_target(&disasm_info); ++# elif HAVE_DISASSEMBLE_INIT_POWERPC + disassemble_init_powerpc(&disasm_info); ++# endif + # endif + # if defined(__sparc__) + disasm_info.endian = disasm_info.display_endian = BFD_ENDIAN_BIG; +-- +2.1.4 +