Backport from mainline

	2012-07-03  Uros Bizjak  <ubizjak@gmail.com>

	* config/i386/i386.c (ix86_option_override_internal): Fix wrong
	code model string in the error message.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@189259 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e5fa0807f6160e3c32bd9ff912e7c45035113c7d..ab8597f7df15ee7f75cb85dc325649a0a855052f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,8 +1,16 @@
+2012-07-04  Uros Bizjak  <ubizjak@gmail.com>
+
+       Backport from mainline
+       2012-07-03  Uros Bizjak  <ubizjak@gmail.com>
+
+       * config/i386/i386.c (ix86_option_override_internal): Fix wrong
+       code model string in the error message.
+
 2012-07-04  Tristan Gingold  <gingold@adacore.com>
 
        Backport from mainline.
        2012-06-25  Tristan Gingold  <gingold@adacore.com>
- 
+
        * config/i386/winnt.c (i386_pe_seh_end_prologue): Move code to ...
        (seh_cfa_adjust_cfa): ... that function.
        (seh_emit_stackalloc): Do not emit out of range values.

diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index 7ae196c0632d6d776ddc9370ba2cc1910100f483..73ab12980d03756d9fe9f9116447582e499857e6 100644 (file)
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -3206,7 +3206,7 @@ ix86_option_override_internal (bool main_args_p)
                   "large", "32");
          else if (TARGET_X32)
            error ("code model %qs not supported in x32 mode",
-                  "medium");
+                  "large");
          break;
 
        case CM_32: