Improve vxWorks support on x86

Mike Stump mrs@wrs.com
Fri Jan 22 11:44:00 GMT 1999


> Date: Fri, 22 Jan 1999 00:36:57 -0700
> From: Jeffrey A Law <law@hurl.cygnus.com>

> Mostly OK.  However, you have several ANSI namespace violations that need
> to be addressed.

> While all the x86 files are not up to date re: these conventions, we
> are not going to keep adding new violations.

Ok, then we should be willing to fix the current violations?  If so,
the patch for that is below.  The reason to fix this, is quite a few
people copy the structure and conventions of existing code, and the
only way to improve things, is to be willing to remove `bad' examples
from the code.  We can experiment with the fallout on x86 for a while,
and after a while, if we like the results, we (I) can come back and do
the entire rest of the compiler.  I did the edits with an emacs macro,
so technically they should be high quality.  I avoided the few that
were already protected or in comments by hand.

1999-01-22  Mike Stump  <mrs@wrs.com>

	* config/i386/*: Fix namespace pollution, -DA -> %{!ansi:-DA}.

Doing diffs in gcc/config/i386:
*** gcc/config/i386/sun.h.~1~	Thu Jan 15 17:30:28 1998
--- gcc/config/i386/sun.h	Fri Jan 22 10:22:34 1999
*************** Boston, MA 02111-1307, USA.  */
*** 44,50 ****
  
  /* Specify predefined symbols in preprocessor.  */
  
! #define CPP_PREDEFINES "-Dunix -Di386 -Dsun386 -Dsun -Asystem(unix) -Asystem(bsd) -Acpu(i386) -Amachine(i386)"
  
  /* Allow #sccs in preprocessor.  */
  
--- 44,50 ----
  
  /* Specify predefined symbols in preprocessor.  */
  
! #define CPP_PREDEFINES "%{!ansi:-Dunix} %{!ansi:-Di386} %{!ansi:-Dsun386} %{!ansi:-Dsun} -Asystem(unix) -Asystem(bsd) -Acpu(i386) -Amachine(i386)"
  
  /* Allow #sccs in preprocessor.  */
  
*** gcc/config/i386/gas.h.~1~	Tue Jul 14 16:27:25 1998
--- gcc/config/i386/gas.h	Fri Jan 22 10:14:35 1999
*************** Boston, MA 02111-1307, USA.  */
*** 56,62 ****
  
  /* Specify predefined symbols in preprocessor.  */
  
! #define CPP_PREDEFINES "-Dunix"
  #define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE}"
  
  /* Allow #sccs in preprocessor.  */
--- 56,62 ----
  
  /* Specify predefined symbols in preprocessor.  */
  
! #define CPP_PREDEFINES "%{!ansi:-Dunix}"
  #define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE}"
  
  /* Allow #sccs in preprocessor.  */
*** gcc/config/i386/386bsd.h.~1~	Tue May 26 13:09:33 1998
--- gcc/config/i386/386bsd.h	Fri Jan 22 10:11:38 1999
***************
*** 9,15 ****
  #include "i386/perform.h"
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-Dunix -Di386 -D____386BSD____ -D__386BSD__ -DBSD_NET2 -Asystem(unix) -Asystem(bsd) -Acpu(i386) -Amachine(i386)"
  
  /* Like the default, except no -lg.  */
  #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
--- 9,15 ----
  #include "i386/perform.h"
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Dunix} %{!ansi:-Di386} -D____386BSD____ -D__386BSD__ %{!ansi:-DBSD_NET2} -Asystem(unix) -Asystem(bsd) -Acpu(i386) -Amachine(i386)"
  
  /* Like the default, except no -lg.  */
  #define LIB_SPEC "%{!p:%{!pg:-lc}}%{p:-lc_p}%{pg:-lc_p}"
*** gcc/config/i386/bsd386.h.~1~	Tue Apr 14 14:35:36 1998
--- gcc/config/i386/bsd386.h	Fri Jan 22 10:12:59 1999
***************
*** 6,12 ****
  /* We exist mostly to add -Dbsdi and such to the predefines. */
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-Dunix -Di386 -Dbsdi -D__i386__ -D__bsdi__ -D____386BSD____ -D__386BSD__ -DBSD_NET2 -Asystem(unix) -Asystem(bsd) -Acpu(i386) -Amachine(i386)"
  
  #undef WCHAR_TYPE
  #define WCHAR_TYPE "int"
--- 6,12 ----
  /* We exist mostly to add -Dbsdi and such to the predefines. */
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Dunix} %{!ansi:-Di386} %{!ansi:-Dbsdi} -D__i386__ -D__bsdi__ -D____386BSD____ -D__386BSD__ %{!ansi:-DBSD_NET2} -Asystem(unix) -Asystem(bsd) -Acpu(i386) -Amachine(i386)"
  
  #undef WCHAR_TYPE
  #define WCHAR_TYPE "int"
*** gcc/config/i386/aix386ng.h.~1~	Thu Dec 10 11:16:00 1998
--- gcc/config/i386/aix386ng.h	Fri Jan 22 10:12:30 1999
*************** Boston, MA 02111-1307, USA.  */
*** 44,53 ****
  
  /* Specify predefined symbols in preprocessor.  */
  
! #define CPP_PREDEFINES "-Dps2 -Dunix -Asystem(aix)"
  
  #define CPP_SPEC "%(cpp_cpu) \
!   %{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
     qualifying forward reference */
--- 44,53 ----
  
  /* Specify predefined symbols in preprocessor.  */
  
! #define CPP_PREDEFINES "%{!ansi:-Dps2} %{!ansi:-Dunix} -Asystem(aix)"
  
  #define CPP_SPEC "%(cpp_cpu) \
!   %{posix:-D_POSIX_SOURCE}%{!posix:%{!ansi:-DAIX}} -D_I386 -D_AIX -D_MBCS"
  
  /* special flags for the aix assembler to generate the short form for all
     qualifying forward reference */
*** gcc/config/i386/crtdll.h.~1~	Thu Nov  5 14:36:23 1998
--- gcc/config/i386/crtdll.h	Fri Jan 22 10:13:44 1999
*************** the Free Software Foundation, 59 Temple 
*** 23,30 ****
  Boston, MA 02111-1307, USA. */
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-Di386 -D_WIN32 -DWIN32 -D__WIN32__ \
!   -D__MINGW32__ -DWINNT  -D_X86_=1 -D__STDC__=1\
    -D__stdcall=__attribute__((__stdcall__)) \
    -D_stdcall=__attribute__((__stdcall__)) \
    -D__cdecl=__attribute__((__cdecl__)) \
--- 23,30 ----
  Boston, MA 02111-1307, USA. */
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Di386} -D_WIN32 %{!ansi:-DWIN32} -D__WIN32__ \
!   -D__MINGW32__ %{!ansi:-DWINNT}  -D_X86_=1 -D__STDC__=1\
    -D__stdcall=__attribute__((__stdcall__)) \
    -D_stdcall=__attribute__((__stdcall__)) \
    -D__cdecl=__attribute__((__cdecl__)) \
*** gcc/config/i386/cygwin.h.~1~	Mon Nov 16 16:01:31 1998
--- gcc/config/i386/cygwin.h	Fri Jan 22 10:14:01 1999
*************** Boston, MA 02111-1307, USA. */
*** 65,72 ****
  #undef CPP_PREDEFINES
  #endif
  
! #define CPP_PREDEFINES "-Di386 -D_WIN32 \
!   -DWINNT  -D_X86_=1 -D__STDC__=1\
    -D__stdcall=__attribute__((__stdcall__)) \
    -D__cdecl=__attribute__((__cdecl__)) \
    -D__declspec(x)=__attribute__((x)) \
--- 65,72 ----
  #undef CPP_PREDEFINES
  #endif
  
! #define CPP_PREDEFINES "%{!ansi:-Di386} -D_WIN32 \
!   %{!ansi:-DWINNT}  -D_X86_=1 -D__STDC__=1\
    -D__stdcall=__attribute__((__stdcall__)) \
    -D__cdecl=__attribute__((__cdecl__)) \
    -D__declspec(x)=__attribute__((x)) \
*** gcc/config/i386/dgux.h.~1~	Thu Dec 17 12:20:43 1998
--- gcc/config/i386/dgux.h	Fri Jan 22 10:14:16 1999
*************** the Free Software Foundation, 675 Mass A
*** 144,150 ****
     operate without installing the header files.  */
  
  #undef	CPP_PREDEFINES
! #define CPP_PREDEFINES "-Di386 -D__ix86 -Dunix -DDGUX -D__CLASSIFY_TYPE__=2\
     -Asystem(unix) -Asystem(svr4) -Acpu(i386) -Amachine(i386)"
  
     /*
--- 144,150 ----
     operate without installing the header files.  */
  
  #undef	CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Di386} -D__ix86 %{!ansi:-Dunix} %{!ansi:-DDGUX} -D__CLASSIFY_TYPE__=2\
     -Asystem(unix) -Asystem(svr4) -Acpu(i386) -Amachine(i386)"
  
     /*
*** gcc/config/i386/freebsd.h.~1~	Mon Jul  6 12:05:47 1998
--- gcc/config/i386/freebsd.h	Fri Jan 22 10:14:31 1999
*************** Boston, MA 02111-1307, USA.  */
*** 35,41 ****
  #include "i386/perform.h"
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-Dunix -Di386 -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
  
  /* Like the default, except no -lg.  */
  #define LIB_SPEC "%{!shared:%{!pg:-lc}%{pg:-lc_p}}"
--- 35,41 ----
  #include "i386/perform.h"
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Dunix} %{!ansi:-Di386} -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
  
  /* Like the default, except no -lg.  */
  #define LIB_SPEC "%{!shared:%{!pg:-lc}%{pg:-lc_p}}"
*** gcc/config/i386/freebsd-elf.h.~1~	Tue Jul 14 16:27:24 1998
--- gcc/config/i386/freebsd-elf.h	Fri Jan 22 10:14:24 1999
*************** Boston, MA 02111-1307, USA.  */
*** 140,146 ****
  #define WCHAR_TYPE_SIZE BITS_PER_WORD
      
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-Di386 -Dunix -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
  
  #undef CPP_SPEC
  #define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}"
--- 140,146 ----
  #define WCHAR_TYPE_SIZE BITS_PER_WORD
      
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Di386} %{!ansi:-Dunix} -D__ELF__ -D__FreeBSD__ -Asystem(unix) -Asystem(FreeBSD) -Acpu(i386) -Amachine(i386)"
  
  #undef CPP_SPEC
  #define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}"
*** gcc/config/i386/gnu.h.~1~	Fri Apr 10 14:05:14 1998
--- gcc/config/i386/gnu.h	Fri Jan 22 10:14:59 1999
***************
*** 4,11 ****
  #include <i386/linux.h>
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-Di386 -Acpu(i386) -Amachine(i386) \
! -Dunix -Asystem(unix)  -DMACH -Asystem(mach) -D__GNU__ -Asystem(gnu)"
  
  #undef TARGET_VERSION
  #define TARGET_VERSION fprintf (stderr, " (i386 GNU)");
--- 4,11 ----
  #include <i386/linux.h>
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Di386} -Acpu(i386) -Amachine(i386) \
! %{!ansi:-Dunix} -Asystem(unix)  %{!ansi:-DMACH} -Asystem(mach) -D__GNU__ -Asystem(gnu)"
  
  #undef TARGET_VERSION
  #define TARGET_VERSION fprintf (stderr, " (i386 GNU)");
*** gcc/config/i386/go32.h.~1~	Fri Jan  8 13:52:58 1999
--- gcc/config/i386/go32.h	Fri Jan 22 10:16:01 1999
*************** Boston, MA 02111-1307, USA.  */
*** 44,50 ****
  #ifdef CPP_PREDEFINES
  #undef CPP_PREDEFINES
  #endif
! #define CPP_PREDEFINES "-Dunix -Di386 -DGO32 -DMSDOS \
    -Asystem(unix) -Asystem(msdos) -Acpu(i386) -Amachine(i386)"
  
  /* We need to override link_command_spec in gcc.c so support -Tdjgpp.djl.
--- 44,50 ----
  #ifdef CPP_PREDEFINES
  #undef CPP_PREDEFINES
  #endif
! #define CPP_PREDEFINES "%{!ansi:-Dunix} %{!ansi:-Di386} %{!ansi:-DGO32} %{!ansi:-DMSDOS} \
    -Asystem(unix) -Asystem(msdos) -Acpu(i386) -Amachine(i386)"
  
  /* We need to override link_command_spec in gcc.c so support -Tdjgpp.djl.
*** gcc/config/i386/go32-rtems.h.~1~	Thu Mar 26 13:48:54 1998
--- gcc/config/i386/go32-rtems.h	Fri Jan 22 10:15:45 1999
*************** Boston, MA 02111-1307, USA.  */
*** 28,34 ****
  #ifdef CPP_PREDEFINES
  #undef CPP_PREDEFINES
  #endif
! #define CPP_PREDEFINES "-Dunix -Di386 -DGO32 -DMSDOS -Drtems -D__rtems__ \
    -Asystem(unix) -Asystem(msdos) -Acpu(i386) -Amachine(i386) -Asystem(rtems)"
  
  /* Generate calls to memcpy, memcmp and memset.  */
--- 28,34 ----
  #ifdef CPP_PREDEFINES
  #undef CPP_PREDEFINES
  #endif
! #define CPP_PREDEFINES "%{!ansi:-Dunix} %{!ansi:-Di386} %{!ansi:-DGO32} %{!ansi:-DMSDOS} %{!ansi:-Drtems} -D__rtems__ \
    -Asystem(unix) -Asystem(msdos) -Acpu(i386) -Amachine(i386) -Asystem(rtems)"
  
  /* Generate calls to memcpy, memcmp and memset.  */
*** gcc/config/i386/i386-aout.h.~1~	Thu Jan 15 17:29:41 1998
--- gcc/config/i386/i386-aout.h	Fri Jan 22 10:16:21 1999
*************** Boston, MA 02111-1307, USA.  */
*** 29,34 ****
  /* Specify predefined symbols in preprocessor.  */
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-Di386"
  
  /* end of i386-aout.h */
--- 29,34 ----
  /* Specify predefined symbols in preprocessor.  */
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Di386}"
  
  /* end of i386-aout.h */
*** gcc/config/i386/i386-coff.h.~1~	Mon Sep 28 13:09:51 1998
--- gcc/config/i386/i386-coff.h	Fri Jan 22 10:16:30 1999
*************** Boston, MA 02111-1307, USA.  */
*** 27,33 ****
  /* Specify predefined symbols in preprocessor.  */
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-Di386"
  
  /* We want to be able to get DBX debugging information via -gstabs.  */
  
--- 27,33 ----
  /* Specify predefined symbols in preprocessor.  */
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Di386}"
  
  /* We want to be able to get DBX debugging information via -gstabs.  */
  
*** gcc/config/i386/linux-aout.h.~1~	Tue Jul 14 16:27:26 1998
--- gcc/config/i386/linux-aout.h	Fri Jan 22 10:17:40 1999
*************** Boston, MA 02111-1307, USA.  */
*** 31,37 ****
  /* Specify predefined symbols in preprocessor.  */
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-Dunix -Dlinux -Asystem(posix)"
  
  #undef CPP_SPEC
  #define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}"
--- 31,37 ----
  /* Specify predefined symbols in preprocessor.  */
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Dunix} %{!ansi:-Dlinux} -Asystem(posix)"
  
  #undef CPP_SPEC
  #define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}"
*** gcc/config/i386/linux-oldld.h.~1~	Tue Jul 14 16:27:26 1998
--- gcc/config/i386/linux-oldld.h	Fri Jan 22 10:17:45 1999
*************** Boston, MA 02111-1307, USA.  */
*** 32,38 ****
  /* Specify predefined symbols in preprocessor.  */
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-Dunix -Dlinux -Asystem(posix)"
  
  #undef CPP_SPEC
  #define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}"
--- 32,38 ----
  /* Specify predefined symbols in preprocessor.  */
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Dunix} %{!ansi:-Dlinux} -Asystem(posix)"
  
  #undef CPP_SPEC
  #define CPP_SPEC "%(cpp_cpu) %{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE}"
*** gcc/config/i386/linux.h.~1~	Wed Nov 25 08:03:54 1998
--- gcc/config/i386/linux.h	Fri Jan 22 10:17:54 1999
*************** Boston, MA 02111-1307, USA.  */
*** 151,157 ****
  #define WCHAR_TYPE_SIZE BITS_PER_WORD
      
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-D__ELF__ -Dunix -D__i386__ -Dlinux -Asystem(posix)"
  
  #undef CPP_SPEC
  #ifdef USE_GNULIBC_1
--- 151,157 ----
  #define WCHAR_TYPE_SIZE BITS_PER_WORD
      
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-D__ELF__ %{!ansi:-Dunix} -D__i386__ %{!ansi:-Dlinux} -Asystem(posix)"
  
  #undef CPP_SPEC
  #ifdef USE_GNULIBC_1
*** gcc/config/i386/lynx-ng.h.~1~	Thu Jan 15 17:30:17 1998
--- gcc/config/i386/lynx-ng.h	Fri Jan 22 10:18:10 1999
*************** Boston, MA 02111-1307, USA.  */
*** 22,28 ****
  #include <lynx-ng.h>
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-Dunix -Di386 -DI386 -DLynx -DIBITS32 -Asystem(unix) -Asystem(lynx) -Acpu(i386) -Amachine(i386)"
  
  /* Provide required defaults for linker switches.  */
  
--- 22,28 ----
  #include <lynx-ng.h>
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Dunix} %{!ansi:-Di386} %{!ansi:-DI386} %{!ansi:-DLynx} %{!ansi:-DIBITS32} -Asystem(unix) -Asystem(lynx) -Acpu(i386) -Amachine(i386)"
  
  /* Provide required defaults for linker switches.  */
  
*** gcc/config/i386/lynx.h.~1~	Thu Jan 15 17:30:17 1998
--- gcc/config/i386/lynx.h	Fri Jan 22 10:18:20 1999
*************** Boston, MA 02111-1307, USA.  */
*** 22,28 ****
  #include <lynx.h>
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-Dunix -Di386 -DI386 -DLynx -DIBITS32 -Asystem(unix) -Asystem(lynx) -Acpu(i386) -Amachine(i386)"
  
  /* The prefix to add to user-visible assembler symbols. */
  
--- 22,28 ----
  #include <lynx.h>
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Dunix} %{!ansi:-Di386} %{!ansi:-DI386} %{!ansi:-DLynx} %{!ansi:-DIBITS32} -Asystem(unix) -Asystem(lynx) -Acpu(i386) -Amachine(i386)"
  
  /* The prefix to add to user-visible assembler symbols. */
  
*** gcc/config/i386/mach.h.~1~	Thu Jan 15 17:30:18 1998
--- gcc/config/i386/mach.h	Fri Jan 22 10:18:27 1999
***************
*** 10,16 ****
  #include "i386/perform.h"
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-Dunix -Di386 -DMACH -Asystem(unix) -Asystem(mach) -Acpu(i386) -Amachine(i386)"
  
  /* Specify extra dir to search for include files.  */
  #define SYSTEM_INCLUDE_DIR "/usr/mach/include"
--- 10,16 ----
  #include "i386/perform.h"
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Dunix} %{!ansi:-Di386} %{!ansi:-DMACH} -Asystem(unix) -Asystem(mach) -Acpu(i386) -Amachine(i386)"
  
  /* Specify extra dir to search for include files.  */
  #define SYSTEM_INCLUDE_DIR "/usr/mach/include"
*** gcc/config/i386/mingw32.h.~1~	Mon Nov 16 16:01:31 1998
--- gcc/config/i386/mingw32.h	Fri Jan 22 10:18:48 1999
*************** Boston, MA 02111-1307, USA. */
*** 30,37 ****
     only difference between the two should be __MSVCRT__ needed to 
     distinguish MSVC from CRTDLL runtime in mingw headers. */
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-Di386 -D_WIN32 -DWIN32 -D__WIN32__ \
!   -D__MINGW32__ -D__MSVCRT__ -DWINNT  -D_X86_=1 -D__STDC__=1\
    -D__stdcall=__attribute__((__stdcall__)) \
    -D_stdcall=__attribute__((__stdcall__)) \
    -D__cdecl=__attribute__((__cdecl__)) \
--- 30,37 ----
     only difference between the two should be __MSVCRT__ needed to 
     distinguish MSVC from CRTDLL runtime in mingw headers. */
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Di386} -D_WIN32 %{!ansi:-DWIN32} -D__WIN32__ \
!   -D__MINGW32__ -D__MSVCRT__ %{!ansi:-DWINNT}  -D_X86_=1 -D__STDC__=1\
    -D__stdcall=__attribute__((__stdcall__)) \
    -D_stdcall=__attribute__((__stdcall__)) \
    -D__cdecl=__attribute__((__cdecl__)) \
*** gcc/config/i386/moss.h.~1~	Thu Jan 15 17:30:18 1998
--- gcc/config/i386/moss.h	Fri Jan 22 10:18:59 1999
*************** the Free Software Foundation, 675 Mass A
*** 22,28 ****
  #include "i386/linux.h"
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-D__ELF__ -Di386 -Dmoss -Asystem(posix) -Acpu(i386) -Amachine(i386)"
  
  #undef STARTFILE_SPEC
  #define STARTFILE_SPEC  "crt0.o%s"
--- 22,28 ----
  #include "i386/linux.h"
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-D__ELF__ %{!ansi:-Di386} %{!ansi:-Dmoss} -Asystem(posix) -Acpu(i386) -Amachine(i386)"
  
  #undef STARTFILE_SPEC
  #define STARTFILE_SPEC  "crt0.o%s"
*** gcc/config/i386/netbsd.h.~1~	Wed Aug  5 16:21:22 1998
--- gcc/config/i386/netbsd.h	Fri Jan 22 10:19:10 1999
***************
*** 13,19 ****
  #include <netbsd.h>
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-Dunix -Di386 -D__NetBSD__ -Asystem(unix) -Asystem(NetBSD) -Acpu(i386) -Amachine(i386)"
  
  #undef SIZE_TYPE
  #define SIZE_TYPE "unsigned int"
--- 13,19 ----
  #include <netbsd.h>
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Dunix} %{!ansi:-Di386} -D__NetBSD__ -Asystem(unix) -Asystem(NetBSD) -Acpu(i386) -Amachine(i386)"
  
  #undef SIZE_TYPE
  #define SIZE_TYPE "unsigned int"
*** gcc/config/i386/next.h.~1~	Mon Dec 14 11:24:36 1998
--- gcc/config/i386/next.h	Fri Jan 22 10:19:18 1999
*************** Boston, MA 02111-1307, USA.  */
*** 133,139 ****
  /* Names to predefine in the preprocessor for this target machine.  */
  
  #undef	CPP_PREDEFINES
! #define CPP_PREDEFINES "-Di386 -DNeXT -Dunix -D__MACH__ -D__LITTLE_ENDIAN__ -D__ARCHITECTURE__=\"i386\" -Asystem(unix) -Asystem(mach) -Acpu(i386) -Amachine(i386)"
  
  /* This accounts for the return pc and saved fp on the i386. */
  
--- 133,139 ----
  /* Names to predefine in the preprocessor for this target machine.  */
  
  #undef	CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Di386} %{!ansi:-DNeXT} %{!ansi:-Dunix} -D__MACH__ -D__LITTLE_ENDIAN__ -D__ARCHITECTURE__=\"i386\" -Asystem(unix) -Asystem(mach) -Acpu(i386) -Amachine(i386)"
  
  /* This accounts for the return pc and saved fp on the i386. */
  
*** gcc/config/i386/osf1elf.h.~1~	Tue May  5 16:21:58 1998
--- gcc/config/i386/osf1elf.h	Fri Jan 22 10:19:49 1999
*************** extern char *sys_siglist[];
*** 39,45 ****
     */
  #undef CPP_PREDEFINES
  #define CPP_PREDEFINES \
!   "-D__NO_UNDERSCORES__ -D__ELF__ -DOSF -DOSF1 -Di386 -Dunix -Asystem(xpg4) -Asystem(osf1) -Acpu(i386) -Amachine(i386)"
  
  /* current OSF/1 doesn't provide separate crti.o and gcrti.o (and also, crtn.o
     and gcrtn.o) for profile.  */
--- 39,45 ----
     */
  #undef CPP_PREDEFINES
  #define CPP_PREDEFINES \
!   "-D__NO_UNDERSCORES__ -D__ELF__ %{!ansi:-DOSF} %{!ansi:-DOSF1} %{!ansi:-Di386} %{!ansi:-Dunix} -Asystem(xpg4) -Asystem(osf1) -Acpu(i386) -Amachine(i386)"
  
  /* current OSF/1 doesn't provide separate crti.o and gcrti.o (and also, crtn.o
     and gcrtn.o) for profile.  */
*** gcc/config/i386/osfelf.h.~1~	Tue Jul 14 16:27:27 1998
--- gcc/config/i386/osfelf.h	Fri Jan 22 10:19:55 1999
*************** Boston, MA 02111-1307, USA.  */
*** 22,28 ****
  #include "config/i386/osfrose.h"
  
  #undef	CPP_PREDEFINES
! #define CPP_PREDEFINES "-DOSF -DOSF1 -Dunix -Asystem(xpg4)"
  
  #undef  CPP_SPEC
  #define CPP_SPEC "%(cpp_cpu) \
--- 22,28 ----
  #include "config/i386/osfrose.h"
  
  #undef	CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-DOSF} %{!ansi:-DOSF1} %{!ansi:-Dunix} -Asystem(xpg4)"
  
  #undef  CPP_SPEC
  #define CPP_SPEC "%(cpp_cpu) \
*** gcc/config/i386/osfrose.h.~1~	Tue Jul 14 16:27:27 1998
--- gcc/config/i386/osfrose.h	Fri Jan 22 10:20:11 1999
*************** Boston, MA 02111-1307, USA.  */
*** 90,96 ****
  
  /* Change default predefines.  */
  #undef	CPP_PREDEFINES
! #define CPP_PREDEFINES "-DOSF -DOSF1 -Dunix -Asystem(xpg4)"
  
  #undef  CPP_SPEC
  #define CPP_SPEC "%(cpp_cpu) \
--- 90,96 ----
  
  /* Change default predefines.  */
  #undef	CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-DOSF} %{!ansi:-DOSF1} %{!ansi:-Dunix} -Asystem(xpg4)"
  
  #undef  CPP_SPEC
  #define CPP_SPEC "%(cpp_cpu) \
*** gcc/config/i386/ptx4-i.h.~1~	Tue May 26 13:09:35 1998
--- gcc/config/i386/ptx4-i.h	Fri Jan 22 10:20:19 1999
*************** Boston, MA 02111-1307, USA.  */
*** 40,46 ****
  /* This used to define X86, but james@bigtex.cactus.org says that
     is supposed to be defined optionally by user programs--not by default.  */
  #define CPP_PREDEFINES \
!   "-Di386 -Dunix -D_SEQUENT_ -Asystem(unix) -Asystem(ptx4) -Acpu(i386) -Amachine(i386)"
  
  /* This is how to output assembly code to define a `float' constant.
     We always have to use a .long pseudo-op to do this because the native
