1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
|
From: Shengjing Zhu <zhsj@debian.org>
Date: Tue, 22 Feb 2022 01:57:23 +0800
Subject: Fix build with gccgo
Origin: backport, https://github.com/containerd/containerd/commit/d28981d4
---
mount/subprocess_unsafe.s | 15 +++++++++++++++
mount/subprocess_unsafe_gc.go | 33 +++++++++++++++++++++++++++++++++
mount/subprocess_unsafe_gccgo.go | 33 +++++++++++++++++++++++++++++++++
mount/subprocess_unsafe_linux.go | 30 ------------------------------
mount/subprocess_unsafe_linux.s | 15 ---------------
5 files changed, 81 insertions(+), 45 deletions(-)
create mode 100644 mount/subprocess_unsafe.s
create mode 100644 mount/subprocess_unsafe_gc.go
create mode 100644 mount/subprocess_unsafe_gccgo.go
delete mode 100644 mount/subprocess_unsafe_linux.go
delete mode 100644 mount/subprocess_unsafe_linux.s
diff --git a/mount/subprocess_unsafe.s b/mount/subprocess_unsafe.s
new file mode 100644
index 0000000..c073fa4
--- /dev/null
+++ b/mount/subprocess_unsafe.s
@@ -0,0 +1,15 @@
+/*
+ Copyright The containerd Authors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
diff --git a/mount/subprocess_unsafe_gc.go b/mount/subprocess_unsafe_gc.go
new file mode 100644
index 0000000..695280a
--- /dev/null
+++ b/mount/subprocess_unsafe_gc.go
@@ -0,0 +1,33 @@
+//go:build linux && gc
+// +build linux,gc
+
+/*
+ Copyright The containerd Authors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+package mount
+
+import (
+ _ "unsafe" // required for go:linkname.
+)
+
+//go:linkname beforeFork syscall.runtime_BeforeFork
+func beforeFork()
+
+//go:linkname afterFork syscall.runtime_AfterFork
+func afterFork()
+
+//go:linkname afterForkInChild syscall.runtime_AfterForkInChild
+func afterForkInChild()
diff --git a/mount/subprocess_unsafe_gccgo.go b/mount/subprocess_unsafe_gccgo.go
new file mode 100644
index 0000000..72c38e7
--- /dev/null
+++ b/mount/subprocess_unsafe_gccgo.go
@@ -0,0 +1,33 @@
+//go:build linux && gccgo
+// +build linux,gccgo
+
+/*
+ Copyright The containerd Authors.
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+*/
+
+package mount
+
+import (
+ _ "unsafe" // required for go:linkname.
+)
+
+//go:linkname beforeFork syscall.runtime__BeforeFork
+func beforeFork()
+
+//go:linkname afterFork syscall.runtime__AfterFork
+func afterFork()
+
+//go:linkname afterForkInChild syscall.runtime__AfterForkInChild
+func afterForkInChild()
diff --git a/mount/subprocess_unsafe_linux.go b/mount/subprocess_unsafe_linux.go
deleted file mode 100644
index c7cb0c0..0000000
--- a/mount/subprocess_unsafe_linux.go
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- Copyright The containerd Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
-
-package mount
-
-import (
- _ "unsafe" // required for go:linkname.
-)
-
-//go:linkname beforeFork syscall.runtime_BeforeFork
-func beforeFork()
-
-//go:linkname afterFork syscall.runtime_AfterFork
-func afterFork()
-
-//go:linkname afterForkInChild syscall.runtime_AfterForkInChild
-func afterForkInChild()
diff --git a/mount/subprocess_unsafe_linux.s b/mount/subprocess_unsafe_linux.s
deleted file mode 100644
index c073fa4..0000000
--- a/mount/subprocess_unsafe_linux.s
+++ /dev/null
@@ -1,15 +0,0 @@
-/*
- Copyright The containerd Authors.
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
-*/
|
