Skip to content

Commit bf862d0

Browse files
Wilco1TamarChristinaArm
authored andcommitted
aor: Support MacOS assembler line separators
1 parent 860871c commit bf862d0

File tree

2 files changed

+30
-24
lines changed

2 files changed

+30
-24
lines changed

Diff for: .github/workflows/tests.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,6 @@ jobs:
6363
- name: configure
6464
run: cp config.mk.dist config.mk
6565
- name: make
66-
run: CC="${{ matrix.compiler }}" WANT_SVE_TESTS=0 USE_GLIBC_ABI=0 make all-math -j
66+
run: CC="${{ matrix.compiler }}" WANT_SVE_TESTS=0 USE_GLIBC_ABI=0 make -j
6767
- name: make check
68-
run: CC="${{ matrix.compiler }}" WANT_SVE_TESTS=0 USE_GLIBC_ABI=0 make check-math -j
68+
run: CC="${{ matrix.compiler }}" WANT_SVE_TESTS=0 USE_GLIBC_ABI=0 make -j

Diff for: string/aarch64/asmdefs.h

+28-22
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,25 @@
11
/*
22
* Macros for asm code. AArch64 version.
33
*
4-
* Copyright (c) 2019-2023, Arm Limited.
4+
* Copyright (c) 2019-2025, Arm Limited.
55
* SPDX-License-Identifier: MIT OR Apache-2.0 WITH LLVM-exception
66
*/
77

88
#ifndef _ASMDEFS_H
99
#define _ASMDEFS_H
1010

11+
#if defined(__APPLE__)
12+
# define SEP %%
13+
#else
14+
# define SEP ;
15+
#endif
16+
1117
/* Branch Target Identitication support. */
1218
#define BTI_C hint 34
1319
#define BTI_J hint 36
1420
/* Return address signing support (pac-ret). */
15-
#define PACIASP hint 25; .cfi_window_save
16-
#define AUTIASP hint 29; .cfi_window_save
21+
#define PACIASP hint 25 SEP .cfi_window_save
22+
#define AUTIASP hint 29 SEP .cfi_window_save
1723

1824
/* GNU_PROPERTY_AARCH64_* macros from elf.h. */
1925
#define FEATURE_1_AND 0xc0000000
@@ -22,16 +28,16 @@
2228

2329
/* Add a NT_GNU_PROPERTY_TYPE_0 note. */
2430
#define GNU_PROPERTY(type, value) \
25-
.section .note.gnu.property, "a"; \
26-
.p2align 3; \
27-
.word 4; \
28-
.word 16; \
29-
.word 5; \
30-
.asciz "GNU"; \
31-
.word type; \
32-
.word 4; \
33-
.word value; \
34-
.word 0; \
31+
.section .note.gnu.property, "a" SEP \
32+
.p2align 3 SEP \
33+
.word 4 SEP \
34+
.word 16 SEP \
35+
.word 5 SEP \
36+
.asciz "GNU" SEP \
37+
.word type SEP \
38+
.word 4 SEP \
39+
.word value SEP \
40+
.word 0 SEP \
3541
.text
3642

3743
/* If set then the GNU Property Note section will be added to
@@ -46,23 +52,23 @@ GNU_PROPERTY (FEATURE_1_AND, FEATURE_1_BTI|FEATURE_1_PAC)
4652
#endif
4753

4854
#define ENTRY_ALIGN(name, alignment) \
49-
.global name; \
50-
.type name,%function; \
51-
.align alignment; \
55+
.global name SEP \
56+
.type name,%function SEP \
57+
.align alignment SEP \
5258
name: \
53-
.cfi_startproc; \
54-
BTI_C;
59+
.cfi_startproc SEP \
60+
BTI_C SEP
5561

5662
#define ENTRY(name) ENTRY_ALIGN(name, 6)
5763

5864
#define ENTRY_ALIAS(name) \
59-
.global name; \
60-
.type name,%function; \
65+
.global name SEP \
66+
.type name,%function SEP \
6167
name:
6268

6369
#define END(name) \
64-
.cfi_endproc; \
65-
.size name, .-name;
70+
.cfi_endproc SEP \
71+
.size name, .-name
6672

6773
#define L(l) .L ## l
6874

0 commit comments

Comments
 (0)