From 8d0faac1dc0c91e2fd35e236fdb0cd95b612a130 Mon Sep 17 00:00:00 2001 From: Peter Maydell Date: Sat, 24 Feb 2018 17:01:49 -0500 Subject: [PATCH] qemu-common.h: Drop WORDS_ALIGNED define The WORDS_ALIGNED #define is not used anywhere, and hasn't been since 2013 when commit 612d590ebc6cef rewrote the various ld__p functions to not use it. Remove the #define and the comment describing it. Also remove the line in the comment about TARGET_WORDS_ALIGNED, since it has never actually existed. Backports commit 0d5c21f2b3bf1e0b562a2c74e353d2e03f2f50ef from qemu --- qemu/include/exec/cpu-all.h | 5 ----- qemu/include/qemu-common.h | 4 ---- 2 files changed, 9 deletions(-) diff --git a/qemu/include/exec/cpu-all.h b/qemu/include/exec/cpu-all.h index bc341e7c..d1d13a11 100644 --- a/qemu/include/exec/cpu-all.h +++ b/qemu/include/exec/cpu-all.h @@ -32,15 +32,10 @@ #define EXCP_YIELD 0x10004 /* cpu wants to yield timeslice to another */ /* some important defines: - * - * WORDS_ALIGNED : if defined, the host cpu can only make word aligned - * memory accesses. * * HOST_WORDS_BIGENDIAN : if defined, the host cpu is big endian and * otherwise little endian. * - * (TARGET_WORDS_ALIGNED : same for target cpu (not supported yet)) - * * TARGET_WORDS_BIGENDIAN : same for target cpu */ diff --git a/qemu/include/qemu-common.h b/qemu/include/qemu-common.h index 6734bcbc..ef9cce3d 100644 --- a/qemu/include/qemu-common.h +++ b/qemu/include/qemu-common.h @@ -17,10 +17,6 @@ #include "qemu/fprintf-fn.h" #include "exec/cpu-common.h" -#if defined(__arm__) || defined(__sparc__) || defined(__mips__) || defined(__hppa__) || defined(__ia64__) -#define WORDS_ALIGNED -#endif - #define TFR(expr) do { if ((expr) != -1) break; } while (errno == EINTR) #include "unicorn/platform.h"