--- 40,46 ----
  /* This used to define X86, but james@bigtex.cactus.org says that
     is supposed to be defined optionally by user programs--not by default.  */
  #define CPP_PREDEFINES \
!   "%{!ansi:-Di386} %{!ansi:-Dunix} -D_SEQUENT_ -Asystem(unix) -Asystem(ptx4) -Acpu(i386) -Amachine(i386)"
  
  /* This is how to output assembly code to define a `float' constant.
     We always have to use a .long pseudo-op to do this because the native
*** gcc/config/i386/rtems.h.~1~	Thu Mar 26 13:48:55 1998
--- gcc/config/i386/rtems.h	Fri Jan 22 10:20:25 1999
*************** Boston, MA 02111-1307, USA.  */
*** 24,30 ****
  /* Specify predefined symbols in preprocessor.  */
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-Di386 -Drtems -D__rtems__ \
     -Asystem(rtems) -Acpu(i386) -Amachine(i386)"
  
  /* Generate calls to memcpy, memcmp and memset.  */
--- 24,30 ----
  /* Specify predefined symbols in preprocessor.  */
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Di386} %{!ansi:-Drtems} -D__rtems__ \
     -Asystem(rtems) -Acpu(i386) -Amachine(i386)"
  
  /* Generate calls to memcpy, memcmp and memset.  */
