@@ -254,28 +254,37 @@ case "${host_os}" in
254254 *darwin*)
255255 AC_MSG_RESULT([ok (${host_os})])
256256 VGCONF_OS="darwin"
257+ AC_DEFINE([DARWIN_10_5], 100500, [DARWIN_VERS value for Mac OS X 10.5])
258+ AC_DEFINE([DARWIN_10_6], 100600, [DARWIN_VERS value for Mac OS X 10.6])
259+ AC_DEFINE([DARWIN_10_7], 100700, [DARWIN_VERS value for Mac OS X 10.7])
257260
258261 AC_MSG_CHECKING([for the kernel version])
259262 kernel=`uname -r`
260263
261264 # Nb: for Darwin we set DEFAULT_SUPP here. That's because Darwin
262265 # has only one relevant version, the OS version. The `uname` check
263266 # is a good way to get that version (i.e. "Darwin 9.6.0" is Mac OS
264- # X 10.5.6, and "Darwin 10.x" would presumably be Mac OS X 10.6.x
265- # Snow Leopard and darwin10.supp), and we don't know of an macros
266- # similar to __GLIBC__ to get that info.
267+ # X 10.5.6, and "Darwin 10.x" is Mac OS X 10.6.x Snow Leopard),
268+ # and we don't know of an macros similar to __GLIBC__ to get that info.
267269 #
268270 # XXX: `uname -r` won't do the right thing for cross-compiles, but
269271 # that's not a problem yet.
270272 case "${kernel}" in
271273 9.*)
272274 AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard])
275+ AC_DEFINE([DARWIN_VERS], DARWIN_10_5, [Darwin / Mac OS X version])
273276 DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}"
274277 DEFAULT_SUPP="darwin9-drd.supp ${DEFAULT_SUPP}"
275278 ;;
279+ 10.*)
280+ AC_MSG_RESULT([Darwin 10.x (${kernel}) / Mac OS X 10.6 Snow Leopard])
281+ AC_DEFINE([DARWIN_VERS], DARWIN_10_6, [Darwin / Mac OS X version])
282+ DEFAULT_SUPP="darwin10.supp ${DEFAULT_SUPP}"
283+ DEFAULT_SUPP="darwin10-drd.supp ${DEFAULT_SUPP}"
284+ ;;
276285 *)
277286 AC_MSG_RESULT([unsupported (${kernel})])
278- AC_MSG_ERROR([Valgrind works on Darwin 9.x (Mac OS X 10.5)])
287+ AC_MSG_ERROR([Valgrind works on Darwin 9.x and 10.x (Mac OS X 10.5 and 10.6 )])
279288 ;;
280289 esac
281290 ;;
@@ -353,47 +362,70 @@ AC_SUBST(VGCONF_PLATFORM_SEC_CAPS)
353362
354363AC_MSG_CHECKING([for a supported CPU/OS combination])
355364
365+ # NB. The load address for a given platform may be specified in more
366+ # than one place, in some cases, depending on whether we're doing a biarch,
367+ # 32-bit only or 64-bit only build. eg see case for amd64-linux below.
368+ # Be careful to give consistent values in all subcases. Also, all four
369+ # valt_load_addres_{pri,sec}_{norml,inner} values must always be set,
370+ # even if it is to "0xUNSET".
371+ #
356372case "$ARCH_MAX-$VGCONF_OS" in
357373 x86-linux)
358374 VGCONF_ARCH_PRI="x86"
359375 VGCONF_ARCH_SEC=""
360376 VGCONF_PLATFORM_PRI_CAPS="X86_LINUX"
361377 VGCONF_PLATFORM_SEC_CAPS=""
362- valt_load_address_normal="0x38000000"
363- valt_load_address_inner="0x28000000"
378+ valt_load_address_pri_norml="0x38000000"
379+ valt_load_address_pri_inner="0x28000000"
380+ valt_load_address_sec_norml="0xUNSET"
381+ valt_load_address_sec_inner="0xUNSET"
364382 AC_MSG_RESULT([ok (${ARCH_MAX}-${VGCONF_OS})])
365383 ;;
366384 amd64-linux)
385+ valt_load_address_sec_norml="0xUNSET"
386+ valt_load_address_sec_inner="0xUNSET"
367387 if test x$vg_cv_only64bit = xyes; then
368388 VGCONF_ARCH_PRI="amd64"
369389 VGCONF_ARCH_SEC=""
370390 VGCONF_PLATFORM_PRI_CAPS="AMD64_LINUX"
371391 VGCONF_PLATFORM_SEC_CAPS=""
392+ valt_load_address_pri_norml="0x38000000"
393+ valt_load_address_pri_inner="0x28000000"
372394 elif test x$vg_cv_only32bit = xyes; then
373395 VGCONF_ARCH_PRI="x86"
374396 VGCONF_ARCH_SEC=""
375397 VGCONF_PLATFORM_PRI_CAPS="X86_LINUX"
376398 VGCONF_PLATFORM_SEC_CAPS=""
399+ valt_load_address_pri_norml="0x38000000"
400+ valt_load_address_pri_inner="0x28000000"
377401 else
378402 VGCONF_ARCH_PRI="amd64"
379403 VGCONF_ARCH_SEC="x86"
380404 VGCONF_PLATFORM_PRI_CAPS="AMD64_LINUX"
381405 VGCONF_PLATFORM_SEC_CAPS="X86_LINUX"
406+ valt_load_address_pri_norml="0x38000000"
407+ valt_load_address_pri_inner="0x28000000"
408+ valt_load_address_sec_norml="0x38000000"
409+ valt_load_address_sec_inner="0x28000000"
382410 fi
383- valt_load_address_normal="0x38000000"
384- valt_load_address_inner="0x28000000"
385411 AC_MSG_RESULT([ok (${ARCH_MAX}-${VGCONF_OS})])
386412 ;;
387413 ppc32-linux)
388414 VGCONF_ARCH_PRI="ppc32"
389415 VGCONF_ARCH_SEC=""
390416 VGCONF_PLATFORM_PRI_CAPS="PPC32_LINUX"
391417 VGCONF_PLATFORM_SEC_CAPS=""
392- valt_load_address_normal="0x38000000"
393- valt_load_address_inner="0x28000000"
418+ valt_load_address_pri_norml="0x38000000"
419+ valt_load_address_pri_inner="0x28000000"
420+ valt_load_address_sec_norml="0xUNSET"
421+ valt_load_address_sec_inner="0xUNSET"
394422 AC_MSG_RESULT([ok (${ARCH_MAX}-${VGCONF_OS})])
395423 ;;
396424 ppc64-aix5)
425+ valt_load_address_pri_norml="0xUNSET"
426+ valt_load_address_pri_inner="0xUNSET"
427+ valt_load_address_sec_norml="0xUNSET"
428+ valt_load_address_sec_inner="0xUNSET"
397429 if test x$vg_cv_only64bit = xyes; then
398430 VGCONF_ARCH_PRI="ppc64"
399431 VGCONF_ARCH_SEC=""
@@ -410,75 +442,97 @@ case "$ARCH_MAX-$VGCONF_OS" in
410442 VGCONF_PLATFORM_PRI_CAPS="PPC64_AIX5"
411443 VGCONF_PLATFORM_SEC_CAPS="PPC32_AIX5"
412444 fi
413- valt_load_address_normal="0x38000000"
414- valt_load_address_inner="0x28000000"
415445 AC_MSG_RESULT([ok (${ARCH_MAX}-${VGCONF_OS})])
416446 ;;
417447 ppc64-linux)
448+ valt_load_address_sec_norml="0xUNSET"
449+ valt_load_address_sec_inner="0xUNSET"
418450 if test x$vg_cv_only64bit = xyes; then
419451 VGCONF_ARCH_PRI="ppc64"
420452 VGCONF_ARCH_SEC=""
421453 VGCONF_PLATFORM_PRI_CAPS="PPC64_LINUX"
422454 VGCONF_PLATFORM_SEC_CAPS=""
455+ valt_load_address_pri_norml="0x38000000"
456+ valt_load_address_pri_inner="0x28000000"
423457 elif test x$vg_cv_only32bit = xyes; then
424458 VGCONF_ARCH_PRI="ppc32"
425459 VGCONF_ARCH_SEC=""
426460 VGCONF_PLATFORM_PRI_CAPS="PPC32_LINUX"
427461 VGCONF_PLATFORM_SEC_CAPS=""
462+ valt_load_address_pri_norml="0x38000000"
463+ valt_load_address_pri_inner="0x28000000"
428464 else
429465 VGCONF_ARCH_PRI="ppc64"
430466 VGCONF_ARCH_SEC="ppc32"
431467 VGCONF_PLATFORM_PRI_CAPS="PPC64_LINUX"
432468 VGCONF_PLATFORM_SEC_CAPS="PPC32_LINUX"
469+ valt_load_address_pri_norml="0x38000000"
470+ valt_load_address_pri_inner="0x28000000"
471+ valt_load_address_sec_norml="0x38000000"
472+ valt_load_address_sec_inner="0x28000000"
433473 fi
434- valt_load_address_normal="0x38000000"
435- valt_load_address_inner="0x28000000"
436474 AC_MSG_RESULT([ok (${ARCH_MAX}-${VGCONF_OS})])
437475 ;;
438476 x86-darwin)
439477 VGCONF_ARCH_PRI="x86"
440478 VGCONF_ARCH_SEC=""
441479 VGCONF_PLATFORM_PRI_CAPS="X86_DARWIN"
442480 VGCONF_PLATFORM_SEC_CAPS=""
443- valt_load_address_normal="0x0"
444- valt_load_address_inner="0x0"
481+ valt_load_address_pri_norml="0x38000000"
482+ valt_load_address_pri_inner="0x28000000"
483+ valt_load_address_sec_norml="0xUNSET"
484+ valt_load_address_sec_inner="0xUNSET"
445485 AC_MSG_RESULT([ok (${ARCH_MAX}-${VGCONF_OS})])
446486 ;;
447487 amd64-darwin)
488+ valt_load_address_sec_norml="0xUNSET"
489+ valt_load_address_sec_inner="0xUNSET"
448490 if test x$vg_cv_only64bit = xyes; then
449491 VGCONF_ARCH_PRI="amd64"
450492 VGCONF_ARCH_SEC=""
451493 VGCONF_PLATFORM_PRI_CAPS="AMD64_DARWIN"
452494 VGCONF_PLATFORM_SEC_CAPS=""
495+ valt_load_address_pri_norml="0x138000000"
496+ valt_load_address_pri_inner="0x128000000"
453497 elif test x$vg_cv_only32bit = xyes; then
454498 VGCONF_ARCH_PRI="x86"
455499 VGCONF_ARCH_SEC=""
456500 VGCONF_PLATFORM_PRI_CAPS="X86_DARWIN"
457501 VGCONF_PLATFORM_SEC_CAPS=""
458502 VGCONF_ARCH_PRI_CAPS="x86"
503+ valt_load_address_pri_norml="0x38000000"
504+ valt_load_address_pri_inner="0x28000000"
459505 else
460506 VGCONF_ARCH_PRI="amd64"
461507 VGCONF_ARCH_SEC="x86"
462508 VGCONF_PLATFORM_PRI_CAPS="AMD64_DARWIN"
463509 VGCONF_PLATFORM_SEC_CAPS="X86_DARWIN"
510+ valt_load_address_pri_norml="0x138000000"
511+ valt_load_address_pri_inner="0x128000000"
512+ valt_load_address_sec_norml="0x38000000"
513+ valt_load_address_sec_inner="0x28000000"
464514 fi
465- valt_load_address_normal="0x0"
466- valt_load_address_inner="0x0"
467515 AC_MSG_RESULT([ok (${ARCH_MAX}-${VGCONF_OS})])
468516 ;;
469517 arm-linux)
470518 VGCONF_ARCH_PRI="arm"
471519 VGCONF_PLATFORM_PRI_CAPS="ARM_LINUX"
472520 VGCONF_PLATFORM_SEC_CAPS=""
473- valt_load_address_normal="0x38000000"
474- valt_load_address_inner="0x28000000"
521+ valt_load_address_pri_norml="0x38000000"
522+ valt_load_address_pri_inner="0x28000000"
523+ valt_load_address_sec_norml="0xUNSET"
524+ valt_load_address_sec_inner="0xUNSET"
475525 AC_MSG_RESULT([ok (${host_cpu}-${host_os})])
476526 ;;
477527 *)
478528 VGCONF_ARCH_PRI="unknown"
479529 VGCONF_ARCH_SEC="unknown"
480530 VGCONF_PLATFORM_PRI_CAPS="UNKNOWN"
481531 VGCONF_PLATFORM_SEC_CAPS="UNKNOWN"
532+ valt_load_address_pri_norml="0xUNSET"
533+ valt_load_address_pri_inner="0xUNSET"
534+ valt_load_address_sec_norml="0xUNSET"
535+ valt_load_address_sec_inner="0xUNSET"
482536 AC_MSG_RESULT([no (${ARCH_MAX}-${VGCONF_OS})])
483537 AC_MSG_ERROR([Valgrind is platform specific. Sorry. Please consider doing a port.])
484538 ;;
@@ -564,17 +618,20 @@ AM_CONDITIONAL(VGCONF_HAVE_PLATFORM_SEC,
564618
565619# Check if this should be built as an inner Valgrind, to be run within
566620# another Valgrind. Choose the load address accordingly.
567- AC_SUBST(VALT_LOAD_ADDRESS)
621+ AC_SUBST(VALT_LOAD_ADDRESS_PRI)
622+ AC_SUBST(VALT_LOAD_ADDRESS_SEC)
568623AC_CACHE_CHECK([for use as an inner Valgrind], vg_cv_inner,
569624 [AC_ARG_ENABLE(inner,
570625 [ --enable-inner enables self-hosting],
571626 [vg_cv_inner=$enableval],
572627 [vg_cv_inner=no])])
573628if test "$vg_cv_inner" = yes; then
574629 AC_DEFINE([ENABLE_INNER], 1, [configured to run as an inner Valgrind])
575- VALT_LOAD_ADDRESS=$valt_load_address_inner
630+ VALT_LOAD_ADDRESS_PRI=$valt_load_address_pri_inner
631+ VALT_LOAD_ADDRESS_SEC=$valt_load_address_sec_inner
576632else
577- VALT_LOAD_ADDRESS=$valt_load_address_normal
633+ VALT_LOAD_ADDRESS_PRI=$valt_load_address_pri_norml
634+ VALT_LOAD_ADDRESS_SEC=$valt_load_address_sec_norml
578635fi
579636
580637
@@ -1821,6 +1878,7 @@ AC_CONFIG_FILES([
18211878 memcheck/tests/x86/Makefile
18221879 memcheck/tests/linux/Makefile
18231880 memcheck/tests/darwin/Makefile
1881+ memcheck/tests/amd64-linux/Makefile
18241882 memcheck/tests/x86-linux/Makefile
18251883 memcheck/perf/Makefile
18261884 cachegrind/Makefile
0 commit comments