AcoSail/wayland
8
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

scanner: drop altmacro from dtddata.S

Browse Source 
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>
This commit is contained in:
Pekka Paalanen 2015-11-18 13:00:00 +02:00
parent 3dc7c2c846
commit b644594a2c
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/dtddata.S
View File

@ -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