diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2c7550a87fd..19931d5b623 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2014-10-27  DJ Delorie  <dj@redhat.com>
+
+	* tree.c (build_common_tree_nodes): Don't even store the
+	__int128 types if they're not supported.
+
 2014-10-27  Richard Sandiford  <richard.sandiford@arm.com>
 
 	* config/i386/i386.c (ix86_loop_memcount): Delete.
diff --git a/gcc/tree.c b/gcc/tree.c
index 3f60fd83563..02a73042626 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -9629,7 +9629,8 @@ build_common_tree_nodes (bool signed_char, bool short_double)
       TYPE_SIZE (int_n_trees[i].signed_type) = bitsize_int (int_n_data[i].bitsize);
       TYPE_SIZE (int_n_trees[i].unsigned_type) = bitsize_int (int_n_data[i].bitsize);
 
-      if (int_n_data[i].bitsize > LONG_LONG_TYPE_SIZE)
+      if (int_n_data[i].bitsize > LONG_LONG_TYPE_SIZE
+	  && int_n_enabled_p[i])
 	{
 	  integer_types[itk_intN_0 + i * 2] = int_n_trees[i].signed_type;
 	  integer_types[itk_unsigned_intN_0 + i * 2] = int_n_trees[i].unsigned_type;