Re: [Axiom-developer] Re: Axiom trunk failure

[Gabriel Dos Reis]

root <address@hidden> writes:

| > Gosh, I forgot the real thing.  
| > It is there, real this time.
| 
| 2 points,
| 
| 1) did you test the patches? did you do a full system erase,
| system checkout, system build, system test? 
| 
| 2) you changed not only the current system (gcl-2.6.8pre) but
| the previous system (gcl-2.6.7). did you test both versions?
| 
| i know this seems like such a trivial patch that it "ought" to work
| but remember that you're asking for changes to a system that many
| people you might never meet are using. 
| 
| as a matter of policy changes need to be fully tested. 
| because you changed gcl-2.6.7 i'll actually have to do a 
| round-trip rebuild of a gcl-2.6.7 system as well as a gcl-2.6.8pre
| system. i do testing every time. and it takes a lot of time.
| but you'd be amazed at the number of ways things can break.
| witness the mistake i made (despite my best efforts) when
| i posted a broken --patch-48

Tim,

  Here is the patch I am about to commit.  
I built Axiom with GCLVERSION set to both 2.6.7 and 2.6.8pre on an
i686-pc-linux-gnu.  No regression.

Note for myself:

    TODO:  Add a configure option set select the version of GCL to
    build (if we ever have to build it).

-- Gaby

lsp/ChangeLog
2006-05-03  Gabriel Dos Reis  <address@hidden>

        * Makefile.pamphlet: Skip tail-recursive patch for GCL version
        greater or equal to 2.6.7.  Document.

zips/ChangeLog  (local)
2006-05-03  Gabriel Dos Reis  <address@hidden>

        * gcl-2.6.7.cmpnew.gcl_cmpcall.lsp.patch: Delete.
        * gcl-2.6.7.cmpnew.gcl_cmpflet.lsp.patch: Likewise.
        * gcl-2.6.7pre.cmpnew.gcl_cmpcall.lsp.patch: Likewise.
        * gcl-2.6.7pre.cmpnew.gcl_cmpflet.lsp.patch: Likewise.
        * gcl-2.6.8pre.cmpnew.gcl_cmpcall.lsp.patch: Likewise.

--- lsp/Makefile.pamphlet       (revision 34)
+++ lsp/Makefile.pamphlet       (local)
@@ -383,7 +383,11 @@
 he left code in the system to print a message when the code was
 executed. We no longer care but it is still in GCL. We patch the
 call rather than the cmpnote function as cmpnote might have later
-usage.
+usage.  
+
+Bill Page reported that this tail-recursive patch is no longer
+necessary for recent releases of GCL.  Consequently, it has 
+been disabled for all versions of GCL greater than 2.6.7.
 <<gcl-2.5.2.tail-recursive.patch>>=
        @(cd ${GCLVERSION}/cmpnew ; \
          echo 11 applying tail-recursive noise patch ; \
@@ -457,22 +461,6 @@
          echo 12 applying tail-recursive noise patch ; \
          ${PATCH} <${SPD}/zips/${GCLVERSION}.cmpnew.gcl_cmpcall.lsp.patch )
 @
-<<gcl-2.6.7.tail-recursive.patch>>=
-       @(cd ${GCLVERSION}/cmpnew ; \
-         echo 11 applying tail-recursive noise patch ; \
-         ${PATCH} <${SPD}/zips/${GCLVERSION}.cmpnew.gcl_cmpflet.lsp.patch )
-       @(cd ${GCLVERSION}/cmpnew ; \
-         echo 12 applying tail-recursive noise patch ; \
-         ${PATCH} <${SPD}/zips/${GCLVERSION}.cmpnew.gcl_cmpcall.lsp.patch )
-@
-<<gcl-2.6.8pre.tail-recursive.patch>>=
-       @(cd ${GCLVERSION}/cmpnew ; \
-         echo 11 applying tail-recursive noise patch ; \
-         ${PATCH} <${SPD}/zips/${GCLVERSION}.cmpnew.gcl_cmpflet.lsp.patch )
-       @(cd ${GCLVERSION}/cmpnew ; \
-         echo 12 applying tail-recursive noise patch ; \
-         ${PATCH} <${SPD}/zips/${GCLVERSION}.cmpnew.gcl_cmpcall.lsp.patch )
-@
 \subsubsection{collectfn fix}
 GCL-2.6.1 renamed collectfn.lsp to gcl\_collectfn.lsp.
 We rename it back into place because we have later Makefiles
