Merge pull request #7389 from tianon/replace-amd64-build-tags-with-cgo-as-appropriate

Replace amd64 build tags with cgo as appropriate

daemon/execdriver/lxc/lxc_init_linux.go

@@ -1,5 +1,3 @@
-// +build amd64
-
 package lxc
 
 import (

daemon/execdriver/lxc/lxc_init_unsupported.go

@@ -1,4 +1,4 @@
-// +build !linux !amd64
+// +build !linux
 
 package lxc
 

daemon/graphdriver/aufs/mount_linux.go

@@ -1,5 +1,3 @@
-// +build amd64
-
 package aufs
 
 import "syscall"

daemon/graphdriver/aufs/mount_unsupported.go

@@ -1,4 +1,4 @@
-// +build !linux !amd64
+// +build !linux
 
 package aufs
 

daemon/graphdriver/btrfs/btrfs.go

@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux
 
 package btrfs
 

daemon/graphdriver/btrfs/dummy_unsupported.go

@@ -1,3 +1,3 @@
-// +build !linux !amd64
+// +build !linux !cgo
 
 package btrfs

daemon/graphdriver/devmapper/attach_loopback.go

@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux
 
 package devmapper
 

daemon/graphdriver/devmapper/deviceset.go

@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux
 
 package devmapper
 

daemon/graphdriver/devmapper/devmapper.go

@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux
 
 package devmapper
 

daemon/graphdriver/devmapper/devmapper_log.go

@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux
 
 package devmapper
 

daemon/graphdriver/devmapper/devmapper_test.go

@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux
 
 package devmapper
 

daemon/graphdriver/devmapper/devmapper_wrapper.go

@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux
 
 package devmapper
 

daemon/graphdriver/devmapper/driver.go

@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux
 
 package devmapper
 

daemon/graphdriver/devmapper/ioctl.go

@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux
 
 package devmapper
 

daemon/graphdriver/devmapper/mount.go

@@ -1,4 +1,4 @@
-// +build linux,amd64
+// +build linux
 
 package devmapper
 

pkg/mount/flags_linux.go

@@ -1,5 +1,3 @@
-// +build amd64
-
 package mount
 
 import (

pkg/mount/flags_unsupported.go

@@ -1,4 +1,4 @@
-// +build !linux,!freebsd linux,!amd64 freebsd,!cgo
+// +build !linux,!freebsd freebsd,!cgo
 
 package mount
 

pkg/mount/mounter_linux.go

@@ -1,5 +1,3 @@
-// +build amd64
-
 package mount
 
 import (

pkg/mount/mounter_unsupported.go

@@ -1,4 +1,4 @@
-// +build !linux,!freebsd linux,!amd64 freebsd,!cgo
+// +build !linux,!freebsd freebsd,!cgo
 
 package mount
 

pkg/parsers/kernel/uname_linux.go

@@ -1,5 +1,3 @@
-// +build amd64
-
 package kernel
 
 import (

pkg/parsers/kernel/uname_unsupported.go

@@ -1,4 +1,4 @@
-// +build !linux !amd64
+// +build !linux
 
 package kernel