* delta.h (C_SWITCH_MACHINE): Let configure decide if this is a

	68040 or 68030.  Don't condition on __STDC__.

1 files changed, 12 insertions, 23 deletions

diff --git a/src/m/delta.h b/src/m/delta.h
index 166775bbdcb..994409f8b0a 100644
--- a/src/m/delta.h
+++ b/src/m/delta.h
@@ -163,17 +163,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #undef sigsetmask
 
 #ifdef HAVE_X_WINDOWS
-/* I have not tested X, but I think these are obsolete, so let's
-   commment them -pot@cnuce.cnr.it */
-/* debug switches enabled because of some difficulties w/X11
-# define C_DEBUG_SWITCH -g
-# define OBJECTS_MACHINE -lg
-# define C_OPTIMIZE_SWITCH
-# define CANNOT_DUMP
-# define XDEBUG */
-/* X library is in 'nonstandard' location. */
-/* This should be taken care of by configure -pot@cnuce.cnr.it
-# define LD_SWITCH_MACHINE -L/usr/lib/X11/ */
 # define HAVE_RANDOM
 # define BROKEN_FIONREAD	/* pearce@ll.mit.edu says this is needed. */
 # define HAVE_XSCREENNUMBEROFSCREEN
@@ -191,25 +180,25 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
  /* Union lisp objects do not yet work as of 19.15. */
 /* # undef NO_UNION_TYPE */
 
-/* There are three ways to use the gnucc provided with R3V7.  Either
-   link /bin/ccd/cc to /bin/cc and then configure (supposing that CC
-   is unset or set to cc).  Or configure like this: `CC=/bin/ccd/cc
-   configure', or else configure like this: `CC=gnucc configure'. */
-
-# ifdef __STDC__
- /* Compiling with gnucc (not through ccd).  This means -traditional is
-    not set.  Let us set it, because gmalloc.c includes <stddef.h>,
-    and we don't have that (as of SYSV68 R3V7). */
-#  define C_SWITCH_MACHINE -mfp0ret -m68881 -traditional -Dconst= -fdelayed-branch -fstrength-reduce -fno-inline -fcaller-saves
+ /* We are assuming here that the `true' GNU gcc has not been
+    installed, and we are using the gnucc provided by Motorola.  No
+    support exists for compiling with GNU gcc, as I do not have it on
+    my machine to try it out.  -pot@cnuce.cnr.it
+    If __STDC__ is defined gnucc has been called without the -traditional
+    option, that is, we are inside configure.  If THIS_IS_CONFIGURE is
+    not defined, then configure is trying to figure out what the right
+    option for real compilation are.
+    Let us set -traditional, because gmalloc.c includes <stddef.h>, and
+    we don't have that (as of SYSV68 R3V7). */
+#  define C_SWITCH_MACHINE -mfp0ret -traditional -Dconst= -fdelayed-branch -fstrength-reduce -fno-inline -fcaller-saves
 #  define LIB_GCC /lib/gnulib881
-# endif /* __STDC__ */
 
 #else
  /* Not __GNUC__, use the alloca in alloca.s. */
 
  /* Try to guess if we are using the Green Hills Compiler */
 # if defined mc68000 && defined MC68000
- /* Required only for use with Green Hills compiler:
+   /* Required only for use with Green Hills compiler:
 	-ga	 Because alloca relies on stack frames. This option forces
 		 the Green Hills compiler to create stack frames even for
 		 functions with few local variables. */