aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog9
-rw-r--r--gcc/c-family/c.opt2
-rw-r--r--gcc/config/darwin-driver.c9
-rw-r--r--gcc/config/darwin.opt3
4 files changed, 22 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fb3cc9e708b..9690cbe39fa 100644
--- 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 4c4727f31c5..6fc72789689 100644
--- 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 1eb92010637..08834da0461 100644
--- 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 a31ee074cf0..3fcd35f090d 100644
--- 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)