diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2017-09-14 12:14:52 +0200 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2017-09-15 16:02:37 +0200 |
| commit | 75ddf7ab901e1ecef20d30f276b9360363b1fee6 (patch) | |
| tree | fdd54914bd7c12fc487d8d1b0c3d819d268e6246 /sys/sys.go | |
| parent | 487aa0d5371e9b020c69d2f9e4a955ed8e5b2555 (diff) | |
sys/syz-extract: switch to consolidated target info in sys package
Diffstat (limited to 'sys/sys.go')
| -rw-r--r-- | sys/sys.go | 28 |
1 files changed, 20 insertions, 8 deletions
diff --git a/sys/sys.go b/sys/sys.go index d5ddd6028..796837325 100644 --- a/sys/sys.go +++ b/sys/sys.go @@ -8,10 +8,13 @@ import ( ) type Target struct { + OS string + Arch string PtrSize uint64 CArch []string CFlags []string - CCompiler string + CrossCFlags []string + CCompilerPrefix string KernelArch string KernelHeaderArch string KernelCrossCompile string @@ -23,7 +26,7 @@ var Targets = map[string]map[string]*Target{ PtrSize: 8, CArch: []string{"__x86_64__"}, CFlags: []string{"-m64"}, - CCompiler: "x86_64-linux-gnu-", + CCompilerPrefix: "x86_64-linux-gnu-", KernelArch: "x86_64", KernelHeaderArch: "x86", }, @@ -31,23 +34,23 @@ var Targets = map[string]map[string]*Target{ PtrSize: 4, CArch: []string{"__i386__"}, CFlags: []string{"-m32"}, - CCompiler: "x86_64-linux-gnu-", + CCompilerPrefix: "x86_64-linux-gnu-", KernelArch: "i386", KernelHeaderArch: "x86", }, "arm64": { PtrSize: 8, CArch: []string{"__aarch64__"}, - CFlags: []string{}, - CCompiler: "aarch64-linux-gnu-", + CCompilerPrefix: "aarch64-linux-gnu-", KernelArch: "arm64", KernelHeaderArch: "arm64", }, "arm": { PtrSize: 4, CArch: []string{"__arm__"}, - CFlags: []string{"-D__LINUX_ARM_ARCH__=6", "-march=armv6t2", "-m32"}, - CCompiler: "arm-linux-gnueabihf-", + CFlags: []string{"-D__LINUX_ARM_ARCH__=6", "-m32"}, + CrossCFlags: []string{"-march=armv6t2"}, + CCompilerPrefix: "arm-linux-gnueabihf-", KernelArch: "arm", KernelHeaderArch: "arm", }, @@ -55,9 +58,18 @@ var Targets = map[string]map[string]*Target{ PtrSize: 8, CArch: []string{"__ppc64__", "__PPC64__", "__powerpc64__"}, CFlags: []string{"-D__powerpc64__"}, - CCompiler: "powerpc64le-linux-gnu-", + CCompilerPrefix: "powerpc64le-linux-gnu-", KernelArch: "powerpc", KernelHeaderArch: "powerpc", }, }, } + +func init() { + for OS, archs := range Targets { + for arch, target := range archs { + target.OS = OS + target.Arch = arch + } + } +} |