*** gcc/config/i386/rtemself.h.~1~	Thu Jul  9 18:52:18 1998
--- gcc/config/i386/rtemself.h	Fri Jan 22 10:20:32 1999
*************** Boston, MA 02111-1307, USA.  */
*** 148,154 ****
  #define WCHAR_TYPE_SIZE BITS_PER_WORD
      
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES  "-Di386 -Drtems -D__rtems__ \
     -Asystem(rtems) -Acpu(i386) -Amachine(i386)"
  
  /* Get perform_* macros to build libgcc.a.  */
--- 148,154 ----
  #define WCHAR_TYPE_SIZE BITS_PER_WORD
      
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES  "%{!ansi:-Di386} %{!ansi:-Drtems} -D__rtems__ \
     -Asystem(rtems) -Acpu(i386) -Amachine(i386)"
  
  /* Get perform_* macros to build libgcc.a.  */
*** gcc/config/i386/sco.h.~1~	Tue Jul 14 16:27:28 1998
--- gcc/config/i386/sco.h	Fri Jan 22 10:20:42 1999
*************** Boston, MA 02111-1307, USA.  */
*** 55,61 ****
  /* Specify predefined symbols in preprocessor.  */
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-Dunix -DM_UNIX -DM_I386 -DM_COFF -DM_WORDSWAP -Asystem(svr3)"
  
  #undef CPP_SPEC
  #define CPP_SPEC "%(cpp_cpu) %{scointl:-DM_INTERNAT}"
