Remove VGA_WORD_SIZE; we already have VG_WORDSIZE.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@3718

diff --git a/coregrind/amd64/core_arch.h b/coregrind/amd64/core_arch.h
index 78aa7537e4efb28b9385d39cf5c98b5e5f2e53d1..f5bec01e5e5a05fb3107040419c2bfdac4cf12e6 100644 (file)
--- a/coregrind/amd64/core_arch.h
+++ b/coregrind/amd64/core_arch.h
@@ -44,8 +44,6 @@
 #define VGA_ELF_MACHINE        EM_X86_64
 #define VGA_ELF_CLASS          ELFCLASS64
 
-#define VGA_WORD_SIZE         8
-
 /* ---------------------------------------------------------------------
    Interesting registers
    ------------------------------------------------------------------ */

diff --git a/coregrind/arm/core_arch.h b/coregrind/arm/core_arch.h
index c1db1bfbe1a27292fde1b91bc665bed25443c942..1d3c1476d8da04353deb2c13a01d78d8dbd603f9 100644 (file)
--- a/coregrind/arm/core_arch.h
+++ b/coregrind/arm/core_arch.h
@@ -45,8 +45,6 @@
 #define VGA_ELF_MACHINE        EM_ARM
 #define VGA_ELF_CLASS          ELFCLASS32
 
-#define VGA_WORD_SIZE         4
-
 /* ---------------------------------------------------------------------
    Interesting registers
    ------------------------------------------------------------------ */

diff --git a/coregrind/vg_symtab2.c b/coregrind/vg_symtab2.c
index 49c8dcd27f92e1958feb096863ecbbcf62bcfb9d..40aaa249e827d6a97f6406cd8f17cdadb4c0164d 100644 (file)
--- a/coregrind/vg_symtab2.c
+++ b/coregrind/vg_symtab2.c
@@ -50,7 +50,7 @@ static SegInfo* segInfo = NULL;
    an 'XX' name.  Then use the 'XX' variant consistently in
    the rest of this file. 
 */
-#if VGA_WORD_SIZE == 4
+#if VG_WORDSIZE == 4
 #  define  ElfXX_Ehdr     Elf32_Ehdr
 #  define  ElfXX_Shdr     Elf32_Shdr
 #  define  ElfXX_Phdr     Elf32_Phdr
@@ -61,7 +61,7 @@ static SegInfo* segInfo = NULL;
 #  define  ELFXX_ST_BIND  ELF32_ST_BIND
 #  define  ELFXX_ST_TYPE  ELF32_ST_TYPE
 
-#elif VGA_WORD_SIZE == 8
+#elif VG_WORDSIZE == 8
 #  define  ElfXX_Ehdr     Elf64_Ehdr
 #  define  ElfXX_Shdr     Elf64_Shdr
 #  define  ElfXX_Phdr     Elf64_Phdr
@@ -73,7 +73,7 @@ static SegInfo* segInfo = NULL;
 #  define  ELFXX_ST_TYPE  ELF64_ST_TYPE
 
 #else
-# error "VGA_WORD_SIZE should be 4 or 8"
+# error "VG_WORDSIZE should be 4 or 8"
 #endif
 
 

diff --git a/coregrind/x86/core_arch.h b/coregrind/x86/core_arch.h
index 4431e43913699b2dd500d0fd630034ce5ef39ce4..60ee74af614b6739e6bc490103fe028d4ffa8094 100644 (file)
--- a/coregrind/x86/core_arch.h
+++ b/coregrind/x86/core_arch.h
@@ -44,8 +44,6 @@
 #define VGA_ELF_MACHINE        EM_386
 #define VGA_ELF_CLASS          ELFCLASS32
 
-#define VGA_WORD_SIZE         4
-
 /* ---------------------------------------------------------------------
    Interesting registers
    ------------------------------------------------------------------ */