@@ -1018,7 +1006,6 @@
 <<gcl-2.6.7pre.socket.patch>>
 <<gcl-2.6.7pre.libspad.patch>>
 <<gcl-2.6.7pre.toploop.patch>>
-<<gcl-2.6.7pre.tail-recursive.patch>>
 <<gcl-2.6.7pre.collectfn.fix>>
 <<gclConfigureMake>>
        @echo 13 finished system build on `date` | tee >gcldir
@@ -1061,7 +1048,6 @@
 <<gcl-2.6.7.socket.patch>>
 <<gcl-2.6.7.libspad.patch>>
 <<gcl-2.6.7.toploop.patch>>
-<<gcl-2.6.7.tail-recursive.patch>>
 <<gcl-2.6.7.collectfn.fix>>
 <<gclConfigureMake>>
        @echo 13 finished system build on `date` | tee >gcldir
@@ -1103,8 +1089,7 @@
 <<gcl-2.6.8pre.socket.patch>>
 <<gcl-2.6.8pre.libspad.patch>>
 <<gcl-2.6.8pre.toploop.patch>>
-<<gcl-2.6.8pre.tail-recursive.patch>>
 <<gcl-2.6.8pre.collectfn.fix>>
 <<gclConfigureMake>>
        @echo 13 finished system build on `date` | tee >gcldir
