Fix test_read_file so it reads its own output (which should obviously

be the same).

--build-id=none isn't supported on F6.

Version 45.

diff --git a/Makefile b/Makefile
index d47b4d2..51fba1e 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,11 +1,14 @@
-# $Id: Makefile,v 1.8 2007-10-11 07:45:35 rich Exp $
+# $Id: Makefile,v 1.9 2007-10-22 18:53:12 rich Exp $
+
+#BUILD_ID_NONE := -Wl,--build-id=none 
+BUILD_ID_NONE := 
 
 SHELL  := /bin/bash
 
 all:   jonesforth
 
 jonesforth: jonesforth.S
-       gcc -m32 -nostdlib -static -Wl,-Ttext,0 -Wl,--build-id=none -o $@ $<
+       gcc -m32 -nostdlib -static -Wl,-Ttext,0 $(BUILD_ID_NONE) -o $@ $<
 
 run:
        cat jonesforth.f $(PROG) - | ./jonesforth

diff --git a/jonesforth.S b/jonesforth.S
index ad93261..8b02f1b 100644 (file)
--- a/jonesforth.S
+++ b/jonesforth.S
@@ -1,11 +1,11 @@
 /*     A sometimes minimal FORTH compiler and tutorial for Linux / i386 systems. -*- asm -*-
        By Richard W.M. Jones <rich@annexia.org> http://annexia.org/forth
        This is PUBLIC DOMAIN (see public domain release statement below).
-       $Id: jonesforth.S,v 1.44 2007-10-11 07:38:31 rich Exp $
+       $Id: jonesforth.S,v 1.45 2007-10-22 18:53:13 rich Exp $
 
        gcc -m32 -nostdlib -static -Wl,-Ttext,0 -Wl,--build-id=none -o jonesforth jonesforth.S
 */
-       .set JONES_VERSION,44
+       .set JONES_VERSION,45
 /*
        INTRODUCTION ----------------------------------------------------------------------
 

diff --git a/test_read_file.f b/test_read_file.f
index f3a6f45..3e3c847 100644 (file)
--- a/test_read_file.f
+++ b/test_read_file.f
@@ -1,14 +1,14 @@
 ( -*- text -*-
        Test READ-FILE.
-       $Id: test_read_file.f,v 1.1 2007-10-07 11:07:15 rich Exp $
+       $Id: test_read_file.f,v 1.2 2007-10-22 18:53:13 rich Exp $
 )
 
 0 VALUE FD
 100 CELLS ALLOT CONSTANT BUFFER
 
 : TEST
-       S" /etc/fstab" R/O OPEN-FILE
-       ?DUP IF S" /etc/fstab" PERROR QUIT THEN
+       S" test_read_file.f.out" R/O OPEN-FILE
+       ?DUP IF S" test_read_file.f.out" PERROR QUIT THEN
 
        TO FD