Skip to content

Commit 73c5044

Browse files
tipabupablodelara
tipabu
authored and
pablodelara
committed
aarch64: Fix build on macOS
Somewhere between Command Line Tools for Xcode 16.2 and 16.3, clang started complaining like <instantiation>:91:26: error: unexpected token in argument list movk x7, br_low_b2, lsl 32 ^ crc/aarch64/crc32_ieee_norm_pmull.S:34:1: note: while in macro instantiation crc32_norm_func crc32_ieee_norm_pmull It seems to do with some change to macro expansion; work around it by replacing .equ directives with #defines. Fixes #352 Signed-off-by: Tim Burke <[email protected]>
1 parent 8772e99 commit 73c5044

11 files changed

+294
-294
lines changed

‎crc/aarch64/crc32_gzip_refl_pmull.h‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,24 @@
2727
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828
#########################################################################
2929

30-
.equ p4_low_b0, 0x2d95
31-
.equ p4_low_b1, 0x8f35
32-
.equ p4_high_b0, 0x13d7
33-
.equ p4_high_b1, 0x1d95
34-
.equ p1_low_b0, 0x9191
35-
.equ p1_low_b1, 0xae68
36-
.equ p1_high_b0, 0x009e
37-
.equ p1_high_b1, 0xccaa
38-
.equ p0_low_b0, 0x6765
39-
.equ p0_low_b1, 0xb8bc
40-
.equ p0_high_b0, p1_high_b0
41-
.equ p0_high_b1, p1_high_b1
42-
.equ br_low_b0, 0x0641
43-
.equ br_low_b1, 0xdb71
44-
.equ br_low_b2, 0x1
45-
.equ br_high_b0, 0x1641
46-
.equ br_high_b1, 0xf701
47-
.equ br_high_b2, 0x1
30+
#define p4_low_b0 0x2d95
31+
#define p4_low_b1 0x8f35
32+
#define p4_high_b0 0x13d7
33+
#define p4_high_b1 0x1d95
34+
#define p1_low_b0 0x9191
35+
#define p1_low_b1 0xae68
36+
#define p1_high_b0 0x009e
37+
#define p1_high_b1 0xccaa
38+
#define p0_low_b0 0x6765
39+
#define p0_low_b1 0xb8bc
40+
#define p0_high_b0 p1_high_b0
41+
#define p0_high_b1 p1_high_b1
42+
#define br_low_b0 0x0641
43+
#define br_low_b1 0xdb71
44+
#define br_low_b2 0x1
45+
#define br_high_b0 0x1641
46+
#define br_high_b1 0xf701
47+
#define br_high_b2 0x1
4848

4949
.text
5050
ASM_DEF_RODATA

‎crc/aarch64/crc32_ieee_norm_pmull.h‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,24 @@
2727
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828
#########################################################################
2929

30-
.equ p4_low_b0, 0x8b11
31-
.equ p4_low_b1, 0xe622
32-
.equ p4_high_b0, 0x794c
33-
.equ p4_high_b1, 0x8833
34-
.equ p1_low_b0, 0x5605
35-
.equ p1_low_b1, 0xe8a4
36-
.equ p1_high_b0, 0xcd4c
37-
.equ p1_high_b1, 0xc5b9
38-
.equ p0_low_b0, 0x678d
39-
.equ p0_low_b1, 0x490d
40-
.equ p0_high_b0, 0xaa66
41-
.equ p0_high_b1, 0xf200
42-
.equ br_low_b0, 0x01df
43-
.equ br_low_b1, 0x04d1
44-
.equ br_low_b2, 0x1
45-
.equ br_high_b0, 0x1db7
46-
.equ br_high_b1, 0x04c1
47-
.equ br_high_b2, 0x1
30+
#define p4_low_b0 0x8b11
31+
#define p4_low_b1 0xe622
32+
#define p4_high_b0 0x794c
33+
#define p4_high_b1 0x8833
34+
#define p1_low_b0 0x5605
35+
#define p1_low_b1 0xe8a4
36+
#define p1_high_b0 0xcd4c
37+
#define p1_high_b1 0xc5b9
38+
#define p0_low_b0 0x678d
39+
#define p0_low_b1 0x490d
40+
#define p0_high_b0 0xaa66
41+
#define p0_high_b1 0xf200
42+
#define br_low_b0 0x01df
43+
#define br_low_b1 0x04d1
44+
#define br_low_b2 0x1
45+
#define br_high_b0 0x1db7
46+
#define br_high_b1 0x04c1
47+
#define br_high_b2 0x1
4848

