Fixes for PR bootstrap/3591, target/5676:

* configure.in (mcore-pe): Disable the configuration of
  libstdc++-v3 since exceptions are not supported.
* config/mcore/mcore.h (CC1_SPEC): Define only if not already
  defined.  Do not disable exceptions or rtti.
* config/mcore/mcore-pe.h (CC1_SPEC): Define before including
  mcore.h.  Disable exceptions and rtti, since they are not
  supported by EPOC.

From-SVN: r51326

diff --git a/ChangeLog b/ChangeLog
index 2c186eca85117ab184980013a0b2033c4c53095e..80061943188ecacd7e016715269379bfcf636c48 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2002-03-24  Nick Clifton  <nickc@cambridge.redhat.com>
+
+       Fix for: PR bootstrap/3591, target/5676
+       * configure.in (mcore-pe): Disable the configuration of
+       libstdc++-v3 since exceptions are not supported.
+
 2002-03-20  Anthony Green  <green@redhat.com>
 
        * configure.in: Enable libgcj for xscale-elf target.

diff --git a/configure.in b/configure.in
index 04c23ec5fd6d3587acb9a6437292c0cd319de9fc..e4380a559e0dc31988e8e489b8dd85e25e433104 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -866,6 +866,11 @@ case "${target}" in
           target_configdirs="${target_configdirs} target-bsp target-cygmon"
     fi
     ;;
+  mcore-*-pe*)
+  # The EPOC C++ environment does not support exceptions or rtti,
+  # and so building libstdc++-v3 tends not to always work.
+    noconfigdirs="$noconfigdirs target-libstdc++-v3"
+    ;;
   mmix-*-*)
     noconfigdirs="$noconfigdirs ${libgcj}"
     ;;

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index ee9a97fcf076841c67a6278f7cc7600dcebc6c73..22a7cfd32054a4c5369bf3456f7aecf490d60bca 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2002-03-25  Nick Clifton  <nickc@cambridge.redhat.com>
+
+       Fixes for: PR bootstrap/3591, target/5676
+       * config/mcore/mcore.h (CC1_SPEC): Define only if not already
+       defined.  Do not disable exceptions or rtti.
+       * config/mcore/mcore-pe.h (CC1_SPEC): Define before including
+       mcore.h.  Disable exceptions and rtti, since they are not
+       supported by EPOC.
+
 2002-03-25  Neil Booth  <neil@daikokuya.demon.co.uk>
 
        * c-decl.c (maybe_build_cleanup): Remove.

diff --git a/gcc/config/mcore/mcore-pe.h b/gcc/config/mcore/mcore-pe.h
index 067706c3f09d65757790c72fd8d8f9d12e54b596..efd90871451b4891e49df7913980c2e7f6e18308 100644 (file)
--- a/gcc/config/mcore/mcore-pe.h
+++ b/gcc/config/mcore/mcore-pe.h
@@ -24,6 +24,10 @@ Boston, MA 02111-1307, USA.  */
 
 #define SUBTARGET_CPP_PREDEFINES " -D__pe__"
 
+/* The MCore ABI says that bitfields are unsigned by default.  */
+/* The EPOC C++ environment does not support exceptions.  */
+#define CC1_SPEC "-funsigned-bitfields %{!DIN_GCC:-fno-rtti} %{!DIN_GCC:-fno-exceptions}"
+
 #include "svr3.h"
 #include "mcore/mcore.h"
 #include "dbxcoff.h"

diff --git a/gcc/config/mcore/mcore.h b/gcc/config/mcore/mcore.h
index 40f0ab20598657de1aa0b94259fdd5c914ac0a68..22fee8450d042271210dfb6270dfa1153945a122 100644 (file)
--- a/gcc/config/mcore/mcore.h
+++ b/gcc/config/mcore/mcore.h
@@ -178,9 +178,10 @@ extern const char * mcore_stack_increment_string;
      N_("Maximum amount for a single stack increment operation")}      \
 }
 
-/* The MCore ABI says that bitfields are unsigned by default. */
-/* The EPOC C++ environment does not support exceptions.  */
-#define CC1_SPEC "-funsigned-bitfields %{!DIN_GCC:-fno-rtti} %{!DIN_GCC:-fno-exceptions}"
+#ifndef CC1_SPEC
+/* The MCore ABI says that bitfields are unsigned by default.  */
+#define CC1_SPEC "-funsigned-bitfields"
+#endif
 
 /* What options are we going to default to specific settings when
    -O* happens; the user can subsequently override these settings.

diff --git a/gcc/config/mcore/t-mcore-pe b/gcc/config/mcore/t-mcore-pe
index 0c94d38ef850945f9acb562d660c1235ae17c249..294f40475a78e988fd925e1416088f7e1e916a98 100644 (file)
--- a/gcc/config/mcore/t-mcore-pe
+++ b/gcc/config/mcore/t-mcore-pe
@@ -30,7 +30,7 @@ MULTILIB_MATCHES     =
 MULTILIB_EXTRA_OPTS  = 
 MULTILIB_EXCEPTIONS  =
 
-EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o
+# EXTRA_MULTILIB_PARTS = crtbegin.o crtend.o
 LIBGCC               = stmp-multilib
 INSTALL_LIBGCC       = install-multilib