Commit 8524774e by Stan Cox

(CPP_SPEC): Use %[cpp_cpu].

From-SVN: r12851
parent 33163ace
...@@ -44,9 +44,9 @@ Boston, MA 02111-1307, USA. */ ...@@ -44,9 +44,9 @@ Boston, MA 02111-1307, USA. */
/* Specify predefined symbols in preprocessor. */ /* Specify predefined symbols in preprocessor. */
#define CPP_PREDEFINES "-Dps2 -Dunix -Di386 -Asystem(unix) -Asystem(aix) -Acpu(i386) -Amachine(i386)" #define CPP_PREDEFINES "-Dps2 -Dunix -Asystem(aix)"
#define CPP_SPEC \ #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] \
"%{posix:-D_POSIX_SOURCE}%{!posix:-DAIX} -D_I386 -D_AIX -D_MBCS" "%{posix:-D_POSIX_SOURCE}%{!posix:-DAIX} -D_I386 -D_AIX -D_MBCS"
/* special flags for the aix assembler to generate the short form for all /* special flags for the aix assembler to generate the short form for all
......
...@@ -26,7 +26,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */ ...@@ -26,7 +26,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA. */
#include "i386/sysv4.h" #include "i386/sysv4.h"
#ifndef VERSION_INFO2 #ifndef VERSION_INFO2
#define VERSION_INFO2 "$Revision: 1.2 $" #define VERSION_INFO2 "$Revision: 1.3 $"
#endif #endif
#ifndef VERSION_STRING #ifndef VERSION_STRING
...@@ -268,3 +268,20 @@ char insn; int insn_; char * file_; int line_; ...@@ -268,3 +268,20 @@ char insn; int insn_; char * file_; int line_;
warning ("argument is a structure"),0 : 0), \ warning ("argument is a structure"),0 : 0), \
(function_arg (&CUM, MODE, TYPE, NAMED))) (function_arg (&CUM, MODE, TYPE, NAMED)))
/* This is how to output an assembler line
that says to advance the location counter
to a multiple of 2**LOG bytes. */
#undef ASM_OUTPUT_ALIGN
#define ASM_OUTPUT_ALIGN(FILE,LOG) \
if (LOG <= 2) \
fprintf ((FILE), "\t.align %d\n", 1<<(LOG));\
else if ((LOG)!=0) \
{ \
char buf[256]; \
if (!backalign_labelno) fprintf ((FILE), "\t.align %d\n", 1); \
ASM_GENERATE_INTERNAL_LABEL (buf, "LBA", backalign_labelno++); \
fprintf ((FILE), "%s:", &buf[1]); \
fprintf ((FILE), "\t.backalign %s,%d,%d\n", &buf[1], 1<<(LOG), \
((TARGET_PENTIUMPRO || TARGET_486) && LOG==4) ? 6 : 2);\
}
...@@ -140,13 +140,13 @@ Boston, MA 02111-1307, USA. */ ...@@ -140,13 +140,13 @@ Boston, MA 02111-1307, USA. */
#define WCHAR_TYPE_SIZE BITS_PER_WORD #define WCHAR_TYPE_SIZE BITS_PER_WORD
#undef CPP_PREDEFINES #undef CPP_PREDEFINES
#define CPP_PREDEFINES "-Dunix -Di386 -D__ELF__ -D__FreeBSD__=2 -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)" #define CPP_PREDEFINES "-Dunix -D__ELF__ -D__FreeBSD__=2 -Asystem(FreeBSD)"
#undef CPP_SPEC #undef CPP_SPEC
#if TARGET_CPU_DEFAULT == 2 #if TARGET_CPU_DEFAULT == 2
#define CPP_SPEC "%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__} %{posix:-D_POSIX_SOURCE}" #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}"
#else #else
#define CPP_SPEC "%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__} %{posix:-D_POSIX_SOURCE}" #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}"
#endif #endif
#undef LIB_SPEC #undef LIB_SPEC
......
...@@ -56,8 +56,8 @@ Boston, MA 02111-1307, USA. */ ...@@ -56,8 +56,8 @@ Boston, MA 02111-1307, USA. */
/* Specify predefined symbols in preprocessor. */ /* Specify predefined symbols in preprocessor. */
#define CPP_PREDEFINES "-Dunix -Di386 -Asystem(unix) -Acpu(i386) -Amachine(i386)" #define CPP_PREDEFINES "-Dunix"
#define CPP_SPEC "%{posix:-D_POSIX_SOURCE}" #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] %{posix:-D_POSIX_SOURCE}"
/* Allow #sccs in preprocessor. */ /* Allow #sccs in preprocessor. */
......
...@@ -19,7 +19,7 @@ ...@@ -19,7 +19,7 @@
#define LIB_SPEC "%{shlib:-lc_s} %{posix:-lcposix} %{Xp:-lcposix} -lc -lg" #define LIB_SPEC "%{shlib:-lc_s} %{posix:-lcposix} %{Xp:-lcposix} -lc -lg"
#undef CPP_SPEC #undef CPP_SPEC
#define CPP_SPEC "%{posix:-D_POSIX_SOURCE} %{Xp:-D_POSIX_SOURCE}" #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] %{posix:-D_POSIX_SOURCE} %{Xp:-D_POSIX_SOURCE}"
/* ISC 2.2 uses `char' for `wchar_t'. */ /* ISC 2.2 uses `char' for `wchar_t'. */
#undef WCHAR_TYPE #undef WCHAR_TYPE
......
...@@ -28,13 +28,13 @@ Boston, MA 02111-1307, USA. */ ...@@ -28,13 +28,13 @@ Boston, MA 02111-1307, USA. */
/* Specify predefined symbols in preprocessor. */ /* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES #undef CPP_PREDEFINES
#define CPP_PREDEFINES "-Dunix -Di386 -Dlinux -Asystem(unix) -Asystem(posix) -Acpu(i386) -Amachine(i386)" #define CPP_PREDEFINES "-Dunix -Dlinux -Asystem(posix)"
#undef CPP_SPEC #undef CPP_SPEC
#if TARGET_CPU_DEFAULT == 2 #if TARGET_CPU_DEFAULT == 2
#define CPP_SPEC "%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__} %{posix:-D_POSIX_SOURCE}" #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}"
#else #else
#define CPP_SPEC "%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__} %{posix:-D_POSIX_SOURCE}" #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}"
#endif #endif
#undef SIZE_TYPE #undef SIZE_TYPE
......
...@@ -28,13 +28,13 @@ Boston, MA 02111-1307, USA. */ ...@@ -28,13 +28,13 @@ Boston, MA 02111-1307, USA. */
/* Specify predefined symbols in preprocessor. */ /* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES #undef CPP_PREDEFINES
#define CPP_PREDEFINES "-Dunix -Di386 -Dlinux -Asystem(unix) -Asystem(posix) -Acpu(i386) -Amachine(i386)" #define CPP_PREDEFINES "-Dunix -Dlinux -Asystem(posix)"
#undef CPP_SPEC #undef CPP_SPEC
#if TARGET_CPU_DEFAULT == 2 #if TARGET_CPU_DEFAULT == 2
#define CPP_SPEC "%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__} %{posix:-D_POSIX_SOURCE}" #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}"
#else #else
#define CPP_SPEC "%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__} %{posix:-D_POSIX_SOURCE}" #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}"
#endif #endif
#undef SIZE_TYPE #undef SIZE_TYPE
......
...@@ -148,13 +148,13 @@ Boston, MA 02111-1307, USA. */ ...@@ -148,13 +148,13 @@ Boston, MA 02111-1307, USA. */
#define WCHAR_TYPE_SIZE BITS_PER_WORD #define WCHAR_TYPE_SIZE BITS_PER_WORD
#undef CPP_PREDEFINES #undef CPP_PREDEFINES
#define CPP_PREDEFINES "-D__ELF__ -Dunix -Di386 -Dlinux -Asystem(unix) -Asystem(posix) -Acpu(i386) -Amachine(i386)" #define CPP_PREDEFINES "-D__ELF__ -Dunix -Dlinux -Asystem(posix)"
#undef CPP_SPEC #undef CPP_SPEC
#if TARGET_CPU_DEFAULT == 2 #if TARGET_CPU_DEFAULT == 2
#define CPP_SPEC "%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__} %{posix:-D_POSIX_SOURCE}" #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{!m386:-D__i486__} %{posix:-D_POSIX_SOURCE}"
#else #else
#define CPP_SPEC "%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__} %{posix:-D_POSIX_SOURCE}" #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{m486:-D__i486__} %{posix:-D_POSIX_SOURCE}"
#endif #endif
/* Provide a LINK_SPEC appropriate for Linux. Here we provide support /* Provide a LINK_SPEC appropriate for Linux. Here we provide support
......
...@@ -22,10 +22,10 @@ Boston, MA 02111-1307, USA. */ ...@@ -22,10 +22,10 @@ Boston, MA 02111-1307, USA. */
#include "config/i386/osfrose.h" #include "config/i386/osfrose.h"
#undef CPP_PREDEFINES #undef CPP_PREDEFINES
#define CPP_PREDEFINES "-DOSF -DOSF1 -Dunix -Di386 -Asystem(unix) -Asystem(xpg4) -Acpu(i386) -Amachine(i386)" #define CPP_PREDEFINES "-DOSF -DOSF1 -Dunix -Asystem(xpg4)"
#undef CPP_SPEC #undef CPP_SPEC
#define CPP_SPEC "\ #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] \
%{mrose: -D__ROSE__ %{!pic-none: -D__SHARED__}} \ %{mrose: -D__ROSE__ %{!pic-none: -D__SHARED__}} \
%{!mrose: -D__ELF__ %{fpic: -D__SHARED__}} \ %{!mrose: -D__ELF__ %{fpic: -D__SHARED__}} \
%{mno-underscores: -D__NO_UNDERSCORES__} \ %{mno-underscores: -D__NO_UNDERSCORES__} \
......
...@@ -90,10 +90,10 @@ Boston, MA 02111-1307, USA. */ ...@@ -90,10 +90,10 @@ Boston, MA 02111-1307, USA. */
/* Change default predefines. */ /* Change default predefines. */
#undef CPP_PREDEFINES #undef CPP_PREDEFINES
#define CPP_PREDEFINES "-DOSF -DOSF1 -Dunix -Di386 -Asystem(unix) -Asystem(xpg4) -Acpu(i386) -Amachine(i386)" #define CPP_PREDEFINES "-DOSF -DOSF1 -Dunix -Asystem(xpg4)"
#undef CPP_SPEC #undef CPP_SPEC
#define CPP_SPEC "\ #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] \
%{!melf: -D__ROSE__ %{!pic-none: -D__SHARED__}} \ %{!melf: -D__ROSE__ %{!pic-none: -D__SHARED__}} \
%{melf: -D__ELF__ %{fpic: -D__SHARED__}} \ %{melf: -D__ELF__ %{fpic: -D__SHARED__}} \
%{mno-underscores: -D__NO_UNDERSCORES__} \ %{mno-underscores: -D__NO_UNDERSCORES__} \
......
...@@ -55,10 +55,10 @@ Boston, MA 02111-1307, USA. */ ...@@ -55,10 +55,10 @@ Boston, MA 02111-1307, USA. */
/* Specify predefined symbols in preprocessor. */ /* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES #undef CPP_PREDEFINES
#define CPP_PREDEFINES "-Dunix -Di386 -DM_UNIX -DM_I386 -DM_COFF -DM_WORDSWAP -Asystem(unix) -Asystem(svr3) -Acpu(i386) -Amachine(i386)" #define CPP_PREDEFINES "-Dunix -DM_UNIX -DM_I386 -DM_COFF -DM_WORDSWAP -Asystem(svr3)"
#undef CPP_SPEC #undef CPP_SPEC
#define CPP_SPEC "%{scointl:-DM_INTERNAT}" #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] %{scointl:-DM_INTERNAT}"
/* This spec is used for telling cpp whether char is signed or not. */ /* This spec is used for telling cpp whether char is signed or not. */
......
...@@ -63,11 +63,11 @@ Boston, MA 02111-1307, USA. */ ...@@ -63,11 +63,11 @@ Boston, MA 02111-1307, USA. */
#undef CPP_PREDEFINES #undef CPP_PREDEFINES
#define CPP_PREDEFINES \ #define CPP_PREDEFINES \
"-Asystem(unix) -Asystem(svr3) -Acpu(i386) -Amachine(i386)" "-Asystem(svr3)"
#undef CPP_SPEC #undef CPP_SPEC
#define CPP_SPEC \ #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] \
"-D_i386 -D_M_I386 -D_M_I86 -D_M_I86SM -D_M_SDATA -D_M_STEXT \ -D_i386 -D_M_I386 -D_M_I86 -D_M_I86SM -D_M_SDATA -D_M_STEXT \
-D_unix -D_M_UNIX -D_M_XENIX \ -D_unix -D_M_UNIX -D_M_XENIX \
-D_M_SYS5 -D_M_SYSV -D_M_SYS3 -D_M_SYSIII \ -D_M_SYS5 -D_M_SYSV -D_M_SYS3 -D_M_SYSIII \
-D_M_COFF -D_M_BITFIELDS -D_M_WORDSWAP \ -D_M_COFF -D_M_BITFIELDS -D_M_WORDSWAP \
......
...@@ -61,11 +61,11 @@ Boston, MA 02111-1307, USA. */ ...@@ -61,11 +61,11 @@ Boston, MA 02111-1307, USA. */
Specify predefined symbols in preprocessor. */ Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES #undef CPP_PREDEFINES
#define CPP_PREDEFINES "-Di386 -Dunix -Asystem(unix) -Asystem(svr3) -Acpu(i386) -Amachine(i386)" #define CPP_PREDEFINES "-Dunix -Asystem(svr3)"
#undef CPP_SPEC #undef CPP_SPEC
#define CPP_SPEC \ #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] \
"-D_M_I386 -D_M_I86 -D_M_I86SM -D_M_SDATA -D_M_STEXT \ -D_M_I386 -D_M_I86 -D_M_I86SM -D_M_SDATA -D_M_STEXT \
-D_M_UNIX -D_M_XENIX \ -D_M_UNIX -D_M_XENIX \
-D_M_SYS5 -D_M_SYSV -D_M_SYS3 -D_M_SYSIII \ -D_M_SYS5 -D_M_SYSV -D_M_SYS3 -D_M_SYSIII \
-D_M_COFF -D_M_BITFIELDS -D_M_WORDSWAP \ -D_M_COFF -D_M_BITFIELDS -D_M_WORDSWAP \
......
...@@ -807,13 +807,13 @@ dtors_section () \ ...@@ -807,13 +807,13 @@ dtors_section () \
#undef CPP_PREDEFINES #undef CPP_PREDEFINES
#define CPP_PREDEFINES \ #define CPP_PREDEFINES \
"-Di386 -Asystem(unix) -Asystem(svr3) -Acpu(i386) -Amachine(i386)" "-Asystem(svr3)"
/* You are in a maze of GCC specs ... all alike */ /* You are in a maze of GCC specs ... all alike */
#undef CPP_SPEC #undef CPP_SPEC
#define CPP_SPEC \ #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] \
"%{fpic:%{!melf:%e-fpic is only valid with -melf}} \ %{fpic:%{!melf:%e-fpic is only valid with -melf}} \
%{fPIC:%{!melf:%e-fPIC is only valid with -melf}} \ %{fPIC:%{!melf:%e-fPIC is only valid with -melf}} \
-D__i386 -D__unix -D_SCO_DS=1 -D_M_I386 -D_M_XENIX -D_M_UNIX \ -D__i386 -D__unix -D_SCO_DS=1 -D_M_I386 -D_M_XENIX -D_M_UNIX \
%{!Xods30:-D_STRICT_NAMES} \ %{!Xods30:-D_STRICT_NAMES} \
......
...@@ -50,10 +50,10 @@ Boston, MA 02111-1307, USA. */ ...@@ -50,10 +50,10 @@ Boston, MA 02111-1307, USA. */
/* Specify predefined symbols in preprocessor. */ /* Specify predefined symbols in preprocessor. */
#undef CPP_PREDEFINES #undef CPP_PREDEFINES
#define CPP_PREDEFINES "-Dunix -Di386 -DM_UNIX -DM_I386 -DM_COFF -DM_WORDSWAP -Asystem(unix) -Asystem(svr3) -Acpu(i386) -Amachine(i386)" #define CPP_PREDEFINES "-Dunix -DM_UNIX -DM_I386 -DM_COFF -DM_WORDSWAP -Asystem(svr3)"
#undef CPP_SPEC #undef CPP_SPEC
#define CPP_SPEC "%{scointl:-DM_INTERNAT}" #define CPP_SPEC " -Acpu(i386) -Amachine(i386) %{scointl:-DM_INTERNAT}"
/* This spec is used for telling cpp whether char is signed or not. */ /* This spec is used for telling cpp whether char is signed or not. */
......
...@@ -36,11 +36,10 @@ Boston, MA 02111-1307, USA. */ ...@@ -36,11 +36,10 @@ Boston, MA 02111-1307, USA. */
/* Add "sun" to the list of symbols defined for SVR4. */ /* Add "sun" to the list of symbols defined for SVR4. */
#undef CPP_PREDEFINES #undef CPP_PREDEFINES
#define CPP_PREDEFINES \ #define CPP_PREDEFINES \
"-Di386 -Dunix -D__svr4__ -D__SVR4 -Dsun \ "-Dunix -D__svr4__ -D__SVR4 -Dsun -Asystem(svr4)"
-Asystem(unix) -Asystem(svr4) -Acpu(i386) -Amachine(i386)"
#undef CPP_SPEC #undef CPP_SPEC
#define CPP_SPEC "\ #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] \
%{compat-bsd:-iwithprefixbefore ucbinclude -I/usr/ucbinclude}" %{compat-bsd:-iwithprefixbefore ucbinclude -I/usr/ucbinclude}"
#undef LIB_SPEC #undef LIB_SPEC
......
...@@ -42,9 +42,9 @@ Boston, MA 02111-1307, USA. */ ...@@ -42,9 +42,9 @@ Boston, MA 02111-1307, USA. */
/* Specify predefined symbols in preprocessor. */ /* Specify predefined symbols in preprocessor. */
#define CPP_PREDEFINES "-Dunix -Di386 -Asystem(unix) -Asystem(svr3) -Acpu(i386) -Amachine(i386)" #define CPP_PREDEFINES "-Dunix -Asystem(svr3)"
#define CPP_SPEC "%{posix:-D_POSIX_SOURCE}" #define CPP_SPEC "%(cpp_cpu) %[cpp_cpu] %{posix:-D_POSIX_SOURCE}"
/* Writing `int' for a bitfield forces int alignment for the structure. */ /* Writing `int' for a bitfield forces int alignment for the structure. */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment