(VALBITS, GCTYPEBITS): Deleted; default is better.

7 files changed, 6 insertions, 35 deletions

diff --git a/src/m/alliant-2800.h b/src/m/alliant-2800.h
index 706e9a71f8d..4c547e8a4da 100644
--- a/src/m/alliant-2800.h
+++ b/src/m/alliant-2800.h
@@ -55,8 +55,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define ALLIANT_2800
 #define sun			/* Use X support for Sun keyboard stuff. */
 #define C_OPTIMIZE_SWITCH -Og	/* No concurrent code allowed here. */
-#define VALBITS 26
-#define GCTYPEBITS 5
 
 /* Use type int rather than a union, to represent Lisp_Object */
 /* This is desirable for most machines.  */
@@ -64,7 +62,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define NO_UNION_TYPE
 
 /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the 24-bit bit field into an int.  In other words, if bit fields
+   the bit field into an int.  In other words, if bit fields
    are always unsigned.
 
    If you use NO_UNION_TYPE, this flag does not matter.  */
diff --git a/src/m/apollo.h b/src/m/apollo.h
index e28fccbc588..4e9335d1943 100644
--- a/src/m/apollo.h
+++ b/src/m/apollo.h
@@ -69,11 +69,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define HAVE_ALLOCA
 
-/* DN460 has a 28 bit virtual address space, and 26 bits are often used */
-
-#define VALBITS 26
-#define GCTYPEBITS 5
-
 /* Prevent -lg from being used for debugging.  Not needed.  */
 
 #define LIBS_DEBUG
diff --git a/src/m/aviion.h b/src/m/aviion.h
index adfe21e7286..01da50fe821 100644
--- a/src/m/aviion.h
+++ b/src/m/aviion.h
@@ -64,7 +64,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define NO_UNION_TYPE
 
 /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the 24-bit bit field into an int.  In other words, if bit fields
+   the bit field into an int.  In other words, if bit fields
    are always unsigned.
 
    If you use NO_UNION_TYPE, this flag does not matter.  */
@@ -112,11 +112,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define NO_REMAP
 
-/* Use 26 bits instead of 24 for internal pointer values */
-
-#define VALBITS 26
-#define GCTYPEBITS 5
-
 /* Define ADDR_CORRECT(ADDR) to be a macro to correct an int which is
    the bit pattern of a pointer to a byte into an int which is the
    number of a byte.
diff --git a/src/m/delta.h b/src/m/delta.h
index a44c012cae6..166775bbdcb 100644
--- a/src/m/delta.h
+++ b/src/m/delta.h
@@ -62,7 +62,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define NO_UNION_TYPE 
 
 /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the 24-bit bit field into an int.  In other words, if bit fields
+   the bit field into an int.  In other words, if bit fields
    are always unsigned.
 
    If you use NO_UNION_TYPE, this flag does not matter.  */
@@ -124,12 +124,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 /* #define NO_SOCK_SIGIO */
 
 
-/* Define these if you want to edit files up to 32Mbytes.
-   Leaving them undefined (files up to 8 Mbytes) should be more efficient. */
-  
-/* #define VALBITS 26
-   #define GCTYPEBITS 5 */
-
 /* Undefine this if you don't want the machine slow down when a buffer
    is modified. */
 
diff --git a/src/m/hp800.h b/src/m/hp800.h
index 345541ff29e..ea3f012d586 100644
--- a/src/m/hp800.h
+++ b/src/m/hp800.h
@@ -60,7 +60,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define NO_UNION_TYPE
 
 /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the 24-bit bit field into an int.  In other words, if bit fields
+   the bit field into an int.  In other words, if bit fields
    are always unsigned.
 
    If you use NO_UNION_TYPE, this flag does not matter.  */
@@ -105,9 +105,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 
 #define DATA_SEG_BITS 0x40000000
 
-#define VALBITS    26
-#define GCTYPEBITS 5
-
 #define DATA_START    0x40000000
 #define TEXT_START    0x00000000
 
diff --git a/src/m/ibmrt.h b/src/m/ibmrt.h
index 0dc0740ce5a..ea4c6443e84 100644
--- a/src/m/ibmrt.h
+++ b/src/m/ibmrt.h
@@ -58,7 +58,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define NO_UNION_TYPE
 
 /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the 24-bit bit field into an int.  In other words, if bit fields
+   the bit field into an int.  In other words, if bit fields
    are always unsigned.
 
    If you use NO_UNION_TYPE, this flag does not matter.  */
@@ -108,9 +108,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
    This way we don't need to have a label _start defined.  */
 #define TEXT_START 0
 
-#define VALBITS 26
-#define GCTYPEBITS 5
-
 /* Taking a pointer to a char casting it as int pointer */
 /* and then taking the int which the int pointer points to */
 /* is practically guaranteed to give erroneous results */
diff --git a/src/m/tower32v3.h b/src/m/tower32v3.h
index dd4365cf0e8..6c899b6c51c 100644
--- a/src/m/tower32v3.h
+++ b/src/m/tower32v3.h
@@ -59,7 +59,7 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #define NO_UNION_TYPE
 
 /* Define EXPLICIT_SIGN_EXTEND if XINT must explicitly sign-extend
-   the 24-bit bit field into an int.  In other words, if bit fields
+   the bit field into an int.  In other words, if bit fields
    are always unsigned.
 
    If you use NO_UNION_TYPE, this flag does not matter.  */
@@ -120,11 +120,6 @@ the Free Software Foundation, 675 Mass Ave, Cambridge, MA 02139, USA.  */
 #undef static
 #define START_FILES pre-crt0.o /lib/crt1.o
 
-/* This is needed since many Tower models start the data/bss segment at
-   an address as large as 0x2000000.  */
-#define VALBITS 26
-#define GCTYPEBITS 5
-
 /* The OS has an implementation of symlinks that is semantically different
    from BSD, but for some silly reason it partly has the same syntax.  */
 #undef S_IFLNK