darwin.h (SELECT_RTX_SECTION): Force address initializers into 'const' section

	* config/darwin.h (SELECT_RTX_SECTION):  Force address
	initializers into 'const' section
	* config/rs6000/rs6000.c (rs6000_emit_cmove):  Fix mode of
	if_then_else to match result, not operands

From-SVN: r47076

gcc/ChangeLog

+2001-11-15  Dale Johannesen  <dalej@apple.com>
+
+	* config/darwin.h (SELECT_RTX_SECTION):  Force address
+	initializers into 'const' section
+	* config/rs6000/rs6000.c (rs6000_emit_cmove):  Fix mode of
+	if_then_else to match result, not operands
+
 Thu Nov 15 17:57:48 2001  Richard Kenner  <kenner@vlsi1.ultra.nyu.edu>
 
 	* alias.c (nonoverlapping_memrefs): Use REGNO_PTR_FRAME_P.

gcc/config/darwin.h

@@ -647,13 +647,17 @@ static void alias_section (name, alias)			\
     }									\
   while (0)
 
+/* This can be called with address expressions as "rtx".
+   They must go in "const". */
 #undef	SELECT_RTX_SECTION
 #define SELECT_RTX_SECTION(mode, rtx, align)				\
   do									\
     {									\
       if (GET_MODE_SIZE (mode) == 8)					\
 	literal8_section ();						\
-      else if (GET_MODE_SIZE (mode) == 4)				\
+      else if (GET_MODE_SIZE (mode) == 4				\
+	       && (GET_CODE (rtx) == CONST_INT				\
+	           || GET_CODE (rtx) == CONST_DOUBLE))			\
 	literal4_section ();						\
       else								\
 	const_section ();						\

gcc/config/rs6000/rs6000.c

@@ -5805,7 +5805,7 @@ rs6000_emit_cmove (dest, op, true_cond, false_cond)
     }
 
   emit_insn (gen_rtx_SET (VOIDmode, dest,
-			  gen_rtx_IF_THEN_ELSE (mode, 
+			  gen_rtx_IF_THEN_ELSE (GET_MODE (dest),
 						gen_rtx_GE (VOIDmode,
 							    op0, op1),
 						true_cond, false_cond)));