FreeBSD: use proper method to detect host architecture

Reading textual representation of the kernel config file to search for
the "machine" config clause is awful, not to mention that kern.conftxt
might be disabled at all.

Use sysctl hw.supported_archs to detect 32bit binary running on amd64
host.

Author: kostikbel

src/internal/routebsd/sys_freebsd.go

@@ -25,24 +25,15 @@ func probeRoutingStack() (int, map[int]*wireFormat) {
 	// to know the underlying kernel's architecture because the
 	// alignment for routing facilities are set at the build time
 	// of the kernel.
-	conf, _ := syscall.Sysctl("kern.conftxt")
-	for i, j := 0, 0; j < len(conf); j++ {
-		if conf[j] != '\n' {
-			continue
+	arches, _ := syscall.Sysctl("hw.supported_archs")
+	amd64 := "amd64"
+	for i := 0; i < len(arches); i++ {
+		s := arches[i:i + len(amd64)]
+		if len(s) < len(amd64) {
+			break
 		}
-		s := conf[i:j]
-		i = j + 1
-		if len(s) > len("machine") && s[:len("machine")] == "machine" {
-			s = s[len("machine"):]
-			for k := 0; k < len(s); k++ {
-				if s[k] == ' ' || s[k] == '\t' {
-					s = s[1:]
-				}
-				break
-			}
-			if s == "amd64" {
-				align = 8
-			}
+		if s == amd64 {
+			align = 8
 			break
 		}
 	}

src/syscall/route_freebsd.go

@@ -7,25 +7,22 @@ package syscall
 import "unsafe"
 
 func init() {
-	conf, _ := Sysctl("kern.conftxt")
-	for i, j := 0, 0; j < len(conf); j++ {
-		if conf[j] != '\n' {
-			continue
-		}
-		s := conf[i:j]
-		i = j + 1
-		if len(s) > len("machine") && s[:len("machine")] == "machine" {
-			s = s[len("machine"):]
-			for k := 0; k < len(s); k++ {
-				if s[k] == ' ' || s[k] == '\t' {
-					s = s[1:]
-				}
+	machine, _ := Sysctl("hw.machine")
+	if machine == "i386" {
+		arches, _ := Sysctl("hw.supported_archs")
+		amd64 := "amd64"
+		for i := 0; i < len(arches); i++ {
+			s := arches[i:i + len(amd64)]
+			if len(s) < len(amd64) {
+				break
+			}
+			if s == amd64 {
+				machine = "amd64"
 				break
 			}
-			freebsdConfArch = s
-			break
 		}
 	}
+	freebsdConfArch = machine
 }
 
 func (any *anyMessage) toRoutingMessage(b []byte) RoutingMessage {