4949
.text
5050
ASM_DEF_RODATA

‎crc/aarch64/crc32_iscsi_refl_pmull.h‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -27,24 +27,24 @@
2727
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828
#########################################################################
2929

30-
.equ p4_low_b0, 0xef02
31-
.equ p4_low_b1, 0x740e
32-
.equ p4_high_b0, 0xddf8
33-
.equ p4_high_b1, 0x9e4a
34-
.equ p1_low_b0, 0x0dfe
35-
.equ p1_low_b1, 0xf20c
36-
.equ p1_high_b0, 0x7d27
37-
.equ p1_high_b1, 0x493c
38-
.equ p0_low_b0, 0xaab8
39-
.equ p0_low_b1, 0xdd45
40-
.equ p0_high_b0, p1_high_b0
41-
.equ p0_high_b1, p1_high_b1
42-
.equ br_low_b0, 0x76f1
43-
.equ br_low_b1, 0x05ec
44-
.equ br_low_b2, 0x1
45-
.equ br_high_b0, 0x13f1
46-
.equ br_high_b1, 0xdea7
47-
.equ br_high_b2, 0x0
30+
#define p4_low_b0 0xef02
31+
#define p4_low_b1 0x740e
32+
#define p4_high_b0 0xddf8
33+
#define p4_high_b1 0x9e4a
34+
#define p1_low_b0 0x0dfe
35+
#define p1_low_b1 0xf20c
36+
#define p1_high_b0 0x7d27
37+
#define p1_high_b1 0x493c
38+
#define p0_low_b0 0xaab8
39+
#define p0_low_b1 0xdd45
40+
#define p0_high_b0 p1_high_b0
41+
#define p0_high_b1 p1_high_b1
42+
#define br_low_b0 0x76f1
43+
#define br_low_b1 0x05ec
44+
#define br_low_b2 0x1
45+
#define br_high_b0 0x13f1
46+
#define br_high_b1 0xdea7
47+
#define br_high_b2 0x0
4848

4949
.text
5050

‎crc/aarch64/crc64_ecma_norm_pmull.h‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -27,41 +27,41 @@
2727
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828
#########################################################################
2929

30-
.equ p4_low_b0, (0xf020)
31-
.equ p4_low_b1, 0x540d
32-
.equ p4_low_b2, 0x43ca
33-
.equ p4_low_b3, 0x5f68
34-
.equ p4_high_b0, 0xb83f
35-
.equ p4_high_b1, 0x1205
36-
.equ p4_high_b2, 0xb698
37-
.equ p4_high_b3, 0xddf4
30+
#define p4_low_b0 (0xf020)
31+
#define p4_low_b1 0x540d
32+
#define p4_low_b2 0x43ca
33+
#define p4_low_b3 0x5f68
34+
#define p4_high_b0 0xb83f
35+
#define p4_high_b1 0x1205
36+
#define p4_high_b2 0xb698
37+
#define p4_high_b3 0xddf4
3838

39-
.equ p1_low_b0, (0xfab6)
40-
.equ p1_low_b1, 0xeb52
41-
.equ p1_low_b2, 0xc3c7
42-
.equ p1_low_b3, 0x05f5
43-
.equ p1_high_b0, 0x740e
44-
.equ p1_high_b1, 0xd257
45-
.equ p1_high_b2, 0x38a7
46-
.equ p1_high_b3, 0x4eb9
39+
#define p1_low_b0 (0xfab6)
40+
#define p1_low_b1 0xeb52
41+
#define p1_low_b2 0xc3c7
42+
#define p1_low_b3 0x05f5
43+
#define p1_high_b0 0x740e
44+
#define p1_high_b1 0xd257
45+
#define p1_high_b2 0x38a7
46+
#define p1_high_b3 0x4eb9
4747

