* c-common.c (builtin_define_type_max): New.

        (cb_register_builtins): Define __SCHAR_MAX__, __SHRT_MAX__,
        __INT_MAX__, __LONG_MAX__, __LONG_LONG_MAX__, __CHAR_BIT__.

        From Joseph S. Myers:
        * glimits.h: Rewrite to expect the double underscore definitions
        from the compiler.

        * config/alpha/unicosmk.h, config/avr/avr.h, config/h8300/h8300.h,
        config/i386/linux64.h, config/ia64/aix.h, config/ia64/hpux.h,
        config/ia64/ia64.h, config/m68hc11/m68hc11.h, config/m68hc11/m68hc12.h,
        config/mips/mips.h, config/mmix/mmix.h, config/mn10200/mn10200.h,
        config/pa/pa.h, config/rs6000/aix43.h, config/rs6000/aix51.h,
        config/rs6000/linux64.h, config/s390/linux.h, config/sh/sh.h,
        config/stormy16/stormy16.h: Don't define any of __SHRT_MAX__,
        __INT_MAX__, __LONG_MAX__, or __LONG_LONG_MAX__.


git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@54544 138bc75d-0d04-0410-961f-82ee72b054a4

19 files changed, 27 insertions, 55 deletions

diff --git a/gcc/config/alpha/unicosmk.h b/gcc/config/alpha/unicosmk.h
index d21ba8844c4..cd9308c027e 100644
--- a/gcc/config/alpha/unicosmk.h
+++ b/gcc/config/alpha/unicosmk.h
@@ -43,8 +43,6 @@ Boston, MA 02111-1307, USA.  */
 	builtin_define ("_ADDR64");				\
 	builtin_define ("_LD64");				\
 	builtin_define ("__UNICOSMK__");			\
-	builtin_define ("__INT_MAX__=9223372036854775807");	\
-	builtin_define ("__SHRT_MAX__=2147483647");		\
     } while (0)
 
 #define SHORT_TYPE_SIZE 32
diff --git a/gcc/config/avr/avr.h b/gcc/config/avr/avr.h
index 5148f3ee8dc..65effa66fba 100644
--- a/gcc/config/avr/avr.h
+++ b/gcc/config/avr/avr.h
@@ -38,10 +38,6 @@ Boston, MA 02111-1307, USA.  */
 	builtin_define ("__AVR_MEGA__");	\
       if (TARGET_NO_INTERRUPTS)			\
 	builtin_define ("__NO_INTERRUPTS__");	\
-      if (TARGET_INT8)				\
-	builtin_define ("__INT_MAX__=127");	\
-      else					\
-	builtin_define ("__INT_MAX__=32767");	\
     }						\
   while (0)
 
diff --git a/gcc/config/h8300/h8300.h b/gcc/config/h8300/h8300.h
index 4c34e514716..1fa64ccf1ba 100644
--- a/gcc/config/h8300/h8300.h
+++ b/gcc/config/h8300/h8300.h
@@ -59,12 +59,6 @@ extern const char * const *h8_reg_names;
 	  builtin_assert ("cpu=h8300");			\
 	  builtin_assert ("machine=h8300");		\
 	}						\
-      if (TARGET_INT32)					\
-	builtin_define ("__INT_MAX__=2147483647");	\
-      else						\
-	builtin_define ("__INT_MAX__=32767");		\
-      builtin_define ("__LONG_MAX__=2147483647L");	\
-      builtin_define ("__LONG_LONG_MAX__=2147483647L");	\
     }							\
   while (0)
 
diff --git a/gcc/config/i386/linux64.h b/gcc/config/i386/linux64.h
index 52730856e71..99c381aa4de 100644
--- a/gcc/config/i386/linux64.h
+++ b/gcc/config/i386/linux64.h
@@ -27,7 +27,7 @@ Boston, MA 02111-1307, USA.  */
 #define CPP_PREDEFINES "-D__ELF__ -Dunix -D__gnu_linux__ -Dlinux -Asystem(posix)"
 
 #undef CPP_SPEC
