Reverted patch to add the -mmacosx= feature. (Darwin only)

From-SVN: r78383

5 files changed, 1 insertions, 64 deletions

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.  */