guile-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Guile-commits] GNU Guile branch, master, updated. release_1-9-0-51-g07f


From: Ludovic Courtès
Subject: [Guile-commits] GNU Guile branch, master, updated. release_1-9-0-51-g07f99e1
Date: Tue, 14 Jul 2009 23:07:29 +0000

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GNU Guile".

http://git.savannah.gnu.org/cgit/guile.git/commit/?id=07f99e1c6a74017f41bdc1355cf8645392f433c6

The branch, master has been updated
       via  07f99e1c6a74017f41bdc1355cf8645392f433c6 (commit)
       via  99c7d3caf622b8ed355562359b445396dee1532c (commit)
       via  9e1a18db9fd34a6156007c7db563f46095989b62 (commit)
      from  ba4c43dc3b6c4bb3b65883283e00228df6029371 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 07f99e1c6a74017f41bdc1355cf8645392f433c6
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jul 15 01:03:35 2009 +0200

    Make sure at compile-time that `OBJCODE_COOKIE' has the right size.
    
    * libguile/objcodes.c: Use `verify' to assert that the size of
      `OBJCODE_COOKIE' is a multiple of 8.

commit 99c7d3caf622b8ed355562359b445396dee1532c
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jul 15 00:58:01 2009 +0200

    Explicitly use Gnulib's `verify' module.
    
    * m4/gnulib-cache.m4: Add `verify'.

commit 9e1a18db9fd34a6156007c7db563f46095989b62
Author: Ludovic Courtès <address@hidden>
Date:   Wed Jul 15 00:55:33 2009 +0200

    Augment `OBJCODE_COOKIE' to detect wrong endianness or word size.
    
    * libguile/objcodes.c (OBJCODE_ENDIANNESS, _OBJCODE_STRINGIFY,
      OBJCODE_STRINGIFY, OBJCODE_WORD_SIZE): New macros.
      (OBJCODE_COOKIE): Use them.  The intent is that `.go' files compiled
      for a different endianness or word size are detected.

-----------------------------------------------------------------------

Summary of changes:
 lib/Makefile.am     |    2 +-
 libguile/objcodes.c |   24 ++++++++++++++++++++++--
 m4/gnulib-cache.m4  |    3 ++-
 3 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 197320e..424e590 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -9,7 +9,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib 
--m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl 
--libtool --macro-prefix=gl --no-vc-files alloca-opt autobuild byteswap 
canonicalize-lgpl count-one-bits environ extensions flock fpieee full-read 
full-write havelib iconv_open-utf lib-symbol-visibility libunistring putenv 
stdlib strcase strftime striconveh string vsnprintf
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=lib 
--m4-base=m4 --doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl 
--libtool --macro-prefix=gl --no-vc-files alloca-opt autobuild byteswap 
canonicalize-lgpl count-one-bits environ extensions flock fpieee full-read 
full-write havelib iconv_open-utf lib-symbol-visibility libunistring putenv 
stdlib strcase strftime striconveh string verify vsnprintf
 
 AUTOMAKE_OPTIONS = 1.5 gnits subdir-objects
 
diff --git a/libguile/objcodes.c b/libguile/objcodes.c
index 4f21971..c758e93 100644
--- a/libguile/objcodes.c
+++ b/libguile/objcodes.c
@@ -28,13 +28,33 @@
 #include <sys/types.h>
 #include <assert.h>
 
+#include <verify.h>
+
 #include "_scm.h"
 #include "vm-bootstrap.h"
 #include "programs.h"
 #include "objcodes.h"
 
-/* nb, the length of the header should be a multiple of 8 bytes */
-#define OBJCODE_COOKIE "GOOF-0.6"
+/* The endianness marker in objcode.  */
+#ifdef WORDS_BIGENDIAN
+# define OBJCODE_ENDIANNESS "BE"
+#else
+# define OBJCODE_ENDIANNESS "LE"
+#endif
+
+#define _OBJCODE_STRINGIFY(x)  # x
+#define OBJCODE_STRINGIFY(x)   _OBJCODE_STRINGIFY (x)
+
+/* The word size marker in objcode.  */
+#define OBJCODE_WORD_SIZE  OBJCODE_STRINGIFY (SIZEOF_VOID_P)
+
+/* The objcode magic header.  */
+#define OBJCODE_COOKIE                                         \
+  "GOOF-0.6-" OBJCODE_ENDIANNESS "-" OBJCODE_WORD_SIZE "---"
+
+/* The length of the header must be a multiple of 8 bytes.  */
+verify ((sizeof (OBJCODE_COOKIE) & 7) != 0);
+
 
 
 /*
diff --git a/m4/gnulib-cache.m4 b/m4/gnulib-cache.m4
index aad4999..7f64af2 100644
--- a/m4/gnulib-cache.m4
+++ b/m4/gnulib-cache.m4
@@ -15,7 +15,7 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 
--doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl --libtool 
--macro-prefix=gl --no-vc-files alloca-opt autobuild byteswap canonicalize-lgpl 
count-one-bits environ extensions flock fpieee full-read full-write havelib 
iconv_open-utf lib-symbol-visibility libunistring putenv stdlib strcase 
strftime striconveh string vsnprintf
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=lib --m4-base=m4 
--doc-base=doc --tests-base=tests --aux-dir=build-aux --lgpl --libtool 
--macro-prefix=gl --no-vc-files alloca-opt autobuild byteswap canonicalize-lgpl 
count-one-bits environ extensions flock fpieee full-read full-write havelib 
iconv_open-utf lib-symbol-visibility libunistring putenv stdlib strcase 
strftime striconveh string verify vsnprintf
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
 gl_LOCAL_DIR([])
@@ -41,6 +41,7 @@ gl_MODULES([
   strftime
   striconveh
   string
+  verify
   vsnprintf
 ])
 gl_AVOID([])


hooks/post-receive
-- 
GNU Guile




reply via email to

[Prev in Thread] Current Thread [Next in Thread]