-#define CPP_SPEC "%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT} %{!m32:-D__LONG_MAX__=9223372036854775807L}"
+#define CPP_SPEC "%{fPIC:-D__PIC__ -D__pic__} %{fpic:-D__PIC__ -D__pic__} %{posix:-D_POSIX_SOURCE} %{pthread:-D_REENTRANT}"
 
 /* Provide a LINK_SPEC.  Here we provide support for the special GCC
    options -static and -shared, which allow us to link things in one
diff --git a/gcc/config/ia64/aix.h b/gcc/config/ia64/aix.h
index b52d49cf66d..40b654836d1 100644
--- a/gcc/config/ia64/aix.h
+++ b/gcc/config/ia64/aix.h
@@ -81,8 +81,7 @@ Boston, MA 02111-1307, USA.  */
 %{mcpu=itanium:-D__itanium__} %{mbig-endian:-D__BIG_ENDIAN__} \
 %{ansi:-D_ANSI_C_SOURCE} \
 %{posix:-D_POSIX_SOURCE} \
-%{cpp_cpu} \
--D__LONG_MAX__=9223372036854775807L"
+%{cpp_cpu}"
 
 #undef CPP_PREDEFINES
 #define CPP_PREDEFINES "\
@@ -97,7 +96,6 @@ Boston, MA 02111-1307, USA.  */
    -D_XOPEN_SOURCE_EXTENDED=1                   \
    -D_LARGE_FILE_API                            \
    -D_ALL_SOURCE                                \
-   -D__LONG_MAX__=9223372036854775807L          \
    %{cpp_cpu}"
 
 /* Define this for shared library support.  */
diff --git a/gcc/config/ia64/hpux.h b/gcc/config/ia64/hpux.h
index afc79990317..8b1867897cf 100644
--- a/gcc/config/ia64/hpux.h
+++ b/gcc/config/ia64/hpux.h
@@ -40,7 +40,7 @@ Boston, MA 02111-1307, USA.  */
 #undef CPP_SPEC
 #define CPP_SPEC "\
   %{mcpu=itanium:-D__itanium__} \
-  %{mlp64:-D__LP64__ -D_LP64 -D__LONG_MAX__=9223372036854775807L} \
+  %{mlp64:-D__LP64__ -D_LP64} \
   %{!ansi:%{!std=c*:%{!std=i*: -D_HPUX_SOURCE -D__STDC_EXT__}}} \
   -D__fpreg=long\\ double \
   -D__float80=long\\ double \
diff --git a/gcc/config/ia64/ia64.h b/gcc/config/ia64/ia64.h
index ab265ca7a06..83da1644e7f 100644
--- a/gcc/config/ia64/ia64.h
+++ b/gcc/config/ia64/ia64.h
@@ -212,14 +212,8 @@ extern const char *ia64_tls_size_string;
    CPP.  It can also specify how to translate options you give to GNU CC into
    options for GNU CC to pass to the CPP.  */
 
-/* ??? __LONG_MAX__ depends on LP64/ILP32 switch.  */
-/* ??? An alternative is to modify glimits.h to check for __LP64__ instead
-   of checked for CPU specific defines.  We could also get rid of all LONG_MAX
-   defines in other tm.h files.  */
 #define CPP_SPEC \
