re PR target/66488 (segfault on sizeof(long) < sizeof(void*) and large GCC memory...

	PR target/66488
	* ggc-page.c (HOST_BITS_PER_PTR): Do not define here...
	* hwint.h (HOST_BITS_PER_PTR): ...but here instead.

From-SVN: r255689

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8aed1e5e93637305375023b463f29141adfd8af5..3331fed614e54d444cbeafc08dcd80e82b92aade 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-12-15  Eric Botcazou  <ebotcazou@adacore.com>
+
+       PR target/66488
+       * ggc-page.c (HOST_BITS_PER_PTR): Do not define here...
+       * hwint.h (HOST_BITS_PER_PTR): ...but here instead.
+
 2017-12-14  Peter Bergner  <bergner@vnet.ibm.com>
 
        Backport from mainline

diff --git a/gcc/ggc-page.c b/gcc/ggc-page.c
index 2b42b6e4f3930b63ff493fb987b1c9b3457a69c1..54bda10762d3ca5cb94ad1cab69bb66c59e1fd11 100644 (file)
--- a/gcc/ggc-page.c
+++ b/gcc/ggc-page.c
@@ -90,11 +90,6 @@ along with GCC; see the file COPYING3.  If not see
      3: Object allocations as well.
      4: Object marks as well.  */
 #define GGC_DEBUG_LEVEL (0)
-\f
-#ifndef HOST_BITS_PER_PTR
-#define HOST_BITS_PER_PTR  HOST_BITS_PER_LONG
-#endif
-
 \f
 /* A two-level tree is used to look up the page-entry for a given
    pointer.  Two chunks of the pointer's bits are extracted to index

diff --git a/gcc/hwint.h b/gcc/hwint.h
index 14740ccc939a4e7d9fa18ff422c4b83451c12866..4dd255d486c5b3a494d22e118d3ffab3b7681c41 100644 (file)
--- a/gcc/hwint.h
+++ b/gcc/hwint.h
@@ -14,6 +14,7 @@
 #define HOST_BITS_PER_SHORT (CHAR_BIT * SIZEOF_SHORT)
 #define HOST_BITS_PER_INT   (CHAR_BIT * SIZEOF_INT)
 #define HOST_BITS_PER_LONG  (CHAR_BIT * SIZEOF_LONG)
+#define HOST_BITS_PER_PTR   (CHAR_BIT * SIZEOF_VOID_P)
 
 /* The string that should be inserted into a printf style format to
    indicate a "long" operand.  */