|
From: <sv...@va...> - 2005-06-19 16:14:08
|
Author: sewardj
Date: 2005-06-19 17:14:06 +0100 (Sun, 19 Jun 2005)
New Revision: 3952
Log:
Get rid of the ELFSZ define, which is created at the configure stage
and use VG_WORDSIZE, as that is used everywhere else.
Modified:
trunk/configure.in
trunk/coregrind/ume.c
trunk/memcheck/tests/vgtest_ume.c
Modified: trunk/configure.in
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/configure.in 2005-06-19 16:10:47 UTC (rev 3951)
+++ trunk/configure.in 2005-06-19 16:14:06 UTC (rev 3952)
@@ -104,7 +104,7 @@
AC_MSG_RESULT([ok (${host_cpu})])
VG_ARCH=3D"x86"
KICKSTART_BASE=3D"0xb0000000"
- ARCH_CORE_AM_CFLAGS=3D"@FLAG_M32@ @PREFERRED_STACK_BOUNDARY@ -DE=
LFSZ=3D32"
+ ARCH_CORE_AM_CFLAGS=3D"@FLAG_M32@ @PREFERRED_STACK_BOUNDARY@"
ARCH_TOOL_AM_CFLAGS=3D"@FLAG_M32@ @PREFERRED_STACK_BOUNDARY@"
ARCH_CORE_AM_CCASFLAGS=3D"@FLAG_M32@"
;;
@@ -116,7 +116,7 @@
# quantities; therefore going above 0x7fffffff doesn't work... t=
his is
# a problem.
KICKSTART_BASE=3D"0x70000000"
- ARCH_CORE_AM_CFLAGS=3D"-m64 -fomit-frame-pointer @PREFERRED_STAC=
K_BOUNDARY@ -DELFSZ=3D64"=20
+ ARCH_CORE_AM_CFLAGS=3D"-m64 -fomit-frame-pointer @PREFERRED_STAC=
K_BOUNDARY@"=20
# XXX: need to use -fpic, otherwise when linking tools I get thi=
s error
# message:
# relocation R_X86_64_32 can not be used when making a shared =
object;
@@ -131,7 +131,7 @@
AC_MSG_RESULT([ok (${host_cpu})])
VG_ARCH=3D"arm"
KICKSTART_BASE=3D"0xb0000000"
- ARCH_CORE_AM_CFLAGS=3D"-fomit-frame-pointer @PREFERRED_STACK_BOU=
NDARY@ -DELFSZ=3D32"
+ ARCH_CORE_AM_CFLAGS=3D"-fomit-frame-pointer @PREFERRED_STACK_BOU=
NDARY@"
ARCH_TOOL_AM_CFLAGS=3D"-fomit-frame-pointer @PREFERRED_STACK_BOU=
NDARY@"
ARCH_CORE_AM_CCASFLAGS=3D""
;;
@@ -140,7 +140,7 @@
AC_MSG_RESULT([no (${host_cpu})])
VG_ARCH=3D"ppc"
KICKSTART_BASE=3D"0x70000000"
- ARCH_CORE_AM_CFLAGS=3D"-DELFSZ=3D32"
+ ARCH_CORE_AM_CFLAGS=3D""
ARCH_TOOL_AM_CFLAGS=3D"-fpic"
ARCH_CORE_AM_CCASFLAGS=3D"-Wa,-maltivec"
AC_MSG_ERROR([PowerPC not supported. Sorry])
Modified: trunk/coregrind/ume.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coregrind/ume.c 2005-06-19 16:10:47 UTC (rev 3951)
+++ trunk/coregrind/ume.c 2005-06-19 16:14:06 UTC (rev 3952)
@@ -51,12 +51,12 @@
#include <unistd.h>
#include <assert.h>
=20
-#if ELFSZ =3D=3D 64
+#if VG_WORDSIZE =3D=3D 8
#define ESZ(x) Elf64_##x
-#elif ELFSZ =3D=3D 32
+#elif VG_WORDSIZE =3D=3D 4
#define ESZ(x) Elf32_##x
#else
-#error ELFSZ needs to =3D=3D32 or =3D=3D64
+#error VG_WORDSIZE needs to =3D=3D4 or =3D=3D8
#endif
=20
struct elfinfo
Modified: trunk/memcheck/tests/vgtest_ume.c
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/memcheck/tests/vgtest_ume.c 2005-06-19 16:10:47 UTC (rev 3951)
+++ trunk/memcheck/tests/vgtest_ume.c 2005-06-19 16:14:06 UTC (rev 3952)
@@ -1,4 +1,3 @@
-#define ELFSZ 32
=20
// This file is a unit self-test for ume.c, jmp_with_stack.c
=20
|