diff options
| author | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-11-18 13:00:00 +0200 |
|---|---|---|
| committer | Pekka Paalanen <pekka.paalanen@collabora.co.uk> | 2015-11-19 09:48:11 +0200 |
| commit | b644594a2ce918e6a9d3dde5d3d60a1405a0ffd9 (patch) | |
| tree | 7afdca134dec215059da7448ff4200913e7eaea3 | |
| parent | 3dc7c2c84675483ca0a018ae8f66ebad5639a0bc (diff) | |
| download | wayland-b644594a2ce918e6a9d3dde5d3d60a1405a0ffd9.tar.gz | |
scanner: drop altmacro from dtddata.S
Stop using .altmacro in dtddata.S, because clang does not yet implement
it. Turns out that we do not actually seem to need it, and we can modify
the syntax to work without it.
Moving the double quotes from the binfile line to the .incbin line is
required to avoid the assembler error "missing string". Instead of & we
now use \() to mark the end of macro argument name.
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=92988
Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Tested-by: Víctor Jáquez <vjaquez@igalia.com>
Acked-by: Peter Hutterer <peter.hutterer@who-t.net>
| -rw-r--r-- | src/dtddata.S | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/dtddata.S b/src/dtddata.S index 53debf3..68e3435 100644 --- a/src/dtddata.S +++ b/src/dtddata.S @@ -22,19 +22,18 @@ /* from: http://www.linuxjournal.com/content/embedding-file-executable-aka-hello-world-version-5967#comment-348129 */ -.altmacro .macro binfile name file .p2align 2 - .globl \name&_begin -\name&_begin: - .incbin \file -\name&_end: + .globl \name\()_begin +\name\()_begin: + .incbin "\file" +\name\()_end: .byte 0 .p2align 2 - .globl \name&_len -\name&_len: - .int (\name&_end - \name&_begin) + .globl \name\()_len +\name\()_len: + .int (\name\()_end - \name\()_begin) .endm .section .rodata -binfile DTD_DATA "src/wayland.dtd.embed" +binfile DTD_DATA src/wayland.dtd.embed |