diff options
author | Ian Lance Taylor <iant@golang.org> | 2020-02-05 14:33:27 -0800 |
---|---|---|
committer | Ian Lance Taylor <iant@golang.org> | 2020-02-15 09:14:10 -0800 |
commit | 0b3c2eed35d608d6541ecf004a9576b4eae0b4ef (patch) | |
tree | c92c05d53eb054d8085d069800f4e9b586fef5a3 /libgo/misc | |
parent | 17edb3310d8ce9d5f6c9e53f6c1f7d611c2a5a41 (diff) | |
download | gcc-0b3c2eed35d608d6541ecf004a9576b4eae0b4ef.zip gcc-0b3c2eed35d608d6541ecf004a9576b4eae0b4ef.tar.gz gcc-0b3c2eed35d608d6541ecf004a9576b4eae0b4ef.tar.bz2 |
libgo: update to Go1.14rc1 release
Reviewed-on: https://go-review.googlesource.com/c/gofrontend/+/218017
Diffstat (limited to 'libgo/misc')
-rw-r--r-- | libgo/misc/cgo/test/issue21897.go | 11 | ||||
-rw-r--r-- | libgo/misc/cgo/test/issue21897b.go | 2 | ||||
-rw-r--r-- | libgo/misc/cgo/test/testdata/issue24161_darwin_test.go | 8 | ||||
-rw-r--r-- | libgo/misc/cgo/test/testdata/issue24161e0/main.go | 2 | ||||
-rw-r--r-- | libgo/misc/cgo/test/testdata/issue24161e1/main.go | 2 | ||||
-rw-r--r-- | libgo/misc/cgo/test/testdata/issue24161e2/main.go | 2 |
6 files changed, 5 insertions, 22 deletions
diff --git a/libgo/misc/cgo/test/issue21897.go b/libgo/misc/cgo/test/issue21897.go index 454a141..d13246b 100644 --- a/libgo/misc/cgo/test/issue21897.go +++ b/libgo/misc/cgo/test/issue21897.go @@ -2,16 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// We skip this test in race mode because, for unknown reasons, -// linking against CoreFoundation on macOS 10.10 causes mmap to ignore -// the hint address, which makes the Go allocator incompatible with -// TSAN. See golang.org/issue/26475. -// -// TODO(austin): Once support for macOS 10.10 is dropped, remove the -// race constraint (and the one in issue21897b.go). See -// golang.org/issue/26513. - -// +build darwin,cgo,!internal,!race +// +build darwin,cgo,!internal package cgotest diff --git a/libgo/misc/cgo/test/issue21897b.go b/libgo/misc/cgo/test/issue21897b.go index e143bad..08b5f4d 100644 --- a/libgo/misc/cgo/test/issue21897b.go +++ b/libgo/misc/cgo/test/issue21897b.go @@ -2,7 +2,7 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// +build !darwin !cgo internal race +// +build !darwin !cgo internal package cgotest diff --git a/libgo/misc/cgo/test/testdata/issue24161_darwin_test.go b/libgo/misc/cgo/test/testdata/issue24161_darwin_test.go index 64f4442..e60eb4e 100644 --- a/libgo/misc/cgo/test/testdata/issue24161_darwin_test.go +++ b/libgo/misc/cgo/test/testdata/issue24161_darwin_test.go @@ -2,14 +2,6 @@ // Use of this source code is governed by a BSD-style // license that can be found in the LICENSE file. -// See issue21897.go and golang.org/issue/26475 for why this is -// skipped in race mode. -// -// TODO(austin): Once support for macOS 10.10 is dropped, remove the -// race constraint. See golang.org/issue/26513. - -// +build !race - package cgotest import ( diff --git a/libgo/misc/cgo/test/testdata/issue24161e0/main.go b/libgo/misc/cgo/test/testdata/issue24161e0/main.go index cbc1dee..efe5345 100644 --- a/libgo/misc/cgo/test/testdata/issue24161e0/main.go +++ b/libgo/misc/cgo/test/testdata/issue24161e0/main.go @@ -12,7 +12,7 @@ package issue24161e0 #include <TargetConditionals.h> #include <CoreFoundation/CoreFoundation.h> #include <Security/Security.h> -#if TARGET_OS_IPHONE == 0 && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101200 +#if TARGET_OS_IPHONE == 0 && __MAC_OS_X_VERSION_MAX_ALLOWED < 101200 typedef CFStringRef SecKeyAlgorithm; static CFDataRef SecKeyCreateSignature(SecKeyRef key, SecKeyAlgorithm algorithm, CFDataRef dataToSign, CFErrorRef *error){return NULL;} #define kSecKeyAlgorithmECDSASignatureDigestX962SHA1 foo() diff --git a/libgo/misc/cgo/test/testdata/issue24161e1/main.go b/libgo/misc/cgo/test/testdata/issue24161e1/main.go index eb48fc0..82bf172 100644 --- a/libgo/misc/cgo/test/testdata/issue24161e1/main.go +++ b/libgo/misc/cgo/test/testdata/issue24161e1/main.go @@ -12,7 +12,7 @@ package issue24161e1 #include <TargetConditionals.h> #include <CoreFoundation/CoreFoundation.h> #include <Security/Security.h> -#if TARGET_OS_IPHONE == 0 && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101200 +#if TARGET_OS_IPHONE == 0 && __MAC_OS_X_VERSION_MAX_ALLOWED < 101200 typedef CFStringRef SecKeyAlgorithm; static CFDataRef SecKeyCreateSignature(SecKeyRef key, SecKeyAlgorithm algorithm, CFDataRef dataToSign, CFErrorRef *error){return NULL;} #define kSecKeyAlgorithmECDSASignatureDigestX962SHA1 foo() diff --git a/libgo/misc/cgo/test/testdata/issue24161e2/main.go b/libgo/misc/cgo/test/testdata/issue24161e2/main.go index 1951c86..82d2ec1 100644 --- a/libgo/misc/cgo/test/testdata/issue24161e2/main.go +++ b/libgo/misc/cgo/test/testdata/issue24161e2/main.go @@ -12,7 +12,7 @@ package issue24161e2 #include <TargetConditionals.h> #include <CoreFoundation/CoreFoundation.h> #include <Security/Security.h> -#if TARGET_OS_IPHONE == 0 && __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ < 101200 +#if TARGET_OS_IPHONE == 0 && __MAC_OS_X_VERSION_MAX_ALLOWED < 101200 typedef CFStringRef SecKeyAlgorithm; static CFDataRef SecKeyCreateSignature(SecKeyRef key, SecKeyAlgorithm algorithm, CFDataRef dataToSign, CFErrorRef *error){return NULL;} #define kSecKeyAlgorithmECDSASignatureDigestX962SHA1 foo() |