From: uz <uz@b7a2c559-68d2-44c3-8de9-860c34a00d81>
Date: Fri, 31 Jul 2009 12:46:38 +0000 (+0000)
Subject: Adjust geos startup code to new compiler handling. Introduce __STARTUP__
X-Git-Tag: V2.13.0rc1~266
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=7ecf7a7e58858282ac96f58dfad13a570dd904d2;p=cc65

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 22db26a49..ad7f56cc2 100644
--- 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 7a3c10280..6d85a9631 100644
--- 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"
 
 ; ------------------------------------------------------------------------