Re: Guile language support in make

[Andreas Schwab <schwab@linux-m68k.org>]

Thorsten Glaser <t.glaser@tarent.de> writes:

> and the guile-2.0 Build-Depends on m68k because guile does not
> work there (and nobody appears capable enough to debug it)?

Index: guile-2.0.9/libguile/gsubr.c
===================================================================
--- guile-2.0.9.orig/libguile/gsubr.c
+++ guile-2.0.9/libguile/gsubr.c
@@ -213,7 +213,7 @@
 */
 static const struct
 {
-  scm_t_uint64 dummy; /* ensure 8-byte alignment; perhaps there's a better way */
+  scm_t_uint64 dummy SCM_ALIGNED (sizeof (scm_t_uint64)); /* ensure 8-byte alignment; perhaps there's a better way */
   const scm_t_uint8 bytes[121 * (sizeof (struct scm_objcode) + 16
                                  + sizeof (struct scm_objcode) + 32)];
 } raw_bytecode = {
@@ -317,7 +317,7 @@ static const struct
 
 static const struct
 {
-  scm_t_uint64 dummy; /* alignment */
+  scm_t_uint64 dummy SCM_ALIGNED (sizeof (scm_t_uint64)); /* alignment */
   scm_t_cell cells[121 * 2]; /* 11*11 double cells */
 } objcode_cells = {
   0,
Index: guile-2.0.9/libguile/vm-engine.h
===================================================================
--- guile-2.0.9.orig/libguile/vm-engine.h
+++ guile-2.0.9/libguile/vm-engine.h
@@ -74,7 +74,7 @@
 #define FP_REG asm("%r16")
 #endif
 #ifdef __mc68000__
-#define IP_REG asm("a5")
+#define IP_REG asm("a3")
 #define SP_REG asm("a4")
 #define FP_REG
 #endif

Andreas.

-- 
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756  01D3 44D5 214B 8276 4ED5
"And now for something completely different."