Patch from Ulrich to fix problems with default CPU defines.

* i386.h (CPP_CPU_DEFAULT): Renamed to CPP_CPU_DEFAULT_SPEC.
	Add missing -Dpentium* options.
	(CPP_CPU_SPEC): Delete redundant definition.  Include cpp_cpu_default
	instead of CPP_CPU_DEFAULT.
	(EXTRA_SPECS): Add entry for cpp_cpu_default.

From-SVN: r19284
This commit is contained in:
Jim Wilson 1998-04-18 18:36:11 +00:00 committed by Jim Wilson
parent db72d7a1d6
commit 84b77fbac2
2 changed files with 20 additions and 17 deletions

View File

@ -1,3 +1,11 @@
Sat Apr 18 18:30:22 1998 Jim Wilson <wilson@cygnus.com>
* i386.h (CPP_CPU_DEFAULT): Renamed to CPP_CPU_DEFAULT_SPEC.
Add missing -Dpentium* options.
(CPP_CPU_SPEC): Delete redundant definition. Include cpp_cpu_default
instead of CPP_CPU_DEFAULT.
(EXTRA_SPECS): Add entry for cpp_cpu_default.
Sat Apr 18 19:06:59 1998 David Edelsohn <edelsohn@mhpcc.edu>
* rs6000.md (floatsidf2_loadaddr): rs6000_fpmem_offset will be

View File

@ -304,36 +304,30 @@ extern int ix86_arch;
%{mpentiumpro:-mcpu=pentiumpro}}"
#endif
#ifndef CPP_CPU_SPEC
#ifdef __STDC__
#ifndef CPP_CPU_DEFAULT_SPEC
#if TARGET_CPU_DEFAULT == 1
#define CPP_CPU_DEFAULT "-Di486"
#define CPP_CPU_DEFAULT_SPEC "-Di486"
#else
#if TARGET_CPU_DEFAULT == 2
#define CPP_CPU_DEFAULT "-Di586"
#define CPP_CPU_DEFAULT_SPEC "-Dpentium -Di586"
#else
#if TARGET_CPU_DEFAULT == 3
#define CPP_CPU_DEFAULT "-Di686"
#define CPP_CPU_DEFAULT_SPEC "-Dpentiumpro -Di686"
#else
#define CPP_CPU_DEFAULT ""
#define CPP_CPU_DEFAULT_SPEC ""
#endif
#endif
#endif /* TARGET_CPU_DEFAULT */
#endif
#endif /* CPP_CPU_DEFAULT_SPEC */
#define CPP_CPU_SPEC "\
-Di386 " CPP_CPU_DEFAULT " -Asystem(unix) -Acpu(i386) -Amachine(i386) \
%{mcpu=i486:-Di486} %{m486:-Di486} \
%{mpentium:-Dpentium -Di586} %{mcpu=pentium:-Dpentium -Di586} \
%{mpentiumpro:-Dpentiumpro -Di686} %{mcpu=pentiumpro:-Dpentiumpro -Di686}"
#else
#ifndef CPP_CPU_SPEC
#define CPP_CPU_SPEC "\
-Di386 -Asystem(unix) -Acpu(i386) -Amachine(i386) \
%{mcpu=i486:-Di486} %{m486:-Di486} \
%{mpentium:-Dpentium -Di586} %{mcpu=pentium:-Dpentium -Di586} \
%{mpentiumpro:-Dpentiumpro -Di686} %{mcpu=pentiumpro:-Dpentiumpro -Di686}"
#endif /* __STDC__ */
#endif /* CPP_CPU_SPEC */
%{mpentiumpro:-Dpentiumpro -Di686} %{mcpu=pentiumpro:-Dpentiumpro -Di686} \
%{!mcpu*:%{!m486:%{!mpentium*: %[cpp_cpu_default]}}}"
#endif
#ifndef CC1_SPEC
#define CC1_SPEC "%(cc1_spec) "
@ -354,6 +348,7 @@ extern int ix86_arch;
#endif
#define EXTRA_SPECS \
{ "cpp_cpu_default", CPP_CPU_DEFAULT_SPEC }, \
{ "cpp_cpu", CPP_CPU_SPEC }, \
{ "cc1_cpu", CC1_CPU_SPEC }, \
SUBTARGET_EXTRA_SPECS