Merge from emacs--rel--22

[gnu-emacs] / src / m / tower32v3.h

diff --git a/src/m/tower32v3.h b/src/m/tower32v3.h
index d85d631b1bbfdb03842166f65b83307e5c29d02c..226c0e2640a97f9ef4205aaf1eb89b982f5e4b50 100644 (file)
--- a/src/m/tower32v3.h
+++ b/src/m/tower32v3.h
@@ -1,11 +1,12 @@
 /* machine description file for the NCR Tower 32 running System V.3.
 /* machine description file for the NCR Tower 32 running System V.3.

-   Copyright (C) 1986 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.

 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)

 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,


@@ -15,12 +16,12 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to

-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */

 
 
 
 
 
 

-/* The following line tells the configuration script what sort of 
+/* The following line tells the configuration script what sort of

    operating system this machine is likely to run.
    USUAL-OPSYS="usg5-3"  */
 
    operating system this machine is likely to run.
    USUAL-OPSYS="usg5-3"  */
 


@@ -81,27 +82,15 @@ Boston, MA 02111-1307, USA.  */
 
 /* #define VIRT_ADDR_VARIES */
 
 
 /* #define VIRT_ADDR_VARIES */
 

-/* Define C_ALLOCA if this machine does not support a true alloca
-   and the one written in C should be used instead.
-   Define HAVE_ALLOCA to say that the system provides a properly
-   working alloca function and it should be used.
-   Define neither one if an assembler-language alloca
-   in the file alloca.s should be used.  */
-

 #ifdef __GNUC__
 #ifdef __GNUC__

-#define HAVE_ALLOCA
-#define alloca __builtin_alloca

 #define C_OPTIMIZE_SWITCH -O -fstrength-reduce -fomit-frame-pointer
 #define LIB_STANDARD -lc /lib/crtn.o
 #else
 /* This section is correct if you do *not* change src/ymakefile so that
    CFLAGS includes C_OPTIMIZE_SWITCH rather than C_DEBUG_SWITCH.  */
 #define C_OPTIMIZE_SWITCH -O -fstrength-reduce -fomit-frame-pointer
 #define LIB_STANDARD -lc /lib/crtn.o
 #else
 /* This section is correct if you do *not* change src/ymakefile so that
    CFLAGS includes C_OPTIMIZE_SWITCH rather than C_DEBUG_SWITCH.  */

-#define HAVE_ALLOCA

 #define C_DEBUG_SWITCH -g -O0
 #define LIB_STANDARD -lc -lPW /lib/crtn.o
 /* This section is correct if you do enable C_OPTIMIZE_SWITCH.  */
 #define C_DEBUG_SWITCH -g -O0
 #define LIB_STANDARD -lc -lPW /lib/crtn.o
 /* This section is correct if you do enable C_OPTIMIZE_SWITCH.  */

-/* #define C_ALLOCA */
-/* #define STACK_DIRECTION -1 */

 /* #define C_OPTIMIZE_SWITCH -O2 */
 /* #define LIB_STANDARD -lc /lib/crtn.o */
 #endif
 /* #define C_OPTIMIZE_SWITCH -O2 */
 /* #define LIB_STANDARD -lc /lib/crtn.o */
 #endif


@@ -119,3 +108,6 @@ Boston, MA 02111-1307, USA.  */
 /* The OS needs stream.h+ptem.h included in sysdep.c.  */
 #define NO_SIOCTL_H
 #define NEED_PTEM_H
 /* The OS needs stream.h+ptem.h included in sysdep.c.  */
 #define NO_SIOCTL_H
 #define NEED_PTEM_H

+
+/* arch-tag: 3dff1355-7cb6-49e3-8834-85a369e4ea8f
+   (do not change this comment) */