fix reference to libc.so to be libc.so.7 for FreeBSD (machine types i…

…3fb, ti3fb, a6fb, ta6fb) foreign.ms
gongchengra · Jun 16, 2017 · 1de3815 · 1de3815
1 parent c2f4b8d
commit 1de3815
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/LOG b/LOG
@@ -514,4 +514,7 @@
 - support Windows build on Bash/WSL
     BUILDING, configure, workarea, c/vs.bat (new), mats/vs.bat (new),
     c/Mf-*nt, mats/Mf-*, s/Mf-base
-- fix c/version.h for FreeBDS (machine types i3fb, ti3fb, a6fb, ta6fb)
+- fix c/version.h for FreeBDS (machine types i3fb, ti3fb, a6fb, ta6fb)
+- fix reference to libc.so to be libc.so.7 for FreeBSD (machine types
+  i3fb, ti3fb, a6fb, ta6fb)
+    foreign.ms
diff --git a/mats/foreign.ms b/mats/foreign.ms
@@ -176,7 +176,7 @@
                       (+ v ...)))))))))
 
 (machine-case
-  [(i3ob ti3ob a6ob ta6ob i3fb ti3fb a6fb ta6fb a6s2 ta6s2 i3s2 ti3s2 i3qnx ti3qnx)
+  [(i3ob ti3ob a6ob ta6ob a6s2 ta6s2 i3s2 ti3s2 i3qnx ti3qnx)
    (mat load-shared-object
       (file-exists? "foreign1.so")
       (begin (load-shared-object "./foreign1.so") #t)
@@ -192,6 +192,14 @@
       (error? (load-shared-object 3))
     )
    ]
+  [(i3fb ti3fb a6fb ta6fb)
+   (mat load-shared-object
+      (file-exists? "foreign1.so")
+      (begin (load-shared-object "./foreign1.so") #t)
+      (begin (load-shared-object "libc.so.7") #t)
+      (error? (load-shared-object 3))
+    )
+   ]
   [(i3nb ti3nb a6nb ta6nb)
    (mat load-shared-object
       (file-exists? "foreign1.so")
@@ -2582,10 +2590,12 @@
   (begin
     (define load-libc
       (machine-case
-        [(i3ob ti3ob a6ob ta6ob i3fb ti3fb a6fb ta6fb a6s2 ta6s2 i3s2 ti3s2 i3qnx ti3qnx i3nb ti3nb a6nb ta6nb)
+        [(i3ob ti3ob a6ob ta6ob a6s2 ta6s2 i3s2 ti3s2 i3qnx ti3qnx i3nb ti3nb a6nb ta6nb)
          '(load-shared-object "libc.so")]
         [(i3le ti3le a6le ta6le arm32le tarm32le ppc32le tppc32le)
          '(load-shared-object "libc.so.6")]
+        [(i3fb ti3fb a6fb ta6fb)
+         '(load-shared-object "libc.so.7")]
         [(i3nt ti3nt a6nt ta6nt)
          '(load-shared-object "msvcrt.dll")]
         [(i3osx ti3osx a6osx ta6osx)