diff options
| author | Robin Watts <robin.watts@artifex.com> | 2016-03-23 16:55:30 +0000 |
|---|---|---|
| committer | Robin Watts <robin.watts@artifex.com> | 2016-03-23 17:15:51 +0000 |
| commit | 321a6cbd2e4f3bd576ca0fd7a883f194742d0ec7 (patch) | |
| tree | f990d8c40491bacb9c06f722b2d8d0fd9416dc9a /scripts | |
| parent | 0b8afc999bba998d56989933e9438137242d6685 (diff) | |
| download | mupdf-321a6cbd2e4f3bd576ca0fd7a883f194742d0ec7.tar.xz | |
Fix font builds on raspberry pi
(And presumably other platforms).
.align is broken - on some archs it wants the padding size, on others
(like ARM) it wants log2(padding size). Use .balign which is consistent.
Avoid using @ or # as these are comment chars on some archs.
Use the STT_OBJECT form instead.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/fontdump.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/fontdump.c b/scripts/fontdump.c index fbeea47f..dddbac75 100644 --- a/scripts/fontdump.c +++ b/scripts/fontdump.c @@ -88,9 +88,9 @@ main(int argc, char **argv) fprintf(fo, "const int fz_font_%s_size = %d;\n", fontname, size); fprintf(fo, "asm(\".section .rodata\");\n"); fprintf(fo, "asm(\".global fz_font_%s\");\n", fontname); - fprintf(fo, "asm(\".type fz_font_%s, @object\");\n", fontname); + fprintf(fo, "asm(\".type fz_font_%s STT_OBJECT\");\n", fontname); fprintf(fo, "asm(\".size fz_font_%s, %d\");\n", fontname, size); - fprintf(fo, "asm(\".align 64\");\n"); + fprintf(fo, "asm(\".balign 64\");\n"); fprintf(fo, "asm(\"fz_font_%s:\");\n", fontname); fprintf(fo, "asm(\".incbin \\\"%s\\\"\");\n", argv[i]); fprintf(fo, "#else\n"); |