--- zips/gcl-2.6.7.cmpnew.gcl_cmpcall.lsp.patch (revision 34)
+++ zips/gcl-2.6.7.cmpnew.gcl_cmpcall.lsp.patch (local)
@@ -1,13 +0,0 @@
---- gcl_cmpcall.lsp    Sun Jul 24 12:54:28 2005
-+++ gcl_cmpcall.lsp.tpd        Sun Jul 24 12:58:36 2005
-@@ -264,7 +264,9 @@
-             (wt-label *exit*))
-       (unwind-no-exit 'tail-recursion-mark)
-       (wt-nl "goto TTL;")
--      (cmpnote "Tail-recursive call of ~s was replaced by iteration." fname))
-+; 20031022000 tpd we don't need to know this
-+;      (cmpnote "Tail-recursive call of ~s was replaced by iteration." fname)
-+      )
- 
-      ;;; Open-codable function call.
-      ((and (listp args)

Property changes on: zips/gcl-2.6.7.cmpnew.gcl_cmpcall.lsp.patch
___________________________________________________________________
Name: svn:eol-style
 -native
Name: svn:keywords
 -Author Date Id Revision

--- zips/gcl-2.6.7.cmpnew.gcl_cmpflet.lsp.patch (revision 34)
+++ zips/gcl-2.6.7.cmpnew.gcl_cmpflet.lsp.patch (local)
@@ -1,15 +0,0 @@
---- gcl_cmpflet.lsp    Sun Jul 24 12:54:29 2005
-+++ gcl_cmpflet.lsp.tpd        Sun Jul 24 13:44:18 2005
-@@ -390,8 +390,10 @@
-           (wt-label *exit*))
-     (unwind-no-exit 'tail-recursion-mark)
-     (wt-nl "goto TTL;")
--    (cmpnote "Tail-recursive call of ~s was replaced by iteration."
--             (fun-name (car fd))))
-+; 20031022000 tpd we don't need to know this
-+;    (cmpnote "Tail-recursive call of ~s was replaced by iteration."
-+;             (fun-name (car fd)))
-+    )
-    (t (push-args args)
-       (wt-nl (c-function-name "L" (fun-cfun (car fd)) (fun-name (car fd))) 
"(")
-       (dotimes** (n (fun-level (car fd))) (wt "base" n ","))

Property changes on: zips/gcl-2.6.7.cmpnew.gcl_cmpflet.lsp.patch
___________________________________________________________________
Name: svn:eol-style
 -native
Name: svn:keywords
 -Author Date Id Revision

--- zips/gcl-2.6.7pre.cmpnew.gcl_cmpcall.lsp.patch      (revision 34)
+++ zips/gcl-2.6.7pre.cmpnew.gcl_cmpcall.lsp.patch      (local)
@@ -1,13 +0,0 @@
---- gcl_cmpcall.lsp    Sun Jul 24 12:54:28 2005
-+++ gcl_cmpcall.lsp.tpd        Sun Jul 24 12:58:36 2005
-@@ -264,7 +264,9 @@
-             (wt-label *exit*))
-       (unwind-no-exit 'tail-recursion-mark)
-       (wt-nl "goto TTL;")
--      (cmpnote "Tail-recursive call of ~s was replaced by iteration." fname))
-+; 20031022000 tpd we don't need to know this
-+;      (cmpnote "Tail-recursive call of ~s was replaced by iteration." fname)
-+      )
- 
-      ;;; Open-codable function call.
-      ((and (listp args)

Property changes on: zips/gcl-2.6.7pre.cmpnew.gcl_cmpcall.lsp.patch
___________________________________________________________________
Name: svn:eol-style
 -native
Name: svn:keywords
 -Author Date Id Revision

--- zips/gcl-2.6.7pre.cmpnew.gcl_cmpflet.lsp.patch      (revision 34)
+++ zips/gcl-2.6.7pre.cmpnew.gcl_cmpflet.lsp.patch      (local)
@@ -1,15 +0,0 @@
---- gcl_cmpflet.lsp    Sun Jul 24 12:54:29 2005
-+++ gcl_cmpflet.lsp.tpd        Sun Jul 24 13:44:18 2005
-@@ -390,8 +390,10 @@
-           (wt-label *exit*))
-     (unwind-no-exit 'tail-recursion-mark)
-     (wt-nl "goto TTL;")
--    (cmpnote "Tail-recursive call of ~s was replaced by iteration."
--             (fun-name (car fd))))
-+; 20031022000 tpd we don't need to know this
-+;    (cmpnote "Tail-recursive call of ~s was replaced by iteration."
-+;             (fun-name (car fd)))
-+    )
-    (t (push-args args)
-       (wt-nl (c-function-name "L" (fun-cfun (car fd)) (fun-name (car fd))) 
"(")
-       (dotimes** (n (fun-level (car fd))) (wt "base" n ","))

Property changes on: zips/gcl-2.6.7pre.cmpnew.gcl_cmpflet.lsp.patch
___________________________________________________________________
Name: svn:eol-style
 -native
Name: svn:keywords
 -Author Date Id Revision

--- zips/gcl-2.6.8pre.cmpnew.gcl_cmpcall.lsp.patch      (revision 34)
+++ zips/gcl-2.6.8pre.cmpnew.gcl_cmpcall.lsp.patch      (local)
@@ -1,13 +0,0 @@
---- gcl_cmpcall.lsp    Sun Jul 24 12:54:28 2005
-+++ gcl_cmpcall.lsp.tpd        Sun Jul 24 12:58:36 2005
-@@ -264,7 +264,9 @@
-             (wt-label *exit*))
-       (unwind-no-exit 'tail-recursion-mark)
-       (wt-nl "goto TTL;")
--      (cmpnote "Tail-recursive call of ~s was replaced by iteration." fname))
-+; 20031022000 tpd we don't need to know this
-+;      (cmpnote "Tail-recursive call of ~s was replaced by iteration." fname)
-+      )
- 
-      ;;; Open-codable function call.
-      ((and (listp args)
--- zips/gcl-2.6.8pre.cmpnew.gcl_cmpflet.lsp.patch      (revision 34)
+++ zips/gcl-2.6.8pre.cmpnew.gcl_cmpflet.lsp.patch      (local)
@@ -1,15 +0,0 @@
---- gcl_cmpflet.lsp    Sun Jul 24 12:54:29 2005
-+++ gcl_cmpflet.lsp.tpd        Sun Jul 24 13:44:18 2005
-@@ -390,8 +390,10 @@
-           (wt-label *exit*))
-     (unwind-no-exit 'tail-recursion-mark)
-     (wt-nl "goto TTL;")
--    (cmpnote "Tail-recursive call of ~s was replaced by iteration."
--             (fun-name (car fd))))
-+; 20031022000 tpd we don't need to know this
-+;    (cmpnote "Tail-recursive call of ~s was replaced by iteration."
-+;             (fun-name (car fd)))
-+    )
-    (t (push-args args)
-       (wt-nl (c-function-name "L" (fun-cfun (car fd)) (fun-name (car fd))) 
"(")
-       (dotimes** (n (fun-level (car fd))) (wt "base" n ","))