--- 55,61 ----
  /* Specify predefined symbols in preprocessor.  */
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Dunix} %{!ansi:-DM_UNIX} %{!ansi:-DM_I386} %{!ansi:-DM_COFF} %{!ansi:-DM_WORDSWAP} -Asystem(svr3)"
  
  #undef CPP_SPEC
  #define CPP_SPEC "%(cpp_cpu) %{scointl:-DM_INTERNAT}"
*** gcc/config/i386/sco4dbx.h.~1~	Tue Jul 14 16:27:28 1998
--- gcc/config/i386/sco4dbx.h	Fri Jan 22 10:21:30 1999
*************** Boston, MA 02111-1307, USA.  */
*** 61,67 ****
     Specify predefined symbols in preprocessor.  */
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-Dunix -Asystem(svr3)"
  
  #undef CPP_SPEC
  #define CPP_SPEC "%(cpp_cpu) \
--- 61,67 ----
     Specify predefined symbols in preprocessor.  */
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Dunix} -Asystem(svr3)"
  
  #undef CPP_SPEC
  #define CPP_SPEC "%(cpp_cpu) \
*** gcc/config/i386/scodbx.h.~1~	Thu Jan 15 17:30:27 1998
--- gcc/config/i386/scodbx.h	Fri Jan 22 10:22:08 1999
*************** Boston, MA 02111-1307, USA.  */
*** 50,56 ****
  /* Specify predefined symbols in preprocessor.  */
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "-Dunix -DM_UNIX -DM_I386 -DM_COFF -DM_WORDSWAP -Asystem(svr3)"
  
  #undef CPP_SPEC
  #define CPP_SPEC " -Acpu(i386) -Amachine(i386) %{scointl:-DM_INTERNAT}"
