From f40b7dfe81ddb2ee9d4ad0acba2a6cb8e1add0fe Mon Sep 17 00:00:00 2001 From: Mumit Khan Date: Sat, 5 Sep 1998 22:31:33 +0000 Subject: [PATCH] cygwin32.h (ASM_OUTPUT_SECTION_NAME): Don't check for for exact section attributions. * 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. Fixes for egcs-1.1.1 from Mumit. From-SVN: r22280 --- gcc/ChangeLog | 9 +++++++++ gcc/config/i386/crtdll.h | 9 +++++++++ gcc/config/i386/cygwin32.h | 3 --- gcc/config/i386/mingw32.h | 6 +++++- 4 files changed, 23 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 43426eb05e5d..6db1d4910413 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +Sat Sep 5 23:29:39 1998 Mumit Khan + + * 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 21:46:47 1998 Richard Henderson * alpha.c (alpha_ra_ever_killed): Inspect the topmost sequence, diff --git a/gcc/config/i386/crtdll.h b/gcc/config/i386/crtdll.h index c6b219ae0202..9a6d9a176a92 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 7d38e9d3e57d..3fe7df9f1536 100644 --- a/gcc/config/i386/cygwin32.h +++ b/gcc/config/i386/cygwin32.h @@ -376,9 +376,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) diff --git a/gcc/config/i386/mingw32.h b/gcc/config/i386/mingw32.h index 19299621f7b6..a320a61f7807 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.47.2