steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch 'master' of git://factorcode.org/git/factor

db4
Slava Pestov 2009-01-30 16:52:11 -06:00
parent 7a4b03821b e70bf1f313
commit e36376b432
2 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
basis/math/blas/cblas/cblas.factor
View File

@ -1,13 +1,19 @@
USING: alien alien.c-types alien.syntax kernel system combinators ; USING: alien alien.c-types alien.syntax kernel system combinators ;
IN: math.blas.cblas IN: math.blas.cblas
<< "cblas" { <<
: load-atlas ( -- )
"atlas" "libatlas.so" "cdecl" add-library
"atlas" load-library drop ;
"cblas" {
{ [ os macosx? ] [ "libblas.dylib" "cdecl" add-library ] } { [ os macosx? ] [ "libblas.dylib" "cdecl" add-library ] }
{ [ os windows? ] [ "blas.dll" "cdecl" add-library ] } { [ os windows? ] [ "blas.dll" "cdecl" add-library ] }
{ [ os openbsd? ] [ "libcblas.so" "cdecl" add-library ] } { [ os openbsd? ] [ "libcblas.so" "cdecl" add-library ] }
{ [ os freebsd? ] [ "libcblas.so" "cdecl" add-library ] } { [ os freebsd? ] [ "libcblas.so" "cdecl" add-library load-atlas ] }
[ "libblas.so" "cdecl" add-library ] [ "libblas.so" "cdecl" add-library ]
} cond >> } cond
>>
LIBRARY: cblas LIBRARY: cblas

2
vm/os-unix.c
View File

@ -36,7 +36,7 @@ void init_ffi(void)
void ffi_dlopen(F_DLL *dll) void ffi_dlopen(F_DLL *dll)
{ {
dll->dll = dlopen(alien_offset(dll->path), RTLD_LAZY); dll->dll = dlopen(alien_offset(dll->path), RTLD_LAZY|RTLD_GLOBAL);
} }
void *ffi_dlsym(F_DLL *dll, F_SYMBOL *symbol) void *ffi_dlsym(F_DLL *dll, F_SYMBOL *symbol)