<short summary of the 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.14-2) unstable; urgency=medium

  * Version_2_6_15pre1

Gbp-Pq: Name Version_2_6_15pre1

diff --git a/cmpnew/gcl_cmpfun.lsp b/cmpnew/gcl_cmpfun.lsp
index 73045687bda566b0ab6d0921ee18a622270a1407..16ac119c3cd1e0807a61246a23ca124978f50ffc 100755 (executable)
--- a/cmpnew/gcl_cmpfun.lsp
+++ b/cmpnew/gcl_cmpfun.lsp
@@ -419,7 +419,7 @@
                     (t (error "should not get here")))
               )))
     (c1expr (cons fun args))))
-(defun shift>> (a b) (ash a  b))
+(defun shift>> (a b) (ash a  (- b)))
 (defun shift<< (a b) (ash a  b))
 (si:putprop 'ash '(c1ash-condition . c1ash)  'c1conditional)
 (si:putprop 'shift>> "Lash" 'lfun)

diff --git a/cmpnew/gcl_cmpopt.lsp b/cmpnew/gcl_cmpopt.lsp
index e825c571880fe9b36b5faacb9da69b1b513fa032..f191d46ca710914eb3216b0ea4f55ce2bbcf9e1b 100755 (executable)
--- a/cmpnew/gcl_cmpopt.lsp
+++ b/cmpnew/gcl_cmpopt.lsp
@@ -1280,11 +1280,6 @@
 ;; type_of(#0)==t_bitvector")
 ;;    (get 'vectorp 'inline-always))
 
-;;WRITE-CHAR
- (push '((t) t #.(flags set)
-  "@0;(writec_stream(char_code(#0),Vstandard_output->s.s_dbind),(#0))")
-   (get 'write-char 'inline-unsafe))
-
 ;;EVENP
 (push '((t) boolean #.(compiler::flags) "immnum_evenp(#0)") (get 'evenp 'compiler::inline-always))
 ;;ODDP

diff --git a/configure b/configure
index e6dcb82dafab275e8fbdf9a92c73de03ec74cbfd..e27723896e7ef33d3069e7ad2427371f9bbac07f 100755 (executable)
--- a/configure
+++ b/configure
@@ -7091,8 +7091,7 @@ else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-                   #include <stdio.h>
-                   #include <stdlib.h>
+                   #include "h/unrandomize_headers.h"
                    int main(int argc,char *argv[],char *envp[]) {
                        #include "h/unrandomize.h"
                        return 0;
@@ -7128,8 +7127,7 @@ else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-                   #include <stdio.h>
-                   #include <stdlib.h>
+                   #include "h/unrandomize_headers.h"
                    int main(int argc,char * argv[],char * envp[]) {
                        FILE *f;
                        #ifdef CAN_UNRANDOMIZE_SBRK
@@ -7165,8 +7163,7 @@ else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-                   #include <stdio.h>
-                   #include <stdlib.h>
+                   #include "h/unrandomize_headers.h"
                    int main(int argc,char * argv[],char * envp[]) {
                        FILE *f;
                        #ifdef CAN_UNRANDOMIZE_SBRK
@@ -7215,8 +7212,7 @@ else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-               #include <stdio.h>
-               #include <stdlib.h>
+               #include "h/unrandomize_headers.h"
                int main(int argc,char **argv,char **envp) {
                    FILE *fp = fopen("conftest1","w");
                    #ifdef CAN_UNRANDOMIZE_SBRK
@@ -7255,8 +7251,7 @@ else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-               #include <stdio.h>
-               #include <stdlib.h>
+               #include "h/unrandomize_headers.h"
                int main(int argc,char **argv,char **envp) {
                    void *b,*c;
                    FILE *fp = fopen("conftest1","w");
@@ -7311,8 +7306,7 @@ else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-               #include <stdio.h>
-               #include <stdlib.h>
+               #include "h/unrandomize_headers.h"
                int
                main(int argc,char **argv,char **envp) {
                    FILE *fp = fopen("conftest1","w");
@@ -7362,8 +7356,7 @@ else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-               #include <stdio.h>
-               #include <stdlib.h>
+               #include "h/unrandomize_headers.h"
                int
                main(int argc,char **argv,char **envp) {
                    void *v ;
@@ -7415,8 +7408,7 @@ else $as_nop
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
-               #include <stdio.h>
-               #include <stdlib.h>
+               #include "h/unrandomize_headers.h"
                int
                main(int argc,char **argv,char **envp) {
                    #ifdef CAN_UNRANDOMIZE_SBRK

diff --git a/configure.in b/configure.in
index ab374430f491ec04619e1e9bf1ad56bb1f8fb89f..0c641a719f9e1cf5632cea38c025810b51017c78 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1181,8 +1181,7 @@ if test "$HAVE_SBRK" = "1" ; then
     AC_RUN_IFELSE(
        [AC_LANG_SOURCE(
                [[
-                   #include <stdio.h>
-                   #include <stdlib.h>
+                   #include "h/unrandomize_headers.h"
                    int main(int argc,char *argv[],char *envp[]) {
                        #include "h/unrandomize.h"
                        return 0;
@@ -1197,8 +1196,7 @@ if test "$HAVE_SBRK" = "1" ; then
     AC_RUN_IFELSE(
        [AC_LANG_SOURCE(
                [[
-                   #include <stdio.h>
-                   #include <stdlib.h>
+                   #include "h/unrandomize_headers.h"
                    int main(int argc,char * argv[],char * envp[]) {
                        FILE *f;
                        #ifdef CAN_UNRANDOMIZE_SBRK
@@ -1218,8 +1216,7 @@ if test "$HAVE_SBRK" = "1" ; then
     AC_RUN_IFELSE(
        [AC_LANG_SOURCE(
                [[
-                   #include <stdio.h>
-                   #include <stdlib.h>
+                   #include "h/unrandomize_headers.h"
                    int main(int argc,char * argv[],char * envp[]) {
                        FILE *f;
                        #ifdef CAN_UNRANDOMIZE_SBRK
@@ -1249,8 +1246,7 @@ AC_MSG_CHECKING(CSTACK_DIRECTION)
 AC_RUN_IFELSE(
     [AC_LANG_SOURCE(
            [[
-               #include <stdio.h>
-               #include <stdlib.h>
+               #include "h/unrandomize_headers.h"
                int main(int argc,char **argv,char **envp) {
                    FILE *fp = fopen("conftest1","w");
                    #ifdef CAN_UNRANDOMIZE_SBRK
@@ -1268,8 +1264,7 @@ AC_MSG_CHECKING([finding CSTACK_ALIGNMENT])
 AC_RUN_IFELSE(
     [AC_LANG_SOURCE(
            [[
-               #include <stdio.h>
-               #include <stdlib.h>
+               #include "h/unrandomize_headers.h"
                int main(int argc,char **argv,char **envp) {
                    void *b,*c;
                    FILE *fp = fopen("conftest1","w");
@@ -1297,8 +1292,7 @@ AC_MSG_CHECKING(CSTACK_ADDRESS)
 AC_RUN_IFELSE(
     [AC_LANG_SOURCE(
            [[
-               #include <stdio.h>
-               #include <stdlib.h>
+               #include "h/unrandomize_headers.h"
                int
                main(int argc,char **argv,char **envp) {
                    FILE *fp = fopen("conftest1","w");
@@ -1327,8 +1321,7 @@ AC_MSG_CHECKING([cstack bits])
 AC_RUN_IFELSE(
     [AC_LANG_SOURCE(
            [[
-               #include <stdio.h>
-               #include <stdlib.h>
+               #include "h/unrandomize_headers.h"
                int
                main(int argc,char **argv,char **envp) {
                    void *v ;
@@ -1359,8 +1352,7 @@ AC_MSG_CHECKING(NEG_CSTACK_ADDRESS)
 AC_RUN_IFELSE(
     [AC_LANG_SOURCE(
            [[
-               #include <stdio.h>
-               #include <stdlib.h>
+               #include "h/unrandomize_headers.h"
                int
                main(int argc,char **argv,char **envp) {
                    #ifdef CAN_UNRANDOMIZE_SBRK

diff --git a/git.tag b/git.tag
index 0ae46e64360e86d6860809d33aab960b08a37fdd..d95dd62818eced2f77ee132515df64717faf068b 100644 (file)
--- a/git.tag
+++ b/git.tag
@@ -1,2 +1 @@
-"Version_2_6_14"
-
+"Version_2_6_15pre1"

diff --git a/h/unrandomize.h b/h/unrandomize.h
index 00ddb887eb4f0d3b6d0b2e5f19c29a5b9ce0fc6c..6a75d51f693e3d05822d3f7aa021ba0c78caf00e 100644 (file)
--- a/h/unrandomize.h
+++ b/h/unrandomize.h
@@ -1,11 +1,3 @@
-#include <sys/personality.h>
-#include <sys/mman.h>
-#include <syscall.h>
-#include <unistd.h>
-#include <string.h>
-#include <alloca.h>
-#include <errno.h>
-
 {
   errno=0;
 

diff --git a/h/unrandomize_headers.h b/h/unrandomize_headers.h
new file mode 100644 (file)
index 0000000..fc3bd9d
--- /dev/null
+++ b/h/unrandomize_headers.h
@@ -0,0 +1,10 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <sys/personality.h>
+#include <sys/mman.h>
+#include <syscall.h>
+#include <unistd.h>
+#include <string.h>
+#include <alloca.h>
+#include <errno.h>
+

diff --git a/lsp/gcl_top.lsp b/lsp/gcl_top.lsp
index ee33cc872f5b7f8cd346c29d42820754c8499b4e..159d0e743f1643255fb9b0e298b5fd8ce3c11f74 100755 (executable)
--- a/lsp/gcl_top.lsp
+++ b/lsp/gcl_top.lsp
@@ -130,6 +130,7 @@
       (cond ((equal x "-load") (load (pop args)))
            ((equal x "-eval") (eval (read-from-string (pop args))))
            ((equal x "-batch") (setq *top-level-hook* 'bye))
+           ((or (equal x "-v") (equal x "--version")) (format t "~a~%" (lisp-implementation-version)) (setq *top-level-hook* 'bye))
            ((equal x "-o-file") (unless (read-from-string (car args))
                                   (push (cons :o-file nil) compile)
                                   (pop args)))

diff --git a/o/gcl_readline.d b/o/gcl_readline.d
index a947028d49279f75bc177185b2872fcc8d861e2d..97d450ad30e355bff6e1dbf0bdc7a1856fdae4ac 100644 (file)
--- a/o/gcl_readline.d
+++ b/o/gcl_readline.d
@@ -109,7 +109,7 @@ rl_completion_words(const char *text, int state) {
       }
     }
     
-    package=package ? package : user_package;
+    package=(package!=OBJNULL && package!=Cnil) ? package : user_package;
     use=package->p.p_uselist;
     internal=temp && temp[1]==':' ? 1 : 0;
     ftext=text;

diff --git a/o/main.c b/o/main.c
index 855a3a00605296c9791e19123a9823bbd3a792cd..3dca37f569384f5eeda873933174c3513f32f4e7 100755 (executable)
--- a/o/main.c
+++ b/o/main.c
@@ -516,6 +516,8 @@ which(const char *n,char *o) {
 static int ARGC;
 static char **ARGV;
 
+#include "unrandomize_headers.h"
+
 int
 main(int argc, char **argv, char **envp) {