From 11fdc4c3b9294512e84eb5808c223a193a5e6d5b Mon Sep 17 00:00:00 2001 From: Mark Elbrecht Date: Thu, 3 May 2001 19:08:11 +0000 Subject: [PATCH] djgpp.h (CPP_PREDEFINES): Define __GO32__. * config/i386/djgpp.h (CPP_PREDEFINES): Define __GO32__. (CPP_SPEC): Conditionally define MSDOS and GO32. (SUBTARGET_SWITCHES): Ignore -mbnu210 and -mno-bnu210. (SUBTARGET_OVERRIDE_OPTIONS): Warn that -mbnu210 and -mno-bnu210 are ignored. (SUPPORTS_WEAK, SUPPORTS_ONE_ONLY): Remove. From-SVN: r41798 --- gcc/ChangeLog | 9 +++++++++ gcc/config/i386/djgpp.h | 32 +++++++++++++++++++------------- 2 files changed, 28 insertions(+), 13 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index ce974e3d4ec..c5c4305746e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2001-05-03 Mark Elbrecht + + * config/i386/djgpp.h (CPP_PREDEFINES): Define __GO32__. + (CPP_SPEC): Conditionally define MSDOS and GO32. + (SUBTARGET_SWITCHES): Ignore -mbnu210 and -mno-bnu210. + (SUBTARGET_OVERRIDE_OPTIONS): Warn that -mbnu210 and -mno-bnu210 are + ignored. + (SUPPORTS_WEAK, SUPPORTS_ONE_ONLY): Remove. + 2001-05-03 Alexandre Oliva * config/mn10300/mn10300.md: Sign-extend GEN_INT operands. diff --git a/gcc/config/i386/djgpp.h b/gcc/config/i386/djgpp.h index 91940b570ef..5a9b68da5bc 100644 --- a/gcc/config/i386/djgpp.h +++ b/gcc/config/i386/djgpp.h @@ -112,11 +112,12 @@ Boston, MA 02111-1307, USA. */ (((NAME)[0] >= 'A') && ((NAME)[0] <= 'z') && ((NAME)[1] == ':'))) #undef CPP_PREDEFINES -#define CPP_PREDEFINES "-D__MSDOS__ -Asystem=msdos" +#define CPP_PREDEFINES "-D__MSDOS__ -D__GO32__ -Asystem=msdos" /* Include so __DJGPP__ and __DJGPP_MINOR__ are defined. */ #undef CPP_SPEC #define CPP_SPEC "-remap %(cpp_cpu) %{posix:-D_POSIX_SOURCE} \ + %{!ansi:%{!std=c*:%{!std=i*:-DMSDOS}}} %{!ansi:%{!std=c*:%{!std=i*:-DGO32}}} \ -imacros %s../include/sys/version.h" /* We need to override link_command_spec in gcc.c so support -Tdjgpp.djl. @@ -260,22 +261,27 @@ dtor_section () \ /* Used to be defined in xm-djgpp.h, but moved here for cross-compilers. */ #define LIBSTDCXX "-lstdcxx" -/* Add command line option -mbnu210 to indicate we can use binutil 2.10's features. */ +/* -mbnu210 is now ignored and obsolete. It was used to enable support for + weak symbols, and .gnu.linkonce support. */ #undef MASK_BNU210 #define MASK_BNU210 (0x40000000) #undef SUBTARGET_SWITCHES -#define SUBTARGET_SWITCHES \ - { "bnu210", -MASK_BNU210, "Enable weak symbol and enhanced C++ template support. Binutils 2.10 or higher required." }, \ - { "no-bnu210", MASK_BNU210, "Disable weak symbol and enhanced C++ template support." }, - -/* Weak symbols and .gnu.linkonce are only in Binutils-2.10 and later. - Default to using Binutils 2.10 features. */ -#undef SUPPORTS_WEAK -#define SUPPORTS_WEAK ((target_flags & MASK_BNU210) == 0) - -#undef SUPPORTS_ONE_ONLY -#define SUPPORTS_ONE_ONLY ((target_flags & MASK_BNU210) == 0) +#define SUBTARGET_SWITCHES \ + { "no-bnu210", -MASK_BNU210, "Ignored (obsolete)." }, \ + { "bnu210", MASK_BNU210, "Ignored (obsolete)." }, + +/* Warn that -mbnu210 is now obsolete. */ +#undef SUBTARGET_OVERRIDE_OPTIONS +#define SUBTARGET_OVERRIDE_OPTIONS \ +do \ + { \ + if (target_flags & MASK_BNU210) \ + { \ + warning ("-mbnu210 is ignored (option is obsolete)."); \ + } \ + } \ +while (0) /* Support for C++ templates. */ #undef MAKE_DECL_ONE_ONLY -- 2.30.2