summaryrefslogtreecommitdiff
path: root/firmware/asm/arm
diff options
context:
space:
mode:
authorSolomon Peachy <pizza@shaftnet.org>2023-05-24 09:37:20 -0400
committerSolomon Peachy <pizza@shaftnet.org>2024-05-08 21:45:42 -0400
commit8c86fb6da0b9c068ee4b4220dee11171e322f67f (patch)
tree35d458f5d8015f659593fb57df67b5e99afb5462 /firmware/asm/arm
parent0a89d1d4df0d24f2b73888fe3c457679acfb48aa (diff)
downloadrockbox-8c86fb6da0b9c068ee4b4220dee11171e322f67f.tar.gz
rockbox-8c86fb6da0b9c068ee4b4220dee11171e322f67f.zip
arm: Use -masm-syntax-unified when compiling with gcc8 or newer
Annoyingly, this makes all of the '.S' files we compile get treated as divided syntax, so we need to make the syntax in them explicit. Change-Id: I56a3916b7b24c84a1214a5d6bc4ed4d651f002cf
Diffstat (limited to 'firmware/asm/arm')
-rw-r--r--firmware/asm/arm/lcd-as-memframe.S2
-rw-r--r--firmware/asm/arm/memcpy.S2
-rw-r--r--firmware/asm/arm/memmove.S2
-rw-r--r--firmware/asm/arm/memset.S2
-rw-r--r--firmware/asm/arm/memset16.S2
5 files changed, 10 insertions, 0 deletions
diff --git a/firmware/asm/arm/lcd-as-memframe.S b/firmware/asm/arm/lcd-as-memframe.S
index d42b2a920d..f69f6e5080 100644
--- a/firmware/asm/arm/lcd-as-memframe.S
+++ b/firmware/asm/arm/lcd-as-memframe.S
@@ -24,6 +24,8 @@
24#include "config.h" 24#include "config.h"
25#include "cpu.h" 25#include "cpu.h"
26 26
27 .syntax unified
28
27/**************************************************************************** 29/****************************************************************************
28 * void lcd_copy_buffer_rect(fb_data *dst, fb_data *src, int width, 30 * void lcd_copy_buffer_rect(fb_data *dst, fb_data *src, int width,
29 * int height); 31 * int height);
diff --git a/firmware/asm/arm/memcpy.S b/firmware/asm/arm/memcpy.S
index 86fc6b7930..1fbb6660e9 100644
--- a/firmware/asm/arm/memcpy.S
+++ b/firmware/asm/arm/memcpy.S
@@ -35,6 +35,8 @@
35#define push lsr 35#define push lsr
36#endif 36#endif
37 37
38 .syntax unified
39
38/* Prototype: void *memcpy(void *dest, const void *src, size_t n); */ 40/* Prototype: void *memcpy(void *dest, const void *src, size_t n); */
39/* Prototype: void *mempcpy(void *dest, const void *src, size_t n); */ 41/* Prototype: void *mempcpy(void *dest, const void *src, size_t n); */
40 42
diff --git a/firmware/asm/arm/memmove.S b/firmware/asm/arm/memmove.S
index e5c9b42928..cf22a74622 100644
--- a/firmware/asm/arm/memmove.S
+++ b/firmware/asm/arm/memmove.S
@@ -35,6 +35,8 @@
35#define push lsr 35#define push lsr
36#endif 36#endif
37 37
38 .syntax unified
39
38 .text 40 .text
39 41
40/* 42/*
diff --git a/firmware/asm/arm/memset.S b/firmware/asm/arm/memset.S
index d727f2a5ec..ef5cdb5819 100644
--- a/firmware/asm/arm/memset.S
+++ b/firmware/asm/arm/memset.S
@@ -20,6 +20,8 @@
20 ****************************************************************************/ 20 ****************************************************************************/
21#include "config.h" 21#include "config.h"
22 22
23 .syntax unified
24
23 .section .icode,"ax",%progbits 25 .section .icode,"ax",%progbits
24 26
25 .align 2 27 .align 2
diff --git a/firmware/asm/arm/memset16.S b/firmware/asm/arm/memset16.S
index 226eac39e1..851b9207a2 100644
--- a/firmware/asm/arm/memset16.S
+++ b/firmware/asm/arm/memset16.S
@@ -20,6 +20,8 @@
20 ****************************************************************************/ 20 ****************************************************************************/
21#include "config.h" 21#include "config.h"
22 22
23 .syntax unified
24
23 .section .icode,"ax",%progbits 25 .section .icode,"ax",%progbits
24 26
25 .align 2 27 .align 2