From 5404dace3af559ea508315905f19209e1eebf25d Mon Sep 17 00:00:00 2001 From: George Koehler Date: Sun, 10 Jun 2018 16:00:23 -0400 Subject: [PATCH] Stop using from x86emu. The code included only for _X_ATTRIBUTE_PRINTF, which tells some compilers to check the printf format string. Remove so ACK doesn't need any X11 headers. Some machines don't have the X11 headers, or they need a flag like -I/usr/X11R[67]/include to find them. --- plat/pc86/emu/README.md | 7 +++---- plat/pc86/emu/x86emu/x86emu/debug.h | 2 +- plat/pc86/emu/x86emu/x86emu/regs.h | 5 +---- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/plat/pc86/emu/README.md b/plat/pc86/emu/README.md index d63cb0275..7c12ca68b 100644 --- a/plat/pc86/emu/README.md +++ b/plat/pc86/emu/README.md @@ -1,4 +1,3 @@ -The x86emu directory contains a copy of the xorg 8086 emulation library from -the X server. It's distributable under the MIT/X11 license, and so is -compatible with the ACK. - +The x86emu directory contains a modified copy of the xorg 8086 emulation +library from the X server. It's distributable under the MIT/X11 license, +and so is compatible with the ACK. diff --git a/plat/pc86/emu/x86emu/x86emu/debug.h b/plat/pc86/emu/x86emu/x86emu/debug.h index 1f04b7b65..1158c2c90 100644 --- a/plat/pc86/emu/x86emu/x86emu/debug.h +++ b/plat/pc86/emu/x86emu/x86emu/debug.h @@ -189,7 +189,7 @@ extern "C" { /* Use "C" linkage when in C++ mode */ #endif extern void x86emu_inc_decoded_inst_len(int x); - extern void x86emu_decode_printf(const char *x, ...) _X_ATTRIBUTE_PRINTF(1,2); + extern void x86emu_decode_printf(const char *x, ...); extern void x86emu_just_disassemble(void); extern void x86emu_single_step(void); extern void x86emu_end_instr(void); diff --git a/plat/pc86/emu/x86emu/x86emu/regs.h b/plat/pc86/emu/x86emu/x86emu/regs.h index 3c9469f52..057f38cb7 100644 --- a/plat/pc86/emu/x86emu/x86emu/regs.h +++ b/plat/pc86/emu/x86emu/x86emu/regs.h @@ -39,8 +39,6 @@ #ifndef __X86EMU_REGS_H #define __X86EMU_REGS_H -#include - /*---------------------- Macros and type definitions ----------------------*/ #ifdef PACK @@ -331,8 +329,7 @@ extern "C" { /* Use "C" linkage when in C++ mode */ /* Function to log information at runtime */ - void printk(const char *fmt, ...) - _X_ATTRIBUTE_PRINTF(1, 2); + void printk(const char *fmt, ...); #ifdef __cplusplus } /* End of "C" linkage for C++ */