Skip to content

Commit b7e368f

Browse files
Wilco1nsz-arm
authored andcommitted
string: Assembly code cleanup
Cleanup spurious .text and .arch. Use ENTRY rather than ENTRY_ALIGN.
1 parent d5b36a8 commit b7e368f

File tree

14 files changed

+9
-41
lines changed

14 files changed

+9
-41
lines changed

string/aarch64/memchr-sve.S

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
* SVE Available.
1515
*/
1616

17-
.arch armv8-a+sve
18-
.text
19-
20-
ENTRY_ALIGN(__memchr_aarch64_sve, 4)
17+
ENTRY (__memchr_aarch64_sve)
2118
PTR_ARG (0)
2219
SIZE_ARG (2)
2320
dup z1.b, w1 /* duplicate c to a vector */

string/aarch64/memcmp-sve.S

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
* SVE Available.
1515
*/
1616

17-
.arch armv8-a+sve
18-
.text
19-
20-
ENTRY_ALIGN (__memcmp_aarch64_sve, 4)
17+
ENTRY (__memcmp_aarch64_sve)
2118
PTR_ARG (0)
2219
PTR_ARG (1)
2320
SIZE_ARG (2)

string/aarch64/strchr-sve.S

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,14 @@
1414
* SVE Available.
1515
*/
1616

17-
.arch armv8-a+sve
18-
.text
19-
2017
/* To build as strchrnul, define BUILD_STRCHRNUL before compiling this file. */
2118
#ifdef BUILD_STRCHRNUL
2219
#define FUNC __strchrnul_aarch64_sve
2320
#else
2421
#define FUNC __strchr_aarch64_sve
2522
#endif
2623

27-
ENTRY_ALIGN (FUNC, 4)
24+
ENTRY (FUNC)
2825
PTR_ARG (0)
2926
dup z1.b, w1 /* replicate byte across vector */
3027
setffr /* initialize FFR */

string/aarch64/strcmp-sve.S

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
* SVE Available.
1515
*/
1616

17-
.arch armv8-a+sve
18-
.text
19-
20-
ENTRY_ALIGN (__strcmp_aarch64_sve, 4)
17+
ENTRY (__strcmp_aarch64_sve)
2118
PTR_ARG (0)
2219
PTR_ARG (1)
2320
setffr /* initialize FFR */

string/aarch64/strcpy-sve.S

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,17 +14,14 @@
1414
* SVE Available.
1515
*/
1616

17-
.arch armv8-a+sve
18-
.text
19-
2017
/* To build as stpcpy, define BUILD_STPCPY before compiling this file. */
2118
#ifdef BUILD_STPCPY
2219
#define FUNC __stpcpy_aarch64_sve
2320
#else
2421
#define FUNC __strcpy_aarch64_sve
2522
#endif
2623

27-
ENTRY_ALIGN (FUNC, 4)
24+
ENTRY (FUNC)
2825
PTR_ARG (0)
2926
PTR_ARG (1)
3027
setffr /* initialize FFR */

string/aarch64/strlen-sve.S

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
* SVE Available.
1515
*/
1616

17-
.arch armv8-a+sve
18-
.text
19-
20-
ENTRY_ALIGN (__strlen_aarch64_sve, 4)
17+
ENTRY (__strlen_aarch64_sve)
2118
PTR_ARG (0)
2219
setffr /* initialize FFR */
2320
ptrue p2.b /* all ones; loop invariant */

string/aarch64/strncmp-mte.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
#define LS_BK lsl
5454
#endif
5555

56-
.text
5756
ENTRY (__strncmp_aarch64_mte)
5857
PTR_ARG (0)
5958
PTR_ARG (1)

string/aarch64/strncmp-sve.S

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
* SVE Available.
1515
*/
1616

17-
.arch armv8-a+sve
18-
.text
19-
20-
ENTRY_ALIGN (__strncmp_aarch64_sve, 4)
17+
ENTRY (__strncmp_aarch64_sve)
2118
PTR_ARG (0)
2219
PTR_ARG (1)
2320
SIZE_ARG (2)

string/aarch64/strncmp.S

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@
4040
#define endloop x15
4141
#define count mask
4242

43-
.text
4443
ENTRY (__strncmp_aarch64)
4544
PTR_ARG (0)
4645
PTR_ARG (1)

string/aarch64/strnlen-sve.S

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,7 @@
1414
* SVE Available.
1515
*/
1616

17-
.arch armv8-a+sve
18-
.text
19-
20-
ENTRY_ALIGN (__strnlen_aarch64_sve, 4)
17+
ENTRY (__strnlen_aarch64_sve)
2118
PTR_ARG (0)
2219
SIZE_ARG (1)
2320
setffr /* initialize FFR */

0 commit comments

Comments
 (0)