sys/targets: take DataOffset from reference targets

For test targets, we curretly specialize a single FreeBSD/386 exception.
But it's more robust to just copy the DataOffset value from the
reference targets, especially now that we explicitly determine it.

1 files changed, 2 insertions, 7 deletions

diff --git a/sys/targets/targets.go b/sys/targets/targets.go
index 7d10dfc04..1e19cfe88 100644
--- a/sys/targets/targets.go
+++ b/sys/targets/targets.go
@@ -640,6 +640,8 @@ func init() {
 		target.CPP = host.CPP
 		target.CFlags = append(append([]string{}, host.CFlags...), target.CFlags...)
 		target.CFlags = processMergedFlags(target.CFlags)
+		// At least FreeBSD/386 requires a non-default DataOffset value.
+		target.DataOffset = host.DataOffset
 		// In ESA/390 mode, the CPU is able to address only 31bit of memory but
 		// arithmetic operations are still 32bit
 		// Fix cflags by replacing compiler's -m32 option with -m31
@@ -648,13 +650,6 @@ func init() {
 				target.CFlags[i] = strings.Replace(target.CFlags[i], "-m32", "-m31", -1)
 			}
 		}
-		if target.PtrSize == 4 && goos == FreeBSD && arch == AMD64 {
-			// A hack to let 32-bit "test" target tests run on FreeBSD:
-			// freebsd/386 requires a non-default DataOffset to avoid
-			// clobbering mappings created by the C runtime. Since that is the
-			// only target with this constraint, just special-case it for now.
-			target.DataOffset = List[goos][I386].DataOffset
-		}
 		target.BuildOS = goos
 	}
 }