diff --git a/unix/asm_solaris_amd64.s b/unix/asm_solaris_amd64.s
index d7c34ec3..f6121318 100644
--- a/unix/asm_solaris_amd64.s
+++ b/unix/asm_solaris_amd64.s
@@ -5,3 +5,18 @@
 //
 // System calls for amd64, Solaris are implemented in runtime/syscall_solaris.goc
 //
+
+TEXT ·sysvicall6(SB), 7, $0-64
+	JMP	syscall·sysvicall6(SB)
+
+TEXT ·rawSysvicall6(SB), 7, $0-64
+	JMP	syscall·rawSysvicall6(SB)
+
+TEXT ·dlopen(SB), 7, $0-16
+	JMP	syscall·dlopen(SB)
+
+TEXT ·dlclose(SB), 7, $0-8
+	JMP	syscall·dlclose(SB)
+
+TEXT ·dlsym(SB), 7, $0-16
+	JMP	syscall·dlsym(SB)
diff --git a/unix/race.go b/unix/race.go
index 03d60dd1..3c7627eb 100644
--- a/unix/race.go
+++ b/unix/race.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin,race linux,race
+// +build darwin,race linux,race freebsd,race
 
 package unix
 
diff --git a/unix/race0.go b/unix/race0.go
index d6de6196..f8678e0d 100644
--- a/unix/race0.go
+++ b/unix/race0.go
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style
 // license that can be found in the LICENSE file.
 
-// +build darwin,!race dragonfly,!race freebsd linux netbsd openbsd solaris
+// +build darwin,!race linux,!race freebsd,!race netbsd openbsd solaris dragonfly
 
 package unix