Skip to content

Commit da8591b

Browse files
committed
all: remove darwin/arm build-tags and files
This removes all files that are only used on darwin/arm and cleans up build tags in files that are still used on other platforms. Updates #37611. Change-Id: Ic9490cf0edfc157c6276a7ca950c1768b34a998f Reviewed-on: https://go-review.googlesource.com/c/go/+/227197 Run-TryBot: Austin Clements <[email protected]> TryBot-Result: Gobot Gobot <[email protected]> Reviewed-by: Cherry Zhang <[email protected]>
1 parent 79b6900 commit da8591b

25 files changed

+10
-5848
lines changed

src/crypto/x509/root_cgo_darwin.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5-
// +build cgo,!arm,!arm64,!ios
5+
// +build cgo,!arm64,!ios
66

77
package x509
88

src/crypto/x509/root_darwin_armx.go renamed to src/crypto/x509/root_darwin_arm64.go

Lines changed: 1 addition & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/crypto/x509/root_darwin_arm_gen.go

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// +build ignore
66

7-
// Generates root_darwin_armx.go.
7+
// Generates root_darwin_arm64.go.
88
//
99
// As of iOS 8, there is no API for querying the system trusted X.509 root
1010
// certificates. We could use SecTrustEvaluate to verify that a trust chain
@@ -33,7 +33,7 @@ import (
3333
"strings"
3434
)
3535

36-
var output = flag.String("output", "root_darwin_armx.go", "file name to write")
36+
var output = flag.String("output", "root_darwin_arm64.go", "file name to write")
3737

3838
func main() {
3939
certs, err := selectCerts()
@@ -173,8 +173,6 @@ const header = `
173173
// license that can be found in the LICENSE file.
174174
175175
// +build cgo
176-
// +build darwin
177-
// +build arm arm64 ios
178176
179177
package x509
180178

src/runtime/cgo/gcc_darwin_arm.c

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

src/runtime/cgo/gcc_signal2_darwin_armx.c renamed to src/runtime/cgo/gcc_signal2_darwin_arm64.c

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,8 @@
33
// license that can be found in the LICENSE file.
44

55
// +build lldb
6-
// +build darwin
7-
// +build arm arm64
86

9-
// Used by gcc_signal_darwin_armx.c when doing the test build during cgo.
7+
// Used by gcc_signal_darwin_arm64.c when doing the test build during cgo.
108
// We hope that for real binaries the definition provided by Go will take precedence
119
// and the linker will drop this .o file altogether, which is why this definition
1210
// is all by itself in its own file.

src/runtime/cgo/gcc_signal_darwin_armx.c renamed to src/runtime/cgo/gcc_signal_darwin_arm64.c

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@
1818
// The dist tool enables this by build flag when testing.
1919

2020
// +build lldb
21-
// +build darwin
22-
// +build arm arm64
2321

2422
#include <limits.h>
2523
#include <pthread.h>

src/runtime/cgo/gcc_signal_darwin_lldb.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
// +build !lldb
66
// +build darwin
7-
// +build arm arm64
7+
// +build arm64
88

99
#include <stdint.h>
1010

src/runtime/cgo/signal_darwin_arm.s

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

src/runtime/cgo/signal_darwin_armx.go renamed to src/runtime/cgo/signal_darwin_arm64.go

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,6 @@
22
// Use of this source code is governed by a BSD-style
33
// license that can be found in the LICENSE file.
44

5-
// +build darwin
6-
// +build arm arm64
7-
85
package cgo
96

107
import _ "unsafe"

0 commit comments

Comments
 (0)