48-
.equ p0_low_b0, (0xfab6)
49-
.equ p0_low_b1, 0xeb52
50-
.equ p0_low_b2, 0xc3c7
51-
.equ p0_low_b3, 0x05f5
52-
.equ p0_high_b0, 0x0
53-
.equ p0_high_b1, 0x0
54-
.equ p0_high_b2, 0x0
55-
.equ p0_high_b3, 0x0
48+
#define p0_low_b0 (0xfab6)
49+
#define p0_low_b1 0xeb52
50+
#define p0_low_b2 0xc3c7
51+
#define p0_low_b3 0x05f5
52+
#define p0_high_b0 0x0
53+
#define p0_high_b1 0x0
54+
#define p0_high_b2 0x0
55+
#define p0_high_b3 0x0
5656

57-
.equ br_low_b0, (0xf872)
58-
.equ br_low_b1, 0x6cc4
59-
.equ br_low_b2, 0x29d0
60-
.equ br_low_b3, 0x578d
61-
.equ br_high_b0, 0x3693
62-
.equ br_high_b1, 0xa9ea
63-
.equ br_high_b2, 0xe1eb
64-
.equ br_high_b3, 0x42f0
57+
#define br_low_b0 (0xf872)
58+
#define br_low_b1 0x6cc4
59+
#define br_low_b2 0x29d0
60+
#define br_low_b3 0x578d
61+
#define br_high_b0 0x3693
62+
#define br_high_b1 0xa9ea
63+
#define br_high_b2 0xe1eb
64+
#define br_high_b3 0x42f0
6565

6666
ASM_DEF_RODATA
6767
.align 4

‎crc/aarch64/crc64_ecma_refl_pmull.h‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -27,37 +27,37 @@
2727
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828
#########################################################################
2929

30-
.equ p4_low_b0, 0x41f3
31-
.equ p4_low_b1, 0x9dd4
32-
.equ p4_low_b2, 0xefbb
33-
.equ p4_low_b3, 0x6ae3
34-
.equ p4_high_b0, 0x2df4
35-
.equ p4_high_b1, 0xa784
36-
.equ p4_high_b2, 0x6054
37-
.equ p4_high_b3, 0x081f
30+
#define p4_low_b0 0x41f3
31+
#define p4_low_b1 0x9dd4
32+
#define p4_low_b2 0xefbb
33+
#define p4_low_b3 0x6ae3
34+
#define p4_high_b0 0x2df4
35+
#define p4_high_b1 0xa784
36+
#define p4_high_b2 0x6054
37+
#define p4_high_b3 0x081f
3838

39-
.equ p1_low_b0, 0x3ae4
40-
.equ p1_low_b1, 0xca39
41-
.equ p1_low_b2, 0xd497
42-
.equ p1_low_b3, 0xe05d
43-
.equ p1_high_b0, 0x5f40
44-
.equ p1_high_b1, 0xc787
45-
.equ p1_high_b2, 0x95af
46-
.equ p1_high_b3, 0xdabe
39+
#define p1_low_b0 0x3ae4
40+
#define p1_low_b1 0xca39
41+
#define p1_low_b2 0xd497
42+
#define p1_low_b3 0xe05d
43+
#define p1_high_b0 0x5f40
44+
#define p1_high_b1 0xc787
45+
#define p1_high_b2 0x95af
46+
#define p1_high_b3 0xdabe
4747

48-
.equ p0_low_b0, 0x5f40
49-
.equ p0_low_b1, 0xc787
50-
.equ p0_low_b2, 0x95af
51-
.equ p0_low_b3, 0xdabe
48+
#define p0_low_b0 0x5f40
49+
#define p0_low_b1 0xc787
50+
#define p0_low_b2 0x95af
51+
#define p0_low_b3 0xdabe
5252