-  "%{mcpu=itanium:-D__itanium__} %{mbig-endian:-D__BIG_ENDIAN__}	\
-   %(cpp_cpu)	\
-   -D__LONG_MAX__=9223372036854775807L"
+  "%{mcpu=itanium:-D__itanium__} %{mbig-endian:-D__BIG_ENDIAN__} %(cpp_cpu)"
 
 /* A C string constant that tells the GNU CC driver program options to pass to
    `cc1'.  It can also specify how to translate options you give to GNU CC into
diff --git a/gcc/config/m68hc11/m68hc11.h b/gcc/config/m68hc11/m68hc11.h
index 47a5cd83b7a..42950e79c3c 100644
--- a/gcc/config/m68hc11/m68hc11.h
+++ b/gcc/config/m68hc11/m68hc11.h
@@ -62,8 +62,8 @@ Note:
 
 #ifndef CPP_SPEC
 #define CPP_SPEC  \
-"%{mshort:-D__HAVE_SHORT_INT__ -D__INT__=16 -D__INT_MAX__=32767}\
- %{!mshort:-D__INT__=32 -D__INT_MAX__=2147483647}\
+"%{mshort:-D__HAVE_SHORT_INT__ -D__INT__=16}\
+ %{!mshort:-D__INT__=32}\
  %{m68hc12:-Dmc6812 -DMC6812 -Dmc68hc12}\
  %{!m68hc12:-Dmc6811 -DMC6811 -Dmc68hc11}\
  %{fshort-double:-D__HAVE_SHORT_DOUBLE__}"
diff --git a/gcc/config/m68hc11/m68hc12.h b/gcc/config/m68hc11/m68hc12.h
index 277c788915b..ba56c172993 100644
--- a/gcc/config/m68hc11/m68hc12.h
+++ b/gcc/config/m68hc11/m68hc12.h
@@ -29,8 +29,8 @@ Boston, MA 02111-1307, USA.  */
 #define LINK_SPEC      "%{m68hc11:-m m68hc11elf}%{!m68hc11:-m m68hc12elf}"
 
 #define CPP_SPEC  \
-"%{mshort:-D__HAVE_SHORT_INT__ -D__INT__=16 -D__INT_MAX__=32767}\
- %{!mshort:-D__INT__=32 -D__INT_MAX__=2147483647}\
+"%{mshort:-D__HAVE_SHORT_INT__ -D__INT__=16}\
+ %{!mshort:-D__INT__=32}\
  %{m68hc11:-Dmc6811 -DMC6811 -Dmc68hc11}\
  %{!m68hc11:-Dmc6812 -DMC6812 -Dmc68hc12}\
  %{fshort-double:-D__HAVE_SHORT_DOUBLE__}"
diff --git a/gcc/config/mips/mips.h b/gcc/config/mips/mips.h
index 8242992b11d..b68840f5e1b 100644
--- a/gcc/config/mips/mips.h
+++ b/gcc/config/mips/mips.h
@@ -417,9 +417,6 @@ extern void		sbss_section PARAMS ((void));
       if (TARGET_SINGLE_FLOAT)					\
 	  builtin_define ("__mips_single_float");		\
 								\