--- 50,56 ----
  /* Specify predefined symbols in preprocessor.  */
  
  #undef CPP_PREDEFINES
! #define CPP_PREDEFINES "%{!ansi:-Dunix} %{!ansi:-DM_UNIX} %{!ansi:-DM_I386} %{!ansi:-DM_COFF} %{!ansi:-DM_WORDSWAP} -Asystem(svr3)"
  
  #undef CPP_SPEC
  #define CPP_SPEC " -Acpu(i386) -Amachine(i386) %{scointl:-DM_INTERNAT}"
*** gcc/config/i386/sequent.h.~1~	Thu Jan 15 17:30:27 1998
--- gcc/config/i386/sequent.h	Fri Jan 22 10:22:19 1999
*************** Boston, MA 02111-1307, USA.  */
*** 34,40 ****
  
  /* Specify predefined symbols in preprocessor.  */
  
! #define CPP_PREDEFINES "-Dunix -Di386 -Dsequent -Asystem(unix) -Acpu(i386) -Amachine(i386)"
  
  /* Pass -Z and -ZO options to the linker.  */
  
--- 34,40 ----
  
  /* Specify predefined symbols in preprocessor.  */
  
! #define CPP_PREDEFINES "%{!ansi:-Dunix} %{!ansi:-Di386} %{!ansi:-Dsequent} -Asystem(unix) -Acpu(i386) -Amachine(i386)"
  
  /* Pass -Z and -ZO options to the linker.  */
  
