From 8a8dd55cc6b370d689bb13b62e79a7a47ab37fb8 Mon Sep 17 00:00:00 2001 From: Camm Maguire Date: Thu, 11 Aug 2022 18:16:42 +0100 Subject: [PATCH] TODO: Put a short summary on the line above and replace this paragraph with a longer explanation of this change. Complete the meta-information with other relevant fields (see below for details). To make it easier, the information below has been extracted from the changelog. Adjust it or drop it. gcl (2.6.12-75) unstable; urgency=medium * Version_2_6_13pre65 Gbp-Pq: Name Version_2_6_13pre66 --- cmpnew/gcl_cmpmulti.lsp | 18 ++++++------------ configure | 5 ++++- configure.in | 21 ++++----------------- o/usig.c | 2 +- 4 files changed, 15 insertions(+), 31 deletions(-) diff --git a/cmpnew/gcl_cmpmulti.lsp b/cmpnew/gcl_cmpmulti.lsp index db2a3fe..39a9a86 100755 --- a/cmpnew/gcl_cmpmulti.lsp +++ b/cmpnew/gcl_cmpmulti.lsp @@ -164,27 +164,21 @@ (cmpwarn "~A was proclaimed to have only one return value. ~%;But you appear to want multiple values." fname)))))) (defun c2multiple-value-setq (vrefs form &aux top-data) - (multiple-value-check vrefs form) + (multiple-value-check vrefs form) (let ((*value-to-go* 'top)*top-data*) (c2expr* form) (setq top-data *top-data*)) (and *record-call-info* (record-call-info nil (car top-data))) + (wt-nl "if(vs_base>vs_top) vs_top=vs_base;*vs_top=Cnil;") (do ((vs vrefs (cdr vs))) ((endp vs)) - (declare (object vs)) (let ((vref (car vs))) - (declare (object vref)) - (wt-nl "if(vs_base&6; } s390*) enableval="no";;#mcount smashes float args in make_shortfloat 20180313 sh4*) enableval="no";; ia64*) enableval="no";; + alpha*) enableval="no";;#write_stub currently depends on t12 set in call hppa*) enableval="no";; arm*) enableval="no";;#FIXME mcount compiled as a 24/22 bit reloc even with -mlong-calls, marginally accessible aarch64*) enableval="no";;#unreproducible buildd bug 20170824 @@ -4132,7 +4133,9 @@ $as_echo "disabled" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: ok" >&5 $as_echo "ok" >&6; } - assert_arg_to_cflags -pg + OLD_CFLAGS=$CFLAGS # Do not run configure tests with -pg + assert_arg_to_cflags -pg + CFLAGS=$OLD_CFLAGS TFPFLAG="" $as_echo "#define GCL_GPROF 1" >>confdefs.h diff --git a/configure.in b/configure.in index 6cc7f97..8fa8d0f 100644 --- a/configure.in +++ b/configure.in @@ -334,6 +334,7 @@ AC_ARG_ENABLE([gprof],[ --enable-gprof builds gcl with -pg in CFLAGS to enable s390*) enableval="no";;#mcount smashes float args in make_shortfloat 20180313 sh4*) enableval="no";; ia64*) enableval="no";; + alpha*) enableval="no";;#write_stub currently depends on t12 set in call hppa*) enableval="no";; arm*) enableval="no";;#FIXME mcount compiled as a 24/22 bit reloc even with -mlong-calls, marginally accessible aarch64*) enableval="no";;#unreproducible buildd bug 20170824 @@ -343,25 +344,11 @@ AC_ARG_ENABLE([gprof],[ --enable-gprof builds gcl with -pg in CFLAGS to enable AC_MSG_RESULT([disabled]) else AC_MSG_RESULT([ok]) - assert_arg_to_cflags -pg + OLD_CFLAGS=$CFLAGS # Do not run configure tests with -pg + assert_arg_to_cflags -pg + CFLAGS=$OLD_CFLAGS TFPFLAG="" AC_DEFINE(GCL_GPROF,1,[use gprof profiling]) -dnl AC_MSG_CHECKING([for text start]) -dnl echo 'int main () {return(0);}' >foo.c -dnl $CC foo.c -o foo -dnl GCL_GPROF_START=`nm foo | $AWK '/ *[[TD]] *__*start$/ {print $NF}'` # D for ppc64 -- FIXME custreloc -dnl rm -f foo.c foo -dnl if test "$GCL_GPROF_START" != "" ; then -dnl AC_MSG_RESULT($GCL_GPROF_START) -dnl AC_DEFINE_UNQUOTED(GCL_GPROF_START,$GCL_GPROF_START,[starting address for gprof]) -dnl assert_arg_to_cflags -pg -dnl # case $use in -dnl # s390*) ;; # relocation truncation bug in gcc -dnl # *) TLIBS="$TLIBS -pg";; -dnl # esac -dnl TFPFLAG="" -dnl AC_DEFINE(GCL_GPROF,1,[use gprof profiling]) -dnl fi fi fi]) diff --git a/o/usig.c b/o/usig.c index f38c5e5..148aecb 100755 --- a/o/usig.c +++ b/o/usig.c @@ -150,7 +150,7 @@ DEFUN_NEW("FLD",object,fSfld,SI,1,1,NONE,OI,OO,OO,OO,(fixnum val),"") { /* For now ignore last three args governing offsets and data modification, just to support fpe sync with master*/ -DEFUN_NEW("*FIXNUM",object,fSAfixnum,SI,4,4,NONE,OI,OO,OO,OO,(fixnum addr,object x,object y,object z),"") { +DEFUN_NEW("*FIXNUM",object,fSAfixnum,SI,4,4,NONE,II,OO,OO,OO,(fixnum addr,object x,object y,object z),"") { RETURN1((object)*(fixnum *)addr); } DEFUN_NEW("*FLOAT",object,fSAfloat,SI,4,4,NONE,OI,OO,OO,OO,(fixnum addr,object x,object y,object z),"") { -- 2.30.2