opts.c (target_handle_option): Do not assert that loc == UNKNOWN_LOCATION.

	* opts.c (target_handle_option): Do not assert that loc ==
	UNKNOWN_LOCATION.

From-SVN: r166866

2 files changed, 10 insertions, 2 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 91ae63e..a131549 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-11-17  Joseph Myers  <joseph@codesourcery.com>
+
+	* opts.c (target_handle_option): Do not assert that loc ==
+	UNKNOWN_LOCATION.
+
 2010-11-17  Jakub Jelinek  <jakub@redhat.com>
 	    Richard Guenther  <rguenther@suse.de>
 
diff --git a/gcc/opts.c b/gcc/opts.c
index d4d7f1d8..6c2fca3 100644
--- a/gcc/opts.c
+++ b/gcc/opts.c
@@ -521,7 +521,7 @@ target_handle_option (struct gcc_options *opts,
 		      struct gcc_options *opts_set,
 		      const struct cl_decoded_option *decoded,
 		      unsigned int lang_mask ATTRIBUTE_UNUSED, int kind,
-		      location_t loc,
+		      location_t loc ATTRIBUTE_UNUSED,
 		      const struct cl_option_handlers *handlers ATTRIBUTE_UNUSED,
 		      diagnostic_context *dc)
 {
@@ -530,7 +530,10 @@ target_handle_option (struct gcc_options *opts,
   gcc_assert (dc == global_dc);
   gcc_assert (decoded->canonical_option_num_elements <= 2);
   gcc_assert (kind == DK_UNSPECIFIED);
-  gcc_assert (loc == UNKNOWN_LOCATION);
+  /* Although the location is not passed down to
+     targetm.handle_option, do not make assertions about its value;
+     options may come from optimize attributes and having the correct
+     location in the handler is not generally important.  */
   return targetm.handle_option (decoded->opt_index, decoded->arg,
 				decoded->value);
 }