Adjust geos startup code to new compiler handling. Introduce __STARTUP__

symbol, remove geos.o.

git-svn-id: svn://svn.cc65.org/cc65/trunk@3989 b7a2c559-68d2-44c3-8de9-860c34a00d81

diff --git a/libsrc/geos/Makefile b/libsrc/geos/Makefile
index 22db26a49971f6e501a73eddfe4d65e264a5d15c..ad7f56cc2e0ad0b14b45d333a2d8d1c640eefcd0 100644 (file)
--- a/libsrc/geos/Makefile
+++ b/libsrc/geos/Makefile
@@ -8,7 +8,6 @@ OBJ_DIRS=common conio devel disk dlgbox file graph menuicon memory mousesprite p
 
 all:
        @for i in $(OBJ_DIRS); do $(MAKE) -C $$i; done
-       @mv devel/crt0.o ../geos.o
        @for i in $(OBJ_DIRS); do $(AR) a ../geos.lib $$i/*.o; done
 
 rebuild: zap all clean
@@ -24,5 +23,5 @@ clean:
 
 .PHONY: zap
 zap:   clean
-       @$(RM) ../geos.lib ../geos.o
+       @$(RM) ../geos.lib 
 

diff --git a/libsrc/geos/devel/crt0.s b/libsrc/geos/devel/crt0.s
index 7a3c1028099c62bcc9cdaa8cfaf5682670ce45c0..6d85a963107cb3d2f1cb154df3b7940b30290eb8 100644 (file)
--- a/libsrc/geos/devel/crt0.s
+++ b/libsrc/geos/devel/crt0.s
@@ -1,16 +1,17 @@
 ;
-; This must be the *second* file on the linker command line
-; (.cvt header must be the *first* one)
-
+; Startup code for geos
+;
 ; Maciej 'YTM/Elysium' Witkowiak
 ; 26.10.99, 10.3.2000, 15.8.2001, 23.12.2002
 
+       .export         _exit
+        .export         __STARTUP__ : absolute = 1      ; Mark as startup
+
        .import         __RAM_START__, __RAM_SIZE__     ; Linker generated
        .import         initlib, donelib
        .import         callmain
        .import         zerobss
        .importzp       sp
-       .export         _exit
        .include        "../inc/jumptab.inc"
 
 ; ------------------------------------------------------------------------