From c51c93708ae9ee9ac9c8461e664956af0cf6efef Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@igalia.com>
Date: Sun, 4 Nov 2018 12:18:38 +0100
Subject: [PATCH] Make _rvs array static-const

---
 jit/aarch64.c | 4 ++--
 jit/alpha.c   | 4 ++--
 jit/arm.c     | 4 ++--
 jit/hppa.c    | 2 +-
 jit/ia64.c    | 2 +-
 jit/jit.c     | 2 +-
 jit/mips.c    | 4 ++--
 jit/ppc.c     | 4 ++--
 jit/s390.c    | 2 +-
 jit/sparc.c   | 4 ++--
 jit/x86.c     | 2 +-
 11 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/jit/aarch64.c b/jit/aarch64.c
index 56428f7db..332c4c0c6 100644
--- a/jit/aarch64.c
+++ b/jit/aarch64.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017  Free Software Foundation, Inc.
+ * Copyright (C) 2013-2018  Free Software Foundation, Inc.
  *
  * This file is part of GNU lightning.
  *
@@ -70,7 +70,7 @@ extern void __clear_cache(void *, void *);
 /*
  * Initialization
  */
-jit_register_t		_rvs[] = {
+static const jit_register_t _rvs[] = {
     { rc(gpr) | 0x08,			"x8" },
     { rc(gpr) | 0x12,			"x18" },
     { rc(gpr) | 0x11,			"x17" },
diff --git a/jit/alpha.c b/jit/alpha.c
index 3278eba1a..1f1e40634 100644
--- a/jit/alpha.c
+++ b/jit/alpha.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2014-2017  Free Software Foundation, Inc.
+ * Copyright (C) 2014-2018  Free Software Foundation, Inc.
  *
  * This file is part of GNU lightning.
  *
@@ -69,7 +69,7 @@ static void _patch(jit_state_t*,jit_word_t,jit_node_t*);
 /*
  * Initialization
  */
-jit_register_t		_rvs[] = {
+static const jit_register_t _rvs[] = {
     { rc(gpr) | 0x1c,			"at" },
     { rc(gpr) | 0x00,			"v0" },
     { rc(gpr) | 0x01,			"t0" },
diff --git a/jit/arm.c b/jit/arm.c
index 6d8d6fd73..ef4a3e2e7 100644
--- a/jit/arm.c
+++ b/jit/arm.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2017  Free Software Foundation, Inc.
+ * Copyright (C) 2012-2018  Free Software Foundation, Inc.
  *
  * This file is part of GNU lightning.
  *
@@ -96,7 +96,7 @@ extern void __clear_cache(void *, void *);
  * Initialization
  */
 jit_cpu_t		jit_cpu;
-jit_register_t		_rvs[] = {
+static const jit_register_t _rvs[] = {
     { rc(gpr) | 0x0c,			"ip" },
     { rc(sav) | rc(gpr) | 0x04,		"r4" },
     { rc(sav) | rc(gpr) | 0x05,		"r5" },
diff --git a/jit/hppa.c b/jit/hppa.c
index fe7a12c6a..38c75e0ca 100644
--- a/jit/hppa.c
+++ b/jit/hppa.c
@@ -41,7 +41,7 @@ extern void __clear_cache(void *, void *);
 /*
  * Initialization
  */
-jit_register_t		_rvs[] = {
+static const jit_register_t _rvs[] = {
     { 0,			"r0" },		/* Zero */
     /* Not register starved, so, avoid allocating r1 and rp
      * due to being implicit target of ADDIL and B,L */
diff --git a/jit/ia64.c b/jit/ia64.c
index f7e3ae378..185d41cbf 100644
--- a/jit/ia64.c
+++ b/jit/ia64.c
@@ -54,7 +54,7 @@ extern void __clear_cache(void *, void *);
 /*
  * Initialization
  */
-jit_register_t		_rvs[] = {
+static const jit_register_t _rvs[] = {
     /* Always 0 */
     { 0,		 "r0"  },
     /* Global Pointer */
diff --git a/jit/jit.c b/jit/jit.c
index 2ddd34aae..ca0a07a65 100644
--- a/jit/jit.c
+++ b/jit/jit.c
@@ -141,7 +141,7 @@ struct jit_register
 
 typedef struct jit_register jit_register_t;
 
-static jit_register_t _rvs[];
+static const jit_register_t _rvs[];
 
 #define jit_regload_reload		0	/* convert to reload */
 #define jit_regload_delete		1	/* just remove node */
diff --git a/jit/mips.c b/jit/mips.c
index 547288cab..70b2d94ea 100644
--- a/jit/mips.c
+++ b/jit/mips.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2017  Free Software Foundation, Inc.
+ * Copyright (C) 2012-2018  Free Software Foundation, Inc.
  *
  * This file is part of GNU lightning.
  *
@@ -72,7 +72,7 @@ static void _patch(jit_state_t*,jit_word_t,jit_node_t*);
 /*
  * Initialization
  */
-jit_register_t		_rvs[] = {
+static const jit_register_t _rvs[] = {
     { rc(gpr) | 0x01,			"at" },
     { rc(gpr) | 0x02,			"v0" },
     { rc(gpr) | 0x03,			"v1" },
diff --git a/jit/ppc.c b/jit/ppc.c
index 93964293a..a6502cbac 100644
--- a/jit/ppc.c
+++ b/jit/ppc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2012-2017  Free Software Foundation, Inc.
+ * Copyright (C) 2012-2018  Free Software Foundation, Inc.
  *
  * This file is part of GNU lightning.
  *
@@ -53,7 +53,7 @@ extern void __clear_cache(void *, void *);
 /*
  * Initialization
  */
-jit_register_t		_rvs[] = {
+static const jit_register_t _rvs[] = {
     { rc(gpr) | 0,			"r0" },
 #if __ppc__
     { rc(gpr) | 11,			"r11" },
diff --git a/jit/s390.c b/jit/s390.c
index f440b58b2..0dc109a9f 100644
--- a/jit/s390.c
+++ b/jit/s390.c
@@ -90,7 +90,7 @@ extern void __clear_cache(void *, void *);
 /*
  * Initialization
  */
-jit_register_t		_rvs[] = {
+static const jit_register_t _rvs[] = {
     { rc(gpr) | 0x0,			"%r0" },
     { rc(gpr) | 0x1,			"%r1" },
     { rc(gpr) | rc(sav) | 0xc,		"%r12" },
diff --git a/jit/sparc.c b/jit/sparc.c
index d2e66e7ff..10aac8528 100644
--- a/jit/sparc.c
+++ b/jit/sparc.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2013-2017  Free Software Foundation, Inc.
+ * Copyright (C) 2013-2018  Free Software Foundation, Inc.
  *
  * This file is part of GNU lightning.
  *
@@ -45,7 +45,7 @@ static void _patch(jit_state_t*,jit_word_t,jit_node_t*);
 /*
  * Initialization
  */
-jit_register_t		_rvs[] = {
+static const jit_register_t _rvs[] = {
     { 0x00,				"%g0" },
     { 0x01,				"%g1" },
     { rc(gpr) | 0x02,			"%g2" },
diff --git a/jit/x86.c b/jit/x86.c
index 91640a1f3..e9ad0df3f 100644
--- a/jit/x86.c
+++ b/jit/x86.c
@@ -117,7 +117,7 @@ static void _x87_from_sse_d(jit_state_t*,int32_t,int32_t);
  * Initialization
  */
 jit_cpu_t		jit_cpu;
-jit_register_t		_rvs[] = {
+static const jit_register_t _rvs[] = {
 #if __X32
     { rc(gpr) | rc(rg8) | 0,		"%eax" },
     { rc(gpr) | rc(rg8) | 1,		"%ecx" },