From d80cfc83325f8e95d35ecd9f15b36b96fa9ed3ee Mon Sep 17 00:00:00 2001
From: Simon South <simon@simonsouth.net>
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

ref='/guix/refs/?id=6773f215d5f8ed9c209b7023478100742d71f3ee'>refs</a><a class='active' href='/guix/log/tests/guix-pack-localstatedir.sh'>log</a><a href='/guix/tree/tests/guix-pack-localstatedir.sh?id=6773f215d5f8ed9c209b7023478100742d71f3ee'>tree</a><a href='/guix/commit/tests/guix-pack-localstatedir.sh?id=6773f215d5f8ed9c209b7023478100742d71f3ee'>commit</a><a href='/guix/diff/tests/guix-pack-localstatedir.sh?id=6773f215d5f8ed9c209b7023478100742d71f3ee'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/tests/guix-pack-localstatedir.sh'>
<input type='hidden' name='id' value='6773f215d5f8ed9c209b7023478100742d71f3ee'/><select name='qt'>
<option value='grep'>log msg</option>
<option value='author'>author</option>
<option value='committer'>committer</option>
<option value='range'>range</option>
</select>
<input class='txt' type='search' size='10' name='q' value=''/>
<input type='submit' value='search'/>
</form>
</td></tr></table>
<div class='path'>path: <a href='/guix/log/?id=6773f215d5f8ed9c209b7023478100742d71f3ee'>root</a>/<a href='/guix/log/tests?id=6773f215d5f8ed9c209b7023478100742d71f3ee'>tests</a>/<a href='/guix/log/tests/guix-pack-localstatedir.sh?id=6773f215d5f8ed9c209b7023478100742d71f3ee'>guix-pack-localstatedir.sh</a></div><div class='content'><table class='list nowrap'><tr class='nohover'><th class='left'>Age</th><th class='left'>Commit message (<a href='/guix/log/tests/guix-pack-localstatedir.sh?id=6773f215d5f8ed9c209b7023478100742d71f3ee&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2019-05-18 12:23:31 +0200'>2019-05-18</span></td><td><a href='/guix/commit/tests/guix-pack-localstatedir.sh?id=baab87ac49e3f0f873e17eb16db9781189b1f2d1'>pack: '--localstatedir' and '-R' tests gracefully handle missing /gnu/store.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>
<tr><td><span title='2018-11-23 15:42:01 +0100'>2018-11-23</span></td><td><a href='/guix/commit/tests/guix-pack-localstatedir.sh?id=08f410834bffbe1e55633a0a4c87caba69d7fa92'>pack: Add '--profile-name'.</a><span class='msg-avail'>...</span></td><td>Ludovic Courtès</td></tr>