Magnus pushed to branch wip/mangoiv/fix-static-001-darwin at Glasgow Haskell Compiler / GHC
Commits:
4 changed files:
- .gitlab/generate-ci/gen_ci.hs
- .gitlab/jobs.yaml
- testsuite/driver/testlib.py
- testsuite/tests/driver/all.T
Changes:
| ... | ... | @@ -301,8 +301,8 @@ runnerTag arch (Linux _) = |
| 301 | 301 | Amd64 -> "x86_64-linux"
|
| 302 | 302 | AArch64 -> "aarch64-linux"
|
| 303 | 303 | I386 -> "x86_64-linux"
|
| 304 | -runnerTag AArch64 Darwin = "aarch64-darwin"
|
|
| 305 | -runnerTag Amd64 Darwin = "x86_64-darwin-m1"
|
|
| 304 | +runnerTag AArch64 Darwin = "beta"
|
|
| 305 | +runnerTag Amd64 Darwin = "beta"
|
|
| 306 | 306 | runnerTag Amd64 Windows = "new-x86_64-windows"
|
| 307 | 307 | runnerTag Amd64 FreeBSD14 = "x86_64-freebsd14"
|
| 308 | 308 | runnerTag _ _ = error "Invalid arch/opsys"
|
| ... | ... | @@ -50,7 +50,7 @@ |
| 50 | 50 | ],
|
| 51 | 51 | "stage": "full-build",
|
| 52 | 52 | "tags": [
|
| 53 | - "aarch64-darwin"
|
|
| 53 | + "beta"
|
|
| 54 | 54 | ],
|
| 55 | 55 | "variables": {
|
| 56 | 56 | "BIGNUM_BACKEND": "gmp",
|
| ... | ... | @@ -838,7 +838,7 @@ |
| 838 | 838 | ],
|
| 839 | 839 | "stage": "full-build",
|
| 840 | 840 | "tags": [
|
| 841 | - "aarch64-darwin"
|
|
| 841 | + "beta"
|
|
| 842 | 842 | ],
|
| 843 | 843 | "variables": {
|
| 844 | 844 | "BIGNUM_BACKEND": "gmp",
|
| ... | ... | @@ -1638,7 +1638,7 @@ |
| 1638 | 1638 | ],
|
| 1639 | 1639 | "stage": "full-build",
|
| 1640 | 1640 | "tags": [
|
| 1641 | - "x86_64-darwin-m1"
|
|
| 1641 | + "beta"
|
|
| 1642 | 1642 | ],
|
| 1643 | 1643 | "variables": {
|
| 1644 | 1644 | "BIGNUM_BACKEND": "gmp",
|
| ... | ... | @@ -3877,7 +3877,7 @@ |
| 3877 | 3877 | ],
|
| 3878 | 3878 | "stage": "full-build",
|
| 3879 | 3879 | "tags": [
|
| 3880 | - "aarch64-darwin"
|
|
| 3880 | + "beta"
|
|
| 3881 | 3881 | ],
|
| 3882 | 3882 | "variables": {
|
| 3883 | 3883 | "BIGNUM_BACKEND": "gmp",
|
| ... | ... | @@ -4459,7 +4459,7 @@ |
| 4459 | 4459 | ],
|
| 4460 | 4460 | "stage": "full-build",
|
| 4461 | 4461 | "tags": [
|
| 4462 | - "x86_64-darwin-m1"
|
|
| 4462 | + "beta"
|
|
| 4463 | 4463 | ],
|
| 4464 | 4464 | "variables": {
|
| 4465 | 4465 | "BIGNUM_BACKEND": "gmp",
|
| ... | ... | @@ -5561,7 +5561,7 @@ |
| 5561 | 5561 | ],
|
| 5562 | 5562 | "stage": "full-build",
|
| 5563 | 5563 | "tags": [
|
| 5564 | - "x86_64-darwin-m1"
|
|
| 5564 | + "beta"
|
|
| 5565 | 5565 | ],
|
| 5566 | 5566 | "variables": {
|
| 5567 | 5567 | "BIGNUM_BACKEND": "gmp",
|
| ... | ... | @@ -3043,6 +3043,12 @@ def normalise_errmsg(s: str) -> str: |
| 3043 | 3043 | # Old emcc warns when we export HEAP8 but new one requires it (see #26290)
|
| 3044 | 3044 | s = s.replace('warning: invalid item in EXPORTED_RUNTIME_METHODS: HEAP8\nwarning: invalid item in EXPORTED_RUNTIME_METHODS: HEAPU8\nemcc: warning: warnings in JS library compilation [-Wjs-compiler]\n','')
|
| 3045 | 3045 | |
| 3046 | + # on newer versions of MacOS X, the shipped ranlib warns about object files with no symbols,
|
|
| 3047 | + # however, these are completely benign stubs.
|
|
| 3048 | + # See https://gitlab.haskell.org/ghc/ghc/-/issues/27116
|
|
| 3049 | + if opsys('darwin'):
|
|
| 3050 | + s = re.sub(r'ranlib: warning:.*has no symbols\n', '', s)
|
|
| 3051 | + |
|
| 3046 | 3052 | return s
|
| 3047 | 3053 | |
| 3048 | 3054 | # normalise a .prof file, so that we can reasonably compare it against
|
| ... | ... | @@ -120,9 +120,7 @@ if config.os == 'darwin': |
| 120 | 120 | else:
|
| 121 | 121 | only_darwin = skip
|
| 122 | 122 | |
| 123 | -test('static001', [extra_files(['Static001.hs']),
|
|
| 124 | - only_darwin,
|
|
| 125 | - when(arch('x86_64'), expect_broken(8127))],
|
|
| 123 | +test('static001', [extra_files(['Static001.hs']), only_darwin],
|
|
| 126 | 124 | makefile_test, ['static001'])
|
| 127 | 125 | |
| 128 | 126 | test('dynHelloWorld',
|