*** gcc/config/i386/sol2.h.~1~	Mon Dec 28 13:56:11 1998
--- gcc/config/i386/sol2.h	Fri Jan 22 10:22:26 1999
*************** Boston, MA 02111-1307, USA.  */
*** 36,42 ****
  /* Add "sun" to the list of symbols defined for SVR4.  */
  #undef CPP_PREDEFINES
  #define CPP_PREDEFINES \
!   "-Dunix -D__svr4__ -D__SVR4 -Dsun -Asystem(svr4)"
  
  #undef CPP_SPEC
  #define CPP_SPEC "%(cpp_cpu) \
--- 36,42 ----
  /* Add "sun" to the list of symbols defined for SVR4.  */
  #undef CPP_PREDEFINES
  #define CPP_PREDEFINES \
!   "%{!ansi:-Dunix} -D__svr4__ -D__SVR4 %{!ansi:-Dsun} -Asystem(svr4)"
  
  #undef CPP_SPEC
  #define CPP_SPEC "%(cpp_cpu) \
*** gcc/config/i386/sysv3.h.~1~	Tue Jul 14 16:27:29 1998
--- gcc/config/i386/sysv3.h	Fri Jan 22 10:22:41 1999
*************** Boston, MA 02111-1307, USA.  */
*** 42,48 ****
  
  /* Specify predefined symbols in preprocessor.  */
  
