Skip to content

Commit 0eafdc3

Browse files
cypharcyphar
committed
merge branch 'pr-1613'
 libcontainer: merge common syscall implementations LGTMs: @crosbymichael @cyphar Closes opencontainers#1613
2 parents 6d30f7a + d2bc081 commit 0eafdc3

File tree

4 files changed

+4
-52
lines changed

4 files changed

+4
-52
lines changed

‎libcontainer/system/syscall_linux_386.go‎ renamed to ‎libcontainer/system/syscall_linux_32.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// +build linux,386
1+
// +build linux
2+
// +build 386 arm
23

34
package system
45

‎libcontainer/system/syscall_linux_64.go‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
// +build linux,arm64 linux,amd64 linux,ppc linux,ppc64 linux,ppc64le linux,s390x
1+
// +build linux
2+
// +build arm64 amd64 mips mipsle mips64 mips64le ppc ppc64 ppc64le s390x
23

34
package system
45

‎libcontainer/system/syscall_linux_arm.go‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

‎libcontainer/system/syscall_linux_mipsx.go‎

Lines changed: 0 additions & 25 deletions
This file was deleted.

0 commit comments

Comments
 (0)