-      if (TARGET_LONG64)					\
-	  builtin_define ("__LONG_MAX__=9223372036854775807L"); \
-								\
       if (TARGET_BIG_ENDIAN)					\
 	{							\
 	  builtin_define_std ("MIPSEB");			\
diff --git a/gcc/config/mmix/mmix.h b/gcc/config/mmix/mmix.h
index 8ffef0b96e7..17471a6e6fa 100644
--- a/gcc/config/mmix/mmix.h
+++ b/gcc/config/mmix/mmix.h
@@ -145,7 +145,6 @@ extern const char *mmix_cc1_ignored_option;
     {								\
       builtin_define ("__mmix__");				\
       builtin_define ("__MMIX__");				\
-      builtin_define ("__LONG_MAX__=9223372036854775807L");	\
       if (TARGET_ABI_GNU)					\
 	builtin_define ("__MMIX_ABI_GNU__");			\
       else							\
diff --git a/gcc/config/mn10200/mn10200.h b/gcc/config/mn10200/mn10200.h
index bc9606e7129..8bf169fc97b 100644
--- a/gcc/config/mn10200/mn10200.h
+++ b/gcc/config/mn10200/mn10200.h
@@ -32,7 +32,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* Names to predefine in the preprocessor for this target machine.  */
 
-#define CPP_PREDEFINES "-D__mn10200__ -D__MN10200__ -D__LONG_MAX__=2147483647L -D__LONG_LONG_MAX__=2147483647L -D__INT_MAX__=32767"
+#define CPP_PREDEFINES "-D__mn10200__ -D__MN10200__"
 
 /* Run-time compilation parameters selecting different hardware subsets.  */
 
diff --git a/gcc/config/pa/pa.h b/gcc/config/pa/pa.h
index d71328b563e..a9c23ac0d1e 100644
--- a/gcc/config/pa/pa.h
+++ b/gcc/config/pa/pa.h
@@ -268,7 +268,7 @@ extern int target_flags;
 #define CPP_PA10_SPEC ""
 #define CPP_PA11_SPEC "-D_PA_RISC1_1 -D__hp9000s700"
 #define CPP_PA20_SPEC "-D_PA_RISC2_0 -D__hp9000s800"
-#define CPP_64BIT_SPEC "-D__LP64__ -D__LONG_MAX__=9223372036854775807L"
+#define CPP_64BIT_SPEC "-D__LP64__"
 
 #if ((TARGET_DEFAULT | TARGET_CPU_DEFAULT) & MASK_PA_11) == 0
 #define CPP_CPU_DEFAULT_SPEC "%(cpp_pa10)"
diff --git a/gcc/config/rs6000/aix43.h b/gcc/config/rs6000/aix43.h
index fe560a22470..ddf9857d9c2 100644
--- a/gcc/config/rs6000/aix43.h
+++ b/gcc/config/rs6000/aix43.h
@@ -103,7 +103,7 @@ do {									\
 #undef CPP_SPEC
 #define CPP_SPEC "%{posix: -D_POSIX_SOURCE}\
    %{ansi: -D_ANSI_C_SOURCE}\
-   %{maix64: -D__64BIT__ -D__LONG_MAX__=9223372036854775807L}\
+   %{maix64: -D__64BIT__}\
    %{mpe: -I/usr/lpp/ppe.poe/include}\
    %{pthread: -D_THREAD_SAFE}"
 
@@ -114,9 +114,9 @@ do {									\
   "-D_XOPEN_SOURCE=500				\
    -D_XOPEN_SOURCE_EXTENDED=1			\
    -D_LARGE_FILE_API				\
-   -D_ALL_SOURCE                                \
-   %{maix64: -D__64BIT__ -D__LONG_MAX__=9223372036854775807L}\
-   %{mpe: -I/usr/lpp/ppe.poe/include}\
+   -D_ALL_SOURCE				\
+   %{maix64: -D__64BIT__}			\
+   %{mpe: -I/usr/lpp/ppe.poe/include}		\
    %{pthread: -D_THREAD_SAFE}"
 
 #undef TARGET_DEFAULT
diff --git a/gcc/config/rs6000/aix51.h b/gcc/config/rs6000/aix51.h
index f0b9e7df503..2f0d68274f9 100644
--- a/gcc/config/rs6000/aix51.h
+++ b/gcc/config/rs6000/aix51.h
@@ -101,22 +101,22 @@ do {									\
 -D_AIX -D_AIX32 -D_AIX41 -D_AIX43 -D_AIX51 -Asystem=unix -Asystem=aix"
 
 #undef CPP_SPEC
-#define CPP_SPEC "%{posix: -D_POSIX_SOURCE}\
-  %{ansi: -D_ANSI_C_SOURCE}\
-  %{maix64: -D__64BIT__ -D__LONG_MAX__=9223372036854775807L}
-  %{mpe: -I/usr/lpp/ppe.poe/include}\
+#define CPP_SPEC "%{posix: -D_POSIX_SOURCE}	\
+  %{ansi: -D_ANSI_C_SOURCE}			\
+  %{maix64: -D__64BIT__}			\
+  %{mpe: -I/usr/lpp/ppe.poe/include}		\
   %{pthread: -D_THREAD_SAFE}"
 
 /* The GNU C++ standard library requires that these macros be 
    defined.  */
 #undef CPLUSPLUS_CPP_SPEC                       
-#define CPLUSPLUS_CPP_SPEC                      \
-  "-D_XOPEN_SOURCE=500                          \
-   -D_XOPEN_SOURCE_EXTENDED=1                   \
-   -D_LARGE_FILE_API                            \
-   -D_ALL_SOURCE                                \
-   %{maix64: -D__64BIT__ -D__LONG_MAX__=9223372036854775807L}
-   %{mpe: -I/usr/lpp/ppe.poe/include}\
+#define CPLUSPLUS_CPP_SPEC			\
+  "-D_XOPEN_SOURCE=500				\
+   -D_XOPEN_SOURCE_EXTENDED=1			\
+   -D_LARGE_FILE_API				\
+   -D_ALL_SOURCE				\
+   %{maix64: -D__64BIT__}			\
+   %{mpe: -I/usr/lpp/ppe.poe/include}		\
    %{pthread: -D_THREAD_SAFE}"
 
 #undef TARGET_DEFAULT
diff --git a/gcc/config/rs6000/linux64.h b/gcc/config/rs6000/linux64.h
index ab2a40968c9..eaa962d024d 100644
--- a/gcc/config/rs6000/linux64.h
+++ b/gcc/config/rs6000/linux64.h
@@ -110,7 +110,6 @@ Boston, MA 02111-1307, USA.  */
 #define CPP_PREDEFINES \
  "-D_PPC_ -D__PPC__ -D_PPC64_ -D__PPC64__ -D__powerpc__ -D__powerpc64__ \
   -D_PIC_ -D__PIC__ -D__ELF__ \
-  -D__LONG_MAX__=9223372036854775807L \
   -Acpu=powerpc64 -Amachine=powerpc64"
 
 #undef  CPP_OS_DEFAULT_SPEC
diff --git a/gcc/config/s390/linux.h b/gcc/config/s390/linux.h
index f49e8b5db4f..8e411b80d50 100644
--- a/gcc/config/s390/linux.h
+++ b/gcc/config/s390/linux.h
@@ -55,7 +55,7 @@ Boston, MA 02111-1307, USA.  */
    -Acpu(s390) -Amachine(s390) -D__s390__"
 
 #define CPP_ARCH31_SPEC ""
-#define CPP_ARCH64_SPEC "-D__s390x__ -D__LONG_MAX__=9223372036854775807L"
+#define CPP_ARCH64_SPEC "-D__s390x__"
 
 #undef  CPP_SPEC
 #ifdef DEFAULT_TARGET_64BIT
diff --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h
index 9e1b4b27555..1479c0210c4 100644
--- a/gcc/config/sh/sh.h
+++ b/gcc/config/sh/sh.h
@@ -65,9 +65,6 @@ do { \
 				   TARGET_SHMEDIA ? "1" : "0", 0); \
 	if (! TARGET_FPU_DOUBLE) \
 	  builtin_define ("__SH4_NOFPU__"); \
-	if (TARGET_SHMEDIA64) \
-	  builtin_define_with_value ("__LONG_MAX__", \
-				     "9223372036854775807L", 0); \
       } \
     } \
   if (TARGET_HITACHI) \
diff --git a/gcc/config/stormy16/stormy16.h b/gcc/config/stormy16/stormy16.h
index 7a6b166aec7..560d0d2239a 100644
--- a/gcc/config/stormy16/stormy16.h
+++ b/gcc/config/stormy16/stormy16.h
@@ -67,7 +67,7 @@ Boston, MA 02111-1307, USA.  */
 
 /* Run-time target specifications */
 
-#define CPP_PREDEFINES "-Dxstormy16 -Amachine=xstormy16 -D__INT_MAX__=32767"
+#define CPP_PREDEFINES "-Dxstormy16 -Amachine=xstormy16"
 
 /* This declaration should be present.  */
 extern int target_flags;