|
From: <sv...@va...> - 2009-01-22 22:55:20
|
Author: njn
Date: 2009-01-22 22:55:11 +0000 (Thu, 22 Jan 2009)
New Revision: 9035
Log:
- Get rid of some relics of when ppc/darwin was supported.
- Add a comment about supp-file generation on Darwin.
- Undefine the not-used VGO_darwin_version.
Modified:
branches/DARWIN/configure.in
Modified: branches/DARWIN/configure.in
===================================================================
--- branches/DARWIN/configure.in 2009-01-22 22:44:30 UTC (rev 9034)
+++ branches/DARWIN/configure.in 2009-01-22 22:55:11 UTC (rev 9035)
@@ -220,8 +220,6 @@
AC_MSG_CHECKING([for a supported OS])
AC_SUBST(VGCONF_OS)
-# DDD: why are the Darwin supps set in the kernel check instead of the libc
-# check?
DEFAULT_SUPP=""
case "${host_os}" in
@@ -277,11 +275,19 @@
AC_MSG_CHECKING([for the kernel version])
kernel=`uname -r`
-
+
+ # Nb: for Darwin we set DEFAULT_SUPP here. That's because Darwin
+ # has only one relevant version, the OS version. The `uname` check
+ # is a good way to get that version (i.e. "Darwin 9.6.0" is Mac OS
+ # X 10.5.6, and "Darwin 10.x" would presumably be Mac OS X 10.6.x
+ # Snow Leopard and darwin10.supp), and we don't know of an macros
+ # similar to __GLIBC__ to get that info.
+ #
+ # XXX: `uname -r` won't do the right thing for cross-compiles, but
+ # that's not a problem yet.
case "${kernel}" in
9.*)
AC_MSG_RESULT([Darwin 9.x (${kernel}) / Mac OS X 10.5 Leopard])
- AC_DEFINE([VGO_darwin_version], 0x900, [foo])
DEFAULT_SUPP="darwin9.supp ${DEFAULT_SUPP}"
;;
*)
@@ -477,13 +483,10 @@
test x$VGCONF_PLATFORM_PRI_CAPS = xPPC32_LINUX \
-o x$VGCONF_PLATFORM_SEC_CAPS = xPPC32_LINUX \
-o x$VGCONF_PLATFORM_PRI_CAPS = xPPC32_AIX5 \
- -o x$VGCONF_PLATFORM_SEC_CAPS = xPPC32_AIX5 \
- -o x$VGCONF_PLATFORM_PRI_CAPS = xPPC32_DARWIN \
- -o x$VGCONF_PLATFORM_SEC_CAPS = xPPC32_DARWIN )
+ -o x$VGCONF_PLATFORM_SEC_CAPS = xPPC32_AIX5 )
AM_CONDITIONAL(VGCONF_ARCHS_INCLUDE_PPC64,
test x$VGCONF_PLATFORM_PRI_CAPS = xPPC64_LINUX \
- -o x$VGCONF_PLATFORM_PRI_CAPS = xPPC64_AIX5 \
- -o x$VGCONF_PLATFORM_PRI_CAPS = xPPC64_DARWIN )
+ -o x$VGCONF_PLATFORM_PRI_CAPS = xPPC64_AIX5 )
# Set up VGCONF_PLATFORMS_INCLUDE_<platform>. Either one or two of these
# become defined.
@@ -508,11 +511,6 @@
test x$VGCONF_PLATFORM_PRI_CAPS = xX86_DARWIN)
AM_CONDITIONAL(VGCONF_PLATFORMS_INCLUDE_AMD64_DARWIN,
test x$VGCONF_PLATFORM_PRI_CAPS = xAMD64_DARWIN)
-AM_CONDITIONAL(VGCONF_PLATFORMS_INCLUDE_PPC32_DARWIN,
- test x$VGCONF_PLATFORM_PRI_CAPS = xPPC32_DARWIN \
- -o x$VGCONF_PLATFORM_SEC_CAPS = xPPC32_DARWIN)
-AM_CONDITIONAL(VGCONF_PLATFORMS_INCLUDE_PPC64_DARWIN,
- test x$VGCONF_PLATFORM_PRI_CAPS = xPPC64_DARWIN)
# Similarly, set up VGCONF_OF_IS_<os>. Exactly one of these becomes defined.
@@ -528,9 +526,7 @@
-o x$VGCONF_PLATFORM_PRI_CAPS = xPPC64_AIX5)
AM_CONDITIONAL(VGCONF_OS_IS_DARWIN,
test x$VG_PLATFORM_PRI = xX86_DARWIN \
- -o x$VG_PLATFORM_PRI = xAMD64_DARWIN \
- -o x$VG_PLATFORM_PRI = xPPC32_DARWIN \
- -o x$VG_PLATFORM_PRI = xPPC64_DARWIN)
+ -o x$VG_PLATFORM_PRI = xAMD64_DARWIN)
# Sometimes, in the Makefile.am files, it's useful to know whether or not
@@ -734,13 +730,14 @@
darwin)
AC_MSG_RESULT(Darwin)
AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin])
- # DEFAULT_SUPP set by kernel version check
+ # DEFAULT_SUPP set by kernel version check above.
;;
*)
AC_MSG_RESULT(unsupported version)
AC_MSG_ERROR([Valgrind requires glibc version 2.2 - 2.9])
AC_MSG_ERROR([or AIX 5.1 or 5.2 or 5.3 GLIBC_VERSION])
+ AC_MSG_ERROR([or Darwin libc])
;;
esac
|