From eef89c1cb4bcabcc69b56f9d538a3e73483a73d1 Mon Sep 17 00:00:00 2001 From: austern Date: Tue, 24 Feb 2004 20:09:16 +0000 Subject: [PATCH] Reverted patch to add the -mmacosx= feature. (Darwin only) git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@78383 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 16 ---------------- gcc/config/darwin-protos.h | 2 -- gcc/config/darwin.c | 42 ------------------------------------------ gcc/config/darwin.h | 13 ------------- gcc/config/i386/darwin.h | 5 ----- gcc/config/rs6000/darwin.h | 3 +-- gcc/doc/invoke.texi | 9 +-------- 7 files changed, 2 insertions(+), 88 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 67d6a92..9f5df1d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -524,22 +524,6 @@ * doc/install.texi: Update for switch of boehm-gc to autoconf 2.57. -2003-02-23 Matt Austern - - * config/darwin.h (SUBTARGET_OPTIONS): Add -mmacosx= option. - (macosx_version_min_required): Declare global variable. - * config/darwin-protos.h (darwin_parse_macosx_version_name): Declare. - * config/darwin.c (macosx_version_min_required): Define variable. - (darwin_macosx_vers_tbl): Define. Table mapping text strings of - OS versions to numerical codes. - (darwin_parse_macosx_version_name): Define. Parse -mmacosx=, - set macosx_version_min_required appropriately. - * config/i386/darwin.h (SUBTARGET_OVERRIDE_OPTIONS): Define. - Invoke darwin_parse_macosx_version_name. - * config/rs6000/darwin.h (SUBTARGET_OVERRIDE_OPTIONS): Add - darwin_parse_macosx_version_name to Darwin option handling. - * doc/invoke.texi (-mmacosx=): Document. - 2004-02-23 Dale Johannesen * config/rs6000.md (movsf_hardfloat): Add POWER form of nop. diff --git a/gcc/config/darwin-protos.h b/gcc/config/darwin-protos.h index 1c432bf..41bad64 100644 --- a/gcc/config/darwin-protos.h +++ b/gcc/config/darwin-protos.h @@ -18,8 +18,6 @@ along with GCC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -extern void darwin_parse_macosx_version_name (void); - extern int name_needs_quotes (const char *); extern void machopic_validate_stub_or_non_lazy_ptr (const char *, int); diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c index 667c21e..978fdde 100644 --- a/gcc/config/darwin.c +++ b/gcc/config/darwin.c @@ -48,48 +48,6 @@ static void update_non_lazy_ptrs (const char *); static void update_stubs (const char *); static const char *machopic_non_lazy_ptr_name (const char*); -/* Earliest operating system for which generated code is targeted, as string - and as integer. The string form is "10.0", "10.1", etc. The corresponding - numeric versions are 1000, 1010, etc. This number is used for feature - tests of the form "enable_this_feature = macosx_version_min_required >= n", - so 0 is a conservative default. */ - -const char *darwin_macosx_version_name; -unsigned int macosx_version_min_required = 0; - -/* Parse -macosx= option. */ - -static struct darwin_macosx_vers { - const char *vers_str; - unsigned int vers_num; -} darwin_macosx_vers_tbl[] = { - { "10.0", 1000 }, - { "10.1", 1010 }, - { "10.2", 1020 }, - { "jaguar", 1020 }, - { "10.3", 1030 }, - { "panther", 1030 }, - { "10.4", 1040 }, - { "10.5", 1050 }, - { NULL, 0 } -}; - -void darwin_parse_macosx_version_name (void) -{ - if (darwin_macosx_version_name) - { - struct darwin_macosx_vers *v = darwin_macosx_vers_tbl; - while (v->vers_str - && strcmp (darwin_macosx_version_name, v->vers_str) != 0) - v++; - - if (v->vers_str) - macosx_version_min_required = v->vers_num; - else - warning ("-macosx=%s: unrecognized version", darwin_macosx_version_name); - } -} - int name_needs_quotes (const char *name) { diff --git a/gcc/config/darwin.h b/gcc/config/darwin.h index b9d1ff6..0a0c2d1 100644 --- a/gcc/config/darwin.h +++ b/gcc/config/darwin.h @@ -82,19 +82,6 @@ Boston, MA 02111-1307, USA. */ #undef DEFAULT_PCC_STRUCT_RETURN #define DEFAULT_PCC_STRUCT_RETURN 0 -/* Strings provided by SUBTARGET_OPTIONS */ -extern const char *darwin_macosx_version_name; - -/* Override rs6000.h/i386.h definition */ -#undef SUBTARGET_OPTIONS -#define SUBTARGET_OPTIONS \ - { "macosx=", &darwin_macosx_version_name, \ - N_("Earliest operating system for which code should be generated"), 0 } - -/* Earliest operating system for which generated code is targeted. 1000 for 10.0, - 1010 for 10.1, etc. */ -extern unsigned int macosx_version_min_required; - /* This table intercepts weirdo options whose names would interfere with normal driver conventions, and either translates them into standardly-named options, or adds a 'Z' so that they can get to diff --git a/gcc/config/i386/darwin.h b/gcc/config/i386/darwin.h index 23db7c0..e99a253a 100644 --- a/gcc/config/i386/darwin.h +++ b/gcc/config/i386/darwin.h @@ -51,11 +51,6 @@ Boston, MA 02111-1307, USA. */ #define SUBTARGET_EXTRA_SPECS \ { "darwin_arch", "i386" }, -#define SUBTARGET_OVERRIDE_OPTIONS \ -do { \ - darwin_parse_macosx_version_name (); \ -} while (0) - /* Use the following macro for any Darwin/x86-specific command-line option translation. */ #define SUBTARGET_OPTION_TRANSLATE_TABLE diff --git a/gcc/config/rs6000/darwin.h b/gcc/config/rs6000/darwin.h index 5b3abab..6f193f7 100644 --- a/gcc/config/rs6000/darwin.h +++ b/gcc/config/rs6000/darwin.h @@ -87,8 +87,7 @@ do { \ flag_pic = 2; \ } \ } \ - darwin_parse_macosx_version_name (); \ -} while (0) +}while(0) /* We want -fPIC by default, unless we're using -static to compile for the kernel or some such. */ diff --git a/gcc/doc/invoke.texi b/gcc/doc/invoke.texi index 3fe6573..7e195f0 100644 --- a/gcc/doc/invoke.texi +++ b/gcc/doc/invoke.texi @@ -461,7 +461,7 @@ in the following sections. -single_module -static -sub_library -sub_umbrella @gol -twolevel_namespace -umbrella -undefined @gol -unexported_symbols_list -weak_reference_mismatches @gol --whatsloaded -mmacosx=@var{ver}} +-whatsloaded} @emph{MIPS Options} @gccoptlist{-EL -EB -march=@var{arch} -mtune=@var{arch} @gol @@ -7578,13 +7578,6 @@ See man ld(1) for more information. This specifies the @var{executable} that will be loading the build output file being linked. See man ld(1) for more information. -@item -mmacosx=@var{ver} -@opindex mmacosx -This specifies the earliest version of Mac OS for which code should -be generated. Specifying @code{-mmacosx=10.2}, for example, allows -the compiler to use features that were first made available in that -version of the operating system. - @item -allowable_client @var{client_name} @itemx -arch_only -- 2.7.4