From: Segher Boessenkool <segher@kernel.crashing.org>
Date: Fri, 16 Jan 2015 16:31:37 +0000 (+0100)
Subject: rs6000.h (PROMOTE_MODE): Correct test for when -m32 -mpowerpc64 is active.
X-Git-Tag: releases/gcc-5.1.0~1665
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=96922e4c5885cd77db84aa9526d444759a3ca630;p=thirdparty%2Fgcc.git

rs6000.h (PROMOTE_MODE): Correct test for when -m32 -mpowerpc64 is active.

	* config/rs6000/rs6000.h (PROMOTE_MODE): Correct test for when -m32
	-mpowerpc64 is active.

From-SVN: r219750
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b77b827328c0..76ccc9d580a4 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2015-01-16  Segher Boessenkool  <segher@kernel.crashing.org>
+
+	* config/rs6000/rs6000.h (PROMOTE_MODE): Correct test for when -m32
+	-mpowerpc64 is active.
+
 2015-01-16  Ilya Enkovich  <ilya.enkovich@intel.com>
 
 	PR middle-end/64353
diff --git a/gcc/config/rs6000/rs6000.h b/gcc/config/rs6000/rs6000.h
index c55d7ed516b3..ef6bb2f7a53d 100644
--- a/gcc/config/rs6000/rs6000.h
+++ b/gcc/config/rs6000/rs6000.h
@@ -733,7 +733,7 @@ extern unsigned char rs6000_recip_bits[];
 
 #define PROMOTE_MODE(MODE,UNSIGNEDP,TYPE)	\
   if (GET_MODE_CLASS (MODE) == MODE_INT		\
-      && GET_MODE_SIZE (MODE) < UNITS_PER_WORD) \
+      && GET_MODE_SIZE (MODE) < (TARGET_32BIT ? 4 : 8)) \
     (MODE) = TARGET_32BIT ? SImode : DImode;
 
 /* Define this if most significant bit is lowest numbered