This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
on native Darwin, set default deployment target to 'current OS'
- From: gkeating at apple dot com (Geoffrey Keating)
- To: gcc-patches at gcc dot gnu dot org
- Date: Thu, 7 Jun 2007 11:55:48 -0700 (PDT)
- Subject: on native Darwin, set default deployment target to 'current OS'
This patch changes the default for -mmacosx-version-min to be the OS
version on which the compiler is running, assuming it's running on
Darwin.
Bootstrapped & tested on powerpc-darwin8, and bootstrapped (partially)
on i386-darwin9.
--
- Geoffrey Keating <geoffk@apple.com>
===File ~/patches/gcc-darwin-5235474.patch==================
Index: ChangeLog
2007-06-06 Geoffrey Keating <geoffk@apple.com>
Hui-May Chang <hm.chang@apple.com>
* doc/invoke.texi (Darwin Options): Update documentation for
-mmacosx-version-min.
* config.gcc (*-*-darwin*): Set extra_gcc_objs.
* config/darwin-driver.c: New file.
* config/darwin.h (GCC_DRIVER_HOST_INITIALIZATION): New.
* config/t-darwin (darwin-driver.o): New rule.
* config/darwin-c.c (version_as_macro): Ignore low digit.
Index: testsuite/ChangeLog
2007-06-06 Geoffrey Keating <geoffk@apple.com>
* gcc.dg/darwin-minversion-3.c: New.
Index: config/t-darwin
===================================================================
--- config/t-darwin (revision 125352)
+++ config/t-darwin (working copy)
@@ -12,6 +12,11 @@
gt-darwin.h : s-gtype ; @true
+darwin-driver.o: $(srcdir)/config/darwin-driver.c \
+ $(CONFIG_H) $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H)
+ $(CC) -c $(ALL_CFLAGS) $(ALL_CPPFLAGS) $(INCLUDES) \
+ $(srcdir)/config/darwin-driver.c
+
# How to build crt3.o
EXTRA_MULTILIB_PARTS=crt3.o
# Pass -fno-tree-dominator-opts to work around bug 26840.
Index: config/darwin-c.c
===================================================================
--- config/darwin-c.c (revision 125352)
+++ config/darwin-c.c (working copy)
@@ -567,8 +567,8 @@
/* Return the value of darwin_macosx_version_min suitable for the
__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ macro,
- so '10.4.2' becomes 1042.
- Print a warning if the version number is not known. */
+ so '10.4.2' becomes 1040. The lowest digit is always zero.
+ Print a warning if the version number can't be understood. */
static const char *
version_as_macro (void)
{
@@ -579,18 +579,9 @@
if (! ISDIGIT (darwin_macosx_version_min[3]))
goto fail;
result[2] = darwin_macosx_version_min[3];
- if (darwin_macosx_version_min[4] != '\0')
- {
- if (darwin_macosx_version_min[4] != '.')
- goto fail;
- if (! ISDIGIT (darwin_macosx_version_min[5]))
- goto fail;
- if (darwin_macosx_version_min[6] != '\0')
- goto fail;
- result[3] = darwin_macosx_version_min[5];
- }
- else
- result[3] = '0';
+ if (darwin_macosx_version_min[4] != '\0'
+ && darwin_macosx_version_min[4] != '.')
+ goto fail;
return result;
Index: config/darwin.h
===================================================================
--- config/darwin.h (revision 125352)
+++ config/darwin.h (working copy)
@@ -986,4 +986,10 @@
#define TARGET_HAS_TARGETCM 1
+#ifndef CROSS_DIRECTORY_STRUCTURE
+extern void darwin_default_min_version (int * argc, char *** argv);
+#define GCC_DRIVER_HOST_INITIALIZATION \
+ darwin_default_min_version (&argc, &argv)
+#endif /* CROSS_DIRECTORY_STRUCTURE */
+
#endif /* CONFIG_DARWIN_H */
Index: config/darwin-driver.c
===================================================================
--- config/darwin-driver.c (revision 0)
+++ config/darwin-driver.c (revision 0)
@@ -0,0 +1,160 @@
+/* Additional functions for the GCC driver on Darwin native.
+ Copyright (C) 2006, 2007 Free Software Foundation, Inc.
+ Contributed by Apple Computer Inc.
+
+This file is part of GCC.
+
+GCC is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2, or (at your option)
+any later version.
+
+GCC is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with GCC; see the file COPYING. If not, write to
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
+
+#ifndef CROSS_DIRECTORY_STRUCTURE
+#include "config.h"
+#include "system.h"
+#include "coretypes.h"
+#include "tm.h"
+#include "gcc.h"
+#include <sys/sysctl.h>
+#include "xregex.h"
+
+#ifndef SWITCH_TAKES_ARG
+#define SWITCH_TAKES_ARG(CHAR) DEFAULT_SWITCH_TAKES_ARG(CHAR)
+#endif
+
+#ifndef WORD_SWITCH_TAKES_ARG
+#define WORD_SWITCH_TAKES_ARG(STR) DEFAULT_WORD_SWITCH_TAKES_ARG (STR)
+#endif
+
+/* When running on a Darwin system and using that system's headers and
+ libraries, default the -mmacosx-version-min flag to be the version
+ of the system on which the compiler is running. */
+
+void
+darwin_default_min_version (int * argc_p, char *** argv_p)
+{
+ const int argc = *argc_p;
+ char ** const argv = *argv_p;
+ int i;
+ char osversion[32];
+ size_t osversion_len = sizeof (osversion) - 1;
+ static int osversion_name[2] = { CTL_KERN, KERN_OSRELEASE };
+ char * version_p;
+ char * version_pend;
+ int major_vers;
+ char minor_vers[6];
+ static char new_flag[sizeof ("-mmacosx-version-min=10.0.0") + 6];
+
+ /* If the command-line is empty, just return. */
+ if (argc <= 1)
+ return;
+ /* Don't do this if the user has specified -b or -V at the start
+ of the command-line. */
+ if (argv[1][0] == '-'
+ && (argv[1][1] == 'V' ||
+ ((argv[1][1] == 'b') && (NULL != strchr(argv[1] + 2,'-')))))
+ return;
+
+ /* Don't do this if the user specified -mmacosx-version-min= or
+ -mno-macosx-version-min. */
+ for (i = 1; i < argc; i++)
+ if (argv[i][0] == '-')
+ {
+ const char * const p = argv[i];
+ if (strncmp (p, "-mno-macosx-version-min", 23) == 0
+ || strncmp (p, "-mmacosx-version-min", 20) == 0)
+ return;
+
+ /* It doesn't count if it's an argument to a different switch. */
+ if (p[0] == '-'
+ && ((SWITCH_TAKES_ARG (p[1]) > (p[2] != 0))
+ || WORD_SWITCH_TAKES_ARG (p + 1)))
+ i++;
+ }
+
+ /* Retrieve the deployment target from the environment and insert
+ it as a flag. */
+ {
+ const char * macosx_deployment_target;
+ macosx_deployment_target = getenv ("MACOSX_DEPLOYMENT_TARGET");
+ if (macosx_deployment_target
+ /* Apparently, an empty string for MACOSX_DEPLOYMENT_TARGET means
+ "use the default". Or, possibly "use 10.1". We choose
+ to ignore the environment variable, as if it was never set. */
+ && macosx_deployment_target[0])
+ {
+ ++*argc_p;
+ *argv_p = xmalloc (sizeof (char *) * *argc_p);
+ (*argv_p)[0] = argv[0];
+ (*argv_p)[1] = concat ("-mmacosx-version-min=",
+ macosx_deployment_target, NULL);
+ memcpy (*argv_p + 2, argv + 1, (argc - 1) * sizeof (char *));
+ return;
+ }
+ }
+
+ /* Determine the version of the running OS. If we can't, warn user,
+ and do nothing. */
+ if (sysctl (osversion_name, ARRAY_SIZE (osversion_name), osversion,
+ &osversion_len, NULL, 0) == -1)
+ {
+ fprintf (stderr, "sysctl for kern.osversion failed: %s\n",
+ xstrerror (errno));
+ return;
+ }
+
+ /* Try to parse the first two parts of the OS version number. Warn
+ user and return if it doesn't make sense. */
+ if (! ISDIGIT (osversion[0]))
+ goto parse_failed;
+ major_vers = osversion[0] - '0';
+ version_p = osversion + 1;
+ if (ISDIGIT (*version_p))
+ major_vers = major_vers * 10 + (*version_p++ - '0');
+ if (major_vers > 4 + 9)
+ goto parse_failed;
+ if (*version_p++ != '.')
+ goto parse_failed;
+ version_pend = strchr(version_p, '.');
+ if (!version_pend)
+ goto parse_failed;
+ if (! ISDIGIT (*version_p))
+ goto parse_failed;
+ strncpy(minor_vers, version_p, version_pend - version_p);
+ minor_vers[version_pend - version_p] = '\0';
+
+ /* The major kernel version number is 4 plus the second OS version
+ component. */
+ if (major_vers - 4 <= 4)
+ /* On 10.4 and earlier, the old linker is used which does not
+ support three-component system versions. */
+ sprintf (new_flag, "-mmacosx-version-min=10.%d", major_vers - 4);
+ else
+ sprintf (new_flag, "-mmacosx-version-min=10.%d.%s", major_vers - 4,
+ minor_vers);
+
+ /* Add the new flag. */
+ ++*argc_p;
+ *argv_p = xmalloc (sizeof (char *) * *argc_p);
+ (*argv_p)[0] = argv[0];
+ (*argv_p)[1] = new_flag;
+ memcpy (*argv_p + 2, argv + 1, (argc - 1) * sizeof (char *));
+ return;
+
+ parse_failed:
+ fprintf (stderr, "couldn't understand kern.osversion `%.*s'\n",
+ (int) osversion_len, osversion);
+ return;
+}
+
+#endif /* CROSS_DIRECTORY_STRUCTURE */
Index: doc/invoke.texi
===================================================================
--- doc/invoke.texi (revision 125352)
+++ doc/invoke.texi (working copy)
@@ -8763,8 +8763,10 @@
is @var{version}. Typical values of @var{version} include @code{10.1},
@code{10.2}, and @code{10.3.9}.
-The default for this option is to make choices that seem to be most
-useful.
+If the compiler was built to use the system's headers by default,
+then the default for this option is the system version on which the
+compiler is running, otherwise the default is to make choices which
+are compatible with as many systems and code bases as possible.
@item -mkernel
@opindex mkernel
Index: config.gcc
===================================================================
--- config.gcc (revision 125352)
+++ config.gcc (working copy)
@@ -393,6 +393,7 @@
c_target_objs="darwin-c.o"
cxx_target_objs="darwin-c.o"
extra_objs="darwin.o"
+ extra_gcc_objs="darwin-driver.o"
default_use_cxa_atexit=yes
case ${enable_threads} in
"" | yes | posix) thread_file='posix' ;;
Index: testsuite/gcc.dg/darwin-minversion-3.c
===================================================================
--- testsuite/gcc.dg/darwin-minversion-3.c (revision 0)
+++ testsuite/gcc.dg/darwin-minversion-3.c (revision 0)
@@ -0,0 +1,11 @@
+/* Test that most-minor versions greater than 9 work. */
+/* { dg-options "-mmacosx-version-min=10.4.10" } */
+/* { dg-do compile { target *-*-darwin* } } */
+
+int main(void)
+{
+#if __ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ != 1040
+ fail me;
+#endif
+ return 0;
+}
============================================================