! #define CPP_PREDEFINES "-Dunix -Asystem(svr3)"
  
  #define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE}"
  
--- 42,48 ----
  
  /* Specify predefined symbols in preprocessor.  */
  
! #define CPP_PREDEFINES "%{!ansi:-Dunix} -Asystem(svr3)"
  
  #define CPP_SPEC "%(cpp_cpu) %{posix:-D_POSIX_SOURCE}"
  
*** gcc/config/i386/sysv4.h.~1~	Thu Jun 25 16:42:22 1998
--- gcc/config/i386/sysv4.h	Fri Jan 22 10:22:48 1999
*************** Boston, MA 02111-1307, USA.  */
*** 38,44 ****
  /* This used to define X86, but james@bigtex.cactus.org says that
     is supposed to be defined optionally by user programs--not by default.  */
  #define CPP_PREDEFINES \
!   "-Di386 -Dunix -D__svr4__ -Asystem(unix) -Asystem(svr4) -Acpu(i386) -Amachine(i386)"
  
  /* This is how to output assembly code to define a `float' constant.
     We always have to use a .long pseudo-op to do this because the native
--- 38,44 ----
  /* This used to define X86, but james@bigtex.cactus.org says that
     is supposed to be defined optionally by user programs--not by default.  */
  #define CPP_PREDEFINES \
