From: Steve Ellcey <sje@cup.hp.com>
Date: Wed, 4 Apr 2012 20:48:59 +0000 (+0000)
Subject: backport: decl.c (cxx_init_decl_processing): Use ptr_mode instead of Pmode.
X-Git-Tag: releases/gcc-4.6.4~604
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5dd818cf41d43c5485eb5fd75e59adcdade511db;p=thirdparty%2Fgcc.git

backport: decl.c (cxx_init_decl_processing): Use ptr_mode instead of Pmode.

2012-04-04  Steve Ellcey <sje@cup.hp.com>

	Backported from mainline.
	* decl.c (cxx_init_decl_processing): Use ptr_mode instead of Pmode.

From-SVN: r186148
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 9dea1b5c1b40..87870dfcf745 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2012-04-04  Steve Ellcey <sje@cup.hp.com>
+
+	Backported from mainline.
+	* decl.c (cxx_init_decl_processing): Use ptr_mode instead of Pmode.
+
 2012-04-03  Jason Merrill  <jason@redhat.com>
 
 	PR c++/52796
diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c
index 6b6f158491eb..9b836f801f95 100644
--- a/gcc/cp/decl.c
+++ b/gcc/cp/decl.c
@@ -3636,7 +3636,7 @@ cxx_init_decl_processing (void)
     TYPE_SIZE_UNIT (nullptr_type_node) = size_int (GET_MODE_SIZE (ptr_mode));
     TYPE_UNSIGNED (nullptr_type_node) = 1;
     TYPE_PRECISION (nullptr_type_node) = GET_MODE_BITSIZE (ptr_mode);
-    SET_TYPE_MODE (nullptr_type_node, Pmode);
+    SET_TYPE_MODE (nullptr_type_node, ptr_mode);
     record_builtin_type (RID_MAX, "decltype(nullptr)", nullptr_type_node);
     nullptr_node = build_int_cst (nullptr_type_node, 0);
   }