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

f='/guix/refs/?id=d7fa9c1ffdbd0ab4d4412020c925be39503ce9e8'>refs</a><a class='active' href='/guix/log/gnu/installer/newt/ethernet.scm'>log</a><a href='/guix/tree/gnu/installer/newt/ethernet.scm?id=d7fa9c1ffdbd0ab4d4412020c925be39503ce9e8'>tree</a><a href='/guix/commit/gnu/installer/newt/ethernet.scm?id=d7fa9c1ffdbd0ab4d4412020c925be39503ce9e8'>commit</a><a href='/guix/diff/gnu/installer/newt/ethernet.scm?id=d7fa9c1ffdbd0ab4d4412020c925be39503ce9e8'>diff</a></td><td class='form'><form class='right' method='get' action='/guix/log/gnu/installer/newt/ethernet.scm'>
<input type='hidden' name='id' value='d7fa9c1ffdbd0ab4d4412020c925be39503ce9e8'/><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=d7fa9c1ffdbd0ab4d4412020c925be39503ce9e8'>root</a>/<a href='/guix/log/gnu?id=d7fa9c1ffdbd0ab4d4412020c925be39503ce9e8'>gnu</a>/<a href='/guix/log/gnu/installer?id=d7fa9c1ffdbd0ab4d4412020c925be39503ce9e8'>installer</a>/<a href='/guix/log/gnu/installer/newt?id=d7fa9c1ffdbd0ab4d4412020c925be39503ce9e8'>newt</a>/<a href='/guix/log/gnu/installer/newt/ethernet.scm?id=d7fa9c1ffdbd0ab4d4412020c925be39503ce9e8'>ethernet.scm</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/gnu/installer/newt/ethernet.scm?id=d7fa9c1ffdbd0ab4d4412020c925be39503ce9e8&amp;showmsg=1'>Expand</a>)</th><th class='left'>Author</th></tr>
<tr><td><span title='2020-11-07 13:19:25 +0100'>2020-11-07</span></td><td><a href='/guix/commit/gnu/installer/newt/ethernet.scm?id=8338d414b361e4fb961221642c1064e9dc89ba65'>installer: Limit listbox height.</a><span class='msg-avail'>...<span class='msg-tooltip'>Fixes: &lt;https://issues.guix.gnu.org/44428&gt;.

* gnu/installer/newt.scm (init): Print screen size.
* gnu/installer/newt/page.scm (default-listbox-height): New variable.
(run-listbox-selection-page): Use it.
* gnu/installer/newt/wifi.scm (wifi-listbox-height): Ditto.
* gnu/installer/newt/network.scm (run-technology-page): Set the maximum
listbox height to 5.
* gnu/installer/newt/ethernet.scm (run-ethernet-page): Ditto.
* gnu/installer/newt/final.scm (run-config-display-page): Change listbox
height.
* gnu/installer/newt/partition.scm (run-disk-page): Ditto.
* gnu/installer/newt/welcome.scm (display-logo?): New procedure.
(run-menu-page): Use it.
* gnu/installer/steps.scm (%configuration-file-width): Remove it.
</span></span></td><td>Mathieu Othacehe</td></tr>