picolisp

commit 1278f0980b9cd309d79615a641dbd2274e491671
parent dbbc189495acb2eacb18585848c168c479a9296d
Author: Alexander Burger <abu@software-lab.de>
Date:   Tue,  6 Sep 2011 18:43:56 +0200

Makefile changes for Ubuntu and OpenBSD
Diffstat:
M
src64/Makefile
 | 
20
++++++++++----------
M
src64/sys/x86-64.openBsd.defs.l
 | 
6
+++++-

2 files changed, 15 insertions(+), 11 deletions(-)
diff --git a/src64/Makefile b/src64/Makefile
@@ -1,4 +1,4 @@
-# 29aug11abu
+# 06sep11abu
 # (c) Software Lab. Alexander Burger
 
 .SILENT:
@@ -45,8 +45,8 @@ ifeq ($(UNAME), Linux)
 		AS = as -mppc64 -a64
 	endif
 	endif
-	LD-MAIN = gcc -m64 -rdynamic -lc -lm -ldl
-	LD-SHARED = gcc -m64 -shared -export-dynamic
+	LD-MAIN = -m64 -rdynamic -lc -lm -ldl
+	LD-SHARED = -m64 -shared -export-dynamic
 	STRIP = strip
 else
 ifeq ($(UNAME), SunOS)
@@ -56,8 +56,8 @@ ifeq ($(UNAME), SunOS)
 	MKASM-BASE =
 	MKASM-LIB = -fpic
 	AS = gas --64
-	LD-MAIN = gcc -m64 -lc -lm -ldl -lsocket -lnsl
-	LD-SHARED = gcc -m64 -shared
+	LD-MAIN = -m64 -lc -lm -ldl -lsocket -lnsl
+	LD-SHARED = -m64 -shared
 	STRIP = strip
 else
 ifeq ($(UNAME), OpenBSD)
@@ -67,8 +67,8 @@ ifeq ($(UNAME), OpenBSD)
 	MKASM-BASE =
 	MKASM-LIB = -fpic
 	AS = as
-	LD-MAIN = gcc -m64 -rdynamic -lc -lm -ldl
-	LD-SHARED = gcc -m64 -shared
+	LD-MAIN = -m64 -rdynamic -lc -lm
+	LD-SHARED = -m64 -shared
 	STRIP = strip
 endif
 endif
@@ -90,15 +90,15 @@ picolisp: $(bin)/picolisp $(lib)/ext $(lib)/ht
 
 $(bin)/picolisp: $(ARCH).$(SYS).base.o
 	mkdir -p $(bin) $(lib)
-	$(LD-MAIN) -o $(bin)/picolisp $(ARCH).$(SYS).base.o
+	gcc -o $(bin)/picolisp $(ARCH).$(SYS).base.o $(LD-MAIN)
 	$(STRIP) $(bin)/picolisp
 
 $(lib)/ext: $(ARCH).$(SYS).ext.o
-	$(LD-SHARED) -o $(lib)/ext $(ARCH).$(SYS).ext.o
+	gcc -o $(lib)/ext $(ARCH).$(SYS).ext.o $(LD-SHARED)
 	$(STRIP) $(lib)/ext
 
 $(lib)/ht: $(ARCH).$(SYS).ht.o
-	$(LD-SHARED) -o $(lib)/ht $(ARCH).$(SYS).ht.o
+	gcc -o $(lib)/ht $(ARCH).$(SYS).ht.o $(LD-SHARED)
 	$(STRIP) $(lib)/ht
 
 .s.o:
diff --git a/src64/sys/x86-64.openBsd.defs.l b/src64/sys/x86-64.openBsd.defs.l
@@ -1,4 +1,4 @@
-# 01sep11abu
+# 06sep11abu
 # Amit Kulkarni <amitkulz@gmail.com>
 # (c) Software Lab. Alexander Burger
 
@@ -27,6 +27,10 @@
 (equ BUFSIZ 1024)
 (equ PIPE_BUF 512)
 
+(equ stdin  "$__sF")
+(equ stdout "$__sF+128")
+(equ stderr "$__sF+256")
+
 (equ MAXPATHLEN 1024)
 
 # dlfcn