From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id Z0zyNkz84F4sdQAA0tVLHw (envelope-from ) for ; Wed, 10 Jun 2020 15:29:16 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id kJwtMkz84F7BSwAAbx9fmQ (envelope-from ) for ; Wed, 10 Jun 2020 15:29:16 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id 6282C9404C5 for ; Wed, 10 Jun 2020 15:29:16 +0000 (UTC) Received: from localhost ([::1]:46678 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1jj2fD-0006dr-9n for larch@yhetil.org; Wed, 10 Jun 2020 11:29:15 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:36716) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1jj2Ik-0004ot-Sr for guix-patches@gnu.org; Wed, 10 Jun 2020 11:06:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51770) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1jj2Ik-0007ln-EI for guix-patches@gnu.org; Wed, 10 Jun 2020 11:06:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1jj2Ik-0000kp-8N for guix-patches@gnu.org; Wed, 10 Jun 2020 11:06:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#41748] [PATCH 0/1] Fix JamVM to work with current gcc and glibc Resent-From: Simon South Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 10 Jun 2020 15:06:02 +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 Received: via spool by 41748-submit@debbugs.gnu.org id=B41748.15918015312858 (code B ref 41748); Wed, 10 Jun 2020 15:06:02 +0000 Received: (at 41748) by debbugs.gnu.org; 10 Jun 2020 15:05:31 +0000 Received: from localhost ([127.0.0.1]:35083 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jj2IA-0000jx-Sp for submit@debbugs.gnu.org; Wed, 10 Jun 2020 11:05:31 -0400 Received: from mailout.easymail.ca ([64.68.200.34]:51454) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1jj2I5-0000ja-D5 for 41748@debbugs.gnu.org; Wed, 10 Jun 2020 11:05:25 -0400 Received: from localhost (localhost [127.0.0.1]) by mailout.easymail.ca (Postfix) with ESMTP id C7D5F22298 for <41748@debbugs.gnu.org>; Wed, 10 Jun 2020 15:05:15 +0000 (UTC) X-Virus-Scanned: Debian amavisd-new at emo06-pco.easydns.vpn Received: from mailout.easymail.ca ([127.0.0.1]) by localhost (emo06-pco.easydns.vpn [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id PZxG-bV3Qoeb for <41748@debbugs.gnu.org>; Wed, 10 Jun 2020 15:05:14 +0000 (UTC) Received: from laptop (unknown [108.162.141.195]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mailout.easymail.ca (Postfix) with ESMTPSA id E2F4120F90 for <41748@debbugs.gnu.org>; Wed, 10 Jun 2020 15:05:12 +0000 (UTC) From: Simon South References: <20200607151709.21821-1-simon@simonsouth.net> Date: Wed, 10 Jun 2020 11:03:39 -0400 In-Reply-To: <20200607151709.21821-1-simon@simonsouth.net> (Simon South's message of "Sun, 7 Jun 2020 11:17:09 -0400") Message-ID: <87a71botdg.fsf@simonsouth.net> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="=-=-=" X-Spam-Score: -2.3 (--) X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-Spam-Score: -3.3 (---) X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Scanner: scn0 Authentication-Results: aspmx1.migadu.com; dkim=none; dmarc=none; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Spam-Score: -1.01 X-TUID: z4OHx8qzK2BW --=-=-= Content-Type: text/plain Attached is an updated version of this patch that - Adds a brief description to the patch it contains, indicating why it is necessary; and - Updates gnu/local.mk, as is apparently now required. -- Simon South simon@simonsouth.net --=-=-= Content-Type: text/x-patch Content-Disposition: attachment; filename=0001-gnu-jamvm-Fix-to-work-with-current-gcc-and-glibc.patch >From 3dbc081418737b0901982f89b8eb260b6c8bd3f0 Mon Sep 17 00:00:00 2001 From: Simon South Date: Sat, 6 Jun 2020 19:53:39 -0400 Subject: [PATCH] gnu: jamvm: Fix to work with current gcc and glibc. * gnu/packages/java.scm (jamvm)[source]: Add patch. (jamvm-1-bootstrap)[native-inputs]: Remove. * gnu/packages/patches/jamvm-2.0.0-disable-branch-patching.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it. --- gnu/local.mk | 1 + gnu/packages/java.scm | 7 ++--- .../jamvm-2.0.0-disable-branch-patching.patch | 31 +++++++++++++++++++ 3 files changed, 34 insertions(+), 5 deletions(-) create mode 100644 gnu/packages/patches/jamvm-2.0.0-disable-branch-patching.patch diff --git a/gnu/local.mk b/gnu/local.mk index 76d6b5deba..7d65fbb605 100644 --- a/gnu/local.mk +++ b/gnu/local.mk @@ -1107,6 +1107,7 @@ dist_patch_DATA = \ %D%/packages/patches/irrlicht-use-system-libs.patch \ %D%/packages/patches/isl-0.11.1-aarch64-support.patch \ %D%/packages/patches/jacal-fix-texinfo.patch \ + %D%/packages/patches/jamvm-2.0.0-disable-branch-patching.patch \ %D%/packages/patches/jamvm-arm.patch \ %D%/packages/patches/java-apache-ivy-port-to-latest-bouncycastle.patch \ %D%/packages/patches/java-commons-collections-fix-java8.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..1352ed7803 --- /dev/null +++ b/gnu/packages/patches/jamvm-2.0.0-disable-branch-patching.patch @@ -0,0 +1,31 @@ +From d80cfc83325f8e95d35ecd9f15b36b96fa9ed3ee Mon Sep 17 00:00:00 2001 +From: Simon South +Date: Sat, 6 Jun 2020 18:56:56 -0400 +Subject: [PATCH] Disable branch-patching + +This patch disables JamVM's branch-patching optimization, which tends +to make JamVM fail with an "Illegal instruction" error on x86_64 (and +possibly other architectures that use variable-length instructions) +when built using modern versions of gcc and glibc. +--- + 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 + -- 2.26.2 --=-=-=--