git subrepo pull --force deps/lightning

subrepo:
  subdir:   "deps/lightning"
  merged:   "a6bb2b5a7cf"
upstream:
  origin:   "https://git.savannah.gnu.org/git/lightning.git"
  branch:   "master"
  commit:   "a6bb2b5a7cf"
git-subrepo:
  version:  "0.4.6"
  origin:   "https://github.com/ingydotnet/git-subrepo.git"
  commit:   "110b9eb"

diff --git a/deps/lightning/.gitrepo b/deps/lightning/.gitrepo
index 2535adc..eae7dbc 100644 (file)
--- a/deps/lightning/.gitrepo
+++ b/deps/lightning/.gitrepo
@@ -6,7 +6,7 @@
 [subrepo]
        remote = https://git.savannah.gnu.org/git/lightning.git
        branch = master
-       commit = 808fdde9e81cc1f43fd3ef3b01d24744c18bc123
-       parent = dde06e44db790da43b379ff3ef74accb15c3586e
+       commit = a6bb2b5a7cf36e074e12ccaed32990b437deb784
+       parent = 2476185f02635f2638bd9f66568e992c2f6b71c2
        method = merge
        cmdver = 0.4.6

diff --git a/deps/lightning/lib/lightning.c b/deps/lightning/lib/lightning.c
index 643c5f1..656e5f7 100644 (file)
--- a/deps/lightning/lib/lightning.c
+++ b/deps/lightning/lib/lightning.c
@@ -3817,12 +3817,13 @@ _simplify_stxi(jit_state_t *_jit, jit_node_t *prev, jit_node_t *node)
     if (value->kind == 0) {
        switch (node->code) {
            /* no information about signed/unsigned either */
-           case jit_code_stxi_c:       value->code = jit_code_ldxi_c;  break;
-           case jit_code_stxi_s:       value->code = jit_code_ldxi_s;  break;
+#if __WORDSIZE == 32
            case jit_code_stxi_i:       value->code = jit_code_ldxi_i;  break;
-           case jit_code_stxi_l:       value->code = jit_code_ldxi_l;  break;
            case jit_code_stxi_f:       value->code = jit_code_ldxi_f;  break;
+#else
+           case jit_code_stxi_l:       value->code = jit_code_ldxi_l;  break;
            case jit_code_stxi_d:       value->code = jit_code_ldxi_d;  break;
+#endif
            default:                    abort();
        }
        value->kind = jit_kind_code;
@@ -3943,20 +3944,26 @@ _simplify(jit_state_t *_jit)
                    simplify_spill(node = prev, regno);
                }
                break;
-           case jit_code_ldxi_c:       case jit_code_ldxi_uc:
-           case jit_code_ldxi_s:       case jit_code_ldxi_us:
-           case jit_code_ldxi_i:       case jit_code_ldxi_ui:
+#if __WORDSIZE == 32
+           case jit_code_ldxi_i:
+           case jit_code_ldxi_f:
+#else
            case jit_code_ldxi_l:
-           case jit_code_ldxi_f:       case jit_code_ldxi_d:
+           case jit_code_ldxi_d:
+#endif
                regno = jit_regno(node->u.w);
                if (simplify_ldxi(prev, node)) {
                    result = 1;
                    simplify_spill(node = prev, regno);
                }
                break;
-           case jit_code_stxi_c:       case jit_code_stxi_s:
-           case jit_code_stxi_i:       case jit_code_stxi_l:
-           case jit_code_stxi_f:       case jit_code_stxi_d:
+#if __WORDSIZE == 32
+           case jit_code_stxi_i:
+           case jit_code_stxi_f:
+#else
+           case jit_code_stxi_l:
+           case jit_code_stxi_d:
+#endif
                regno = jit_regno(node->u.w);
                if (simplify_stxi(prev, node)) {
                    result = 1;