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 "CMU Common Lisp".

The branch, master has been updated via ee975d1ba18dfd418481151a9c3449059ffcfe0a (commit) from 4e3000cdaeb66080a3c01616ecc0712c98b0256d (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 ee975d1ba18dfd418481151a9c3449059ffcfe0a Author: Raymond Toy toy.raymond@gmail.com Date: Tue Dec 2 20:34:57 2014 -0800

Use the same code for sparc and ppc to handle the call_into_c entry. They were identical before anyway, so make it so.

diff --git a/src/lisp/os-common.c b/src/lisp/os-common.c index 183d808..ab82d36 100755 --- a/src/lisp/os-common.c +++ b/src/lisp/os-common.c @@ -221,7 +221,7 @@ os_foreign_linkage_init(void) } #endif if (i == 0) { -#if defined(sparc) +#if defined(sparc) || (defined(DARWIN) && defined(__ppc__)) if (type != LINKAGE_CODE_TYPE || strcmp(c_symbol_name, EXTERN_ALIEN_NAME("call_into_c"))) { fprintf(stderr, "linkage_data is %s but expected %s\n", c_symbol_name, @@ -229,14 +229,6 @@ os_foreign_linkage_init(void) lose("First element of linkage_data is bogus.\n"); } arch_make_linkage_entry(i, (void*) call_into_c, 1); -#elif (defined(DARWIN) && defined(__ppc__)) - if (type != 1 || strcmp(c_symbol_name, EXTERN_ALIEN_NAME("call_into_c"))) { - fprintf(stderr, "linkage_data is %s but expected %s\n", - c_symbol_name, - EXTERN_ALIEN_NAME("call_into_c")); - lose("First element of linkage_data is bogus.\n"); - } - arch_make_linkage_entry(i, &call_into_c, 1); #else if (type != LINKAGE_CODE_TYPE || strcmp(c_symbol_name, EXTERN_ALIEN_NAME("resolve_linkage_tramp"))) {

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

Summary of changes: src/lisp/os-common.c | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-)

hooks/post-receive