[Valgrind-developers] valgrind

[Nicholas N. <nj...@ca...>]

CVS commit by nethercote: 

Arch-abstraction:
- factor out KICKSTART_BASE


  M +3 -0      configure.in   1.133
  M +2 -8      coregrind/Makefile.am   1.95


--- valgrind/configure.in  #1.132:1.133
@@ -68,4 +68,5 @@
 AC_MSG_CHECKING([for a supported CPU])
 AC_SUBST(VG_ARCH)
+AC_SUBST(KICKSTART_BASE)
 
 case "${host_cpu}" in
@@ -73,4 +74,5 @@
         AC_MSG_RESULT([ok (${host_cpu})])
         VG_ARCH="x86"
+        KICKSTART_BASE="0xb0000000"
         ;;
 
@@ -78,4 +80,5 @@
         AC_MSG_RESULT([no (${host_cpu})])
         VG_ARCH="ppc"
+        KICKSTART_BASE="0x70000000"
         AC_MSG_ERROR([PowerPC not supported. Sorry])
         ;;

--- valgrind/coregrind/Makefile.am  #1.94:1.95
@@ -5,5 +5,5 @@
 
 AM_CPPFLAGS += -DVG_LIBDIR="\"$(valdir)"\" -I$(srcdir)/demangle \
-                -DKICKSTART_BASE=$(KICKSTART_BASE) \
+                -DKICKSTART_BASE=@KICKSTART_BASE@ \
                 -DVG_PLATFORM="\"$(VG_PLATFORM)"\"
 AM_CFLAGS = $(WERROR) -Winline -Wall -Wshadow -O -fno-omit-frame-pointer \
@@ -48,10 +48,4 @@
 valgrind_LDADD=
 
-# Where stage2 will be put.
-# Nb: Hard-wiring this sucks.  A configure-time test would be better.  A
-#     load-time test would be even better, but would require building stage2 in
-#     a position-independent way...
-KICKSTART_BASE=0xb0000000
-
 stage2_SOURCES = \
         ume.c \
@@ -87,5 +81,5 @@
 stage2_DEPENDENCIES = $(srcdir)/valgrind.vs ${VG_ARCH}/stage2.lds
 stage2_LDFLAGS=-Wl,--export-dynamic -g \
-        -Wl,-defsym,kickstart_base=$(KICKSTART_BASE) \
+        -Wl,-defsym,kickstart_base=@KICKSTART_BASE@ \
         -Wl,-T,${VG_ARCH}/stage2.lds \
         -Wl,-version-script $(srcdir)/valgrind.vs