mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-15 14:10:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Don't check/change generic/i686 tuning

Browse Source 
gcc/

	PR target/59588
	* config/i386/i386.c (ix86_option_override_internal): Don't
	check generic tuning.  Don't change i686 tuning.

gcc/testsuite/

	PR target/59588
	* gcc.target/i386/pr59588-1.c: New file.
	* gcc.target/i386/pr59588-2.c: Likewise.

From-SVN: r206213
This commit is contained in:
H.J. Lu 2013-12-26 16:10:55 +00:00 committed by H.J. Lu
parent 806ac50747
commit dd908cc5d8
5 changed files with 30 additions and 16 deletions
gcc
ChangeLog
config/i386
i386.c
testsuite
ChangeLog
gcc.target/i386
pr59588-1.cpr59588-2.c

6
gcc/ChangeLog

@ -1,3 +1,9 @@
2013-12-26 H.J. Lu <hongjiu.lu@intel.com>
PR target/59588
* config/i386/i386.c (ix86_option_override_internal): Don't
check generic tuning. Don't change i686 tuning.
2013-12-26 H.J. Lu <hongjiu.lu@intel.com>
PR target/59601

20
gcc/config/i386/i386.c

@ -3283,23 +3283,13 @@ ix86_option_override_internal (bool main_args_p,
/* Need to check -mtune=generic first. */
if (opts->x_ix86_tune_string)
{
if (!strcmp (opts->x_ix86_tune_string, "generic")
|| !strcmp (opts->x_ix86_tune_string, "i686")
/* As special support for cross compilers we read -mtune=native
/* As special support for cross compilers we read -mtune=native
as -mtune=generic. With native compilers we won't see the
-mtune=native, as it was changed by the driver. */
|| !strcmp (opts->x_ix86_tune_string, "native"))
if (!strcmp (opts->x_ix86_tune_string, "native"))
{
opts->x_ix86_tune_string = "generic";
}
/* If this call is for setting the option attribute, allow the
generic that was previously set. */
else if (!main_args_p
&& !strcmp (opts->x_ix86_tune_string, "generic"))
;
else if (!strncmp (opts->x_ix86_tune_string, "generic", 7))
error ("bad value (%s) for %stune=%s %s",
opts->x_ix86_tune_string, prefix, suffix, sw);
else if (!strcmp (opts->x_ix86_tune_string, "x86-64"))
warning (OPT_Wdeprecated, "%stune=x86-64%s is deprecated; use "
"%stune=k8%s or %stune=generic%s instead as appropriate",
@ -3318,9 +3308,7 @@ ix86_option_override_internal (bool main_args_p,
/* opts->x_ix86_tune_string is set to opts->x_ix86_arch_string
or defaulted. We need to use a sensible tune option. */
if (!strcmp (opts->x_ix86_tune_string, "generic")
|| !strcmp (opts->x_ix86_tune_string, "x86-64")
|| !strcmp (opts->x_ix86_tune_string, "i686"))
if (!strcmp (opts->x_ix86_tune_string, "x86-64"))
{
opts->x_ix86_tune_string = "generic";
}
@ -3600,7 +3588,7 @@ ix86_option_override_internal (bool main_args_p,
else if (!strcmp (opts->x_ix86_arch_string, "intel"))
error ("intel CPU can be used only for %stune=%s %s",
prefix, suffix, sw);
else if (!strncmp (opts->x_ix86_arch_string, "generic", 7) || i == pta_size)
else if (i == pta_size)
error ("bad value (%s) for %sarch=%s %s",
opts->x_ix86_arch_string, prefix, suffix, sw);

6
gcc/testsuite/ChangeLog

@ -1,3 +1,9 @@
2013-12-26 H.J. Lu <hongjiu.lu@intel.com>
PR target/59588
* gcc.target/i386/pr59588-1.c: New file.
* gcc.target/i386/pr59588-2.c: Likewise.
2013-12-26 Uros Bizjak <ubizjak@gmail.com>
H.J. Lu <hongjiu.lu@intel.com>

7
gcc/testsuite/gcc.target/i386/pr59588-1.c Normal file

@ -0,0 +1,7 @@
/* { dg-do preprocess } */
/* { dg-require-effective-target ia32 } */
/* { dg-options "-march=i686" } */
#ifndef __tune_i686__
#error "__tune_i686__ should be defined for this test"
#endif

7
gcc/testsuite/gcc.target/i386/pr59588-2.c Normal file

@ -0,0 +1,7 @@
/* { dg-do preprocess } */
/* { dg-require-effective-target ia32 } */
/* { dg-options "-mtune=i686" } */
#ifndef __tune_i686__
#error "__tune_i686__ should be defined for this test"
#endif