--- gforth/libcc.fs	2008/07/10 19:59:41	1.41
+++ gforth/libcc.fs	2008/07/27 10:34:06	1.51
@@ -1,6 +1,6 @@
 \ libcc.fs	foreign function interface implemented using a C compiler
 
-\ Copyright (C) 2006,2007 Free Software Foundation, Inc.
+\ Copyright (C) 2006,2007,2008 Free Software Foundation, Inc.
 
 \ This file is part of Gforth.
 
@@ -136,8 +136,6 @@
 
 require struct.fs
 
-    \ counted-string
-    
 \ c-function-ft word body:
 struct
     cell% field cff-cfr \ xt of c-function-rt word
@@ -158,8 +156,11 @@ variable lib-handle-addr \ points to the
   here 0 , lib-handle-addr ! \ just make sure LIB-HANDLE always works
 2variable lib-filename   \ filename without extension
 2variable lib-modulename \ basename of the file without extension
+2variable libcc-named-dir-v \ directory for named libcc wrapper libraries
+0 value libcc-path       \ pointer to path of library directories
 
-: delete-file 2drop 0 ;
+defer replace-rpath ( c-addr1 u1 -- c-addr2 u2 )
+' noop is replace-rpath
 
 : .nb ( n -- )
     0 .r ;
@@ -283,6 +284,7 @@ const+ d \ double
 const+ r \ float
 const+ func \ C function pointer
 const+ void
+const+ file \ C file pointer
 drop
 
 set-current
@@ -299,7 +301,7 @@ set-current
     parse-libcc-type dup 0< -32 and throw swap c! ;
 
 : type-letter ( n -- c )
-    chars s" nadrfv" drop + c@ ;
+    chars s" nadrfvF" drop + c@ ;
 
 \ count-stacks
 
@@ -328,6 +330,7 @@ create count-stacks-types
 ' count-stacks-r ,
 ' count-stacks-func ,
 ' count-stacks-void ,
+' count-stacks-a ,
 
 : count-stacks ( pars -- fp-change sp-change )
     \ pars is an addr u pair
@@ -355,6 +358,9 @@ create count-stacks-types
 : gen-par-void ( fp-depth1 sp-depth1 -- fp-depth2 sp-depth2 )
     -32 throw ;
 
+: gen-par-file ( fp-depth1 sp-depth1 -- fp-depth2 sp-depth2 )
+    ." (FILE *)(" gen-par-n ." )" ;
+
 create gen-par-types
 ' gen-par-n ,
 ' gen-par-a ,
@@ -362,6 +368,7 @@ create gen-par-types
 ' gen-par-r ,
 ' gen-par-func ,
 ' gen-par-void ,
+' gen-par-file ,
 
 : gen-par ( fp-depth1 sp-depth1 partype -- fp-depth2 sp-depth2 )
     cells gen-par-types + @ execute ;
@@ -406,6 +413,7 @@ create gen-wrapped-types
 ' gen-wrapped-r ,
 ' gen-wrapped-func ,
 ' gen-wrapped-void ,
+' gen-wrapped-a ,
 
 : gen-wrapped-stmt ( pars c-name fp-change1 sp-change1 ret -- fp-change sp-change )
     cells gen-wrapped-types + @ execute ;
@@ -441,12 +449,6 @@ create gen-wrapped-types
     endif
     .\" }\n" ;
 
-: open-wrappers ( -- addr )
-    lib-filename 2@ s" .la" s+
-    \ 2dup cr type
-    2dup open-lib >r
-    drop free throw r> ;
-
 : scan-back { c-addr u1 c -- c-addr u2 }
     \ the last occurence of c in c-addr u1 is at u2-1; if it does not
     \ occur, u2=0.
@@ -470,7 +472,7 @@ create gen-wrapped-types
     s" gforth_c_" 2swap s+ #>> ;
 
 : libcc-named-dir ( -- c-addr u )
-    s" ~/.gforth/libcc-named/" ;
+    libcc-named-dir-v 2@ ;
 
 : libcc-tmp-dir ( -- c-addr u )
     s" ~/.gforth/libcc-tmp/" ;
@@ -478,6 +480,19 @@ create gen-wrapped-types
 : prepend-dirname ( c-addr1 u1 c-addr2 u2 -- c-addr3 u3 )
     2over s+ 2swap drop free throw ;
 
+: open-wrappers ( -- addr|0 )
+    lib-filename 2@ s" .la" s+
+    2dup libcc-named-dir string-prefix? if ( c-addr u )
+	\ see if we can open it in the path
+	libcc-named-dir nip /string
+	libcc-path open-path-file if
+	    0 exit endif
+	( wfile-id c-addr2 u2 ) rot close-file throw save-mem ( c-addr2 u2 )
+    endif
+    \ 2dup cr type
+    2dup open-lib >r
+    drop free throw r> ;
+
 : c-library-name-setup ( c-addr u -- )
     assert( c-source-file-id @ 0= )
     { d: filename }
@@ -545,14 +560,16 @@ DEFER compile-wrapper-function ( -- )
     lib-handle 0= if
 	c-source-file close-file throw
 	0 c-source-file-id !
-	[ libtool-command s"  --silent --mode=compile gcc -I " s+
-	s" includedir" getenv append ] sliteral
+	[ libtool-command s"  --silent --mode=compile --tag=CC " s+
+	  libtool-cc append s"  -I " append
+	  s" includedir" getenv append ] sliteral
 	s"  -O -c " s+ lib-filename 2@ append s" .c -o " append
 	lib-filename 2@ append s" .lo" append ( c-addr u )
 	\    cr 2dup type
 	2dup system drop free throw $? abort" libtool compile failed"
-	[ libtool-command s"  --silent --mode=link gcc -module -rpath " s+ ] sliteral
-	lib-filename 2@ dirname s+ s"  " append
+	[ libtool-command s"  --silent --mode=link --tag=CC " s+
+	  libtool-cc append s"  -module -rpath " s+ ] sliteral
+	lib-filename 2@ dirname replace-rpath s+ s"  " append
 	lib-filename 2@ append s" .lo -o " append
 	lib-filename 2@ append s" .la" append ( c-addr u )
 	c-libs @ ['] append-l list-map
@@ -629,3 +646,19 @@ clear-libs
 \G Finish and (if necessary) build the latest C library interface.
     ['] compile-wrapper-function1 is compile-wrapper-function
     compile-wrapper-function1 ;
+
+: init-libcc ( -- )
+    s" ~/.gforth/libcc-named/" libcc-named-dir-v 2!
+[IFDEF] make-path
+    make-path to libcc-path
+    libcc-named-dir libcc-path also-path
+    [ s" libccdir" getenv ] sliteral libcc-path also-path
+[THEN]
+;
+
+init-libcc
+
+:noname ( -- )
+    defers 'cold
+    init-libcc ;
+is 'cold