From: Michael Meissner <meissner@linux.vnet.ibm.com>
Date: Sat, 31 Dec 2011 00:29:44 +0000 (+0000)
Subject: Fix thinko in setting target options
X-Git-Tag: releases/gcc-4.6.3~218
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5ba8eea3f16089762148dd8195b8a1677d1ef7fb;p=thirdparty%2Fgcc.git

Fix thinko in setting target options

From-SVN: r182752
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 679b0b928c99..3352bdfc8270 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2011-12-30  Michael Meissner  <meissner@linux.vnet.ibm.com>
+
+	Backport from the mainline
+	2011-12-30  Michael Meissner  <meissner@linux.vnet.ibm.com>
+
+	* config/rs6000/rs6000.c (rs6000_inner_target_options): Fix thinko
+	in setting options via target #pragma or attribute.
+
 2011-12-28  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
 	Backport from mainline
diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c
index c069629327e7..ae0cc17f573c 100644
--- a/gcc/config/rs6000/rs6000.c
+++ b/gcc/config/rs6000/rs6000.c
@@ -27760,7 +27760,7 @@ rs6000_inner_target_options (tree args, bool attr_p)
 		    if (strcmp (r, rs6000_opt_vars[i].name) == 0)
 		      {
 			size_t j = rs6000_opt_vars[i].global_offset;
-			((int *) &global_options)[j] = !invert;
+			*((int *) ((char *)&global_options + j)) = !invert;
 			error_p = false;
 			break;
 		      }