X-Git-Url: http://git.sourceforge.jp/view?a=blobdiff_plain;f=gcc%2Fglimits.h;h=a766f81bdd522084621580ab1d0e1851146f7e1a;hb=1886e87de6421bee912b8f1d37f76339f2d6624c;hp=96e254d5f74a4ad063846eaf771a66ed15a5c83f;hpb=9e6911296d4806bd341cfcbfc409e97a3a7d6823;p=pf3gnuchains%2Fgcc-fork.git

diff --git a/gcc/glimits.h b/gcc/glimits.h
index 96e254d5f74..a766f81bdd5 100644
--- a/gcc/glimits.h
+++ b/gcc/glimits.h
@@ -39,7 +39,8 @@
 
 /* Minimum and maximum values a `signed short int' can hold.  */
 #undef SHRT_MIN
-#define SHRT_MIN (-32768)
+/* For the sake of 16 bit hosts, we may not use -32768 */
+#define SHRT_MIN (-32767-1)
 #undef SHRT_MAX
 #define SHRT_MAX 32767
 
@@ -54,25 +55,29 @@
 #undef INT_MIN
 #define INT_MIN (-INT_MAX-1)
 #undef INT_MAX
-#define INT_MAX (__INT_MAX__)
+#define INT_MAX __INT_MAX__
 
 /* Maximum value an `unsigned int' can hold.  (Minimum is 0).  */
 #undef UINT_MAX
-#define UINT_MAX ((unsigned) INT_MAX * 2 + 1)
+#define UINT_MAX (INT_MAX * 2U + 1)
 
 /* Minimum and maximum values a `signed long int' can hold.
    (Same as `int').  */
 #ifndef __LONG_MAX__
+#if defined (__alpha__) || (defined (_ARCH_PPC) && defined (__64BIT__)) || (defined (__sparc__) && defined(__arch64__)) || defined (__sparcv9)
+#define __LONG_MAX__ 9223372036854775807L
+#else
 #define __LONG_MAX__ 2147483647L
+#endif /* __alpha__ || sparc64 */
 #endif
 #undef LONG_MIN
 #define LONG_MIN (-LONG_MAX-1)
 #undef LONG_MAX
-#define LONG_MAX (__LONG_MAX__)
+#define LONG_MAX __LONG_MAX__
 
 /* Maximum value an `unsigned long int' can hold.  (Minimum is 0).  */
 #undef ULONG_MAX
-#define ULONG_MAX ((unsigned long) LONG_MAX * 2 + 1)
+#define ULONG_MAX (LONG_MAX * 2UL + 1)
 
 #if defined (__GNU_LIBRARY__) ? defined (__USE_GNU) : !defined (__STRICT_ANSI__)
 /* Minimum and maximum values a `signed long long int' can hold.  */
@@ -82,11 +87,11 @@
 #undef LONG_LONG_MIN
 #define LONG_LONG_MIN (-LONG_LONG_MAX-1)
 #undef LONG_LONG_MAX
-#define LONG_LONG_MAX (__LONG_LONG_MAX__)
+#define LONG_LONG_MAX __LONG_LONG_MAX__
 
 /* Maximum value an `unsigned long long int' can hold.  (Minimum is 0).  */
 #undef ULONG_LONG_MAX
-#define ULONG_LONG_MAX ((unsigned long long) LONG_LONG_MAX * 2 + 1)
+#define ULONG_LONG_MAX (LONG_LONG_MAX * 2ULL + 1)
 #endif
 
 #endif /* _MACH_MACHLIMITS_H_ */