53-
.equ br_low_b0, 0x63d5
54-
.equ br_low_b1, 0x1729
55-
.equ br_low_b2, 0x466c
56-
.equ br_low_b3, 0x9c3e
57-
.equ br_high_b0, 0x1e85
58-
.equ br_high_b1, 0xaf0e
59-
.equ br_high_b2, 0xaf2b
60-
.equ br_high_b3, 0x92d8
53+
#define br_low_b0 0x63d5
54+
#define br_low_b1 0x1729
55+
#define br_low_b2 0x466c
56+
#define br_low_b3 0x9c3e
57+
#define br_high_b0 0x1e85
58+
#define br_high_b1 0xaf0e
59+
#define br_high_b2 0xaf2b
60+
#define br_high_b3 0x92d8
6161

6262
ASM_DEF_RODATA
6363
.align 4

‎crc/aarch64/crc64_iso_norm_pmull.h‎

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -27,41 +27,41 @@
2727
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828
#########################################################################
2929

30-
.equ p4_low_b0, (0x0101)
31-
.equ p4_low_b1, 0x0100
32-
.equ p4_low_b2, 0x0001
33-
.equ p4_low_b3, 0x0000
34-
.equ p4_high_b0, 0x1b1b
35-
.equ p4_high_b1, 0x1b00
36-
.equ p4_high_b2, 0x001b
37-
.equ p4_high_b3, 0x0000
30+
#define p4_low_b0 (0x0101)
31+
#define p4_low_b1 0x0100
32+
#define p4_low_b2 0x0001
33+
#define p4_low_b3 0x0000
34+
#define p4_high_b0 0x1b1b
35+
#define p4_high_b1 0x1b00
36+
#define p4_high_b2 0x001b
37+
#define p4_high_b3 0x0000
3838

39-
.equ p1_low_b0, (0x0145)
40-
.equ p1_low_b1, 0x0000
41-
.equ p1_low_b2, 0x0000
42-
.equ p1_low_b3, 0x0000
43-
.equ p1_high_b0, 0x1db7
44-
.equ p1_high_b1, 0x0000
45-
.equ p1_high_b2, 0x0000
46-
.equ p1_high_b3, 0x0000
39+
#define p1_low_b0 (0x0145)
40+
#define p1_low_b1 0x0000
41+
#define p1_low_b2 0x0000
42+
#define p1_low_b3 0x0000
43+
#define p1_high_b0 0x1db7
44+
#define p1_high_b1 0x0000
45+
#define p1_high_b2 0x0000
46+
#define p1_high_b3 0x0000
4747

48-
.equ p0_low_b0, (0x0145)
49-
.equ p0_low_b1, 0x0000
50-
.equ p0_low_b2, 0x0000
51-
.equ p0_low_b3, 0x0000
52-
.equ p0_high_b0, 0x0000
53-
.equ p0_high_b1, 0x0000
54-
.equ p0_high_b2, 0x0000
55-
.equ p0_high_b3, 0x0000
48+
#define p0_low_b0 (0x0145)
49+
#define p0_low_b1 0x0000
50+
#define p0_low_b2 0x0000
51+
#define p0_low_b3 0x0000
52+
#define p0_high_b0 0x0000
53+
#define p0_high_b1 0x0000
54+
#define p0_high_b2 0x0000
55+
#define p0_high_b3 0x0000
5656

57-
.equ br_low_b0, (0x001b)
58-
.equ br_low_b1, 0x0000
59-
.equ br_low_b2, 0x0000
60-
.equ br_low_b3, 0x0000
61-
.equ br_high_b0, 0x001b
62-
.equ br_high_b1, 0x0000
63-
.equ br_high_b2, 0x0000
64-
.equ br_high_b3, 0x0000
57+
#define br_low_b0 (0x001b)
58+
#define br_low_b1 0x0000
59+
#define br_low_b2 0x0000
60+
#define br_low_b3 0x0000
61+
#define br_high_b0 0x001b
62+
#define br_high_b1 0x0000
63+
#define br_high_b2 0x0000
64+
#define br_high_b3 0x0000
6565

6666
ASM_DEF_RODATA
6767
.align 4

0 commit comments

Comments
 (0)