From 3fafc2f66579e8baac5d27dd66e3813e05c0c0b6 Mon Sep 17 00:00:00 2001 From: Mumit Khan Date: Sat, 5 Sep 1998 12:28:53 +0000 Subject: [PATCH] cygwin32.h (BIGGEST_ALIGNMENT): Define. * i386/cygwin32.h (BIGGEST_ALIGNMENT): Define. (PCC_BITFIELD_TYPE_MATTERS): Define to be 0. * i386/cygwin32.h (ASM_OUTPUT_SECTION_NAME): Don't check for for exact section attributions. * i386/mingw32.h (CPP_PREDEFINES): Add __MSVCRT__ for msvc runtime. * i386/crtdll.h (CPP_PREDEFINES): Define. From-SVN: r22261 --- gcc/ChangeLog | 12 ++++++++++++ gcc/config/i386/crtdll.h | 9 +++++++++ gcc/config/i386/cygwin32.h | 11 ++++++++--- gcc/config/i386/mingw32.h | 6 +++++- 4 files changed, 34 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ff6834cb881..2cd237a988e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,15 @@ +Sat Aug 29 13:32:58 1998 Mumit Khan + + * i386/cygwin32.h (BIGGEST_ALIGNMENT): Define. + (PCC_BITFIELD_TYPE_MATTERS): Define to be 0. + + * i386/cygwin32.h (ASM_OUTPUT_SECTION_NAME): Don't check for + for exact section attributions. + + * i386/mingw32.h (CPP_PREDEFINES): Add __MSVCRT__ for msvc + runtime. + * i386/crtdll.h (CPP_PREDEFINES): Define. + Sat Sep 5 03:23:05 1998 Jeffrey A Law (law@cygnus.com) * Makefile.in (pexecute.o): Use pexecute.c from libiberty. Provide diff --git a/gcc/config/i386/crtdll.h b/gcc/config/i386/crtdll.h index c6b219ae020..9a6d9a176a9 100644 --- a/gcc/config/i386/crtdll.h +++ b/gcc/config/i386/crtdll.h @@ -22,6 +22,15 @@ along with GNU CC; see the file COPYING. If not, write to the Free Software Foundation, 59 Temple Place - Suite 330, 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__)) \ + -D__declspec(x)=__attribute__((x)) \ + -Asystem(winnt) -Acpu(i386) -Amachine(i386)" + #undef LIBGCC_SPEC #define LIBGCC_SPEC "-lmingw32 -lgcc -lmoldname -lcrtdll" diff --git a/gcc/config/i386/cygwin32.h b/gcc/config/i386/cygwin32.h index 76f2b9bf136..a422af0693a 100644 --- a/gcc/config/i386/cygwin32.h +++ b/gcc/config/i386/cygwin32.h @@ -377,9 +377,6 @@ do { \ } \ else \ { \ - if (DECL && s->type != type) \ - error_with_decl (DECL, "%s causes a section type conflict"); \ - \ fprintf (STREAM, ".section\t%s,\"%s\"\n", NAME, mode); \ } \ } while (0) @@ -469,3 +466,11 @@ extern void i386_pe_asm_file_end STDIO_PROTO((FILE *)); #undef DEFAULT_PCC_STRUCT_RETURN #define DEFAULT_PCC_STRUCT_RETURN 0 +/* No data type wants to be aligned rounder than this. */ +#undef BIGGEST_ALIGNMENT +#define BIGGEST_ALIGNMENT 128 + +/* A bitfield declared as `int' forces `int' alignment for the struct. */ +#undef PCC_BITFIELDS_TYPE_MATTERS +#define PCC_BITFIELDS_TYPE_MATTERS 0 + diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h index 19299621f7b..a320a61f780 100644 --- a/gcc/config/i386/mingw32.h +++ b/gcc/config/i386/mingw32.h @@ -26,10 +26,14 @@ Boston, MA 02111-1307, USA. */ #include "i386/cygwin32.h" +/* Please keep changes to CPP_PREDEFINES in sync with i386/crtdll. The + 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__ -DWINNT -D_X86_=1 -D__STDC__=1\ + -D__MINGW32__ -D__MSVCRT__ -DWINNT -D_X86_=1 -D__STDC__=1\ -D__stdcall=__attribute__((__stdcall__)) \ + _D_stdcall=__attribute__((__stdcall__)) \ -D__cdecl=__attribute__((__cdecl__)) \ -D__declspec(x)=__attribute__((x)) \ -Asystem(winnt) -Acpu(i386) -Amachine(i386)" -- 2.30.2