!   "%{!ansi:-Di386} %{!ansi:-Dunix} -D__svr4__ -Asystem(unix) -Asystem(svr4) -Acpu(i386) -Amachine(i386)"
  
  /* This is how to output assembly code to define a `float' constant.
     We always have to use a .long pseudo-op to do this because the native
*** gcc/config/i386/vsta.h.~1~	Thu Jan 15 17:30:32 1998
--- gcc/config/i386/vsta.h	Fri Jan 22 10:22:58 1999
*************** Boston, MA 02111-1307, USA.  */
*** 26,32 ****
  #ifdef CPP_PREDEFINES
  #undef CPP_PREDEFINES
  #endif
! #define CPP_PREDEFINES "-Dunix -Di386 -DVSTA \
    -Asystem(unix) -Asystem(vsta) -Acpu(i386) -Amachine(i386)"
  
  #undef EXTRA_SECTIONS
--- 26,32 ----
  #ifdef CPP_PREDEFINES
  #undef CPP_PREDEFINES
  #endif
! #define CPP_PREDEFINES "%{!ansi:-Dunix} %{!ansi:-Di386} %{!ansi:-DVSTA} \
    -Asystem(unix) -Asystem(vsta) -Acpu(i386) -Amachine(i386)"
  
  #undef EXTRA_SECTIONS
*** gcc/config/i386/win-nt.h.~1~	Thu Dec 10 11:16:01 1998
--- gcc/config/i386/win-nt.h	Fri Jan 22 10:23:25 1999
*************** Boston, MA 02111-1307, USA. */
*** 27,34 ****
  #ifdef CPP_PREDEFINES
  #undef CPP_PREDEFINES
  #endif
! #define CPP_PREDEFINES "-Dunix -Di386 -DWIN32 -D_WIN32 \
!   -DWINNT -D_M_IX86=300 -D_X86_=1 -D__STDC__=0 -DALMOST_STDC -D_MSC_VER=800 \
    -D__stdcall=__attribute__((__stdcall__)) \
    -D__cdecl=__attribute__((__cdecl__)) \
    -D_cdecl=__attribute__((__cdecl__)) \
--- 27,34 ----
  #ifdef CPP_PREDEFINES
  #undef CPP_PREDEFINES
  #endif
! #define CPP_PREDEFINES "%{!ansi:-Dunix} %{!ansi:-Di386} %{!ansi:-DWIN32} -D_WIN32 \
!   %{!ansi:-DWINNT} -D_M_IX86=300 -D_X86_=1 -D__STDC__=0 %{!ansi:-DALMOST_STDC} -D_MSC_VER=800 \
    -D__stdcall=__attribute__((__stdcall__)) \
    -D__cdecl=__attribute__((__cdecl__)) \
    -D_cdecl=__attribute__((__cdecl__)) \
*** gcc/config/i386/win32.h.~1~	Mon Nov 16 16:01:32 1998
--- gcc/config/i386/win32.h	Fri Jan 22 10:23:32 1999
*************** Boston, MA 02111-1307, USA. */
*** 58,64 ****
  
  #undef CPP_PREDEFINES
  #define CPP_PREDEFINES "-D_WIN32 \
!   -DWINNT  -D_X86_=1 -D__STDC__=1\
    -D__stdcall=__attribute__((__stdcall__)) \
    -D__cdecl=__attribute__((__cdecl__)) \
    -Asystem(winnt)"
--- 58,64 ----
  
  #undef CPP_PREDEFINES
  #define CPP_PREDEFINES "-D_WIN32 \
!   %{!ansi:-DWINNT}  -D_X86_=1 -D__STDC__=1\
    -D__stdcall=__attribute__((__stdcall__)) \
    -D__cdecl=__attribute__((__cdecl__)) \
    -Asystem(winnt)"
--------------



More information about the Gcc-patches mailing list