From patchwork Sun Jun 7 15:18:33 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Simon South X-Patchwork-Id: 22580 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 5B58E27BBE1; Sun, 7 Jun 2020 16:21:24 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.9 required=5.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_MSPIKE_H4,RCVD_IN_MSPIKE_WL,URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTP id 0570516CCB for ; Sun, 7 Jun 2020 16:21:24 +0100 (BST) Received: from localhost ([::1]:49302 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jhx6x-0000ic-GQ for patchwork@mira.cbaines.net; Sun, 07 Jun 2020 11:21:23 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:37506) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jhx6c-0000iD-Cy for guix-patches@gnu.org; Sun, 07 Jun 2020 11:21:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:43072) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jhx6c-0006OH-2p for guix-patches@gnu.org; Sun, 07 Jun 2020 11:21:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jhx6b-0006tj-VM for guix-patches@gnu.org; Sun, 07 Jun 2020 11:21:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41748] [PATCH 1/1] gnu: jamvm: Fix to work with current gcc and glibc. References: <20200607151709.21821-1-simon@simonsouth.net> In-Reply-To: <20200607151709.21821-1-simon@simonsouth.net> Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 07 Jun 2020 15:21:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 41748 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 41748@debbugs.gnu.org Cc: Simon South Received: via spool by 41748-submit@debbugs.gnu.org id=B41748.159154322226445 (code B ref 41748); Sun, 07 Jun 2020 15:21:01 +0000 Received: (at 41748) by debbugs.gnu.org; 7 Jun 2020 15:20:22 +0000 Received: from localhost ([127.0.0.1]:54618 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhx5y-0006sT-Ax for submit@debbugs.gnu.org; Sun, 07 Jun 2020 11:20:22 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:54546) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jhx5x-0006sD-5w for 41748@debbugs.gnu.org; Sun, 07 Jun 2020 11:20:21 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id 9D81BA0799; Sun, 7 Jun 2020 15:20:15 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo05-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo05-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id NKxnbsqK80RW; Sun, 7 Jun 2020 15:20:15 +0000 (UTC) Received: from localhost.localdomain (unknown [108.162.141.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id E8740A0075; Sun, 7 Jun 2020 15:20:13 +0000 (UTC) From: Simon South Date: Sun, 7 Jun 2020 11:18:33 -0400 Message-Id: <20200607151833.22052-1-simon@simonsouth.net> X-Mailer: git-send-email 2.25.2 MIME-Version: 1.0 X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/patches/jamvm-2.0.0-disable-branch-patching.patch: New file. * gnu/packages/java.scm (jamvm)[source]: Add patch. (jamvm-1-bootstrap)[native-inputs]: Remove. --- gnu/packages/java.scm | 7 ++--- .../jamvm-2.0.0-disable-branch-patching.patch | 27 +++++++++++++++++++ 2 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/jamvm-2.0.0-disable-branch-patching.patch diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm index 43f0f37b91..9a6f6fe0df 100644 --- a/gnu/packages/java.scm +++ b/gnu/packages/java.scm @@ -254,11 +254,6 @@ language.") ("libffi" ,libffi) ("zip" ,zip) ("zlib" ,zlib))) - ;; When built with a recent GCC and glibc the configure step of icedtea-6 - ;; fails with an invalid instruction error. - (native-inputs - `(("gcc" ,gcc-5) - ("libc" ,glibc-2.28))) (home-page "http://jamvm.sourceforge.net/") (synopsis "Small Java Virtual Machine") (description "JamVM is a Java Virtual Machine conforming to the JVM @@ -708,6 +703,8 @@ machine."))) (sha256 (base32 "1nl0zxz8y5x8gwsrm7n32bry4dx8x70p8z3s9jbdvs8avyb8whkn")) + (patches + (search-patches "jamvm-2.0.0-disable-branch-patching.patch")) (snippet '(begin ;; Remove precompiled software. diff --git a/gnu/packages/patches/jamvm-2.0.0-disable-branch-patching.patch b/gnu/packages/patches/jamvm-2.0.0-disable-branch-patching.patch new file mode 100644 index 0000000000..a99624280f --- /dev/null +++ b/gnu/packages/patches/jamvm-2.0.0-disable-branch-patching.patch @@ -0,0 +1,27 @@ +From 8d10be7345d7fe139e619cc55a22dbc86f677543 Mon Sep 17 00:00:00 2001 +From: Simon South +Date: Sat, 6 Jun 2020 18:56:56 -0400 +Subject: [PATCH] Disable branch-patching + +--- + src/init.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/init.c b/src/init.c +index 32539cf..38ad54b 100644 +--- a/src/init.c ++++ b/src/init.c +@@ -72,8 +72,8 @@ void setDefaultInitArgs(InitArgs *args) { + #ifdef INLINING + args->replication_threshold = 10; + args->profile_threshold = 10; +- args->branch_patching_dup = TRUE; +- args->branch_patching = TRUE; ++ args->branch_patching_dup = FALSE; ++ args->branch_patching = FALSE; + args->print_codestats = FALSE; + args->join_blocks = TRUE; + args->profiling = TRUE; +-- +2.25.2 +