Merge in changes from upstream lightening

libguile/lightning/README.md

@@ -6,8 +6,8 @@ Lightning, adapted to the purposes of the GNU Guile project.
 ## Use
 
 ```
-gcc -flto -O2 -g -o jit.o -c jit/jit.c
-gcc -flto -O2 -g -o my-program jit.o my-program.c
+gcc -flto -O2 -g -o lightening.o -c lightening/lightening.c
+gcc -flto -O2 -g -o my-program lightening.o my-program.c
 ```
 
 See the GNU Lightning manual for more on how to program against

libguile/lightning/lightening.h

@@ -27,7 +27,7 @@
 #include <string.h>
 #include <stddef.h>
 
-#include "jit/endian.h"
+#include "lightening/endian.h"
 
 CHOOSE_32_64(typedef int32_t jit_word_t,
              typedef int64_t jit_word_t);
@@ -74,25 +74,25 @@ typedef struct jit_reloc
 #endif
 
 #if defined(__i386__) || defined(__x86_64__)
-#  include "jit/x86.h"
+#  include "lightening/x86.h"
 #elif defined(__mips__)
-#  include "jit/mips.h"
+#  include "lightening/mips.h"
 #elif defined(__arm__)
-#  include "jit/arm.h"
+#  include "lightening/arm.h"
 #elif defined(__ppc__) || defined(__powerpc__)
-#  include "jit/ppc.h"
+#  include "lightening/ppc.h"
 #elif defined(__sparc__)
-#  include "jit/sparc.h"
+#  include "lightening/sparc.h"
 #elif defined(__ia64__)
-#  include "jit/ia64.h"
+#  include "lightening/ia64.h"
 #elif defined(__hppa__)
-#  include "jit/hppa.h"
+#  include "lightening/hppa.h"
 #elif defined(__aarch64__)
-#  include "jit/aarch64.h"
+#  include "lightening/aarch64.h"
 #elif defined(__s390__) || defined(__s390x__)
-#  include "jit/s390.h"
+#  include "lightening/s390.h"
 #elif defined(__alpha__)
-#  include "jit/alpha.h"
+#  include "lightening/alpha.h"
 #endif
 
 #define JIT_R(index)		JIT_GPR(jit_r(index))

libguile/lightning/lightening/lightening.c

@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <sys/mman.h>
 
-#include "../jit.h"
+#include "../lightening.h"
 
 #if defined(__GNUC__)
 # define maybe_unused           __attribute__ ((unused))

libguile/lightning/tests/Makefile

@@ -13,12 +13,12 @@ check: all
 	done
 	@echo "Success."
 
-jit.o: ../jit.h ../jit/*.c
-	$(CC) $(CFLAGS) $(CPPFLAGS) -I.. -o jit.o -c ../jit/jit.c
+lightening.o: ../lightening.h ../lightening/*.c
+	$(CC) $(CFLAGS) $(CPPFLAGS) -I.. -o lightening.o -c ../lightening/lightening.c
 
-test-%: %.c jit.o test.h
-	$(CC) $(CFLAGS) $(CPPFLAGS) -I.. -o $@ jit.o $<
+test-%: %.c lightening.o test.h
+	$(CC) $(CFLAGS) $(CPPFLAGS) -I.. -o $@ lightening.o $<
 
 clean:
 	rm -f $(addprefix test-,$(TESTS))
-	rm -f jit.o
+	rm -f lightening.o

libguile/lightning/tests/test.h

@@ -2,7 +2,7 @@
 #include <stdlib.h>
 #include <sys/mman.h>
 
-#include <jit.h>
+#include <lightening.h>
 
 #define ASSERT(x) \
   do {                                                                  \