PR/driver 48208

2011-03-30  Christian Schüler  <cschueler@gmx.de>

	PR/driver 48208
	* config/c.opt (F): Added 'Driver' to -F option.
	PR/driver 48260
	* config/darwin-driver.c (darwin_driver_init): Add '-arch' to
	  handler function.
	* config/darwin.opt: Added '-arch' option.

From-SVN: r171727

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fb3cc9e708b69fd910ab160521ddeb4c1c684b45..9690cbe39fafe9cf7c1f76206c5299e68f33f754 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2011-03-30  Christian Schüler  <cschueler@gmx.de>
+
+       PR/driver 48208
+       * config/c.opt (F): Added 'Driver' to -F option.
+       PR/driver 48260
+       * config/darwin-driver.c (darwin_driver_init): Add '-arch' to
+         handler function.
+       * config/darwin.opt: Added '-arch' option.
+
 2011-03-30  Nick Clifton  <nickc@redhat.com>
 
        * config/rx/rx.md: Add peepholes and patterns to combine

diff --git a/gcc/c-family/c.opt b/gcc/c-family/c.opt
index 4c4727f31c5719b6fbf2db0b1e9fdb497b86b142..6fc72789689d20e2a64db4b55fff8c98729462d7 100644 (file)
--- a/gcc/c-family/c.opt
+++ b/gcc/c-family/c.opt
@@ -201,7 +201,7 @@ E
 C ObjC C++ ObjC++ Undocumented Var(flag_preprocess_only)
 
 F
-C ObjC C++ ObjC++ Joined Separate MissingArgError(missing path after %qs)
+Driver C ObjC C++ ObjC++ Joined Separate MissingArgError(missing path after %qs)
 -F <dir>       Add <dir> to the end of the main framework include path
 
 H

diff --git a/gcc/config/darwin-driver.c b/gcc/config/darwin-driver.c
index 1eb9201063774f46c00fbc677a5d68ae0c9647c4..08834da0461d9f5dfdf95cb9ee5b524bdd369a5a 100644 (file)
--- a/gcc/config/darwin-driver.c
+++ b/gcc/config/darwin-driver.c
@@ -161,6 +161,15 @@ darwin_driver_init (unsigned int *decoded_options_count,
        continue;
       switch ((*decoded_options)[i].opt_index)
        {
+#if DARWIN_X86
+       case OPT_arch:
+         if (!strcmp ((*decoded_options)[i].arg, "i386"))
+           generate_option (OPT_m32, NULL, 1, CL_DRIVER, &(*decoded_options)[i]);
+         else if (!strcmp ((*decoded_options)[i].arg, "x86_64"))
+           generate_option (OPT_m64, NULL, 1, CL_DRIVER, &(*decoded_options)[i]);
+         break;
+#endif
+
        case OPT_filelist:
        case OPT_framework:
          ++*decoded_options_count;

diff --git a/gcc/config/darwin.opt b/gcc/config/darwin.opt
index a31ee074cf06b3b2e3ee6663b1652818f7387d32..3fcd35f090d144cf2abcff29b978a6bac8dc142c 100644 (file)
--- a/gcc/config/darwin.opt
+++ b/gcc/config/darwin.opt
@@ -31,6 +31,9 @@ Driver Alias(Zall_load)
 allowable_client
 Driver Separate Alias(Zallowable_client)
 
+arch
+Driver RejectNegative Separate
+
 arch_errors_fatal
 Driver Alias(Zarch_errors_fatal)