openSUSE Build Service

Overview Repositories Revisions Requests Users Attributes Meta

File project.diff of Package gcc43 (Revision 89d2c3b27114bc980ac4d42c1355aa65)

Currently displaying revision 89d2c3b27114bc980ac4d42c1355aa65 , Show latest

--- amd-SSE5-shift-ppc-2.diff.orig
+++ amd-SSE5-shift-ppc-2.diff
@@ -57,9 +57,9 @@
 
 Index: gcc/config/spu/spu.c
 ===================================================================
---- gcc/config/spu/spu.c	(revision 135303)
-+++ gcc/config/spu/spu.c	(revision 135304)
-@@ -4799,7 +4799,7 @@ spu_initialize_trampoline (rtx tramp, rt
+--- gcc/config/spu/spu.c.orig	2009-09-21 11:42:16.000000000 +0200
++++ gcc/config/spu/spu.c	2009-09-21 11:44:57.000000000 +0200
+@@ -5479,7 +5479,7 @@ spu_initialize_trampoline (rtx tramp, rt
        insnc = force_reg (V4SImode, array_to_constant (V4SImode, insna));
  
        emit_insn (gen_shufb (shuf, fnaddr, cxt, shufc));
@@ -70,8 +70,8 @@ Index: gcc/config/spu/spu.c
  
 Index: gcc/config/spu/spu-builtins.def
 ===================================================================
---- gcc/config/spu/spu-builtins.def	(revision 135303)
-+++ gcc/config/spu/spu-builtins.def	(revision 135304)
+--- gcc/config/spu/spu-builtins.def.orig	2009-09-21 11:42:16.000000000 +0200
++++ gcc/config/spu/spu-builtins.def	2009-09-21 11:44:57.000000000 +0200
 @@ -107,19 +107,19 @@ DEF_BUILTIN (SI_NOR,         CODE_FOR_no
  DEF_BUILTIN (SI_EQV,         CODE_FOR_eqv_v16qi,     "si_eqv",         B_INSN,   _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD))
  DEF_BUILTIN (SI_SELB,        CODE_FOR_selb,          "si_selb",        B_INSN,   _A4(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD))
@@ -148,9 +148,9 @@ Index: gcc/config/spu/spu-builtins.def
  DEF_BUILTIN (SPU_SLQW_1,           CODE_FOR_shlqbi_ti,     "spu_slqw_1",           B_INTERNAL, _A3(SPU_BTI_UV2DI,  SPU_BTI_UV2DI,  SPU_BTI_UINTSI))
 Index: gcc/config/spu/spu.md
 ===================================================================
---- gcc/config/spu/spu.md	(revision 135303)
-+++ gcc/config/spu/spu.md	(revision 135304)
-@@ -211,6 +211,9 @@ (define_mode_iterator VCMPU [V16QI
+--- gcc/config/spu/spu.md.orig	2009-09-21 11:42:16.000000000 +0200
++++ gcc/config/spu/spu.md	2009-09-21 11:44:57.000000000 +0200
+@@ -213,6 +213,9 @@
  			  V8HI
  			  V4SI])
  
@@ -160,7 +160,7 @@ Index: gcc/config/spu/spu.md
  (define_mode_attr bh  [(QI "b")  (V16QI "b")
  		       (HI "h")  (V8HI "h")
  		       (SI "")   (V4SI "")])
-@@ -727,7 +730,7 @@ (define_insn_and_split "floatunssidf2_in
+@@ -790,7 +793,7 @@
      rtx op6_ti = gen_rtx_REG (TImode, REGNO (ops[6]));
      emit_insn (gen_clzv4si2 (ops[3],op1_v4si));
      emit_move_insn (ops[6], spu_const (V4SImode, 1023+31));
@@ -169,7 +169,7 @@ Index: gcc/config/spu/spu.md
      emit_insn (gen_ceq_v4si (ops[5],ops[3],spu_const (V4SImode, 32)));
      emit_insn (gen_subv4si3 (ops[6],ops[6],ops[3]));
      emit_insn (gen_addv4si3 (ops[4],ops[4],ops[4]));
-@@ -822,7 +825,7 @@ (define_insn_and_split "floatunsdidf2_in
+@@ -885,7 +888,7 @@
      rtx op4_df = gen_rtx_REG (DFmode, REGNO(ops[4]));
      rtx op5_df = gen_rtx_REG (DFmode, REGNO(ops[5]));
      emit_insn (gen_clzv4si2 (ops[4],op1_v4si));
@@ -178,7 +178,7 @@ Index: gcc/config/spu/spu.md
      emit_insn (gen_ceq_v4si (ops[6],ops[4],spu_const (V4SImode, 32)));
      emit_insn (gen_subv4si3 (ops[4],ops[3],ops[4]));
      emit_insn (gen_addv4si3 (ops[5],ops[5],ops[5]));
-@@ -1222,7 +1225,7 @@ (define_expand "mulv8hi3"
+@@ -1285,7 +1288,7 @@
      emit_move_insn (mask, spu_const (V4SImode, 0x0000ffff));
      emit_insn (gen_spu_mpyhh (high, operands[1], operands[2]));
      emit_insn (gen_spu_mpy (low, operands[1], operands[2]));
@@ -187,7 +187,7 @@ Index: gcc/config/spu/spu.md
      emit_insn (gen_selb (result, shift, low, mask));
      DONE;
     }")
-@@ -2100,9 +2103,9 @@ (define_insn "sumb_si"
+@@ -2220,9 +2223,9 @@
    [(set_attr "type" "fxb")])
  
  
@@ -199,7 +199,7 @@ Index: gcc/config/spu/spu.md
    [(set (match_operand:VHSI 0 "spu_reg_operand" "=r,r")
  	(ashift:VHSI (match_operand:VHSI 1 "spu_reg_operand" "r,r")
  		     (match_operand:VHSI 2 "spu_nonmem_operand" "r,W")))]
-@@ -2234,9 +2237,9 @@ (define_insn "shlqby_ti"
+@@ -2354,9 +2357,9 @@
    [(set_attr "type" "shuf,shuf")])
  
  
@@ -211,7 +211,7 @@ Index: gcc/config/spu/spu.md
    [(set (match_operand:VHSI 0 "spu_reg_operand" "=r,r")
  	(lshiftrt:VHSI (match_operand:VHSI 1 "spu_reg_operand" "r,r")
  		       (match_operand:VHSI 2 "spu_nonmem_operand" "r,W")))
-@@ -2363,9 +2366,9 @@ (define_insn "rotqmby_<mode>"
+@@ -2483,9 +2486,9 @@
    [(set_attr "type" "shuf")])
  
  
@@ -223,7 +223,7 @@ Index: gcc/config/spu/spu.md
    [(set (match_operand:VHSI 0 "spu_reg_operand" "=r,r")
  	(ashiftrt:VHSI (match_operand:VHSI 1 "spu_reg_operand" "r,r")
  		       (match_operand:VHSI 2 "spu_nonmem_operand" "r,W")))
-@@ -2430,7 +2433,7 @@ (define_insn_and_split "ashrdi3"
+@@ -2550,7 +2553,7 @@
  	emit_insn (gen_lshrti3 (op0, op1, GEN_INT (32)));
  	emit_insn (gen_spu_xswd (op0d, op0v));
          if (val > 32)
@@ -232,7 +232,7 @@ Index: gcc/config/spu/spu.md
        }
      else
        {
-@@ -2479,7 +2482,7 @@ (define_expand "ashrti3"
+@@ -2599,7 +2602,7 @@
      rtx op1_v4si = spu_gen_subreg (V4SImode, operands[1]);
      rtx t = gen_reg_rtx (TImode);
      emit_insn (gen_subsi3 (sign_shift, GEN_INT (128), force_reg (SImode, operands[2])));
@@ -241,7 +241,7 @@ Index: gcc/config/spu/spu.md
      emit_insn (gen_fsm_ti (sign_mask, sign_mask));
      emit_insn (gen_ashlti3 (sign_mask, sign_mask, sign_shift));
      emit_insn (gen_lshrti3 (t, operands[1], operands[2]));
-@@ -2496,9 +2499,9 @@ (define_insn "fsm_ti"
+@@ -2616,9 +2619,9 @@
    [(set_attr "type" "shuf")])
  
  
@@ -253,7 +253,7 @@ Index: gcc/config/spu/spu.md
    [(set (match_operand:VHSI 0 "spu_reg_operand" "=r,r")
  	(rotate:VHSI (match_operand:VHSI 1 "spu_reg_operand" "r,r")
  		     (match_operand:VHSI 2 "spu_nonmem_operand" "r,W")))]
-@@ -3046,14 +3049,14 @@ (define_expand "cgt_df"
+@@ -3166,14 +3169,14 @@ selb\t%0,%5,%0,%3"
            emit_insn (gen_iorv4si3 (a_nan, a_nan, b_nan));
  	}
        emit_move_insn (zero, CONST0_RTX (V4SImode));
@@ -270,7 +270,7 @@ Index: gcc/config/spu/spu.md
        emit_insn (gen_shufb (bsel, bsel, bsel, hi_promote));
        emit_insn (gen_bg_v4si (bbor, zero, b_abs));
        emit_insn (gen_shufb (bbor, bbor, bbor, borrow_shuffle));
-@@ -3154,13 +3157,13 @@ (define_expand "cgt_v2df"
+@@ -3274,13 +3277,13 @@ selb\t%0,%5,%0,%3"
        emit_insn (gen_shufb (b_nan, b_nan, b_nan, hi_promote));
        emit_insn (gen_iorv4si3 (a_nan, a_nan, b_nan));
        emit_move_insn (zero, CONST0_RTX (V4SImode));
@@ -286,7 +286,7 @@ Index: gcc/config/spu/spu.md
        emit_insn (gen_shufb (bsel, bsel, bsel, hi_promote));
        emit_insn (gen_bg_v4si (bbor, zero, b_abs));
        emit_insn (gen_shufb (bbor, bbor, bbor, borrow_shuffle));
-@@ -3344,7 +3347,7 @@ (define_expand "dftsv"
+@@ -3464,7 +3467,7 @@ selb\t%0,%4,%0,%3"
                                               0x08090A0B, 0x08090A0B);
            emit_move_insn (hi_promote, pat);
  
@@ -297,9 +297,9 @@ Index: gcc/config/spu/spu.md
  
 Index: gcc/config/rs6000/rs6000.c
 ===================================================================
---- gcc/config/rs6000/rs6000.c	(revision 135303)
-+++ gcc/config/rs6000/rs6000.c	(revision 135304)
-@@ -7109,20 +7109,20 @@ static struct builtin_description bdesc_
+--- gcc/config/rs6000/rs6000.c.orig	2009-09-21 11:44:56.000000000 +0200
++++ gcc/config/rs6000/rs6000.c	2009-09-21 11:44:57.000000000 +0200
+@@ -7049,20 +7049,20 @@ static struct builtin_description bdesc_
    { MASK_ALTIVEC, CODE_FOR_altivec_vrlb, "__builtin_altivec_vrlb", ALTIVEC_BUILTIN_VRLB },
    { MASK_ALTIVEC, CODE_FOR_altivec_vrlh, "__builtin_altivec_vrlh", ALTIVEC_BUILTIN_VRLH },
    { MASK_ALTIVEC, CODE_FOR_altivec_vrlw, "__builtin_altivec_vrlw", ALTIVEC_BUILTIN_VRLW },
@@ -331,9 +331,9 @@ Index: gcc/config/rs6000/rs6000.c
    { MASK_ALTIVEC, CODE_FOR_subv16qi3, "__builtin_altivec_vsububm", ALTIVEC_BUILTIN_VSUBUBM },
 Index: gcc/config/rs6000/altivec.md
 ===================================================================
---- gcc/config/rs6000/altivec.md	(revision 135303)
-+++ gcc/config/rs6000/altivec.md	(revision 135304)
-@@ -575,7 +575,7 @@ (define_expand "mulv4sf3"
+--- gcc/config/rs6000/altivec.md.orig	2009-09-21 11:44:56.000000000 +0200
++++ gcc/config/rs6000/altivec.md	2009-09-21 11:44:57.000000000 +0200
+@@ -581,7 +581,7 @@
    /* Generate [-0.0, -0.0, -0.0, -0.0].  */
    neg0 = gen_reg_rtx (V4SImode);
    emit_insn (gen_altivec_vspltisw (neg0, constm1_rtx));
@@ -342,7 +342,7 @@ Index: gcc/config/rs6000/altivec.md
  
    /* Use the multiply-add.  */
    emit_insn (gen_altivec_vmaddfp (operands[0], operands[1], operands[2],
-@@ -634,7 +634,7 @@ (define_expand "mulv4si3"
+@@ -640,7 +640,7 @@
     high_product = gen_reg_rtx (V4SImode);
     emit_insn (gen_altivec_vmsumuhm (high_product, one, small_swap, zero));
   
@@ -351,7 +351,7 @@ Index: gcc/config/rs6000/altivec.md
   
     emit_insn (gen_addv4si3 (operands[0], high_product, low_product));
     
-@@ -1238,7 +1238,7 @@ (define_insn "altivec_vslo"
+@@ -1244,7 +1244,7 @@
    "vslo %0,%1,%2"
    [(set_attr "type" "vecperm")])
  
@@ -360,7 +360,7 @@ Index: gcc/config/rs6000/altivec.md
    [(set (match_operand:VI 0 "register_operand" "=v")
          (ashift:VI (match_operand:VI 1 "register_operand" "v")
                     (match_operand:VI 2 "register_operand" "v") ))]
-@@ -1246,7 +1246,7 @@ (define_insn "ashl<mode>3"
+@@ -1252,7 +1252,7 @@
    "vsl<VI_char> %0,%1,%2"
    [(set_attr "type" "vecsimple")])
  
@@ -369,7 +369,7 @@ Index: gcc/config/rs6000/altivec.md
    [(set (match_operand:VI 0 "register_operand" "=v")
          (lshiftrt:VI (match_operand:VI 1 "register_operand" "v")
                      (match_operand:VI 2 "register_operand" "v") ))]
-@@ -1254,7 +1254,7 @@ (define_insn "lshr<mode>3"
+@@ -1260,7 +1260,7 @@
    "vsr<VI_char> %0,%1,%2"
    [(set_attr "type" "vecsimple")])
  
@@ -378,7 +378,7 @@ Index: gcc/config/rs6000/altivec.md
    [(set (match_operand:VI 0 "register_operand" "=v")
          (ashiftrt:VI (match_operand:VI 1 "register_operand" "v")
                      (match_operand:VI 2 "register_operand" "v") ))]
-@@ -2640,7 +2640,7 @@ (define_expand "negv4sf2"
+@@ -2646,7 +2646,7 @@
    /* Generate [-0.0, -0.0, -0.0, -0.0].  */
    neg0 = gen_reg_rtx (V4SImode);
    emit_insn (gen_altivec_vspltisw (neg0, constm1_rtx));
--- gcc.spec.in.orig
+++ gcc.spec.in
@@ -251,6 +251,7 @@ Patch123:       gcc43-no-unwind-tables.d
 Patch124:	nvl441016.patch
 Patch126:       nvl447669.diff
 Patch127:	nvl464739.patch
+Patch128:	ibm434505-spu
 # Patches for SAP features
 Patch130:	sap303956-utf16-1.diff
 Patch131:	sap303956-utf16-2.diff
@@ -1025,6 +1026,7 @@ Results from running the gcc and target
 %patch124 -p1
 %patch126
 %patch127
+%patch128
 %patch130
 %patch131
 %patch132
--- gcc41-ppc32-retaddr.patch.orig
+++ gcc41-ppc32-retaddr.patch
@@ -6,9 +6,11 @@
 
 	* gcc.dg/20051128-1.c: New test.
 
---- gcc/config/rs6000/rs6000.c.jj	2005-11-26 14:38:01.000000000 +0100
-+++ gcc/config/rs6000/rs6000.c	2005-11-28 20:32:18.000000000 +0100
-@@ -13166,17 +13166,22 @@ rs6000_return_addr (int count, rtx frame
+Index: gcc/config/rs6000/rs6000.c
+===================================================================
+--- gcc/config/rs6000/rs6000.c.orig	2009-09-21 11:42:17.000000000 +0200
++++ gcc/config/rs6000/rs6000.c	2009-09-21 11:44:28.000000000 +0200
+@@ -14835,17 +14835,22 @@ rs6000_return_addr (int count, rtx frame
       don't try to be too clever here.  */
    if (count != 0 || (DEFAULT_ABI != ABI_AIX && flag_pic))
      {
@@ -40,8 +42,10 @@
      }
  
    cfun->machine->ra_need_lr = 1;
---- gcc/testsuite/gcc.dg/20051128-1.c.jj	2005-10-10 11:21:41.096999000 +0200
-+++ gcc/testsuite/gcc.dg/20051128-1.c	2005-11-28 12:30:57.000000000 +0100
+Index: gcc/testsuite/gcc.dg/20051128-1.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.dg/20051128-1.c	2009-09-21 11:44:28.000000000 +0200
 @@ -0,0 +1,41 @@
 +/* { dg-do run } */
 +/* { dg-options "-O2 -fpic" } */
--- gcc43-pr34037.patch.orig
+++ gcc43-pr34037.patch
@@ -10,9 +10,11 @@
 	* function.c (instantiate_decls): Instantiate also DECL_RTL
 	of vars in cfun->unexpanded_var_list, free that list afterwards.
 
---- gcc/gimplify.c.jj	2008-09-10 20:50:11.000000000 +0200
-+++ gcc/gimplify.c	2008-09-11 13:54:22.000000000 +0200
-@@ -7105,6 +7105,18 @@ gimplify_type_sizes (tree type, gimple_s
+Index: gcc/gimplify.c
+===================================================================
+--- gcc/gimplify.c.orig	2009-09-21 11:44:07.000000000 +0200
++++ gcc/gimplify.c	2009-09-21 11:44:17.000000000 +0200
+@@ -6376,6 +6376,18 @@ gimplify_type_sizes (tree type, tree *li
        /* These types may not have declarations, so handle them here.  */
        gimplify_type_sizes (TREE_TYPE (type), list_p);
        gimplify_type_sizes (TYPE_DOMAIN (type), list_p);
@@ -31,9 +33,11 @@
        break;
  
      case RECORD_TYPE:
---- gcc/cfgexpand.c.jj	2008-09-09 16:08:04.000000000 +0200
-+++ gcc/cfgexpand.c	2008-09-11 15:01:00.000000000 +0200
-@@ -1440,7 +1440,7 @@ estimated_stack_frame_size (void)
+Index: gcc/cfgexpand.c
+===================================================================
+--- gcc/cfgexpand.c.orig	2009-09-21 11:42:17.000000000 +0200
++++ gcc/cfgexpand.c	2009-09-21 11:44:17.000000000 +0200
+@@ -1110,7 +1110,7 @@ estimated_stack_frame_size (void)
  static void
  expand_used_vars (void)
  {
@@ -42,7 +46,7 @@
  
    /* Compute the phase of the stack frame for this function.  */
    {
-@@ -1453,11 +1453,15 @@ expand_used_vars (void)
+@@ -1123,11 +1123,15 @@ expand_used_vars (void)
  
    /* At this point all variables on the unexpanded_var_list with TREE_USED
       set are not associated with any block scope.  Lay them out.  */
@@ -59,7 +63,7 @@
        /* We didn't set a block for static or extern because it's hard
  	 to tell the difference between a global variable (re)declared
  	 in a local scope, and one that's really declared there to
-@@ -1484,9 +1488,25 @@ expand_used_vars (void)
+@@ -1154,9 +1158,25 @@ expand_used_vars (void)
        TREE_USED (var) = 1;
  
        if (expand_now)
@@ -87,9 +91,11 @@
  
    /* At this point, all variables within the block tree with TREE_USED
       set are actually used by the optimized function.  Lay them out.  */
---- gcc/function.c.jj	2008-09-09 21:13:24.000000000 +0200
-+++ gcc/function.c	2008-09-11 14:56:47.000000000 +0200
-@@ -1645,7 +1645,7 @@ instantiate_decls_1 (tree let)
+Index: gcc/function.c
+===================================================================
+--- gcc/function.c.orig	2009-09-21 11:42:17.000000000 +0200
++++ gcc/function.c	2009-09-21 11:44:17.000000000 +0200
+@@ -1659,7 +1659,7 @@ instantiate_decls_1 (tree let)
  static void
  instantiate_decls (tree fndecl)
  {
@@ -98,7 +104,7 @@
  
    /* Process all parameters of the function.  */
    for (decl = DECL_ARGUMENTS (fndecl); decl; decl = TREE_CHAIN (decl))
-@@ -1661,6 +1661,17 @@ instantiate_decls (tree fndecl)
+@@ -1675,6 +1675,17 @@ instantiate_decls (tree fndecl)
  
    /* Now process all variables defined in the function or its subblocks.  */
    instantiate_decls_1 (DECL_INITIAL (fndecl));
--- gcc43-pr37189.patch.orig
+++ gcc43-pr37189.patch
@@ -13,9 +13,11 @@
 	PR c++/37189
 	* g++.dg/gomp/pr37189.C: New test.
 
---- gcc/cp/decl2.c	(revision 139954)
-+++ gcc/cp/decl2.c	(revision 139955)
-@@ -3776,6 +3776,15 @@ mark_used (tree decl)
+Index: gcc/cp/decl2.c
+===================================================================
+--- gcc/cp/decl2.c.orig	2009-09-21 11:42:17.000000000 +0200
++++ gcc/cp/decl2.c	2009-09-21 11:44:36.000000000 +0200
+@@ -3745,6 +3745,15 @@ mark_used (tree decl)
    /* If we don't need a value, then we don't need to synthesize DECL.  */
    if (skip_evaluation)
      return;
@@ -31,8 +33,10 @@
    /* Normally, we can wait until instantiation-time to synthesize
       DECL.  However, if DECL is a static data member initialized with
       a constant, we need the value right now because a reference to
---- gcc/cp/decl.c	(revision 139954)
-+++ gcc/cp/decl.c	(revision 139955)
+Index: gcc/cp/decl.c
+===================================================================
+--- gcc/cp/decl.c.orig	2009-09-21 11:44:13.000000000 +0200
++++ gcc/cp/decl.c	2009-09-21 11:44:36.000000000 +0200
 @@ -227,6 +227,11 @@ struct named_label_entry GTY(())
     function, two inside the body of a function in a local class, etc.)  */
  int function_depth;
@@ -45,7 +49,7 @@
  /* States indicating how grokdeclarator() should handle declspecs marked
     with __attribute__((deprecated)).  An object declared as
     __attribute__((deprecated)) suppresses warnings of uses of other
-@@ -12033,6 +12038,9 @@ finish_function (int flags)
+@@ -11788,6 +11793,9 @@ finish_function (int flags)
    if (fndecl == NULL_TREE)
      return error_mark_node;
  
@@ -55,7 +59,7 @@
    if (DECL_NONSTATIC_MEMBER_FUNCTION_P (fndecl)
        && DECL_VIRTUAL_P (fndecl)
        && !processing_template_decl)
-@@ -12232,6 +12240,17 @@ finish_function (int flags)
+@@ -11989,6 +11997,17 @@ finish_function (int flags)
         cxx_pop_function_context and then reset via pop_function_context.  */
      current_function_decl = NULL_TREE;
  
@@ -73,9 +77,11 @@
    return fndecl;
  }
  
---- gcc/cp/cp-tree.h	(revision 139954)
-+++ gcc/cp/cp-tree.h	(revision 139955)
-@@ -4381,6 +4381,9 @@ extern void initialize_artificial_var		(
+Index: gcc/cp/cp-tree.h
+===================================================================
+--- gcc/cp/cp-tree.h.orig	2009-09-21 11:42:17.000000000 +0200
++++ gcc/cp/cp-tree.h	2009-09-21 11:44:36.000000000 +0200
+@@ -4270,6 +4270,9 @@ extern void initialize_artificial_var		(
  extern tree check_var_type			(tree, tree);
  extern tree reshape_init (tree, tree);
  
@@ -85,8 +91,10 @@
  /* in decl2.c */
  extern bool check_java_method			(tree);
  extern tree build_memfn_type			(tree, tree, cp_cv_quals);
---- gcc/testsuite/g++.dg/gomp/pr37189.C	(revision 0)
-+++ gcc/testsuite/g++.dg/gomp/pr37189.C	(revision 139955)
+Index: gcc/testsuite/g++.dg/gomp/pr37189.C
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/gomp/pr37189.C	2009-09-21 11:44:36.000000000 +0200
 @@ -0,0 +1,27 @@
 +// PR c++/37189
 +// { dg-do compile }
--- gcc43.changes.orig
+++ gcc43.changes
@@ -1,7 +1,12 @@
 -------------------------------------------------------------------
+Mon Sep 21 11:32:05 CEST 2009 - rguenther@suse.de
+
+- Backport patch for avoiding SPU micrococded instructions.  [bnc#434505]
+
+-------------------------------------------------------------------
 Tue Aug  4 14:14:33 CEST 2009 - rguenther@suse.de
 
-- Update to GCC 4.3.4 release. 
+- Update to GCC 4.3.4 release.  [bnc#504421]
 - Disable -Wl,--as-needed.
 
 -------------------------------------------------------------------
--- gcc43.spec.orig
+++ gcc43.spec
@@ -1,5 +1,4 @@
-#
-# spec file for package gcc43 (Version 4.3.4_20090804)
+# spec file for package gcc43 (Version 4.3.x)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,9 +17,12 @@
 # norootforbuild
 # icecream 0
 
+
+# Run the testsuite if there's a file named RUN_TESTS in the source
 %if 0%{!?run_tests:1}
 %define run_tests %(test -f %_sourcedir/RUN_TESTS && echo 1 || echo 0)
 %endif
+
 # Ada currently fails to build on a few platforms, enable it only
 # on those that work
 # Note that AdaCore only supports %ix86, x86_64 and ia64
@@ -30,6 +32,7 @@
 # alpha ppc64 s390x hppa
 %define build_ada 0
 %endif
+
 # We don't want to build java on arm
 %ifarch mips %arm
 %define build_java 0
@@ -38,39 +41,44 @@
 %define build_java 1
 %define build_libjava 0%{?building_libjava:1}
 %endif
+
 %define build_cp 1
 %define build_fortran 1
 %define build_objc 1
 %define build_objcp 0%{!?building_libjava:1}
 %define build_with_mudflap 0
+
 %if %{build_objcp}
 %define build_cp 1
 %define build_objc 1
 %endif
+
 %if %{build_libjava}
 %define build_cp 1
 %endif
 
-Name:           gcc43
-BuildRequires:  bison flex gettext-devel glibc-devel-32bit mpfr-devel perl texinfo zlib-devel
+
+Name:         gcc43
+BuildRequires: bison flex gettext-devel glibc-devel-32bit mpfr-devel perl texinfo zlib-devel
 %if %{build_ada}
 %if %{suse_version} > 1110
 %define hostsuffix -4.3
-BuildRequires:  gcc43-ada
+BuildRequires: gcc43-ada
 %else
 %define hostsuffix %{nil}
-BuildRequires:  gcc-ada
+BuildRequires: gcc-ada
 %endif
 %endif
 %if %{build_libjava}
-BuildRequires:  fastjar gtk2-devel libart_lgpl-devel unzip
+BuildRequires: fastjar gtk2-devel libart_lgpl-devel unzip
 %endif
 %ifarch ia64
-BuildRequires:  libunwind-devel
+BuildRequires: libunwind-devel
 %endif
 %if %{run_tests}
-BuildRequires:  dejagnu expect
+BuildRequires: dejagnu expect
 %endif
+
 # Define version number of libgcc_s
 %ifarch hppa
 %define libgcc_s 4
@@ -84,6 +92,7 @@ BuildRequires:  dejagnu expect
 %else
 %define build_nof 0
 %endif
+
 %define separate_bi32 0
 %define separate_bi64 0
 %ifarch ppc
@@ -94,6 +103,7 @@ BuildRequires:  dejagnu expect
 %ifarch x86_64 s390x ppc64
 %define separate_bi32 1
 %endif
+
 # Define two macros to trigger -32bit or -64bit package variants
 %define separate_biarch 0
 %if %{separate_bi32}
@@ -104,147 +114,155 @@ BuildRequires:  dejagnu expect
 %define separate_biarch 1
 %define separate_biarch_suffix -64bit
 %endif
+
 %ifarch x86_64 ia64 s390x alpha ppc64
 # 64-bit is primary build target
 %define build_primary_64bit 1
 %else
 %define build_primary_64bit 0
 %endif
+
 %define biarch_libjava 0
+
 # COMMON-BEGIN
 %define biarch_targets x86_64 s390x powerpc64 powerpc
-Url:            http://gcc.gnu.org/
-Version:        4.3.4_20090804
-Release:        1
+
+URL:          http://gcc.gnu.org/
+Version: 4.3.4_20090804
+Release:      1
 %define gcc_version %(echo %version | sed 's/_.*//')
 %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2)
 %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/')
 %define binsuffix -4.3
 # COMMON-END
+
 %if 0%{?!building_libjava:1}
-Requires:       binutils glibc-devel
-Requires:       cpp43 = %{version}-%{release}
-Requires:       libgcc%{libgcc_s} >= %{version}-%{release}
-Requires:       libgomp1 >= %{version}-%{release}
+Requires:     binutils glibc-devel
+Requires:     cpp43 = %{version}-%{release}
+Requires:     libgcc%{libgcc_s} >= %{version}-%{release}
+Requires:     libgomp1 >= %{version}-%{release}
 %if %{build_with_mudflap}
-Requires:       libmudflap0 >= %{version}-%{release}
-Requires:       libmudflapth0 >= %{version}-%{release}
+Requires:     libmudflap0 >= %{version}-%{release}
+Requires:     libmudflapth0 >= %{version}-%{release}
 %endif
 %if 0%{suse_version} > 1000
-Suggests:       gcc43-info gcc43-locale
+Suggests:     gcc43-info gcc43-locale
 %endif
 %endif
+
 # COMMON-BEGIN
-AutoReqProv:    on
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source:         gcc-%{gcc_version}%{snapshot_date}.tar.bz2
-Source1:        change_spec
-Source2:        libgcj43-rpmlintrc
-Source3:        gcc43-rpmlintrc
-Source4:        ecj.jar
-Source5:        README.First-for.SuSE.packagers
-Patch1:         gcc-dir-version.patch
-Patch2:         gcc-sles-version.patch
-Patch3:         gcc-noalias-warn.diff
-Patch4:         gcc-add-defaultsspec.diff
-Patch5:         boehm-gc-strict-aliasing.patch
-Patch6:         suse-record-gcc-opts.diff
-Patch7:         acats-timeout.patch
-Patch10:        program-transform-name.diff
-Patch11:        program-transform-name-tools.diff
-Patch12:        gcc4-ppc64-m32-m64-multilib-only.patch
-Patch22:        libjava-no-static.diff
-Patch23:        libjava-no-multilib.diff
-Patch24:        tls-no-direct.diff
-Patch25:        pr27880.diff
-Patch28:        pr33763.diff
-Patch29:        pr40141.diff
-Patch30:        Wunprototyped-calls.diff
-Patch31:        pr27799-1.diff
-Patch32:        pr27799-2.diff
-Patch33:        pr27799-3.diff
-Patch41:        fpreserve-function-arguments43.patch
-Patch42:        pr27975.diff
-Patch43:        build-id.diff
-Patch44:        nvl428413.patch
-Patch45:        nvl423594.patch
+Autoreqprov:  on
+BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+Source:       gcc-%{gcc_version}%{snapshot_date}.tar.bz2
+Source1:      change_spec
+Source2:      libgcj43-rpmlintrc
+Source3:      gcc43-rpmlintrc
+Source4:      ecj.jar
+Source5:      README.First-for.SuSE.packagers
+Patch1:		gcc-dir-version.patch
+Patch2:		gcc-sles-version.patch
+Patch3:		gcc-noalias-warn.diff
+Patch4:		gcc-add-defaultsspec.diff
+Patch5:		boehm-gc-strict-aliasing.patch
+Patch6:		suse-record-gcc-opts.diff
+Patch7:		acats-timeout.patch
+Patch10:	program-transform-name.diff
+Patch11:	program-transform-name-tools.diff
+Patch12:	gcc4-ppc64-m32-m64-multilib-only.patch
+Patch22:	libjava-no-static.diff
+Patch23:	libjava-no-multilib.diff
+Patch24:	tls-no-direct.diff
+Patch25:	pr27880.diff
+Patch28:	pr33763.diff
+Patch29:	pr40141.diff
+Patch30:	Wunprototyped-calls.diff
+Patch31:	pr27799-1.diff
+Patch32:	pr27799-2.diff
+Patch33:	pr27799-3.diff
+Patch41:	fpreserve-function-arguments43.patch
+Patch42:	pr27975.diff
+Patch43:	build-id.diff
+Patch44:	nvl428413.patch
+Patch45:	nvl423594.patch
 Patch46:        pr32277.diff
-Patch47:        gcc43-as-g0
-Patch202:       nvl440482.patch
-Patch204:       pr39675.diff
+Patch47:	gcc43-as-g0
+Patch202:	nvl440482.patch
+Patch204:	pr39675.diff
 # A set of patches from the RH srpm
-Patch50:        gcc43-c++-builtin-redecl.patch
-Patch51:        gcc41-ia64-stack-protector.patch
-Patch52:        gcc43-java-debug-iface-type.patch
-Patch53:        gcc43-libgomp-omp_h-multilib.patch
-Patch54:        gcc43-pr34037.patch
-Patch55:        gcc41-java-slow_pthread_self.patch
-Patch56:        gcc43-pr36741-revert.patch
-Patch57:        gcc41-ppc32-retaddr.patch
-Patch58:        gcc43-pr37189.patch
-Patch59:        gcc43-x86_64-va_start.patch
+Patch50:	gcc43-c++-builtin-redecl.patch
+Patch51:	gcc41-ia64-stack-protector.patch
+Patch52:	gcc43-java-debug-iface-type.patch
+Patch53:	gcc43-libgomp-omp_h-multilib.patch
+Patch54:	gcc43-pr34037.patch
+Patch55:	gcc41-java-slow_pthread_self.patch
+Patch56:	gcc43-pr36741-revert.patch
+Patch57:	gcc41-ppc32-retaddr.patch
+Patch58:	gcc43-pr37189.patch
+Patch59:	gcc43-x86_64-va_start.patch
 # Some patches taken from Debian
-Patch60:        gcc43-textdomain.patch
-Patch61:        gcc43-rename-info-files.patch
+Patch60:	gcc43-textdomain.patch
+Patch61:	gcc43-rename-info-files.patch
 # Patches for AMD features
-Patch70:        pr34043-1.diff
-Patch71:        pr34043-2.diff
-Patch72:        pr34043-3.diff
-Patch73:        pr34043-4.diff
-Patch74:        pr34043-5.diff
-Patch75:        amd-SSE5-shift-ppc-1.diff
-Patch76:        amd-SSE5-shift-ppc-2.diff
-Patch77:        amd-SSE5-shift.diff
-Patch78:        amd-cunroll-1.diff
-Patch79:        amd-cunroll-2.diff
-Patch81:        amd-cvect-1.diff
-Patch82:        amd-cvect-2.diff
+Patch70:	pr34043-1.diff
+Patch71:	pr34043-2.diff
+Patch72:	pr34043-3.diff
+Patch73:	pr34043-4.diff
+Patch74:	pr34043-5.diff
+Patch75:	amd-SSE5-shift-ppc-1.diff
+Patch76:	amd-SSE5-shift-ppc-2.diff
+Patch77:	amd-SSE5-shift.diff
+Patch78:	amd-cunroll-1.diff
+Patch79:	amd-cunroll-2.diff
+Patch81:	amd-cvect-1.diff
+Patch82:	amd-cvect-2.diff
 # Patches for Intel features
-Patch80:        intel303993-aes.diff
+Patch80:	intel303993-aes.diff
 # Patches for IBM features
-Patch90:        ibm304071-z10-1
-Patch91:        ibm304071-z10-2
-Patch92:        ibm304071-z10-3
-Patch93:        ibm304071-z10-4
-Patch94:        ibm304071-z10-5
-Patch95:        ibm304071-z10-6
-Patch96:        pr36745.diff
-Patch97:        pr36822.diff
-Patch99:        ibm-vector-keyword-1
-Patch100:       ibm-vector-keyword-2
-Patch101:       ibm-vector-keyword-3
-Patch102:       ibm304071-z10-7
-Patch103:       ibm304134-power7-1
-Patch104:       ibm-cell-split
-Patch105:       ibm-cell-split-fixes
-Patch106:       nvl425806.patch
-Patch109:       nvl425783.patch
-Patch110:       nvl425784.patch
-Patch111:       nvl425788.patch
-Patch112:       nvl425789.patch
-Patch114:       nvl425791.patch
-Patch115:       nvl425794.patch
-Patch116:       nvl425798-1.patch
-Patch117:       nvl425798-2.patch
-Patch118:       nvl425799.patch
-Patch119:       nvl426087.patch
-Patch120:       ibm304071-z10-8
-Patch121:       nvl434500.patch
-Patch122:       nvl436041.patch
+Patch90:	ibm304071-z10-1
+Patch91:	ibm304071-z10-2
+Patch92:	ibm304071-z10-3
+Patch93:	ibm304071-z10-4
+Patch94:	ibm304071-z10-5
+Patch95:	ibm304071-z10-6
+Patch96:	pr36745.diff
+Patch97:	pr36822.diff
+Patch99:	ibm-vector-keyword-1
+Patch100:	ibm-vector-keyword-2
+Patch101:	ibm-vector-keyword-3
+Patch102:	ibm304071-z10-7
+Patch103:	ibm304134-power7-1
+Patch104:	ibm-cell-split
+Patch105:	ibm-cell-split-fixes
+Patch106:	nvl425806.patch
+Patch109:	nvl425783.patch
+Patch110:	nvl425784.patch
+Patch111:	nvl425788.patch
+Patch112:	nvl425789.patch
+Patch114:	nvl425791.patch
+Patch115:	nvl425794.patch
+Patch116:	nvl425798-1.patch
+Patch117:	nvl425798-2.patch
+Patch118:	nvl425799.patch
+Patch119:	nvl426087.patch
+Patch120:	ibm304071-z10-8
+Patch121:	nvl434500.patch
+Patch122:	nvl436041.patch
 Patch123:       gcc43-no-unwind-tables.diff
-Patch124:       nvl441016.patch
+Patch124:	nvl441016.patch
 Patch126:       nvl447669.diff
-Patch127:       nvl464739.patch
+Patch127:	nvl464739.patch
+Patch128:	ibm434505-spu
 # Patches for SAP features
-Patch130:       sap303956-utf16-1.diff
-Patch131:       sap303956-utf16-2.diff
-Patch132:       sap303956-utf16-3.diff
-Patch133:       sap303956-utf16-4.diff
-Patch134:       sap303956-utf16-mangling.diff
+Patch130:	sap303956-utf16-1.diff
+Patch131:	sap303956-utf16-2.diff
+Patch132:	sap303956-utf16-3.diff
+Patch133:	sap303956-utf16-4.diff
+Patch134:	sap303956-utf16-mangling.diff
+
 # LIBJAVA-DELETE-BEGIN
-Group:          Development/Languages/C and C++
-Summary:        The GNU C Compiler and Support Files
-License:        GPL v3 or later
+Group:        Development/Languages/C and C++
+Summary:      The GNU C Compiler and Support Files
+License:      GPL v3 or later
 
 %description
 Core package for the GNU Compiler Collection, including the C language
@@ -256,53 +274,48 @@ gcc-obj-c++.
 
 
 
+# COMMON-END
 %package -n gcc43-32bit
 License:        GPL v3 or later
-Summary:        The GNU C Compiler 32bit support
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Requires:       gcc43 = %{version}-%{release}
-Requires:       libgcc%{libgcc_s}-32bit >= %{version}-%{release}
-Requires:       libgomp1-32bit >= %{version}-%{release}
+Summary:      The GNU C Compiler 32bit support
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Requires:     gcc43 = %{version}-%{release}
+Requires:     libgcc%{libgcc_s}-32bit >= %{version}-%{release}
+Requires:     libgomp1-32bit >= %{version}-%{release}
 %if %{build_with_mudflap}
-Requires:       libmudflap0-32bit >= %{version}-%{release}
-Requires:       libmudflapth0-32bit >= %{version}-%{release}
+Requires:     libmudflap0-32bit >= %{version}-%{release}
+Requires:     libmudflapth0-32bit >= %{version}-%{release}
 %endif
-Requires:       glibc-devel-32bit
+Requires:     glibc-devel-32bit
 
 %description -n gcc43-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 This package contains 32bit support for the GNU Compiler Collection.
 
 %package -n gcc43-64bit
 License:        GPL v3 or later
-Summary:        The GNU C Compiler 64bit support
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Requires:       gcc43 = %{version}-%{release}
-Requires:       libgcc%{libgcc_s}-64bit >= %{version}-%{release}
-Requires:       libgomp1-64bit >= %{version}-%{release}
+Summary:      The GNU C Compiler 64bit support
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Requires:     gcc43 = %{version}-%{release}
+Requires:     libgcc%{libgcc_s}-64bit >= %{version}-%{release}
+Requires:     libgomp1-64bit >= %{version}-%{release}
 %if %{build_with_mudflap}
-Requires:       libmudflap0-64bit >= %{version}-%{release}
-Requires:       libmudflapth0-64bit >= %{version}-%{release}
+Requires:     libmudflap0-64bit >= %{version}-%{release}
+Requires:     libmudflapth0-64bit >= %{version}-%{release}
 %endif
-Requires:       glibc-devel-64bit
+Requires:     glibc-devel-64bit
 
 %description -n gcc43-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 This package contains 64bit support for the GNU Compiler Collection.
 
 
 %package locale
 License:        GPL v3 or later
-Summary:        Locale Data for the GNU Compiler Collection
-Group:          Development/Languages/C and C++
-Requires:       gcc43 = %{version}-%{release}
-AutoReqProv:    on
+Summary:      Locale Data for the GNU Compiler Collection
+Group:        Development/Languages/C and C++
+Requires:     gcc43 = %{version}-%{release}
+Autoreqprov:  on
 
 %description locale
 Locale data for the GNU Compiler Collection (GCC) to give error message
@@ -311,92 +324,97 @@ in the current locale.
 
 %package c++
 License:        GPL v3 or later
-Summary:        The GNU C++ Compiler
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Requires:       gcc43 = %{version}-%{release}
-Requires:       libstdc++43-devel = %{version}-%{release}
+Summary:      The GNU C++ Compiler
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Requires:     gcc43 = %{version}-%{release}
+Requires:     libstdc++43-devel = %{version}-%{release}
 
 %description c++
 This package contains the GNU compiler for C++.
 
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libstdc++43-devel
 License:        GPL v2 or later
-Summary:        Include Files and Libraries mandatory for Development
-Group:          System/Libraries
-AutoReqProv:    on
-Requires:       libstdc++6 >= %{version}-%{release}
-Requires:       glibc-devel
+Summary:      Include Files and Libraries mandatory for Development
+Group:        System/Libraries
+Autoreqprov:  on
+Requires:     libstdc++6 >= %{version}-%{release}
+Requires:     glibc-devel
 %ifarch ia64
-Requires:       libunwind-devel
+Requires:     libunwind-devel
 %endif
 
 %description -n libstdc++43-devel
 This package contains all the headers and libraries of the standard C++
 library. It is needed for compiling C++ code.
+# PACKAGE-END
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libstdc++43-devel-32bit
 License:        GPL v2 or later
-Summary:        Include Files and Libraries mandatory for Development
-Group:          System/Libraries
-AutoReqProv:    on
-Requires:       libstdc++6-32bit >= %{version}-%{release}
-Requires:       glibc-devel-32bit
+Summary:      Include Files and Libraries mandatory for Development
+Group:        System/Libraries
+Autoreqprov:  on
+Requires:     libstdc++6-32bit >= %{version}-%{release}
+Requires:     glibc-devel-32bit
 %ifarch ia64
-Requires:       libunwind-devel
+Requires:     libunwind-devel
 %endif
 
 %description -n libstdc++43-devel-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 This package contains all the headers and libraries of the standard C++
 library. It is needed for compiling C++ code.
+# PACKAGE-END
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libstdc++43-devel-64bit
 License:        GPL v2 or later
-Summary:        Include Files and Libraries mandatory for Development
-Group:          System/Libraries
-AutoReqProv:    on
-Requires:       libstdc++6-64bit >= %{version}-%{release}
-Requires:       glibc-devel-64bit
+Summary:      Include Files and Libraries mandatory for Development
+Group:        System/Libraries
+Autoreqprov:  on
+Requires:     libstdc++6-64bit >= %{version}-%{release}
+Requires:     glibc-devel-64bit
 %ifarch ia64
-Requires:       libunwind-devel
+Requires:     libunwind-devel
 %endif
 
 %description -n libstdc++43-devel-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 This package contains all the headers and libraries of the standard C++
 library. It is needed for compiling C++ code.
+# PACKAGE-END
 
 %package -n libstdc++43-doc
 License:        GPL v2 or later
-Summary:        Documentation for the GNU C++ standard library
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
+Summary:      Documentation for the GNU C++ standard library
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
 
 %description -n libstdc++43-doc
 Documentation for the GNU C++ standard library
 
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libgcc43
 License:        GPL v2 or later
-Summary:        C compiler runtime library
-Group:          System/Base
-Provides:       libgcc = %{version}-%{release}
-Obsoletes:      libgcc < %{version}-%{release}
-Provides:       libgcc%{libgcc_s} = %{version}-%{release}
-Obsoletes:      libgcc%{libgcc_s} < %{version}-%{release}
+Summary:      C compiler runtime library
+Group:        System/Base
+Provides:     libgcc = %{version}-%{release}
+Obsoletes:    libgcc < %{version}-%{release}
+Provides:     libgcc%{libgcc_s} = %{version}-%{release}
+Obsoletes:    libgcc%{libgcc_s} < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libgcc33 libgcc41 libgcc42
+Obsoletes:    libgcc33 libgcc41 libgcc42
 # make zypp happy
-Provides:       libgcc33 libgcc41 libgcc42
+Provides:     libgcc33 libgcc41 libgcc42
 # make SLE9 ppc -> SLE11 ppc64 update happy
 %if "" == ""
 %ifarch ppc64
-Obsoletes:      libgcc-64bit
+Obsoletes:    libgcc-64bit
 %endif
 %endif
-AutoReqProv:    on
+Autoreqprov:  on
 
 %description -n libgcc43
 Libgcc is needed for dynamically linked C programs.
@@ -409,31 +427,27 @@ Libgcc is needed for dynamically linked
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libgcc43-32bit
 License:        GPL v2 or later
-Summary:        C compiler runtime library
-Group:          System/Base
-Provides:       libgcc-32bit = %{version}-%{release}
-Obsoletes:      libgcc-32bit < %{version}-%{release}
-Provides:       libgcc%{libgcc_s}-32bit = %{version}-%{release}
-Obsoletes:      libgcc%{libgcc_s}-32bit < %{version}-%{release}
+Summary:      C compiler runtime library
+Group:        System/Base
+Provides:     libgcc-32bit = %{version}-%{release}
+Obsoletes:    libgcc-32bit < %{version}-%{release}
+Provides:     libgcc%{libgcc_s}-32bit = %{version}-%{release}
+Obsoletes:    libgcc%{libgcc_s}-32bit < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libgcc33-32bit libgcc41-32bit libgcc42-32bit
+Obsoletes:    libgcc33-32bit libgcc41-32bit libgcc42-32bit
 # make zypp happy
-Provides:       libgcc33-32bit libgcc41-32bit libgcc42-32bit
+Provides:     libgcc33-32bit libgcc41-32bit libgcc42-32bit
 # make SLE9 ppc -> SLE11 ppc64 update happy
 %if "-32bit" == ""
 %ifarch ppc64
-Obsoletes:      libgcc-64bit
+Obsoletes:    libgcc-64bit
 %endif
 %endif
-AutoReqProv:    on
+Autoreqprov:  on
 
 %description -n libgcc43-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 Libgcc is needed for dynamically linked C programs.
 
 %post -n libgcc43-32bit
@@ -444,31 +458,27 @@ Libgcc is needed for dynamically linked
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libgcc43-64bit
 License:        GPL v2 or later
-Summary:        C compiler runtime library
-Group:          System/Base
-Provides:       libgcc-64bit = %{version}-%{release}
-Obsoletes:      libgcc-64bit < %{version}-%{release}
-Provides:       libgcc%{libgcc_s}-64bit = %{version}-%{release}
-Obsoletes:      libgcc%{libgcc_s}-64bit < %{version}-%{release}
+Summary:      C compiler runtime library
+Group:        System/Base
+Provides:     libgcc-64bit = %{version}-%{release}
+Obsoletes:    libgcc-64bit < %{version}-%{release}
+Provides:     libgcc%{libgcc_s}-64bit = %{version}-%{release}
+Obsoletes:    libgcc%{libgcc_s}-64bit < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libgcc33-64bit libgcc41-64bit libgcc42-64bit
+Obsoletes:    libgcc33-64bit libgcc41-64bit libgcc42-64bit
 # make zypp happy
-Provides:       libgcc33-64bit libgcc41-64bit libgcc42-64bit
+Provides:     libgcc33-64bit libgcc41-64bit libgcc42-64bit
 # make SLE9 ppc -> SLE11 ppc64 update happy
 %if "-64bit" == ""
 %ifarch ppc64
-Obsoletes:      libgcc-64bit
+Obsoletes:    libgcc-64bit
 %endif
 %endif
-AutoReqProv:    on
+Autoreqprov:  on
 
 %description -n libgcc43-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 Libgcc is needed for dynamically linked C programs.
 
 %post -n libgcc43-64bit
@@ -477,22 +487,22 @@ Libgcc is needed for dynamically linked
 %postun -n libgcc43-64bit
 /sbin/ldconfig
 # PACKAGE-END
+
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libgomp43
 License:        LGPL v2.1 or later
-Summary:        The GNU compiler collection OpenMP runtime library
-Group:          System/Base
-Provides:       libgomp = %{version}-%{release}
-Obsoletes:      libgomp < %{version}-%{release}
-Provides:       libgomp1 = %{version}-%{release}
-Obsoletes:      libgomp1 < %{version}-%{release}
+Summary:      The GNU compiler collection OpenMP runtime library
+Group:        System/Base
+Provides:     libgomp = %{version}-%{release}
+Obsoletes:    libgomp < %{version}-%{release}
+Provides:     libgomp1 = %{version}-%{release}
+Obsoletes:    libgomp1 < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libgomp42
+Obsoletes:    libgomp42
 # make zypp happy
-Provides:       libgomp42
-AutoReqProv:    on
+Provides:     libgomp42
+Autoreqprov:  on
 
 %description -n libgomp43
 This is the OpenMP runtime library needed by OpenMP enabled programs
@@ -509,25 +519,21 @@ option.
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libgomp43-32bit
 License:        LGPL v2.1 or later
-Summary:        The GNU compiler collection OpenMP runtime library
-Group:          System/Base
-Provides:       libgomp-32bit = %{version}-%{release}
-Obsoletes:      libgomp-32bit < %{version}-%{release}
-Provides:       libgomp1-32bit = %{version}-%{release}
-Obsoletes:      libgomp1-32bit < %{version}-%{release}
+Summary:      The GNU compiler collection OpenMP runtime library
+Group:        System/Base
+Provides:     libgomp-32bit = %{version}-%{release}
+Obsoletes:    libgomp-32bit < %{version}-%{release}
+Provides:     libgomp1-32bit = %{version}-%{release}
+Obsoletes:    libgomp1-32bit < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libgomp42-32bit
+Obsoletes:    libgomp42-32bit
 # make zypp happy
-Provides:       libgomp42-32bit
-AutoReqProv:    on
+Provides:     libgomp42-32bit
+Autoreqprov:  on
 
 %description -n libgomp43-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 This is the OpenMP runtime library needed by OpenMP enabled programs
 that were built with the -fopenmp compiler option and by programs that
 were auto-parallelized via the -ftree-parallelize-loops compiler
@@ -542,25 +548,21 @@ option.
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libgomp43-64bit
 License:        LGPL v2.1 or later
-Summary:        The GNU compiler collection OpenMP runtime library
-Group:          System/Base
-Provides:       libgomp-64bit = %{version}-%{release}
-Obsoletes:      libgomp-64bit < %{version}-%{release}
-Provides:       libgomp1-64bit = %{version}-%{release}
-Obsoletes:      libgomp1-64bit < %{version}-%{release}
+Summary:      The GNU compiler collection OpenMP runtime library
+Group:        System/Base
+Provides:     libgomp-64bit = %{version}-%{release}
+Obsoletes:    libgomp-64bit < %{version}-%{release}
+Provides:     libgomp1-64bit = %{version}-%{release}
+Obsoletes:    libgomp1-64bit < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libgomp42-64bit
+Obsoletes:    libgomp42-64bit
 # make zypp happy
-Provides:       libgomp42-64bit
-AutoReqProv:    on
+Provides:     libgomp42-64bit
+Autoreqprov:  on
 
 %description -n libgomp43-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 This is the OpenMP runtime library needed by OpenMP enabled programs
 that were built with the -fopenmp compiler option and by programs that
 were auto-parallelized via the -ftree-parallelize-loops compiler
@@ -573,28 +575,28 @@ option.
 %postun -n libgomp43-64bit
 /sbin/ldconfig
 # PACKAGE-END
+
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libstdc++43
 License:        GPL v2 or later
-Summary:        The standard C++ shared library
-Group:          System/Libraries
-Provides:       libstdc++ = %{version}-%{release}
-Obsoletes:      libstdc++ < %{version}-%{release}
-Provides:       libstdc++6 = %{version}-%{release}
-Obsoletes:      libstdc++6 < %{version}-%{release}
+Summary:      The standard C++ shared library
+Group:        System/Libraries
+Provides:     libstdc++ = %{version}-%{release}
+Obsoletes:    libstdc++ < %{version}-%{release}
+Provides:     libstdc++6 = %{version}-%{release}
+Obsoletes:    libstdc++6 < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libstdc++41 libstdc++42
+Obsoletes:    libstdc++41 libstdc++42
 # make zypp happy
-Provides:       libstdc++41 libstdc++42
+Provides:     libstdc++41 libstdc++42
 # make SLE9 ppc -> SLE11 ppc64 update happy
 %if "" == ""
 %ifarch ppc64
-Obsoletes:      libstdc++-64bit
+Obsoletes:    libstdc++-64bit
 %endif
 %endif
-AutoReqProv:    on
+Autoreqprov:  on
 
 %description -n libstdc++43
 The standard C++ library, needed for dynamically linked C++ programs.
@@ -608,31 +610,27 @@ The standard C++ library, needed for dyn
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libstdc++43-32bit
 License:        GPL v2 or later
-Summary:        The standard C++ shared library
-Group:          System/Libraries
-Provides:       libstdc++-32bit = %{version}-%{release}
-Obsoletes:      libstdc++-32bit < %{version}-%{release}
-Provides:       libstdc++6-32bit = %{version}-%{release}
-Obsoletes:      libstdc++6-32bit < %{version}-%{release}
+Summary:      The standard C++ shared library
+Group:        System/Libraries
+Provides:     libstdc++-32bit = %{version}-%{release}
+Obsoletes:    libstdc++-32bit < %{version}-%{release}
+Provides:     libstdc++6-32bit = %{version}-%{release}
+Obsoletes:    libstdc++6-32bit < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libstdc++41-32bit libstdc++42-32bit
+Obsoletes:    libstdc++41-32bit libstdc++42-32bit
 # make zypp happy
-Provides:       libstdc++41-32bit libstdc++42-32bit
+Provides:     libstdc++41-32bit libstdc++42-32bit
 # make SLE9 ppc -> SLE11 ppc64 update happy
 %if "-32bit" == ""
 %ifarch ppc64
-Obsoletes:      libstdc++-64bit
+Obsoletes:    libstdc++-64bit
 %endif
 %endif
-AutoReqProv:    on
+Autoreqprov:  on
 
 %description -n libstdc++43-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 The standard C++ library, needed for dynamically linked C++ programs.
 
 
@@ -644,31 +642,27 @@ The standard C++ library, needed for dyn
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libstdc++43-64bit
 License:        GPL v2 or later
-Summary:        The standard C++ shared library
-Group:          System/Libraries
-Provides:       libstdc++-64bit = %{version}-%{release}
-Obsoletes:      libstdc++-64bit < %{version}-%{release}
-Provides:       libstdc++6-64bit = %{version}-%{release}
-Obsoletes:      libstdc++6-64bit < %{version}-%{release}
+Summary:      The standard C++ shared library
+Group:        System/Libraries
+Provides:     libstdc++-64bit = %{version}-%{release}
+Obsoletes:    libstdc++-64bit < %{version}-%{release}
+Provides:     libstdc++6-64bit = %{version}-%{release}
+Obsoletes:    libstdc++6-64bit < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libstdc++41-64bit libstdc++42-64bit
+Obsoletes:    libstdc++41-64bit libstdc++42-64bit
 # make zypp happy
-Provides:       libstdc++41-64bit libstdc++42-64bit
+Provides:     libstdc++41-64bit libstdc++42-64bit
 # make SLE9 ppc -> SLE11 ppc64 update happy
 %if "-64bit" == ""
 %ifarch ppc64
-Obsoletes:      libstdc++-64bit
+Obsoletes:    libstdc++-64bit
 %endif
 %endif
-AutoReqProv:    on
+Autoreqprov:  on
 
 %description -n libstdc++43-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 The standard C++ library, needed for dynamically linked C++ programs.
 
 
@@ -679,72 +673,78 @@ The standard C++ library, needed for dyn
 /sbin/ldconfig
 # PACKAGE-END
 
+
 %package info
-License:        GFDL v1.1
-Summary:        Documentation for the GNU compiler collection
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-PreReq:         %{install_info_prereq}
+License:        GNU Free Documentation License, Version 1.1 (GFDL 1.1)
+Summary:      Documentation for the GNU compiler collection
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+PreReq:       %{install_info_prereq}
 
 %description info
 GNU info-pages for the GNU compiler collection covering both user-level
 and internals documentation.
 
 
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package objc
 License:        GPL v3 or later
-Summary:        GNU Objective C Compiler
-Group:          Development/Languages/Other
-AutoReqProv:    on
-Requires:       gcc43 = %{version}-%{release}
-Requires:       libobjc2 >= %{version}-%{release}
+Summary:      GNU Objective C Compiler
+Group:        Development/Languages/Other
+Autoreqprov:  on
+Requires:     gcc43 = %{version}-%{release}
+Requires:     libobjc2 >= %{version}-%{release}
 
 %description objc
 This package contains the GNU Objective C compiler. Objective C is an
 object oriented language, created by Next Inc. and used in their
 Nextstep OS. The source code is available in the gcc package.
+# PACKAGE-END
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package objc-32bit
 License:        GPL v3 or later
-Summary:        GNU Objective C Compiler
-Group:          Development/Languages/Other
-AutoReqProv:    on
-Requires:       gcc43 = %{version}-%{release}
-Requires:       libobjc2-32bit >= %{version}-%{release}
+Summary:      GNU Objective C Compiler
+Group:        Development/Languages/Other
+Autoreqprov:  on
+Requires:     gcc43 = %{version}-%{release}
+Requires:     libobjc2-32bit >= %{version}-%{release}
 
 %description objc-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 This package contains the GNU Objective C compiler. Objective C is an
 object oriented language, created by Next Inc. and used in their
 Nextstep OS. The source code is available in the gcc package.
+# PACKAGE-END
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package objc-64bit
 License:        GPL v3 or later
-Summary:        GNU Objective C Compiler
-Group:          Development/Languages/Other
-AutoReqProv:    on
-Requires:       gcc43 = %{version}-%{release}
-Requires:       libobjc2-64bit >= %{version}-%{release}
+Summary:      GNU Objective C Compiler
+Group:        Development/Languages/Other
+Autoreqprov:  on
+Requires:     gcc43 = %{version}-%{release}
+Requires:     libobjc2-64bit >= %{version}-%{release}
 
 %description objc-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 This package contains the GNU Objective C compiler. Objective C is an
 object oriented language, created by Next Inc. and used in their
 Nextstep OS. The source code is available in the gcc package.
+# PACKAGE-END
 
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libobjc43
 License:        GPL v2 or later
-Summary:        Library for the GNU Objective C Compiler
-Group:          Development/Libraries/Other
-Provides:       libobjc2 = %{version}-%{release}
-Obsoletes:      libobjc2 < %{version}-%{release}
+Summary:      Library for the GNU Objective C Compiler
+Group:        Development/Libraries/Other
+Provides:     libobjc2 = %{version}-%{release}
+Obsoletes:    libobjc2 < %{version}-%{release}
 # unless so version changes again for libobjc
 # make rpm happy
-Obsoletes:      libobjc42
+Obsoletes:    libobjc42
 # make zypp happy
-Provides:       libobjc42
+Provides:     libobjc42
 
 %description -n libobjc43
 The library for the GNU Objective C compiler.
@@ -757,23 +757,19 @@ The library for the GNU Objective C comp
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libobjc43-32bit
 License:        GPL v2 or later
-Summary:        Library for the GNU Objective C Compiler
-Group:          Development/Libraries/Other
-Provides:       libobjc2-32bit = %{version}-%{release}
-Obsoletes:      libobjc2-32bit < %{version}-%{release}
+Summary:      Library for the GNU Objective C Compiler
+Group:        Development/Libraries/Other
+Provides:     libobjc2-32bit = %{version}-%{release}
+Obsoletes:    libobjc2-32bit < %{version}-%{release}
 # unless so version changes again for libobjc
 # make rpm happy
-Obsoletes:      libobjc42-32bit
+Obsoletes:    libobjc42-32bit
 # make zypp happy
-Provides:       libobjc42-32bit
+Provides:     libobjc42-32bit
 
 %description -n libobjc43-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 The library for the GNU Objective C compiler.
 
 %post -n libobjc43-32bit
@@ -784,23 +780,19 @@ The library for the GNU Objective C comp
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libobjc43-64bit
 License:        GPL v2 or later
-Summary:        Library for the GNU Objective C Compiler
-Group:          Development/Libraries/Other
-Provides:       libobjc2-64bit = %{version}-%{release}
-Obsoletes:      libobjc2-64bit < %{version}-%{release}
+Summary:      Library for the GNU Objective C Compiler
+Group:        Development/Libraries/Other
+Provides:     libobjc2-64bit = %{version}-%{release}
+Obsoletes:    libobjc2-64bit < %{version}-%{release}
 # unless so version changes again for libobjc
 # make rpm happy
-Obsoletes:      libobjc42-64bit
+Obsoletes:    libobjc42-64bit
 # make zypp happy
-Provides:       libobjc42-64bit
+Provides:     libobjc42-64bit
 
 %description -n libobjc43-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 The library for the GNU Objective C compiler.
 
 %post -n libobjc43-64bit
@@ -812,11 +804,11 @@ The library for the GNU Objective C comp
 
 %package obj-c++
 License:        GPL v3 or later
-Summary:        GNU Objective C++ Compiler
-Group:          Development/Languages/Other
-AutoReqProv:    on
-Requires:       gcc43-objc = %{version}-%{release}
-Requires:       gcc43-c++ = %{version}-%{release}
+Summary:      GNU Objective C++ Compiler
+Group:        Development/Languages/Other
+Autoreqprov:  on
+Requires:     gcc43-objc = %{version}-%{release}
+Requires:     gcc43-c++ = %{version}-%{release}
 
 %description obj-c++
 This package contains the GNU Objective C++ compiler. Objective C++ is an
@@ -826,8 +818,8 @@ Nextstep OS. The source code is availabl
 
 %package -n cpp43
 License:        GPL v3 or later
-Summary:        The GCC Preprocessor
-Group:          Development/Languages/C and C++
+Summary:      The GCC Preprocessor
+Group:        Development/Languages/C and C++
 
 %description -n cpp43
 This Package contains just the preprocessor that is used by the X11
@@ -836,11 +828,11 @@ packages.
 
 %package ada
 License:        GPL v3 or later
-Requires:       gcc43 = %{version}-%{release}
-Requires:       libada43 = %{version}-%{release}
-Summary:        GNU Ada95 Compiler Based on GCC (GNAT)
-Group:          Development/Languages/Other
-AutoReqProv:    on
+Requires:     gcc43 = %{version}-%{release}
+Requires:     libada43 = %{version}-%{release}
+Summary:      GNU Ada95 Compiler Based on GCC (GNAT)
+Group:        Development/Languages/Other
+Autoreqprov:  on
 
 %description ada
 This package contains an Ada95 compiler and associated development
@@ -851,13 +843,13 @@ must have installed a binary version to
 
 %package -n libada43
 License:        GPL v2 or later
-Summary:        GNU Ada Runtime Libraries
-Group:          System/Libraries
-AutoReqProv:    on
-Provides:       libgnarl-4_3 = %{version}-%{release}
-Obsoletes:      libgnarl-4_3 < %{version}-%{release}
-Provides:       libgnat-4_3 = %{version}-%{release}
-Obsoletes:      libgnat-4_3 < %{version}-%{release}
+Summary:      GNU Ada Runtime Libraries
+Group:        System/Libraries
+Autoreqprov:  on
+Provides:     libgnarl-4_3 = %{version}-%{release}
+Obsoletes:    libgnarl-4_3 < %{version}-%{release}
+Provides:     libgnat-4_3 = %{version}-%{release}
+Obsoletes:    libgnat-4_3 < %{version}-%{release}
 
 %description -n libada43
 This package contains the shared libraries required to run programs
@@ -872,53 +864,56 @@ implementation of Distributed Systems Pr
 
 %postun -n libada43
 /sbin/ldconfig
+
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package fortran
 License:        GPL v3 or later
-Summary:        The GNU Fortran Compiler and Support Files
-Group:          Development/Languages/Fortran
-AutoReqProv:    on
-Requires:       gcc43 = %{version}-%{release}
-Requires:       libgfortran3 >= %{version}-%{release}
+Summary:      The GNU Fortran Compiler and Support Files
+Group:        Development/Languages/Fortran
+Autoreqprov:  on
+Requires:     gcc43 = %{version}-%{release}
+Requires:     libgfortran3 >= %{version}-%{release}
 
 %description fortran
 This is the Fortran compiler of the GNU Compiler Collection (GCC).
+# PACKAGE-END
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package fortran-32bit
 License:        GPL v3 or later
-Summary:        The GNU Fortran Compiler and Support Files
-Group:          Development/Languages/Fortran
-AutoReqProv:    on
-Requires:       gcc43 = %{version}-%{release}
-Requires:       libgfortran3-32bit >= %{version}-%{release}
+Summary:      The GNU Fortran Compiler and Support Files
+Group:        Development/Languages/Fortran
+Autoreqprov:  on
+Requires:     gcc43 = %{version}-%{release}
+Requires:     libgfortran3-32bit >= %{version}-%{release}
 
 %description fortran-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 This is the Fortran compiler of the GNU Compiler Collection (GCC).
+# PACKAGE-END
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package fortran-64bit
 License:        GPL v3 or later
-Summary:        The GNU Fortran Compiler and Support Files
-Group:          Development/Languages/Fortran
-AutoReqProv:    on
-Requires:       gcc43 = %{version}-%{release}
-Requires:       libgfortran3-64bit >= %{version}-%{release}
+Summary:      The GNU Fortran Compiler and Support Files
+Group:        Development/Languages/Fortran
+Autoreqprov:  on
+Requires:     gcc43 = %{version}-%{release}
+Requires:     libgfortran3-64bit >= %{version}-%{release}
 
 %description fortran-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 This is the Fortran compiler of the GNU Compiler Collection (GCC).
+# PACKAGE-END
 
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libgfortran43
 License:        GPL v2 or later
-Summary:        The GNU Fortran Compiler Runtime Library
-Group:          Development/Languages/Fortran
-Provides:       libgfortran3 = %{version}-%{release}
-Obsoletes:      libgfortran3 < %{version}-%{release}
-AutoReqProv:    on
+Summary:      The GNU Fortran Compiler Runtime Library
+Group:        Development/Languages/Fortran
+Provides:     libgfortran3 = %{version}-%{release}
+Obsoletes:    libgfortran3 < %{version}-%{release}
+Autoreqprov:  on
 
 %description -n libgfortran43
 The runtime library needed to run programs compiled with the Fortran compiler
@@ -932,19 +927,15 @@ of the GNU Compiler Collection (GCC).
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libgfortran43-32bit
 License:        GPL v2 or later
-Summary:        The GNU Fortran Compiler Runtime Library
-Group:          Development/Languages/Fortran
-Provides:       libgfortran3-32bit = %{version}-%{release}
-Obsoletes:      libgfortran3-32bit < %{version}-%{release}
-AutoReqProv:    on
+Summary:      The GNU Fortran Compiler Runtime Library
+Group:        Development/Languages/Fortran
+Provides:     libgfortran3-32bit = %{version}-%{release}
+Obsoletes:    libgfortran3-32bit < %{version}-%{release}
+Autoreqprov:  on
 
 %description -n libgfortran43-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 The runtime library needed to run programs compiled with the Fortran compiler
 of the GNU Compiler Collection (GCC).
 
@@ -956,19 +947,15 @@ of the GNU Compiler Collection (GCC).
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libgfortran43-64bit
 License:        GPL v2 or later
-Summary:        The GNU Fortran Compiler Runtime Library
-Group:          Development/Languages/Fortran
-Provides:       libgfortran3-64bit = %{version}-%{release}
-Obsoletes:      libgfortran3-64bit < %{version}-%{release}
-AutoReqProv:    on
+Summary:      The GNU Fortran Compiler Runtime Library
+Group:        Development/Languages/Fortran
+Provides:     libgfortran3-64bit = %{version}-%{release}
+Obsoletes:    libgfortran3-64bit < %{version}-%{release}
+Autoreqprov:  on
 
 %description -n libgfortran43-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 The runtime library needed to run programs compiled with the Fortran compiler
 of the GNU Compiler Collection (GCC).
 
@@ -978,25 +965,25 @@ of the GNU Compiler Collection (GCC).
 %postun -n libgfortran43-64bit
 /sbin/ldconfig
 # PACKAGE-END
+
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libmudflap43
 License:        GPL v2 or later
-Summary:        The Mudflap Extension Runtime Library
-Group:          Development/Languages/C and C++
-Provides:       libmudflap0 = %{version}-%{release}
-Obsoletes:      libmudflap0 < %{version}-%{release}
-Provides:       libmudflapth0 = %{version}-%{release}
-Obsoletes:      libmudflapth0 < %{version}-%{release}
+Summary:      The Mudflap Extension Runtime Library
+Group:        Development/Languages/C and C++
+Provides:     libmudflap0 = %{version}-%{release}
+Obsoletes:    libmudflap0 < %{version}-%{release}
+Provides:     libmudflapth0 = %{version}-%{release}
+Obsoletes:    libmudflapth0 < %{version}-%{release}
 # transitional
-Provides:       libmudflap = %{version}-%{release}
-Obsoletes:      libmudflap < %{version}-%{release}
+Provides:     libmudflap = %{version}-%{release}
+Obsoletes:    libmudflap < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libmudflap41 libmudflap42
+Obsoletes:    libmudflap41 libmudflap42
 # make zypp happy
-Provides:       libmudflap41 libmudflap42
-AutoReqProv:    on
+Provides:     libmudflap41 libmudflap42
+Autoreqprov:  on
 
 %description -n libmudflap43
 This is the Mudflap Extension Runtime Library.
@@ -1009,28 +996,24 @@ This is the Mudflap Extension Runtime Li
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libmudflap43-32bit
 License:        GPL v2 or later
-Summary:        The Mudflap Extension Runtime Library
-Group:          Development/Languages/C and C++
-Provides:       libmudflap0-32bit = %{version}-%{release}
-Obsoletes:      libmudflap0-32bit < %{version}-%{release}
-Provides:       libmudflapth0-32bit = %{version}-%{release}
-Obsoletes:      libmudflapth0-32bit < %{version}-%{release}
+Summary:      The Mudflap Extension Runtime Library
+Group:        Development/Languages/C and C++
+Provides:     libmudflap0-32bit = %{version}-%{release}
+Obsoletes:    libmudflap0-32bit < %{version}-%{release}
+Provides:     libmudflapth0-32bit = %{version}-%{release}
+Obsoletes:    libmudflapth0-32bit < %{version}-%{release}
 # transitional
-Provides:       libmudflap-32bit = %{version}-%{release}
-Obsoletes:      libmudflap-32bit < %{version}-%{release}
+Provides:     libmudflap-32bit = %{version}-%{release}
+Obsoletes:    libmudflap-32bit < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libmudflap41-32bit libmudflap42-32bit
+Obsoletes:    libmudflap41-32bit libmudflap42-32bit
 # make zypp happy
-Provides:       libmudflap41-32bit libmudflap42-32bit
-AutoReqProv:    on
+Provides:     libmudflap41-32bit libmudflap42-32bit
+Autoreqprov:  on
 
 %description -n libmudflap43-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 This is the Mudflap Extension Runtime Library.
 
 %post -n libmudflap43-32bit
@@ -1041,28 +1024,24 @@ This is the Mudflap Extension Runtime Li
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libmudflap43-64bit
 License:        GPL v2 or later
-Summary:        The Mudflap Extension Runtime Library
-Group:          Development/Languages/C and C++
-Provides:       libmudflap0-64bit = %{version}-%{release}
-Obsoletes:      libmudflap0-64bit < %{version}-%{release}
-Provides:       libmudflapth0-64bit = %{version}-%{release}
-Obsoletes:      libmudflapth0-64bit < %{version}-%{release}
+Summary:      The Mudflap Extension Runtime Library
+Group:        Development/Languages/C and C++
+Provides:     libmudflap0-64bit = %{version}-%{release}
+Obsoletes:    libmudflap0-64bit < %{version}-%{release}
+Provides:     libmudflapth0-64bit = %{version}-%{release}
+Obsoletes:    libmudflapth0-64bit < %{version}-%{release}
 # transitional
-Provides:       libmudflap-64bit = %{version}-%{release}
-Obsoletes:      libmudflap-64bit < %{version}-%{release}
+Provides:     libmudflap-64bit = %{version}-%{release}
+Obsoletes:    libmudflap-64bit < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libmudflap41-64bit libmudflap42-64bit
+Obsoletes:    libmudflap41-64bit libmudflap42-64bit
 # make zypp happy
-Provides:       libmudflap41-64bit libmudflap42-64bit
-AutoReqProv:    on
+Provides:     libmudflap41-64bit libmudflap42-64bit
+Autoreqprov:  on
 
 %description -n libmudflap43-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 This is the Mudflap Extension Runtime Library.
 
 %post -n libmudflap43-64bit
@@ -1072,22 +1051,23 @@ This is the Mudflap Extension Runtime Li
 /sbin/ldconfig
 # PACKAGE-END
 
+
 %package -n libgcj43
 # LIBJAVA-DELETE-END
-License:        GPL v2 or later ; LGPL v2.1 or later
-Summary:        Java Runtime Library for gcc
-Group:          System/Libraries
+License:        GPL v2 or later; LGPL v2.1 or later
+Summary:      Java Runtime Library for gcc
+Group:        System/Libraries
 %define gcj_sover 9
 %if 0%{suse_version} > 1000
-Recommends:     libgcj43-jar = %{version}-%{release}
+Recommends:   libgcj43-jar = %{version}-%{release}
 %endif
-Provides:       libgcj%{gcj_sover} = %{version}-%{release}
-Obsoletes:      libgcj%{gcj_sover} < %{version}-%{release}
-Provides:       libgij%{gcj_sover} = %{version}-%{release}
-Obsoletes:      libgij%{gcj_sover} < %{version}-%{release}
-Provides:       libgcj-tools%{gcj_sover} = %{version}-%{release}
-Obsoletes:      libgcj-tools%{gcj_sover} < %{version}-%{release}
-AutoReqProv:    on
+Provides:     libgcj%{gcj_sover} = %{version}-%{release}
+Obsoletes:    libgcj%{gcj_sover} < %{version}-%{release}
+Provides:     libgij%{gcj_sover} = %{version}-%{release}
+Obsoletes:    libgij%{gcj_sover} < %{version}-%{release}
+Provides:     libgcj-tools%{gcj_sover} = %{version}-%{release}
+Obsoletes:    libgcj-tools%{gcj_sover} < %{version}-%{release}
+Autoreqprov:  on
 
 %description -n libgcj43
 This library is needed if you want to use the GNU Java compiler, gcj.
@@ -1099,38 +1079,40 @@ Source code for this package is in gcc.
 %postun -n libgcj43
 /sbin/ldconfig
 
+
 %package -n gcc43-java
 License:        GPL v3 or later
-Summary:        The GNU Java Compiler
-Group:          Development/Languages/Java
-AutoReqProv:    on
-Requires:       gcc43 = %{version}
-Requires:       libgcj43-devel = %{version}-%{release}
+Summary:      The GNU Java Compiler
+Group:        Development/Languages/Java
+Autoreqprov:  on
+Requires:     gcc43 = %{version}
+Requires:     libgcj43-devel = %{version}-%{release}
 
 %description -n gcc43-java
 The Java compiler from the GCC-tools-suite.
 
 
 %package -n libgcj_bc43
-License:        GPL v2 or later ; LGPL v2.1 or later
-Summary:        Fake library for BC-ABI compatibility.
-Group:          Development/Libraries/Java
-AutoReqProv:    on
-Provides:       libgcj_bc1 = %{version}-%{release}
-Obsoletes:      libgcj_bc1 < %{version}-%{release}
+License:        GPL v2 or later; LGPL v2.1 or later
+Summary:      Fake library for BC-ABI compatibility.
+Group:        Development/Libraries/Java
+Autoreqprov:  on
+Provides:     libgcj_bc1 = %{version}-%{release}
+Obsoletes:    libgcj_bc1 < %{version}-%{release}
 # libgcj_bc is special in that it just contains a symlink to
 # a proper libgcj version.  So require that library and add
 # provides for the shlib version as created at link time
-Requires:       libgcj%{gcj_sover}
+Requires:     libgcj%{gcj_sover}
 %ifarch x86_64 ia64 ppc64 s390x
-Provides:       libgcj_bc.so.1()(64bit)
+Provides:     libgcj_bc.so.1()(64bit)
 %else
-Provides:       libgcj_bc.so.1
+Provides:     libgcj_bc.so.1
 %endif
 # make rpm happy
-Obsoletes:      libgcj_bc42
+Obsoletes:    libgcj_bc42
 # make zypp happy
-Provides:       libgcj_bc42
+Provides:     libgcj_bc42
+
 
 %description -n libgcj_bc43
 A fake library that is used at link time only. It ensures that
@@ -1140,29 +1122,29 @@ libgcj.so changes.
 
 
 %package -n libgcj43-jar
-License:        GPL v2 or later ; LGPL v2.1 or later
-Summary:        Java runtime library (jar files).
-Group:          Development/Libraries/Java
+License:        GPL v2 or later; LGPL v2.1 or later
+Summary:      Java runtime library (jar files).
+Group:        Development/Libraries/Java
 
 %description -n libgcj43-jar
 These are the jar files that go along with the gcj front end to gcc.
 
 
 %package -n libgcj43-devel
-License:        GPL v2 or later ; LGPL v2.1 or later
-Summary:        Include Files and Libraries mandatory for Development.
-Group:          Development/Libraries/Java
-AutoReqProv:    on
-Requires:       libstdc++43-devel = %{version}
-Requires:       libgcj%{gcj_sover} >= %{version}-%{release}
-Requires:       libgcj_bc1 >= %{version}-%{release}
-Requires:       libgcj43-jar = %{version}-%{release}
-Requires:       gtk2-devel
-Requires:       libart_lgpl-devel
-Requires:       glibc-devel
-Requires:       zlib-devel
+License:        GPL v2 or later; LGPL v2.1 or later
+Summary:      Include Files and Libraries mandatory for Development.
+Group:        Development/Libraries/Java
+Autoreqprov:  on
+Requires:     libstdc++43-devel = %{version}
+Requires:     libgcj%{gcj_sover} >= %{version}-%{release}
+Requires:     libgcj_bc1 >= %{version}-%{release}
+Requires:     libgcj43-jar = %{version}-%{release}
+Requires:     gtk2-devel
+Requires:     libart_lgpl-devel
+Requires:     glibc-devel
+Requires:     zlib-devel
 %ifarch ia64
-Requires:       libunwind-devel
+Requires:     libunwind-devel
 %endif
 
 %description -n libgcj43-devel
@@ -1172,27 +1154,29 @@ to develop applications that require the
 
 %package -n gcc43-gij
 License:        GPL v3 or later
-Summary:        Java Bytecode Interpreter for gcc
-Group:          Development/Libraries/Java
-Requires:       libgcj%{gcj_sover} >= %{version}-%{release}
-AutoReqProv:    on
+Summary:      Java Bytecode Interpreter for gcc
+Group:        Development/Libraries/Java
+Requires:     libgcj%{gcj_sover} >= %{version}-%{release}
+Autoreqprov:  on
 
 %description -n gcc43-gij
 This package contains the java bytecode interpreter gij and related tools.
 
 
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libffi43
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Provides:       g-wrap:/usr/lib/libffi.so.4
-Provides:       libffi4 = %{version}-%{release}
-Obsoletes:      libffi4 < %{version}-%{release}
+License:        BSD 3-Clause
+Summary:      Foreign Function Interface library
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Provides:     g-wrap:/usr/lib/libffi.so.4
+Provides:     libffi4 = %{version}-%{release}
+Obsoletes:    libffi4 < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libffi41 libffi42
+Obsoletes:    libffi41 libffi42
 # make zypp happy
-Provides:       libffi41 libffi42
+Provides:     libffi41 libffi42
 
 %description -n libffi43
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
@@ -1205,24 +1189,20 @@ A foreign function interface is the popu
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libffi43-32bit
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Provides:       g-wrap:/usr/lib/libffi.so.4
-Provides:       libffi4 = %{version}-%{release}
-Obsoletes:      libffi4 < %{version}-%{release}
+License:        BSD 3-Clause
+Summary:      Foreign Function Interface library
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Provides:     g-wrap:/usr/lib/libffi.so.4
+Provides:     libffi4 = %{version}-%{release}
+Obsoletes:    libffi4 < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libffi41-32bit libffi42-32bit
+Obsoletes:    libffi41-32bit libffi42-32bit
 # make zypp happy
-Provides:       libffi41-32bit libffi42-32bit
+Provides:     libffi41-32bit libffi42-32bit
 
 %description -n libffi43-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
 
 %post -n libffi43-32bit
@@ -1233,24 +1213,20 @@ A foreign function interface is the popu
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libffi43-64bit
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Provides:       g-wrap:/usr/lib/libffi.so.4
-Provides:       libffi4 = %{version}-%{release}
-Obsoletes:      libffi4 < %{version}-%{release}
+License:        BSD 3-Clause
+Summary:      Foreign Function Interface library
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Provides:     g-wrap:/usr/lib/libffi.so.4
+Provides:     libffi4 = %{version}-%{release}
+Obsoletes:    libffi4 < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libffi41-64bit libffi42-64bit
+Obsoletes:    libffi41-64bit libffi42-64bit
 # make zypp happy
-Provides:       libffi41-64bit libffi42-64bit
+Provides:     libffi41-64bit libffi42-64bit
 
 %description -n libffi43-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
 
 %post -n libffi43-64bit
@@ -1259,53 +1235,56 @@ A foreign function interface is the popu
 %postun -n libffi43-64bit
 /sbin/ldconfig
 # PACKAGE-END
+
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libffi43-devel
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library development files
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Requires:       libffi43 >= %{version}-%{release}
+Summary:      Foreign Function Interface library development files
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Requires:     libffi43 >= %{version}-%{release}
 
 %description -n libffi43-devel
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
+# PACKAGE-END
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libffi43-devel-32bit
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library development files
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Requires:       libffi43-32bit >= %{version}-%{release}
+Summary:      Foreign Function Interface library development files
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Requires:     libffi43-32bit >= %{version}-%{release}
 
 %description -n libffi43-devel-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
+# PACKAGE-END
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libffi43-devel-64bit
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library development files
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Requires:       libffi43-64bit >= %{version}-%{release}
+Summary:      Foreign Function Interface library development files
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Requires:     libffi43-64bit >= %{version}-%{release}
 
 %description -n libffi43-devel-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
+# PACKAGE-END
 
 %package -n gcc43-testresults
-License:        Public Domain, Freeware
-Summary:        Testsuite results
-Group:          Development/Languages/C and C++
+License:	Public Domain, Freeware
+Summary:      Testsuite results
+Group:        Development/Languages/C and C++
 
 %description -n gcc43-testresults
 Results from running the gcc and target library testsuites.
 
 
+# COMMON-BEGIN
 
+# Define the canonical target and host architecture
+#   %gcc_target_arch  is supposed to be the full target triple
+#   %TARGET_ARCH      is the canonicalized CPU part
+#   %CONFIGURE_TARGET is the target triple used for --target=
 %if 0%{?gcc_target_arch:1}
 %define CONFIGURE_TARGET %{gcc_target_arch}
 %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/")
@@ -1322,15 +1301,20 @@ Results from running the gcc and target
 %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/")
 %endif
 %define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/")
+
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
+
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
 %define GCCDIST %{HOST_ARCH}-suse-linux
 %endif
+
 %define libsubdir %{_libdir}/gcc/%{GCCDIST}/%{gcc_dir_version}
 %define gxxinclude %{_prefix}/include/c++/%{gcc_dir_version}
+
 # COMMON-END
+
 # Versionspecific directories
 %define versmainlibdir %{libsubdir}
 %define versmainlibdirbi32 %{libsubdir}/32
@@ -1348,6 +1332,7 @@ Results from running the gcc and target
 %else
 %define versmainlibdirbi %{versmainlibdirbi64}
 %endif
+
 %define mainlibdir %{_libdir}
 %define mainlibdirbi32 %{_prefix}/lib
 %define mainlibdirbi64 %{_prefix}/lib64
@@ -1357,6 +1342,8 @@ Results from running the gcc and target
 %else
 %define mainlibdirbi %{mainlibdirbi64}
 %endif
+
+
 # Now define a few macros that make it easy to package libs and
 # related files just to the right package, without caring for the
 # exact path the files are in.
@@ -1397,6 +1384,7 @@ Results from running the gcc and target
 %endif
 %endif
 %endif
+
 %if %{build_nof}
 %define versmainlib() %{versmainlibdir}/%1\
 %{versnoflibdir}/%1\
@@ -1431,6 +1419,8 @@ Results from running the gcc and target
 %endif
 %endif
 %endif
+
+
 # COMMON-BEGIN
 
 %prep
@@ -1533,6 +1523,7 @@ Results from running the gcc and target
 %patch124 -p1
 %patch126
 %patch127
+%patch128
 %patch130
 %patch131
 %patch132
@@ -1542,6 +1533,7 @@ Results from running the gcc and target
 %build
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
+
 # Split version file into version used for directories (X.Y) and
 # version to report with --version (X.Y.Z).
 # See also gcc-dir-version.patch.
@@ -1552,6 +1544,7 @@ else
   mv gcc/BASE-VER gcc/FULL-VER
 fi
 cat gcc/FULL-VER | cut -d '.' -f 1-2 > gcc/BASE-VER
+
 rm -rf obj-%{GCCDIST}
 mkdir obj-%{GCCDIST}
 cd obj-%{GCCDIST}
@@ -1573,6 +1566,7 @@ RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -
 %endif
 # Replace 2 spaces by one finally
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/  / /g'`
+
 languages=c
 %if %{build_cp}
 languages=$languages,c++
@@ -1592,6 +1586,7 @@ languages=$languages,java
 %if %{build_ada}
 languages=$languages,ada
 %endif
+
 J=%{?jobs:%jobs}
 if test -z "$J"; then
   J=$(getconf _NPROCESSORS_CONF)
@@ -1607,28 +1602,35 @@ if test "$JL" == "0"; then
   JL=1
 fi
 PARALLEL="-j$J -l$JL"
+
 # we don't want some miscompiles in the testsuite, or some fault in
 # the compiler to kill the machine.  Hence we limit the amount of memory
 # by the physical RAM plus half of swap
 #MEM=$(free -m | awk '/^Mem:/ {print $2}')
 #SWAP=$(free -m | awk '/^Swap:/ {print $2}')
 #ulimit -v $(((MEM + SWAP/2)*1024))
+
 # In general we want to ship release checking enabled compilers
 # and run BETA with checking enabled.
 #ENABLE_CHECKING="--enable-checking=yes"
 ENABLE_CHECKING="--enable-checking=release"
+
 %if "%{name}" != "gcc43"
 export PATH=/opt/cross/bin:$PATH
 %endif
+
 # Work around tail/head -1 changes
 export _POSIX2_VERSION=199209
+
 # -Wl,-as-needed breaks the libgcj setup
 export SUSE_ASNEEDED=0
+
 # configure tries to parse include/features.h to detect
 # if glibc supports SSP.  When cross compiling we would need
 # to install a cross glibc, which we don't, or make the whole
 # thing point to the native glibc, which is in /, hence the
 # --with-sysroot=/
+
 %if %{build_ada}
 # Using the host gnatmake like
 #   CC="gcc%{hostsuffix}" GNATBIND="gnatbind%{hostsuffix}"
@@ -1734,7 +1736,9 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_
 	--with-long-double-128 \
 %endif
 	--build=%{GCCDIST}
+
 # COMMON-END
+
 # Only run profiled bootstrap on archs where it works
 #%ifarch %ix86 x86_64 ppc ppc64 ia64
 #%ifarch %ix86 x86_64 ia64 s390 s390x
@@ -1786,6 +1790,7 @@ rm $RPM_BUILD_ROOT%{libsubdir}/jc1
 rm $RPM_BUILD_ROOT%{libsubdir}/jvgenmain
 %endif
 %endif
+
 # Remove some useless .la files
 for lib in libobjc libgfortran libgfortranbegin libmudflap libmudflapth \
     libgomp libstdc++ libsupc++ libgcj-tools libgij; do
@@ -1794,6 +1799,7 @@ for lib in libobjc libgfortran libgfortr
   rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/$lib.la
 %endif
 done
+
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
 %if %{biarch}
 %if %{build_primary_64bit}
@@ -1802,6 +1808,7 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib64
 %endif
 %endif
+
 # LIBJAVA-DELETE-BEGIN
 %if %{build_cp}
 # Merge multilib c++config.h to allow omitting the duplicate and
@@ -1828,6 +1835,7 @@ for i in `find %{GCCDIST}/[36]*/libstdc+
       echo "Urgs?"
       exit 1
     fi
+    
     cat > $RPM_BUILD_ROOT%{_prefix}/include/c++/%{gcc_dir_version}/%{GCCDIST}/bits/c++config.h <<EOF
 #ifndef _CPP_CPPCONFIG_WRAPPER
 #define _CPP_CPPCONFIG_WRAPPER 1
@@ -1848,6 +1856,7 @@ if ! test -z "$dir_ml"; then
 fi
 %endif
 # LIBJAVA-DELETE-END
+
 # move shared libs from versionspecific dir to main libdir
 for libname in \
 %if 0%{?building_libjava:1}
@@ -1898,6 +1907,7 @@ done
 ln -s libgcj.so.%{gcj_sover} $RPM_BUILD_ROOT%{mainlibdirbi}/libgcj_bc.so.1
 %endif
 %endif
+
 # LIBJAVA-DELETE-BEGIN
 # Move libgcc_s around
 rm -f $RPM_BUILD_ROOT/%{_lib}/libgcc_s.so
@@ -1918,13 +1928,16 @@ chmod a+x $RPM_BUILD_ROOT/lib64/libgcc_s
 %endif
 %endif
 # LIBJAVA-DELETE-END
+
 %if %{build_ada}
 mv $RPM_BUILD_ROOT%{libsubdir}/adalib/lib*-*.so $RPM_BUILD_ROOT%{_libdir}
 ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir} && echo libgnarl-*.so) $RPM_BUILD_ROOT%{libsubdir}/adalib/libgnarl.so
 ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir} && echo libgnat-*.so) $RPM_BUILD_ROOT%{libsubdir}/adalib/libgnat.so
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/libgna*-*.so
 %endif
+
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/c++%{binsuffix}
+
 # Remove some crap from the .la files:
 for l in `find $RPM_BUILD_ROOT -name '*.la'`; do
   echo "changing $l"
@@ -1944,6 +1957,7 @@ for l in `find $RPM_BUILD_ROOT -name '*.
       < $l  > $l.new
   mv $l.new $l
 done
+
 %if %{run_tests} 
 cp `find . -name "*.sum"` ../testresults/
 cp `find . -name "*.log"  \! -name "config.log" |grep -v 'acats/tests' ` ../testresults/
@@ -1978,6 +1992,7 @@ rm -rf $RPM_BUILD_ROOT%{libsubdir}/inclu
 rm -rf $RPM_BUILD_ROOT%{libsubdir}/include-fixed/sys
 rm -f  $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f  $RPM_BUILD_ROOT%{_prefix}/bin/gccbug%{binsuffix}
+
 %if !0%{?building_libjava:1}
 # delete compile flag tracking from crt files
 crt_list=$RPM_BUILD_ROOT%{versmainlibdir}/crt*.o
@@ -1992,6 +2007,7 @@ for o in $crt_list $crt32_list $crt64_li
   objcopy -R ".comment.SUSE.OPTs" $o
 done
 %endif
+
 %if %{build_libjava}
 # gcj -static doesn't work properly anyway, unless using --whole-archive
 # let's save the space instead.
@@ -2003,8 +2019,10 @@ find $RPM_BUILD_ROOT -name libgcj.a \
 	-o -name libjvm.a \
 	-o -name libgcj_bc.a \
   | xargs rm -f
+
 find $RPM_BUILD_ROOT -name libgcj.spec | xargs \
   sed -i -e 's/lib: /&%%{static:%%eJava programs cannot be linked statically}/'
+
 # Move libffi headers, remove empty libffi libtool file
 mv $RPM_BUILD_ROOT%{libsubdir}/include/ffitarget.h $RPM_BUILD_ROOT%{_prefix}/include/
 mv $RPM_BUILD_ROOT%{libsubdir}/include/ffi.h $RPM_BUILD_ROOT%{_prefix}/include/
@@ -2012,6 +2030,7 @@ rm -f $RPM_BUILD_ROOT%{mainlibdir}/libff
 %if %{biarch}
 rm -f $RPM_BUILD_ROOT%{mainlibdirbi}/libffi.la
 %endif
+
 # security files have broken install locations, also they cause conflicts
 # between libgcj versions.  Simply delete them here, libgcj will use its
 # defaults in this case (which is what these files contain anyway).
@@ -2041,6 +2060,7 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/lib/libi
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib64/libiberty.a
 %endif
 %endif
+
 %if 0%{?building_libjava:1}
 # For building libjava only we need to delete other info docs
 rm $RPM_BUILD_ROOT%{_infodir}/cp-tools.info*
@@ -2057,6 +2077,7 @@ mv $RPM_BUILD_ROOT%{_infodir}/gnat_rm.in
 mv $RPM_BUILD_ROOT%{_infodir}/gnat_ugn_unw.info $RPM_BUILD_ROOT%{_infodir}/gnat_ugn_unw%{binsuffix}.info
 %endif
 %endif
+
 # LIBJAVA-DELETE-BEGIN
 cd ..
 %if 0%{suse_version} > 1000
@@ -2107,6 +2128,7 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %install_info_delete --info-dir=%{_infodir} %{_infodir}/gnat_ug_unx%{binsuffix}.info.gz
 %endif
 
+
 %files
 %defattr(-,root,root)
 %dir %{_libdir}/gcc
@@ -2204,8 +2226,8 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 
 %doc %{_mandir}/man1/gcc%{binsuffix}.1.gz
 %doc %{_mandir}/man1/gcov%{binsuffix}.1.gz
-%if %{separate_biarch}
 
+%if %{separate_biarch}
 %files -n gcc43%{separate_biarch_suffix}
 %defattr(-,root,root)
 %versbiarchlib *crt*.o
@@ -2235,8 +2257,8 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %endif
 
 %files locale -f gcc43-locale.lang
-%if %{build_cp}
 
+%if %{build_cp}
 %files c++
 %defattr(-,root,root)
 %dir %{_libdir}/gcc
@@ -2254,7 +2276,6 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %mainlib libstdc++.so.*
 
 %if %{separate_biarch}
-
 %files -n libstdc++43%{separate_biarch_suffix}
 %defattr(-,root,root)
 %biarchlib libstdc++.so.*
@@ -2270,7 +2291,6 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %versmainlib libsupc++.a
 
 %if %{separate_biarch}
-
 %files -n libstdc++43-devel%{separate_biarch_suffix}
 %defattr(-,root,root)
 %versbiarchlib libstdc++.a
@@ -2304,32 +2324,33 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %endif
 %endif
 %endif
-%if %{separate_bi64}
 
+%if %{separate_bi64}
 %files -n libgcc43-64bit
 %defattr(-,root,root)
 /lib64/libgcc_s.so.%{libgcc_s}
 %endif
-%if %{separate_bi32}
 
+%if %{separate_bi32}
 %files -n libgcc43-32bit
 %defattr(-,root,root)
 /lib/libgcc_s.so.%{libgcc_s}
 %endif
 
+
 %files -n libgomp43
 %defattr(-,root,root)
 %mainlib libgomp.so.1*
 
 %if %{separate_biarch}
-
 %files -n libgomp43%{separate_biarch_suffix}
 %defattr(-,root,root)
 %biarchlib libgomp.so.1*
 
 %endif
-%if %{build_fortran}
 
+
+%if %{build_fortran}
 %files fortran
 %defattr(-,root,root)
 %dir %{libsubdir}/finclude
@@ -2343,8 +2364,8 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %versmainlib libgfortranbegin.a
 
 %doc %{_mandir}/man1/gfortran%{binsuffix}.1.gz
-%if %{separate_biarch}
 
+%if %{separate_biarch}
 %files fortran%{separate_biarch_suffix}
 %defattr(-,root,root)
 %versbiarchlib libgfortran.a
@@ -2360,15 +2381,14 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %mainlib libgfortran.so.*
 
 %if %{separate_biarch}
-
 %files -n libgfortran43%{separate_biarch_suffix}
 %defattr(-,root,root)
 %biarchlib libgfortran.so.*
 
 %endif
 %endif
-%if %{build_with_mudflap}
 
+%if %{build_with_mudflap}
 %files -n libmudflap43
 %defattr(-,root,root)
 %mainlib libmudflap.so.0*
@@ -2376,7 +2396,6 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %mainlib libmudflapth.so.0*
 
 %if %{separate_biarch}
-
 %files -n libmudflap43%{separate_biarch_suffix}
 %defattr(-,root,root)
 %biarchlib libmudflap.so.0*
@@ -2415,8 +2434,8 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %{libsubdir}/cc1
 #%{libsubdir}/specs
 %doc %{_mandir}/man1/cpp%{binsuffix}.1.gz
-%if %{build_objc}
 
+%if %{build_objc}
 %files objc
 %defattr(-,root,root)
 %{libsubdir}/cc1obj
@@ -2426,7 +2445,6 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %versmainlib libobjc.so
 
 %if %{separate_biarch}
-
 %files objc%{separate_biarch_suffix}
 %defattr(-,root,root)
 %versbiarchlib libobjc.a
@@ -2440,21 +2458,22 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %mainlib libobjc.so.*
 
 %if %{separate_biarch}
-
 %files -n libobjc43%{separate_biarch_suffix}
 %defattr(-,root,root)
 %biarchlib libobjc.so.*
 
 %endif
 %endif
-%if %{build_objcp}
 
+
+%if %{build_objcp}
 %files obj-c++
 %defattr(-,root,root)
 %{libsubdir}/cc1objplus
 %endif
-%if %{build_ada}
 
+
+%if %{build_ada}
 %files ada
 %defattr(-,root,root)
 %dir %{_libdir}/gcc
@@ -2477,9 +2496,10 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %{mainlibdir}/libgnat-*.so
 %endif
 # LIBJAVA-DELETE-END
+
+
 %if %{build_java}
 %if 0%{?building_libjava:1}
-
 %files -n gcc43-java
 %defattr(-,root,root)
 %{_prefix}/bin/gcj%{binsuffix}
@@ -2500,9 +2520,9 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %doc %{_mandir}/man1/gc-analyze%{binsuffix}.1.gz
 %endif
 %endif
+
 %if %{build_java}
 %if %{build_libjava}
-
 %files -n libgcj43
 %defattr(-,root,root)
 %dir %{_libdir}/gcj-%{gcc_dir_version}-%{gcj_sover}
@@ -2630,7 +2650,6 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %mainlib libffi.so.*
 
 %if %{separate_biarch}
-
 %files -n libffi43%{separate_biarch_suffix}
 %defattr(-,root,root)
 %biarchlib libffi.so.*
@@ -2646,7 +2665,6 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %mainlib libffi.a
 
 %if %{separate_biarch}
-
 %files -n libffi43-devel%{separate_biarch_suffix}
 %defattr(-,root,root)
 %biarchlib libffi.so
@@ -2656,8 +2674,8 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %endif
 %endif
 %endif
-%if %{run_tests}
 
+%if %{run_tests}
 %files -n gcc43-testresults
 %defattr(-,root,root)
 %doc testresults/test_summary.txt
@@ -2665,4 +2683,5 @@ cat cpplib%{binsuffix}.lang gcc%{binsuff
 %doc testresults/*.log
 %endif
 
+
 %changelog
--- ibm-cell-split.orig
+++ ibm-cell-split
@@ -36,1481 +36,1092 @@
 testsuite/
 	* testsuite/gcc.target/spu/split0-1.c : Add test.
 
-diff -crNp -x .svn gcc-4_3-orig/gcc/config/spu/predicates.md gcc-4_3/gcc/config/spu/predicates.md
-*** gcc-4_3-orig/gcc/config/spu/predicates.md	2008-09-11 13:44:34.000000000 +0200
---- gcc-4_3/gcc/config/spu/predicates.md	2008-09-10 20:09:59.000000000 +0200
-***************
-*** 39,52 ****
-         (ior (not (match_code "subreg"))
-              (match_test "valid_subreg (op)"))))
-  
-- (define_predicate "spu_mem_operand"
--   (and (match_operand 0 "memory_operand")
--        (match_test "reload_in_progress || reload_completed || aligned_mem_p (op)")))
-- 
-  (define_predicate "spu_mov_operand"
-!   (ior (match_operand 0 "spu_mem_operand")
-         (match_operand 0 "spu_nonmem_operand")))
-  
-  (define_predicate "call_operand"
-    (and (match_code "mem")
-         (match_test "(!TARGET_LARGE_MEM && satisfies_constraint_S (op))
---- 39,52 ----
-         (ior (not (match_code "subreg"))
-              (match_test "valid_subreg (op)"))))
-  
-  (define_predicate "spu_mov_operand"
-!   (ior (match_operand 0 "memory_operand")
-         (match_operand 0 "spu_nonmem_operand")))
-  
-+ (define_predicate "spu_dest_operand"
-+   (ior (match_operand 0 "memory_operand")
-+        (match_operand 0 "spu_reg_operand")))
-+ 
-  (define_predicate "call_operand"
-    (and (match_code "mem")
-         (match_test "(!TARGET_LARGE_MEM && satisfies_constraint_S (op))
-diff -crNp -x .svn gcc-4_3-orig/gcc/config/spu/spu-builtins.md gcc-4_3/gcc/config/spu/spu-builtins.md
-*** gcc-4_3-orig/gcc/config/spu/spu-builtins.md	2008-09-11 13:44:34.000000000 +0200
---- gcc-4_3/gcc/config/spu/spu-builtins.md	2008-09-10 20:09:59.000000000 +0200
-***************
-*** 23,31 ****
-  
-  (define_expand "spu_lqd"
-    [(set (match_operand:TI 0 "spu_reg_operand" "")
-!         (mem:TI (and:SI (plus:SI (match_operand:SI 1 "spu_reg_operand" "")
-! 				 (match_operand:SI 2 "spu_nonmem_operand" ""))
-! 		        (const_int -16))))]
-    ""
-    {
-      if (GET_CODE (operands[2]) == CONST_INT
---- 23,30 ----
-  
-  (define_expand "spu_lqd"
-    [(set (match_operand:TI 0 "spu_reg_operand" "")
-!         (mem:TI (plus:SI (match_operand:SI 1 "spu_reg_operand" "")
-! 			 (match_operand:SI 2 "spu_nonmem_operand" ""))))]
-    ""
-    {
-      if (GET_CODE (operands[2]) == CONST_INT
-***************
-*** 42,57 ****
-  
-  (define_expand "spu_lqx"
-    [(set (match_operand:TI 0 "spu_reg_operand" "")
-!         (mem:TI (and:SI (plus:SI (match_operand:SI 1 "spu_reg_operand" "")
-!                                  (match_operand:SI 2 "spu_reg_operand" ""))
-!                         (const_int -16))))]
-    ""
-    "")
-  
-  (define_expand "spu_lqa"
-    [(set (match_operand:TI 0 "spu_reg_operand" "")
-!         (mem:TI (and:SI (match_operand:SI 1 "immediate_operand" "")
-!                         (const_int -16))))]
-    ""
-    {
-      if (GET_CODE (operands[1]) == CONST_INT
---- 41,54 ----
-  
-  (define_expand "spu_lqx"
-    [(set (match_operand:TI 0 "spu_reg_operand" "")
-!         (mem:TI (plus:SI (match_operand:SI 1 "spu_reg_operand" "")
-! 			 (match_operand:SI 2 "spu_reg_operand" ""))))]
-    ""
-    "")
-  
-  (define_expand "spu_lqa"
-    [(set (match_operand:TI 0 "spu_reg_operand" "")
-!         (mem:TI (match_operand:SI 1 "immediate_operand" "")))]
-    ""
-    {
-      if (GET_CODE (operands[1]) == CONST_INT
-***************
-*** 61,75 ****
-  
-  (define_expand "spu_lqr"
-    [(set (match_operand:TI 0 "spu_reg_operand" "")
-! 	(mem:TI (and:SI (match_operand:SI 1 "address_operand" "")
-! 			(const_int -16))))]
-    ""
-    "")
-  
-  (define_expand "spu_stqd"
-!   [(set (mem:TI (and:SI (plus:SI (match_operand:SI 1 "spu_reg_operand" "")
-! 				 (match_operand:SI 2 "spu_nonmem_operand" ""))
-! 		        (const_int -16)))
-          (match_operand:TI 0 "spu_reg_operand" "r,r"))]
-    ""
-    {
---- 58,70 ----
-  
-  (define_expand "spu_lqr"
-    [(set (match_operand:TI 0 "spu_reg_operand" "")
-! 	(mem:TI (match_operand:SI 1 "address_operand" "")))]
-    ""
-    "")
-  
-  (define_expand "spu_stqd"
-!   [(set (mem:TI (plus:SI (match_operand:SI 1 "spu_reg_operand" "")
-! 			 (match_operand:SI 2 "spu_nonmem_operand" "")))
-          (match_operand:TI 0 "spu_reg_operand" "r,r"))]
-    ""
-    {
-***************
-*** 86,101 ****
-    })
-  
-  (define_expand "spu_stqx"
-!   [(set (mem:TI (and:SI (plus:SI (match_operand:SI 1 "spu_reg_operand" "")
-! 				 (match_operand:SI 2 "spu_reg_operand" ""))
-! 		        (const_int -16)))
-          (match_operand:TI 0 "spu_reg_operand" "r"))]
-    ""
-    "")
-  
-  (define_expand "spu_stqa"
-!   [(set (mem:TI (and:SI (match_operand:SI 1 "immediate_operand" "")
-! 			(const_int -16)))
-          (match_operand:TI 0 "spu_reg_operand" "r"))]
-    ""
-    {
---- 81,94 ----
-    })
-  
-  (define_expand "spu_stqx"
-!   [(set (mem:TI (plus:SI (match_operand:SI 1 "spu_reg_operand" "")
-! 			 (match_operand:SI 2 "spu_reg_operand" "")))
-          (match_operand:TI 0 "spu_reg_operand" "r"))]
-    ""
-    "")
-  
-  (define_expand "spu_stqa"
-!   [(set (mem:TI (match_operand:SI 1 "immediate_operand" ""))
-          (match_operand:TI 0 "spu_reg_operand" "r"))]
-    ""
-    {
-***************
-*** 105,112 ****
-    })
-  
-  (define_expand "spu_stqr"
-!     [(set (mem:TI (and:SI (match_operand:SI 1 "address_operand" "")
-! 			  (const_int -16)))
-  	  (match_operand:TI 0 "spu_reg_operand" ""))]
-    ""
-    "")
---- 98,104 ----
-    })
-  
-  (define_expand "spu_stqr"
-!     [(set (mem:TI (match_operand:SI 1 "address_operand" ""))
-  	  (match_operand:TI 0 "spu_reg_operand" ""))]
-    ""
-    "")
-diff -crNp -x .svn gcc-4_3-orig/gcc/config/spu/spu.c gcc-4_3/gcc/config/spu/spu.c
-*** gcc-4_3-orig/gcc/config/spu/spu.c	2008-09-11 13:44:34.000000000 +0200
---- gcc-4_3/gcc/config/spu/spu.c	2008-09-11 13:45:00.000000000 +0200
-*************** static tree spu_build_builtin_va_list (v
-*** 120,128 ****
-  static void spu_va_start (tree, rtx);
-  static tree spu_gimplify_va_arg_expr (tree valist, tree type, tree * pre_p,
-  				      tree * post_p);
-- static int regno_aligned_for_load (int regno);
-  static int store_with_one_insn_p (rtx mem);
-  static int mem_is_padded_component_ref (rtx x);
-  static bool spu_assemble_integer (rtx x, unsigned int size, int aligned_p);
-  static void spu_asm_globalize_label (FILE * file, const char *name);
-  static unsigned char spu_rtx_costs (rtx x, int code, int outer_code,
---- 120,128 ----
-  static void spu_va_start (tree, rtx);
-  static tree spu_gimplify_va_arg_expr (tree valist, tree type, tree * pre_p,
-  				      tree * post_p);
-  static int store_with_one_insn_p (rtx mem);
-  static int mem_is_padded_component_ref (rtx x);
-+ static int reg_aligned_for_addr (rtx x, int aligned);
-  static bool spu_assemble_integer (rtx x, unsigned int size, int aligned_p);
-  static void spu_asm_globalize_label (FILE * file, const char *name);
-  static unsigned char spu_rtx_costs (rtx x, int code, int outer_code,
-*************** spu_legitimate_constant_p (rtx x)
-*** 2857,2880 ****
-  /* Valid address are:
-     - symbol_ref, label_ref, const
-     - reg
-!    - reg + const, where either reg or const is 16 byte aligned
-     - reg + reg, alignment doesn't matter
-    The alignment matters in the reg+const case because lqd and stqd
-!   ignore the 4 least significant bits of the const.  (TODO: It might be
-!   preferable to allow any alignment and fix it up when splitting.) */
-  int
-! spu_legitimate_address (enum machine_mode mode ATTRIBUTE_UNUSED,
-! 			rtx x, int reg_ok_strict)
-  {
-!   if (mode == TImode && GET_CODE (x) == AND
-!       && GET_CODE (XEXP (x, 1)) == CONST_INT
-!       && INTVAL (XEXP (x, 1)) == (HOST_WIDE_INT) -16)
-      x = XEXP (x, 0);
-    switch (GET_CODE (x))
-      {
--     case SYMBOL_REF:
-      case LABEL_REF:
-!       return !TARGET_LARGE_MEM;
-  
-      case CONST:
-        if (!TARGET_LARGE_MEM && GET_CODE (XEXP (x, 0)) == PLUS)
---- 2857,2908 ----
-  /* Valid address are:
-     - symbol_ref, label_ref, const
-     - reg
-!    - reg + const, where const is 16 byte aligned
-     - reg + reg, alignment doesn't matter
-    The alignment matters in the reg+const case because lqd and stqd
-!   ignore the 4 least significant bits of the const.  
-! 
-!   Addresses are handled in 4 phases. 
-!   1) from the beginning of rtl expansion until the split0 pass.  Any
-!      address is acceptable.  
-!   2) The split0 pass. It is responsible for making every load and store
-!      valid.  It calls legitimate_address with FOR_SPLIT set to 1.  This
-!      is where non-16-byte aligned loads/stores are split into multiple
-!      instructions to extract or insert just the part we care about.
-!   3) From the split0 pass to the beginning of reload.  During this
-!      phase the constant part of an address must be 16 byte aligned, and
-!      we don't allow any loads/store of less than 4 bytes.  We also
-!      allow a mask of -16 to be part of the address as an optimization.
-!   4) From reload until the end.  Reload can change the modes of loads
-!      and stores to something smaller than 4-bytes which we need to allow
-!      now, and it also adjusts the address to match.  So in this phase we
-!      allow that special case.  Still allow addresses with a mask of -16.
-! 
-!   FOR_SPLIT is only set to 1 for phase 2, otherwise it is 0.  */
-  int
-! spu_legitimate_address (enum machine_mode mode, rtx x, int reg_ok_strict,
-! 			int for_split)
-  {
-!   int aligned = (split0_completed || for_split)
-!     && !reload_in_progress && !reload_completed;
-!   int const_aligned = split0_completed || for_split;
-!   if (GET_MODE_SIZE (mode) >= 16)
-!     aligned = 0;
-!   else if (aligned && GET_MODE_SIZE (mode) < 4)
-!     return 0;
-!   if (split0_completed
-!       && (GET_CODE (x) == AND
-! 	  && GET_CODE (XEXP (x, 1)) == CONST_INT
-! 	  && INTVAL (XEXP (x, 1)) == (HOST_WIDE_INT) - 16
-! 	  && !CONSTANT_P (XEXP (x, 0))))
-      x = XEXP (x, 0);
-    switch (GET_CODE (x))
-      {
-      case LABEL_REF:
-!       return !TARGET_LARGE_MEM && !aligned;
-! 
-!     case SYMBOL_REF:
-!       return !TARGET_LARGE_MEM && (!aligned || ALIGNED_SYMBOL_REF_P (x));
-  
-      case CONST:
-        if (!TARGET_LARGE_MEM && GET_CODE (XEXP (x, 0)) == PLUS)
-*************** spu_legitimate_address (enum machine_mod
-*** 2882,2903 ****
-  	  rtx sym = XEXP (XEXP (x, 0), 0);
-  	  rtx cst = XEXP (XEXP (x, 0), 1);
-  
-- 	  /* Accept any symbol_ref + constant, assuming it does not
-- 	     wrap around the local store addressability limit.  */
-  	  if (GET_CODE (sym) == SYMBOL_REF && GET_CODE (cst) == CONST_INT)
-! 	    return 1;
-  	}
-        return 0;
-  
-      case CONST_INT:
-        return INTVAL (x) >= 0 && INTVAL (x) <= 0x3ffff;
-  
-      case SUBREG:
-        x = XEXP (x, 0);
-!       gcc_assert (GET_CODE (x) == REG);
-  
-      case REG:
-!       return INT_REG_OK_FOR_BASE_P (x, reg_ok_strict);
-  
-      case PLUS:
-      case LO_SUM:
---- 2910,2939 ----
-  	  rtx sym = XEXP (XEXP (x, 0), 0);
-  	  rtx cst = XEXP (XEXP (x, 0), 1);
-  
-  	  if (GET_CODE (sym) == SYMBOL_REF && GET_CODE (cst) == CONST_INT)
-! 	    {
-! 	      /* Check for alignment if required.  */
-! 	      if (!aligned)
-! 		return 1;
-! 	      if ((INTVAL (cst) & 15) == 0 && ALIGNED_SYMBOL_REF_P (sym))
-! 		return 1;
-! 	    }
-  	}
-        return 0;
-  
-      case CONST_INT:
-+       /* We don't test alignement here.  For an absolute address we
-+          assume the user knows what they are doing. */
-        return INTVAL (x) >= 0 && INTVAL (x) <= 0x3ffff;
-  
-      case SUBREG:
-        x = XEXP (x, 0);
-!       if (GET_CODE (x) != REG)
-! 	return 0;
-  
-      case REG:
-!       return INT_REG_OK_FOR_BASE_P (x, reg_ok_strict)
-! 	&& reg_aligned_for_addr (x, 0);
-  
-      case PLUS:
-      case LO_SUM:
-*************** spu_legitimate_address (enum machine_mod
-*** 2908,2928 ****
-  	  op0 = XEXP (op0, 0);
-  	if (GET_CODE (op1) == SUBREG)
-  	  op1 = XEXP (op1, 0);
-- 	/* We can't just accept any aligned register because CSE can
-- 	   change it to a register that is not marked aligned and then
-- 	   recog will fail.   So we only accept frame registers because
-- 	   they will only be changed to other frame registers. */
-  	if (GET_CODE (op0) == REG
-  	    && INT_REG_OK_FOR_BASE_P (op0, reg_ok_strict)
-  	    && GET_CODE (op1) == CONST_INT
-  	    && INTVAL (op1) >= -0x2000
-  	    && INTVAL (op1) <= 0x1fff
-! 	    && (regno_aligned_for_load (REGNO (op0)) || (INTVAL (op1) & 15) == 0))
-  	  return 1;
-  	if (GET_CODE (op0) == REG
-  	    && INT_REG_OK_FOR_BASE_P (op0, reg_ok_strict)
-  	    && GET_CODE (op1) == REG
-! 	    && INT_REG_OK_FOR_INDEX_P (op1, reg_ok_strict))
-  	  return 1;
-        }
-        break;
---- 2944,2972 ----
-  	  op0 = XEXP (op0, 0);
-  	if (GET_CODE (op1) == SUBREG)
-  	  op1 = XEXP (op1, 0);
-  	if (GET_CODE (op0) == REG
-  	    && INT_REG_OK_FOR_BASE_P (op0, reg_ok_strict)
-  	    && GET_CODE (op1) == CONST_INT
-  	    && INTVAL (op1) >= -0x2000
-  	    && INTVAL (op1) <= 0x1fff
-! 	    && reg_aligned_for_addr (op0, 0)
-! 	    && (!const_aligned
-! 		|| (INTVAL (op1) & 15) == 0
-! 		|| ((reload_in_progress || reload_completed)
-! 		    && GET_MODE_SIZE (mode) < 4
-! 		    && (INTVAL (op1) & 15) == 4 - GET_MODE_SIZE (mode))
-! 		/* Some passes create a fake register for testing valid
-! 		   addresses, be more lenient when we see those.  ivopts
-! 		   and reload do it. */
-! 		|| REGNO (op0) == LAST_VIRTUAL_REGISTER + 1
-! 		|| REGNO (op0) == LAST_VIRTUAL_REGISTER + 2))
-  	  return 1;
-  	if (GET_CODE (op0) == REG
-  	    && INT_REG_OK_FOR_BASE_P (op0, reg_ok_strict)
-+ 	    && reg_aligned_for_addr (op0, 0)
-  	    && GET_CODE (op1) == REG
-! 	    && INT_REG_OK_FOR_INDEX_P (op1, reg_ok_strict)
-! 	    && reg_aligned_for_addr (op1, 0))
-  	  return 1;
-        }
-        break;
-*************** spu_legitimize_address (rtx x, rtx oldx 
-*** 2960,2966 ****
-        else if (GET_CODE (op1) != REG)
-  	op1 = force_reg (Pmode, op1);
-        x = gen_rtx_PLUS (Pmode, op0, op1);
-!       if (spu_legitimate_address (mode, x, 0))
-  	return x;
-      }
-    return NULL_RTX;
---- 3004,3010 ----
-        else if (GET_CODE (op1) != REG)
-  	op1 = force_reg (Pmode, op1);
-        x = gen_rtx_PLUS (Pmode, op0, op1);
-!       if (spu_legitimate_address (mode, x, 0, 0))
-  	return x;
-      }
-    return NULL_RTX;
-*************** spu_conditional_register_usage (void)
-*** 3385,3444 ****
-      }
-  }
-  
-! /* This is called to decide when we can simplify a load instruction.  We
-!    must only return true for registers which we know will always be
-!    aligned.  Taking into account that CSE might replace this reg with
-!    another one that has not been marked aligned.  
-!    So this is really only true for frame, stack and virtual registers,
-!    which we know are always aligned and should not be adversely effected
-!    by CSE.  */
-  static int
-! regno_aligned_for_load (int regno)
-! {
-!   return regno == FRAME_POINTER_REGNUM
-!     || (frame_pointer_needed && regno == HARD_FRAME_POINTER_REGNUM)
-!     || regno == ARG_POINTER_REGNUM
-!     || regno == STACK_POINTER_REGNUM
-!     || (regno >= FIRST_VIRTUAL_REGISTER 
-! 	&& regno <= LAST_VIRTUAL_REGISTER);
-! }
-! 
-! /* Return TRUE when mem is known to be 16-byte aligned. */
-! int
-! aligned_mem_p (rtx mem)
-  {
-!   if (MEM_ALIGN (mem) >= 128)
-      return 1;
-!   if (GET_MODE_SIZE (GET_MODE (mem)) >= 16)
-!     return 1;
-!   if (GET_CODE (XEXP (mem, 0)) == PLUS)
-!     {
-!       rtx p0 = XEXP (XEXP (mem, 0), 0);
-!       rtx p1 = XEXP (XEXP (mem, 0), 1);
-!       if (regno_aligned_for_load (REGNO (p0)))
-! 	{
-! 	  if (GET_CODE (p1) == REG && regno_aligned_for_load (REGNO (p1)))
-! 	    return 1;
-! 	  if (GET_CODE (p1) == CONST_INT && (INTVAL (p1) & 15) == 0)
-! 	    return 1;
-! 	}
-!     }
-!   else if (GET_CODE (XEXP (mem, 0)) == REG)
-!     {
-!       if (regno_aligned_for_load (REGNO (XEXP (mem, 0))))
-! 	return 1;
-!     }
-!   else if (ALIGNED_SYMBOL_REF_P (XEXP (mem, 0)))
-!     return 1;
-!   else if (GET_CODE (XEXP (mem, 0)) == CONST)
-!     {
-!       rtx p0 = XEXP (XEXP (XEXP (mem, 0), 0), 0);
-!       rtx p1 = XEXP (XEXP (XEXP (mem, 0), 0), 1);
-!       if (GET_CODE (p0) == SYMBOL_REF
-! 	  && GET_CODE (p1) == CONST_INT && (INTVAL (p1) & 15) == 0)
-! 	return 1;
-!     }
-!   return 0;
-  }
-  
-  /* Encode symbol attributes (local vs. global, tls model) of a SYMBOL_REF
---- 3429,3444 ----
-      }
-  }
-  
-! /* This is called any time we inspect the alignment of a register for
-!    addresses.  */
-  static int
-! reg_aligned_for_addr (rtx x, int aligned)
-  {
-!   int regno =
-!     REGNO (x) < FIRST_PSEUDO_REGISTER ? ORIGINAL_REGNO (x) : REGNO (x);
-!   if (!aligned)
-      return 1;
-!   return REGNO_POINTER_ALIGN (regno) >= 128;
-  }
-  
-  /* Encode symbol attributes (local vs. global, tls model) of a SYMBOL_REF
-*************** spu_encode_section_info (tree decl, rtx 
-*** 3467,3475 ****
-  static int
-  store_with_one_insn_p (rtx mem)
-  {
-    rtx addr = XEXP (mem, 0);
-!   if (GET_MODE (mem) == BLKmode)
-      return 0;
-    /* Only static objects. */
-    if (GET_CODE (addr) == SYMBOL_REF)
-      {
---- 3467,3478 ----
-  static int
-  store_with_one_insn_p (rtx mem)
-  {
-+   enum machine_mode mode = GET_MODE (mem);
-    rtx addr = XEXP (mem, 0);
-!   if (mode == BLKmode)
-      return 0;
-+   if (GET_MODE_SIZE (mode) >= 16)
-+     return 1;
-    /* Only static objects. */
-    if (GET_CODE (addr) == SYMBOL_REF)
-      {
-*************** store_with_one_insn_p (rtx mem)
-*** 3493,3498 ****
---- 3496,3517 ----
-    return 0;
-  }
-  
-+ /* Return 1 when the address is not valid for a simple load and store as
-+    required by the '_mov*' patterns.   We could make this less strict
-+    for loads, but we prefer mem's to look the same so they are more
-+    likely to be merged.  */
-+ static int
-+ address_needs_split (rtx mem)
-+ {
-+   if (GET_MODE_SIZE (GET_MODE (mem)) < 16
-+       && (GET_MODE_SIZE (GET_MODE (mem)) < 4
-+ 	  || !(store_with_one_insn_p (mem)
-+ 	       || mem_is_padded_component_ref (mem))))
-+     return 1;
-+ 
-+   return 0;
-+ }
-+ 
-  int
-  spu_expand_mov (rtx * ops, enum machine_mode mode)
-  {
-*************** spu_expand_mov (rtx * ops, enum machine_
-*** 3540,3564 ****
-      }
-    else
-      {
--       if (GET_CODE (ops[0]) == MEM)
-- 	{
-- 	  if (!spu_valid_move (ops))
-- 	    {
-- 	      emit_insn (gen_store (ops[0], ops[1], gen_reg_rtx (TImode),
-- 				    gen_reg_rtx (TImode)));
-- 	      return 1;
-- 	    }
-- 	}
--       else if (GET_CODE (ops[1]) == MEM)
-- 	{
-- 	  if (!spu_valid_move (ops))
-- 	    {
-- 	      emit_insn (gen_load
-- 			 (ops[0], ops[1], gen_reg_rtx (TImode),
-- 			  gen_reg_rtx (SImode)));
-- 	      return 1;
-- 	    }
-- 	}
-        /* Catch the SImode immediates greater than 0x7fffffff, and sign
-           extend them. */
-        if (GET_CODE (ops[1]) == CONST_INT)
---- 3559,3564 ----
-*************** spu_expand_mov (rtx * ops, enum machine_
-*** 3574,3580 ****
-    return 0;
-  }
-  
-! void
-  spu_split_load (rtx * ops)
-  {
-    enum machine_mode mode = GET_MODE (ops[0]);
---- 3574,3580 ----
-    return 0;
-  }
-  
-! int
-  spu_split_load (rtx * ops)
-  {
-    enum machine_mode mode = GET_MODE (ops[0]);
-*************** spu_split_load (rtx * ops)
-*** 3582,3587 ****
---- 3582,3598 ----
-    int rot_amt;
-  
-    addr = XEXP (ops[1], 0);
-+   gcc_assert (GET_CODE (addr) != AND);
-+ 
-+   if (!address_needs_split (ops[1]))
-+     {
-+       addr = XEXP (ops[1], 0);
-+       if (spu_legitimate_address (mode, addr, 0, 1))
-+ 	return 0;
-+       ops[1] = change_address (ops[1], VOIDmode, force_reg (Pmode, addr));
-+       emit_move_insn (ops[0], ops[1]);
-+       return 1;
-+     }
-  
-    rot = 0;
-    rot_amt = 0;
-*************** spu_split_load (rtx * ops)
-*** 3599,3610 ****
-         */
-        p0 = XEXP (addr, 0);
-        p1 = XEXP (addr, 1);
-!       if (REG_P (p0) && !regno_aligned_for_load (REGNO (p0)))
-  	{
-! 	  if (REG_P (p1) && !regno_aligned_for_load (REGNO (p1)))
-  	    {
-! 	      emit_insn (gen_addsi3 (ops[3], p0, p1));
-! 	      rot = ops[3];
-  	    }
-  	  else
-  	    rot = p0;
---- 3610,3641 ----
-         */
-        p0 = XEXP (addr, 0);
-        p1 = XEXP (addr, 1);
-!       if (!reg_aligned_for_addr (p0, 1))
-  	{
-! 	  if (GET_CODE (p1) == REG && !reg_aligned_for_addr (p1, 1))
-  	    {
-! 	      rot = gen_reg_rtx (SImode);
-! 	      emit_insn (gen_addsi3 (rot, p0, p1));
-! 	    }
-! 	  else if (GET_CODE (p1) == CONST_INT && (INTVAL (p1) & 15))
-! 	    {
-! 	      if (INTVAL (p1) > 0
-! 		  && INTVAL (p1) * BITS_PER_UNIT < REG_ALIGN (p0))
-! 		{
-! 		  rot = gen_reg_rtx (SImode);
-! 		  emit_insn (gen_addsi3 (rot, p0, p1));
-! 		  addr = p0;
-! 		}
-! 	      else
-! 		{
-! 		  rtx x = gen_reg_rtx (SImode);
-! 		  emit_move_insn (x, p1);
-! 		  if (!spu_arith_operand (p1, SImode))
-! 		    p1 = x;
-! 		  rot = gen_reg_rtx (SImode);
-! 		  emit_insn (gen_addsi3 (rot, p0, p1));
-! 		  addr = gen_rtx_PLUS (Pmode, p0, x);
-! 		}
-  	    }
-  	  else
-  	    rot = p0;
-*************** spu_split_load (rtx * ops)
-*** 3614,3629 ****
-  	  if (GET_CODE (p1) == CONST_INT && (INTVAL (p1) & 15))
-  	    {
-  	      rot_amt = INTVAL (p1) & 15;
-! 	      p1 = GEN_INT (INTVAL (p1) & -16);
-! 	      addr = gen_rtx_PLUS (SImode, p0, p1);
-  	    }
-! 	  else if (REG_P (p1) && !regno_aligned_for_load (REGNO (p1)))
-  	    rot = p1;
-  	}
-      }
-    else if (GET_CODE (addr) == REG)
-      {
-!       if (!regno_aligned_for_load (REGNO (addr)))
-  	rot = addr;
-      }
-    else if (GET_CODE (addr) == CONST)
---- 3645,3665 ----
-  	  if (GET_CODE (p1) == CONST_INT && (INTVAL (p1) & 15))
-  	    {
-  	      rot_amt = INTVAL (p1) & 15;
-! 	      if (INTVAL (p1) & -16)
-! 		{
-! 		  p1 = GEN_INT (INTVAL (p1) & -16);
-! 		  addr = gen_rtx_PLUS (SImode, p0, p1);
-! 		}
-! 	      else
-! 		addr = p0;
-  	    }
-! 	  else if (GET_CODE (p1) == REG && !reg_aligned_for_addr (p1, 1))
-  	    rot = p1;
-  	}
-      }
-    else if (GET_CODE (addr) == REG)
-      {
-!       if (!reg_aligned_for_addr (addr, 1))
-  	rot = addr;
-      }
-    else if (GET_CODE (addr) == CONST)
-*************** spu_split_load (rtx * ops)
-*** 3642,3648 ****
-  	    addr = XEXP (XEXP (addr, 0), 0);
-  	}
-        else
-! 	rot = addr;
-      }
-    else if (GET_CODE (addr) == CONST_INT)
-      {
---- 3678,3687 ----
-  	    addr = XEXP (XEXP (addr, 0), 0);
-  	}
-        else
-! 	{
-! 	  rot = gen_reg_rtx (Pmode);
-! 	  emit_move_insn (rot, addr);
-! 	}
-      }
-    else if (GET_CODE (addr) == CONST_INT)
-      {
-*************** spu_split_load (rtx * ops)
-*** 3650,3656 ****
-        addr = GEN_INT (rot_amt & -16);
-      }
-    else if (!ALIGNED_SYMBOL_REF_P (addr))
-!     rot = addr;
-  
-    if (GET_MODE_SIZE (mode) < 4)
-      rot_amt += GET_MODE_SIZE (mode) - 4;
---- 3689,3698 ----
-        addr = GEN_INT (rot_amt & -16);
-      }
-    else if (!ALIGNED_SYMBOL_REF_P (addr))
-!     {
-!       rot = gen_reg_rtx (Pmode);
-!       emit_move_insn (rot, addr);
-!     }
-  
-    if (GET_MODE_SIZE (mode) < 4)
-      rot_amt += GET_MODE_SIZE (mode) - 4;
-*************** spu_split_load (rtx * ops)
-*** 3659,3673 ****
-  
-    if (rot && rot_amt)
-      {
-!       emit_insn (gen_addsi3 (ops[3], rot, GEN_INT (rot_amt)));
-!       rot = ops[3];
-        rot_amt = 0;
-      }
-  
-!   load = ops[2];
-  
-!   addr = gen_rtx_AND (SImode, copy_rtx (addr), GEN_INT (-16));
-!   mem = change_address (ops[1], TImode, addr);
-  
-    emit_insn (gen_movti (load, mem));
-  
---- 3701,3715 ----
-  
-    if (rot && rot_amt)
-      {
-!       rtx x = gen_reg_rtx (SImode);
-!       emit_insn (gen_addsi3 (x, rot, GEN_INT (rot_amt)));
-!       rot = x;
-        rot_amt = 0;
-      }
-  
-!   load = gen_reg_rtx (TImode);
-  
-!   mem = change_address (ops[1], TImode, copy_rtx (addr));
-  
-    emit_insn (gen_movti (load, mem));
-  
-*************** spu_split_load (rtx * ops)
-*** 3676,3698 ****
-    else if (rot_amt)
-      emit_insn (gen_rotlti3 (load, load, GEN_INT (rot_amt * 8)));
-  
-!   if (reload_completed)
-!     emit_move_insn (ops[0], gen_rtx_REG (GET_MODE (ops[0]), REGNO (load)));
-!   else
-!     emit_insn (gen_spu_convert (ops[0], load));
-  }
-  
-! void
-  spu_split_store (rtx * ops)
-  {
-    enum machine_mode mode = GET_MODE (ops[0]);
-!   rtx pat = ops[2];
-!   rtx reg = ops[3];
-    rtx addr, p0, p1, p1_lo, smem;
-    int aform;
-    int scalar;
-  
-    addr = XEXP (ops[0], 0);
-  
-    if (GET_CODE (addr) == PLUS)
-      {
---- 3718,3748 ----
-    else if (rot_amt)
-      emit_insn (gen_rotlti3 (load, load, GEN_INT (rot_amt * 8)));
-  
-!   emit_insn (gen_spu_convert (ops[0], load));
-!   return 1;
-  }
-  
-! int
-  spu_split_store (rtx * ops)
-  {
-    enum machine_mode mode = GET_MODE (ops[0]);
-!   rtx reg;
-    rtx addr, p0, p1, p1_lo, smem;
-    int aform;
-    int scalar;
-  
-+   if (!address_needs_split (ops[0]))
-+     {
-+       addr = XEXP (ops[0], 0);
-+       if (spu_legitimate_address (mode, addr, 0, 1))
-+ 	return 0;
-+       ops[0] = change_address (ops[0], VOIDmode, force_reg (Pmode, addr));
-+       emit_move_insn (ops[0], ops[1]);
-+       return 1;
-+     }
-+ 
-    addr = XEXP (ops[0], 0);
-+   gcc_assert (GET_CODE (addr) != AND);
-  
-    if (GET_CODE (addr) == PLUS)
-      {
-*************** spu_split_store (rtx * ops)
-*** 3704,3710 ****
-           unaligned reg + aligned reg     => lqx, c?x, shuf, stqx
-           unaligned reg + unaligned reg   => lqx, c?x, shuf, stqx
-           unaligned reg + aligned const   => lqd, c?d, shuf, stqx
-!          unaligned reg + unaligned const -> not allowed by legitimate address
-         */
-        aform = 0;
-        p0 = XEXP (addr, 0);
---- 3754,3760 ----
-           unaligned reg + aligned reg     => lqx, c?x, shuf, stqx
-           unaligned reg + unaligned reg   => lqx, c?x, shuf, stqx
-           unaligned reg + aligned const   => lqd, c?d, shuf, stqx
-!          unaligned reg + unaligned const -> lqx, c?d, shuf, stqx
-         */
-        aform = 0;
-        p0 = XEXP (addr, 0);
-*************** spu_split_store (rtx * ops)
-*** 3712,3719 ****
-        if (GET_CODE (p0) == REG && GET_CODE (p1) == CONST_INT)
-  	{
-  	  p1_lo = GEN_INT (INTVAL (p1) & 15);
-! 	  p1 = GEN_INT (INTVAL (p1) & -16);
-! 	  addr = gen_rtx_PLUS (SImode, p0, p1);
-  	}
-      }
-    else if (GET_CODE (addr) == REG)
---- 3762,3781 ----
-        if (GET_CODE (p0) == REG && GET_CODE (p1) == CONST_INT)
-  	{
-  	  p1_lo = GEN_INT (INTVAL (p1) & 15);
-! 	  if (reg_aligned_for_addr (p0, 1))
-! 	    {
-! 	      p1 = GEN_INT (INTVAL (p1) & -16);
-! 	      if (p1 == const0_rtx)
-! 		addr = p0;
-! 	      else
-! 		addr = gen_rtx_PLUS (SImode, p0, p1);
-! 	    }
-! 	  else
-! 	    {
-! 	      rtx x = gen_reg_rtx (SImode);
-! 	      emit_move_insn (x, p1);
-! 	      addr = gen_rtx_PLUS (SImode, p0, x);
-! 	    }
-  	}
-      }
-    else if (GET_CODE (addr) == REG)
-*************** spu_split_store (rtx * ops)
-*** 3730,3760 ****
-        p1_lo = addr;
-        if (ALIGNED_SYMBOL_REF_P (addr))
-  	p1_lo = const0_rtx;
-!       else if (GET_CODE (addr) == CONST)
-  	{
-! 	  if (GET_CODE (XEXP (addr, 0)) == PLUS
-! 	      && ALIGNED_SYMBOL_REF_P (XEXP (XEXP (addr, 0), 0))
-! 	      && GET_CODE (XEXP (XEXP (addr, 0), 1)) == CONST_INT)
-! 	    {
-! 	      HOST_WIDE_INT v = INTVAL (XEXP (XEXP (addr, 0), 1));
-! 	      if ((v & -16) != 0)
-! 		addr = gen_rtx_CONST (Pmode,
-! 				      gen_rtx_PLUS (Pmode,
-! 						    XEXP (XEXP (addr, 0), 0),
-! 						    GEN_INT (v & -16)));
-! 	      else
-! 		addr = XEXP (XEXP (addr, 0), 0);
-! 	      p1_lo = GEN_INT (v & 15);
-! 	    }
-  	}
-        else if (GET_CODE (addr) == CONST_INT)
-  	{
-  	  p1_lo = GEN_INT (INTVAL (addr) & 15);
-  	  addr = GEN_INT (INTVAL (addr) & -16);
-  	}
-      }
-  
-!   addr = gen_rtx_AND (SImode, copy_rtx (addr), GEN_INT (-16));
-  
-    scalar = store_with_one_insn_p (ops[0]);
-    if (!scalar)
---- 3792,3825 ----
-        p1_lo = addr;
-        if (ALIGNED_SYMBOL_REF_P (addr))
-  	p1_lo = const0_rtx;
-!       else if (GET_CODE (addr) == CONST
-! 	       && GET_CODE (XEXP (addr, 0)) == PLUS
-! 	       && ALIGNED_SYMBOL_REF_P (XEXP (XEXP (addr, 0), 0))
-! 	       && GET_CODE (XEXP (XEXP (addr, 0), 1)) == CONST_INT)
-  	{
-! 	  HOST_WIDE_INT v = INTVAL (XEXP (XEXP (addr, 0), 1));
-! 	  if ((v & -16) != 0)
-! 	    addr = gen_rtx_CONST (Pmode,
-! 				  gen_rtx_PLUS (Pmode,
-! 						XEXP (XEXP (addr, 0), 0),
-! 						GEN_INT (v & -16)));
-! 	  else
-! 	    addr = XEXP (XEXP (addr, 0), 0);
-! 	  p1_lo = GEN_INT (v & 15);
-  	}
-        else if (GET_CODE (addr) == CONST_INT)
-  	{
-  	  p1_lo = GEN_INT (INTVAL (addr) & 15);
-  	  addr = GEN_INT (INTVAL (addr) & -16);
-  	}
-+       else
-+ 	{
-+ 	  p1_lo = gen_reg_rtx (SImode);
-+ 	  emit_move_insn (p1_lo, addr);
-+ 	}
-      }
-  
-!   reg = gen_reg_rtx (TImode);
-  
-    scalar = store_with_one_insn_p (ops[0]);
-    if (!scalar)
-*************** spu_split_store (rtx * ops)
-*** 3764,3774 ****
-           possible, and copying the flags will prevent that in certain
-           cases, e.g. consider the volatile flag. */
-  
-        rtx lmem = change_address (ops[0], TImode, copy_rtx (addr));
-        set_mem_alias_set (lmem, 0);
-        emit_insn (gen_movti (reg, lmem));
-  
-!       if (!p0 || regno_aligned_for_load (REGNO (p0)))
-  	p0 = stack_pointer_rtx;
-        if (!p1_lo)
-  	p1_lo = const0_rtx;
---- 3829,3840 ----
-           possible, and copying the flags will prevent that in certain
-           cases, e.g. consider the volatile flag. */
-  
-+       rtx pat = gen_reg_rtx (TImode);
-        rtx lmem = change_address (ops[0], TImode, copy_rtx (addr));
-        set_mem_alias_set (lmem, 0);
-        emit_insn (gen_movti (reg, lmem));
-  
-!       if (!p0 || reg_aligned_for_addr (p0, 1))
-  	p0 = stack_pointer_rtx;
-        if (!p1_lo)
-  	p1_lo = const0_rtx;
-*************** spu_split_store (rtx * ops)
-*** 3776,3792 ****
-        emit_insn (gen_cpat (pat, p0, p1_lo, GEN_INT (GET_MODE_SIZE (mode))));
-        emit_insn (gen_shufb (reg, ops[1], reg, pat));
-      }
--   else if (reload_completed)
--     {
--       if (GET_CODE (ops[1]) == REG)
-- 	emit_move_insn (reg, gen_rtx_REG (GET_MODE (reg), REGNO (ops[1])));
--       else if (GET_CODE (ops[1]) == SUBREG)
-- 	emit_move_insn (reg,
-- 			gen_rtx_REG (GET_MODE (reg),
-- 				     REGNO (SUBREG_REG (ops[1]))));
--       else
-- 	abort ();
--     }
-    else
-      {
-        if (GET_CODE (ops[1]) == REG)
---- 3842,3847 ----
-*************** spu_split_store (rtx * ops)
-*** 3798,3812 ****
-      }
-  
-    if (GET_MODE_SIZE (mode) < 4 && scalar)
-!     emit_insn (gen_shlqby_ti
-! 	       (reg, reg, GEN_INT (4 - GET_MODE_SIZE (mode))));
-  
-!   smem = change_address (ops[0], TImode, addr);
-    /* We can't use the previous alias set because the memory has changed
-       size and can potentially overlap objects of other types.  */
-    set_mem_alias_set (smem, 0);
-  
-    emit_insn (gen_movti (smem, reg));
-  }
-  
-  /* Return TRUE if X is MEM which is a struct member reference
---- 3853,3868 ----
-      }
-  
-    if (GET_MODE_SIZE (mode) < 4 && scalar)
-!     emit_insn (gen_ashlti3
-! 	       (reg, reg, GEN_INT (32 - GET_MODE_BITSIZE (mode))));
-  
-!   smem = change_address (ops[0], TImode, copy_rtx (addr));
-    /* We can't use the previous alias set because the memory has changed
-       size and can potentially overlap objects of other types.  */
-    set_mem_alias_set (smem, 0);
-  
-    emit_insn (gen_movti (smem, reg));
-+   return 1;
-  }
-  
-  /* Return TRUE if X is MEM which is a struct member reference
-*************** fix_range (const char *const_str)
-*** 3905,3941 ****
-      }
-  }
-  
-- int
-- spu_valid_move (rtx * ops)
-- {
--   enum machine_mode mode = GET_MODE (ops[0]);
--   if (!register_operand (ops[0], mode) && !register_operand (ops[1], mode))
--     return 0;
-- 
--   /* init_expr_once tries to recog against load and store insns to set
--      the direct_load[] and direct_store[] arrays.  We always want to
--      consider those loads and stores valid.  init_expr_once is called in
--      the context of a dummy function which does not have a decl. */
--   if (cfun->decl == 0)
--     return 1;
-- 
--   /* Don't allows loads/stores which would require more than 1 insn.
--      During and after reload we assume loads and stores only take 1
--      insn. */
--   if (GET_MODE_SIZE (mode) < 16 && !reload_in_progress && !reload_completed)
--     {
--       if (GET_CODE (ops[0]) == MEM
-- 	  && (GET_MODE_SIZE (mode) < 4
-- 	      || !(store_with_one_insn_p (ops[0])
-- 		   || mem_is_padded_component_ref (ops[0]))))
-- 	return 0;
--       if (GET_CODE (ops[1]) == MEM
-- 	  && (GET_MODE_SIZE (mode) < 4 || !aligned_mem_p (ops[1])))
-- 	return 0;
--     }
--   return 1;
-- }
-- 
-  /* Return TRUE if x is a CONST_INT, CONST_DOUBLE or CONST_VECTOR that
-     can be generated using the fsmbi instruction. */
-  int
---- 3961,3966 ----
-*************** spu_sms_res_mii (struct ddg *g)
-*** 5577,5588 ****
-  
-  void
-  spu_init_expanders (void)
-! {   
-!   /* HARD_FRAME_REGISTER is only 128 bit aligned when
-!    * frame_pointer_needed is true.  We don't know that until we're
-!    * expanding the prologue. */
-    if (cfun)
-!     REGNO_POINTER_ALIGN (HARD_FRAME_POINTER_REGNUM) = 8;
-  }
-  
-  static enum machine_mode
---- 5602,5627 ----
-  
-  void
-  spu_init_expanders (void)
-! {
-    if (cfun)
-!     {
-!       rtx r0, r1;
-!       /* HARD_FRAME_REGISTER is only 128 bit aligned when
-!          frame_pointer_needed is true.  We don't know that until we're
-!          expanding the prologue. */
-!       REGNO_POINTER_ALIGN (HARD_FRAME_POINTER_REGNUM) = 8;
-! 
-!       /* A number of passes use LAST_VIRTUAL_REGISTER+1 and
-!          LAST_VIRTUAL_REGISTER+2 to test the back-end.  We want to
-!          handle those cases specially, so we reserve those two registers
-!          here by generating them. */
-!       r0 = gen_reg_rtx (SImode);
-!       r1 = gen_reg_rtx (SImode);
-!       mark_reg_pointer (r0, 128);
-!       mark_reg_pointer (r1, 128);
-!       gcc_assert (REGNO (r0) == LAST_VIRTUAL_REGISTER + 1
-! 		  && REGNO (r1) == LAST_VIRTUAL_REGISTER + 2);
-!     }
-  }
-  
-  static enum machine_mode
-diff -crNp -x .svn gcc-4_3-orig/gcc/config/spu/spu.h gcc-4_3/gcc/config/spu/spu.h
-*** gcc-4_3-orig/gcc/config/spu/spu.h	2008-09-11 13:44:34.000000000 +0200
---- gcc-4_3/gcc/config/spu/spu.h	2008-09-11 13:45:00.000000000 +0200
-*************** enum reg_class { 
-*** 254,259 ****
---- 254,264 ----
-  #define INT_REG_OK_FOR_BASE_P(X,STRICT) \
-  	((!(STRICT) || REGNO_OK_FOR_BASE_P (REGNO (X))))
-  
-+ #define REG_ALIGN(X) \
-+ 	(REG_POINTER(X) \
-+ 	 	? REGNO_POINTER_ALIGN (ORIGINAL_REGNO (X)) \
-+ 		: 0)
-+ 
-  #define PREFERRED_RELOAD_CLASS(X,CLASS)  (CLASS)
-  
-  #define CLASS_MAX_NREGS(CLASS, MODE)	\
-*************** targetm.resolve_overloaded_builtin = spu
-*** 439,445 ****
-  #endif
-  
-  #define GO_IF_LEGITIMATE_ADDRESS(MODE, X, ADDR)			\
-!     { if (spu_legitimate_address (MODE, X, REG_OK_STRICT_FLAG))	\
-  	goto ADDR;						\
-      }
-  
---- 444,450 ----
-  #endif
-  
-  #define GO_IF_LEGITIMATE_ADDRESS(MODE, X, ADDR)			\
-!     { if (spu_legitimate_address (MODE, X, REG_OK_STRICT_FLAG, 0))	\
-  	goto ADDR;						\
-      }
-  
-*************** targetm.resolve_overloaded_builtin = spu
-*** 633,635 ****
---- 638,642 ----
-  extern GTY(()) rtx spu_compare_op0;
-  extern GTY(()) rtx spu_compare_op1;
-  
-+ #define SPLIT_BEFORE_CSE2 1
-+ 
-diff -crNp -x .svn gcc-4_3-orig/gcc/config/spu/spu.md gcc-4_3/gcc/config/spu/spu.md
-*** gcc-4_3-orig/gcc/config/spu/spu.md	2008-09-11 13:44:34.000000000 +0200
---- gcc-4_3/gcc/config/spu/spu.md	2008-09-11 13:45:00.000000000 +0200
-***************
-*** 273,280 ****
-  (define_split 
-    [(set (match_operand 0 "spu_reg_operand")
-  	(match_operand 1 "immediate_operand"))]
-! 
-!   ""
-    [(set (match_dup 0)
-  	(high (match_dup 1)))
-     (set (match_dup 0)
---- 273,279 ----
-  (define_split 
-    [(set (match_operand 0 "spu_reg_operand")
-  	(match_operand 1 "immediate_operand"))]
-!   "split0_completed"
-    [(set (match_dup 0)
-  	(high (match_dup 1)))
-     (set (match_dup 0)
-***************
-*** 311,319 ****
-  ;; move internal
-  
-  (define_insn "_mov<mode>"
-!   [(set (match_operand:MOV 0 "spu_nonimm_operand" "=r,r,r,r,r,m")
-  	(match_operand:MOV 1 "spu_mov_operand" "r,A,f,j,m,r"))]
-!   "spu_valid_move (operands)"
-    "@
-     ori\t%0,%1,0
-     il%s1\t%0,%S1
---- 310,319 ----
-  ;; move internal
-  
-  (define_insn "_mov<mode>"
-!   [(set (match_operand:MOV 0 "spu_dest_operand" "=r,r,r,r,r,m")
-  	(match_operand:MOV 1 "spu_mov_operand" "r,A,f,j,m,r"))]
-!   "register_operand(operands[0], <MODE>mode)
-!    || register_operand(operands[1], <MODE>mode)"
-    "@
-     ori\t%0,%1,0
-     il%s1\t%0,%S1
-***************
-*** 331,339 ****
-    "iohl\t%0,%2@l")
-  
-  (define_insn "_movdi"
-!   [(set (match_operand:DI 0 "spu_nonimm_operand" "=r,r,r,r,r,m")
-  	(match_operand:DI 1 "spu_mov_operand" "r,a,f,k,m,r"))]
-!   "spu_valid_move (operands)"
-    "@
-     ori\t%0,%1,0
-     il%d1\t%0,%D1
---- 331,340 ----
-    "iohl\t%0,%2@l")
-  
-  (define_insn "_movdi"
-!   [(set (match_operand:DI 0 "spu_dest_operand" "=r,r,r,r,r,m")
-  	(match_operand:DI 1 "spu_mov_operand" "r,a,f,k,m,r"))]
-!   "register_operand(operands[0], DImode)
-!    || register_operand(operands[1], DImode)"
-    "@
-     ori\t%0,%1,0
-     il%d1\t%0,%D1
-***************
-*** 344,352 ****
-    [(set_attr "type" "fx2,fx2,shuf,shuf,load,store")])
-  
-  (define_insn "_movti"
-!   [(set (match_operand:TI 0 "spu_nonimm_operand" "=r,r,r,r,r,m")
-  	(match_operand:TI 1 "spu_mov_operand" "r,U,f,l,m,r"))]
-!   "spu_valid_move (operands)"
-    "@
-     ori\t%0,%1,0
-     il%t1\t%0,%T1
---- 345,354 ----
-    [(set_attr "type" "fx2,fx2,shuf,shuf,load,store")])
-  
-  (define_insn "_movti"
-!   [(set (match_operand:TI 0 "spu_dest_operand" "=r,r,r,r,r,m")
-  	(match_operand:TI 1 "spu_mov_operand" "r,U,f,l,m,r"))]
-!   "register_operand(operands[0], TImode)
-!    || register_operand(operands[1], TImode)"
-    "@
-     ori\t%0,%1,0
-     il%t1\t%0,%T1
-***************
-*** 356,384 ****
-     stq%p0\t%1,%0"
-    [(set_attr "type" "fx2,fx2,shuf,shuf,load,store")])
-  
-! (define_insn_and_split "load"
-!   [(set (match_operand 0 "spu_reg_operand" "=r")
-! 	(match_operand 1 "memory_operand" "m"))
-!    (clobber (match_operand:TI 2 "spu_reg_operand" "=&r"))
-!    (clobber (match_operand:SI 3 "spu_reg_operand" "=&r"))]
-!   "GET_MODE(operands[0]) == GET_MODE(operands[1])"
-!   "#"
-!   ""
-    [(set (match_dup 0)
-  	(match_dup 1))]
-!   { spu_split_load(operands); DONE; })
-  
-! (define_insn_and_split "store"
-!   [(set (match_operand 0 "memory_operand" "=m")
-! 	(match_operand 1 "spu_reg_operand" "r"))
-!    (clobber (match_operand:TI 2 "spu_reg_operand" "=&r"))
-!    (clobber (match_operand:TI 3 "spu_reg_operand" "=&r"))]
-!   "GET_MODE(operands[0]) == GET_MODE(operands[1])"
-!   "#"
-!   ""
-    [(set (match_dup 0)
-  	(match_dup 1))]
-!   { spu_split_store(operands); DONE; })
-  
-  ;; Operand 3 is the number of bytes. 1:b 2:h 4:w 8:d
-  
---- 358,382 ----
-     stq%p0\t%1,%0"
-    [(set_attr "type" "fx2,fx2,shuf,shuf,load,store")])
-  
-! (define_split
-!   [(set (match_operand 0 "spu_reg_operand")
-! 	(match_operand 1 "memory_operand"))]
-!   "GET_MODE(operands[0]) == GET_MODE(operands[1]) && !split0_completed"
-    [(set (match_dup 0)
-  	(match_dup 1))]
-!   { if (spu_split_load(operands))
-!       DONE;
-!   })
-  
-! (define_split
-!   [(set (match_operand 0 "memory_operand")
-! 	(match_operand 1 "spu_reg_operand"))]
-!   "GET_MODE(operands[0]) == GET_MODE(operands[1]) && !split0_completed"
-    [(set (match_dup 0)
-  	(match_dup 1))]
-!   { if (spu_split_store(operands))
-!       DONE;
-!   })
-  
-  ;; Operand 3 is the number of bytes. 1:b 2:h 4:w 8:d
-  
-diff -crNp -x .svn gcc-4_3-orig/gcc/config/spu/spu-protos.h gcc-4_3/gcc/config/spu/spu-protos.h
-*** gcc-4_3-orig/gcc/config/spu/spu-protos.h	2008-09-11 13:44:34.000000000 +0200
---- gcc-4_3/gcc/config/spu/spu-protos.h	2008-09-10 20:09:59.000000000 +0200
-*************** extern int arith_immediate_p (rtx op, en
-*** 54,60 ****
-  extern int spu_constant_address_p (rtx x);
-  extern int spu_legitimate_constant_p (rtx x);
-  extern int spu_legitimate_address (enum machine_mode mode, rtx x,
-! 				   int reg_ok_strict);
-  extern rtx spu_legitimize_address (rtx x, rtx oldx, enum machine_mode mode);
-  extern int spu_initial_elimination_offset (int from, int to);
-  extern rtx spu_function_value (const_tree type, const_tree func);
---- 54,60 ----
-  extern int spu_constant_address_p (rtx x);
-  extern int spu_legitimate_constant_p (rtx x);
-  extern int spu_legitimate_address (enum machine_mode mode, rtx x,
-! 				   int reg_ok_strict, int for_split);
-  extern rtx spu_legitimize_address (rtx x, rtx oldx, enum machine_mode mode);
-  extern int spu_initial_elimination_offset (int from, int to);
-  extern rtx spu_function_value (const_tree type, const_tree func);
-*************** extern void spu_setup_incoming_varargs (
-*** 64,74 ****
-  					tree type, int *pretend_size,
-  					int no_rtl);
-  extern void spu_conditional_register_usage (void);
-- extern int aligned_mem_p (rtx mem);
-  extern int spu_expand_mov (rtx * ops, enum machine_mode mode);
-! extern void spu_split_load (rtx * ops);
-! extern void spu_split_store (rtx * ops);
-! extern int spu_valid_move (rtx * ops);
-  extern int fsmbi_const_p (rtx x);
-  extern int cpat_const_p (rtx x, enum machine_mode mode);
-  extern rtx gen_cpat_const (rtx * ops);
---- 64,72 ----
-  					tree type, int *pretend_size,
-  					int no_rtl);
-  extern void spu_conditional_register_usage (void);
-  extern int spu_expand_mov (rtx * ops, enum machine_mode mode);
-! extern int spu_split_load (rtx * ops);
-! extern int spu_split_store (rtx * ops);
-  extern int fsmbi_const_p (rtx x);
-  extern int cpat_const_p (rtx x, enum machine_mode mode);
-  extern rtx gen_cpat_const (rtx * ops);
-diff -crNp -x .svn gcc-4_3-orig/gcc/doc/tm.texi gcc-4_3/gcc/doc/tm.texi
-*** gcc-4_3-orig/gcc/doc/tm.texi	2008-09-11 13:44:35.000000000 +0200
---- gcc-4_3/gcc/doc/tm.texi	2008-09-11 13:45:01.000000000 +0200
-*************** to the functions in @file{libgcc} that p
-*** 10372,10374 ****
---- 10372,10386 ----
-  call stack unwinding.  It is used in declarations in @file{unwind-generic.h}
-  and the associated definitions of those functions.
-  @end defmac
-+ 
-+ @defmac SPLIT_BEFORE_CSE2
-+ This macro determines whether to use an additional split pass before the
-+ second CSE pass.  @code{split0_completed} will be set after this pass is
-+ completed.
-+ 
-+ For example, the Cell SPU target uses this for better optimization of
-+ the multiple instructions required to do simple loads and stores.  The
-+ optimizations before this pass work better on simple memory
-+ instructions, and the optimizations right after this pass (e.g., CSE and
-+ combine) are be able to optimize the split instructions.
-+ @end defmac
-diff -crNp -x .svn gcc-4_3-orig/gcc/final.c gcc-4_3/gcc/final.c
-*** gcc-4_3-orig/gcc/final.c	2008-09-11 13:44:35.000000000 +0200
---- gcc-4_3/gcc/final.c	2008-09-10 20:09:59.000000000 +0200
-*************** rest_of_clean_state (void)
-*** 4238,4243 ****
---- 4238,4246 ----
-  #ifdef STACK_REGS
-    regstack_completed = 0;
-  #endif
-+ #ifdef SPLIT_BEFORE_CSE2
-+   split0_completed = 0;
-+ #endif
-  
-    /* Clear out the insn_length contents now that they are no
-       longer valid.  */
-diff -crNp -x .svn gcc-4_3-orig/gcc/passes.c gcc-4_3/gcc/passes.c
-*** gcc-4_3-orig/gcc/passes.c	2008-09-11 13:44:35.000000000 +0200
---- gcc-4_3/gcc/passes.c	2008-09-10 20:09:59.000000000 +0200
-*************** init_optimization_passes (void)
-*** 715,720 ****
---- 715,721 ----
-  	}
-        NEXT_PASS (pass_web);
-        NEXT_PASS (pass_jump_bypass);
-+       NEXT_PASS (pass_split_before_cse2);
-        NEXT_PASS (pass_cse2);
-        NEXT_PASS (pass_rtl_dse1);
-        NEXT_PASS (pass_rtl_fwprop_addr);
-diff -crNp -x .svn gcc-4_3-orig/gcc/recog.c gcc-4_3/gcc/recog.c
-*** gcc-4_3-orig/gcc/recog.c	2008-09-11 13:44:35.000000000 +0200
---- gcc-4_3/gcc/recog.c	2008-09-10 20:09:59.000000000 +0200
-*************** int reload_completed;
-*** 94,99 ****
---- 94,104 ----
-  /* Nonzero after thread_prologue_and_epilogue_insns has run.  */
-  int epilogue_completed;
-  
-+ #ifdef SPLIT_BEFORE_CSE2
-+ /* Nonzero after split0 pass has run.  */
-+ int split0_completed;
-+ #endif
-+ 
-  /* Initialize data used by the function `recog'.
-     This must be called once in the compilation of a function
-     before any insn recognition may be done in the function.  */
-*************** struct tree_opt_pass pass_split_for_shor
-*** 3497,3500 ****
---- 3502,3541 ----
-    0                                     /* letter */
-  };
-  
-+ static bool
-+ gate_handle_split_before_cse2 (void)
-+ {
-+ #ifdef SPLIT_BEFORE_CSE2
-+   return SPLIT_BEFORE_CSE2;
-+ #else
-+   return 0;
-+ #endif
-+ }
-+ 
-+ static unsigned int
-+ rest_of_handle_split_before_cse2 (void)
-+ {
-+ #ifdef SPLIT_BEFORE_CSE2
-+   split_all_insns_noflow ();
-+   split0_completed = 1;
-+ #endif
-+   return 0;
-+ }
-+ 
-+ struct tree_opt_pass pass_split_before_cse2 =
-+ {
-+   "split0",                             /* name */
-+   gate_handle_split_before_cse2,        /* gate */
-+   rest_of_handle_split_before_cse2,     /* execute */
-+   NULL,                                 /* sub */
-+   NULL,                                 /* next */
-+   0,                                    /* static_pass_number */
-+   0,                                    /* tv_id */
-+   0,                                    /* properties_required */
-+   0,                                    /* properties_provided */
-+   0,                                    /* properties_destroyed */
-+   0,                                    /* todo_flags_start */
-+   TODO_dump_func,                       /* todo_flags_finish */
-+   0                                     /* letter */
-+ };
-  
-diff -crNp -x .svn gcc-4_3-orig/gcc/rtl.h gcc-4_3/gcc/rtl.h
-*** gcc-4_3-orig/gcc/rtl.h	2008-09-11 13:44:36.000000000 +0200
---- gcc-4_3/gcc/rtl.h	2008-09-10 20:09:59.000000000 +0200
-*************** extern int reload_completed;
-*** 1997,2002 ****
---- 1997,2007 ----
-  /* Nonzero after thread_prologue_and_epilogue_insns has run.  */
-  extern int epilogue_completed;
-  
-+ #ifdef SPLIT_BEFORE_CSE2
-+ /* Nonzero after the split0 pass has completed. */
-+ extern int split0_completed;
-+ #endif
-+ 
-  /* Set to 1 while reload_as_needed is operating.
-     Required by some machines to handle any generated moves differently.  */
-  
-diff -crNp -x .svn gcc-4_3-orig/gcc/testsuite/gcc.target/spu/split0-1.c gcc-4_3/gcc/testsuite/gcc.target/spu/split0-1.c
-*** gcc-4_3-orig/gcc/testsuite/gcc.target/spu/split0-1.c	1970-01-01 01:00:00.000000000 +0100
---- gcc-4_3/gcc/testsuite/gcc.target/spu/split0-1.c	2008-09-10 20:09:59.000000000 +0200
-***************
-*** 0 ****
---- 1,17 ----
-+ /* Make sure there are only 2 loads. */
-+ /* { dg-do compile { target spu-*-* } } */
-+ /* { dg-options "-O2" } */
-+ /* { dg-final { scan-assembler-times "lqd	\\$\[0-9\]+,0\$\\$\[0-9\]+\$" 1 } } */
-+ /* { dg-final { scan-assembler-times "lqd	\\$\[0-9\]+,16\$\\$\[0-9\]+\$" 1 } } */
-+ /* { dg-final { scan-assembler-times "lq\[dx\]" 2 } } */
-+   
-+ struct __attribute__ ((__aligned__(16))) S {
-+   int a, b, c, d;
-+   int e, f, g, h;
-+ };
-+   
-+ int
-+ f(struct S *s)
-+ { 
-+   return s->a + s->b + s->c + s->d + s->e + s->f + s->g + s->h;
-+ } 
-diff -crNp -x .svn gcc-4_3-orig/gcc/tree-pass.h gcc-4_3/gcc/tree-pass.h
-*** gcc-4_3-orig/gcc/tree-pass.h	2008-09-11 13:44:36.000000000 +0200
---- gcc-4_3/gcc/tree-pass.h	2008-09-10 20:09:59.000000000 +0200
-*************** extern struct tree_opt_pass pass_rtl_dol
-*** 385,390 ****
---- 385,391 ----
-  extern struct tree_opt_pass pass_rtl_loop_done;
-  
-  extern struct tree_opt_pass pass_web;
-+ extern struct tree_opt_pass pass_split_before_cse2;
-  extern struct tree_opt_pass pass_cse2;
-  extern struct tree_opt_pass pass_df_initialize_opt;
-  extern struct tree_opt_pass pass_df_initialize_no_opt;
+Index: gcc-4.3.4-20090804/gcc/config/spu/predicates.md
+===================================================================
+--- gcc-4.3.4-20090804.orig/gcc/config/spu/predicates.md	2009-09-21 11:42:15.000000000 +0200
++++ gcc-4.3.4-20090804/gcc/config/spu/predicates.md	2009-09-21 11:47:27.000000000 +0200
+@@ -39,14 +39,14 @@
+        (ior (not (match_code "subreg"))
+             (match_test "valid_subreg (op)"))))
+ 
+-(define_predicate "spu_mem_operand"
+-  (and (match_operand 0 "memory_operand")
+-       (match_test "reload_in_progress || reload_completed || aligned_mem_p (op)")))
+-
+ (define_predicate "spu_mov_operand"
+-  (ior (match_operand 0 "spu_mem_operand")
++  (ior (match_operand 0 "memory_operand")
+        (match_operand 0 "spu_nonmem_operand")))
+ 
++(define_predicate "spu_dest_operand"
++  (ior (match_operand 0 "memory_operand")
++       (match_operand 0 "spu_reg_operand")))
++
+ (define_predicate "call_operand"
+   (and (match_code "mem")
+        (match_test "(!TARGET_LARGE_MEM && satisfies_constraint_S (op))
+Index: gcc-4.3.4-20090804/gcc/config/spu/spu-builtins.md
+===================================================================
+--- gcc-4.3.4-20090804.orig/gcc/config/spu/spu-builtins.md	2009-09-21 11:42:15.000000000 +0200
++++ gcc-4.3.4-20090804/gcc/config/spu/spu-builtins.md	2009-09-21 11:47:27.000000000 +0200
+@@ -23,9 +23,8 @@
+ 
+ (define_expand "spu_lqd"
+   [(set (match_operand:TI 0 "spu_reg_operand" "")
+-        (mem:TI (and:SI (plus:SI (match_operand:SI 1 "spu_reg_operand" "")
+-				 (match_operand:SI 2 "spu_nonmem_operand" ""))
+-		        (const_int -16))))]
++        (mem:TI (plus:SI (match_operand:SI 1 "spu_reg_operand" "")
++			 (match_operand:SI 2 "spu_nonmem_operand" ""))))]
+   ""
+   {
+     if (GET_CODE (operands[2]) == CONST_INT
+@@ -42,16 +41,14 @@
+ 
+ (define_expand "spu_lqx"
+   [(set (match_operand:TI 0 "spu_reg_operand" "")
+-        (mem:TI (and:SI (plus:SI (match_operand:SI 1 "spu_reg_operand" "")
+-                                 (match_operand:SI 2 "spu_reg_operand" ""))
+-                        (const_int -16))))]
++        (mem:TI (plus:SI (match_operand:SI 1 "spu_reg_operand" "")
++			 (match_operand:SI 2 "spu_reg_operand" ""))))]
+   ""
+   "")
+ 
+ (define_expand "spu_lqa"
+   [(set (match_operand:TI 0 "spu_reg_operand" "")
+-        (mem:TI (and:SI (match_operand:SI 1 "immediate_operand" "")
+-                        (const_int -16))))]
++        (mem:TI (match_operand:SI 1 "immediate_operand" "")))]
+   ""
+   {
+     if (GET_CODE (operands[1]) == CONST_INT
+@@ -61,15 +58,13 @@
+ 
+ (define_expand "spu_lqr"
+   [(set (match_operand:TI 0 "spu_reg_operand" "")
+-	(mem:TI (and:SI (match_operand:SI 1 "address_operand" "")
+-			(const_int -16))))]
++	(mem:TI (match_operand:SI 1 "address_operand" "")))]
+   ""
+   "")
+ 
+ (define_expand "spu_stqd"
+-  [(set (mem:TI (and:SI (plus:SI (match_operand:SI 1 "spu_reg_operand" "")
+-				 (match_operand:SI 2 "spu_nonmem_operand" ""))
+-		        (const_int -16)))
++  [(set (mem:TI (plus:SI (match_operand:SI 1 "spu_reg_operand" "")
++			 (match_operand:SI 2 "spu_nonmem_operand" "")))
+         (match_operand:TI 0 "spu_reg_operand" "r,r"))]
+   ""
+   {
+@@ -86,16 +81,14 @@
+   })
+ 
+ (define_expand "spu_stqx"
+-  [(set (mem:TI (and:SI (plus:SI (match_operand:SI 1 "spu_reg_operand" "")
+-				 (match_operand:SI 2 "spu_reg_operand" ""))
+-		        (const_int -16)))
++  [(set (mem:TI (plus:SI (match_operand:SI 1 "spu_reg_operand" "")
++			 (match_operand:SI 2 "spu_reg_operand" "")))
+         (match_operand:TI 0 "spu_reg_operand" "r"))]
+   ""
+   "")
+ 
+ (define_expand "spu_stqa"
+-  [(set (mem:TI (and:SI (match_operand:SI 1 "immediate_operand" "")
+-			(const_int -16)))
++  [(set (mem:TI (match_operand:SI 1 "immediate_operand" ""))
+         (match_operand:TI 0 "spu_reg_operand" "r"))]
+   ""
+   {
+@@ -105,8 +98,7 @@
+   })
+ 
+ (define_expand "spu_stqr"
+-    [(set (mem:TI (and:SI (match_operand:SI 1 "address_operand" "")
+-			  (const_int -16)))
++    [(set (mem:TI (match_operand:SI 1 "address_operand" ""))
+ 	  (match_operand:TI 0 "spu_reg_operand" ""))]
+   ""
+   "")
+Index: gcc-4.3.4-20090804/gcc/config/spu/spu.c
+===================================================================
+--- gcc-4.3.4-20090804.orig/gcc/config/spu/spu.c	2009-09-21 11:44:57.000000000 +0200
++++ gcc-4.3.4-20090804/gcc/config/spu/spu.c	2009-09-21 11:47:27.000000000 +0200
+@@ -189,9 +189,9 @@ static tree spu_build_builtin_va_list (v
+ static void spu_va_start (tree, rtx);
+ static tree spu_gimplify_va_arg_expr (tree valist, tree type, tree * pre_p,
+ 				      tree * post_p);
+-static int regno_aligned_for_load (int regno);
+ static int store_with_one_insn_p (rtx mem);
+ static int mem_is_padded_component_ref (rtx x);
++static int reg_aligned_for_addr (rtx x, int aligned);
+ static bool spu_assemble_integer (rtx x, unsigned int size, int aligned_p);
+ static void spu_asm_globalize_label (FILE * file, const char *name);
+ static unsigned char spu_rtx_costs (rtx x, int code, int outer_code,
+@@ -3530,24 +3530,52 @@ spu_legitimate_constant_p (rtx x)
+ /* Valid address are:
+    - symbol_ref, label_ref, const
+    - reg
+-   - reg + const, where either reg or const is 16 byte aligned
++   - reg + const, where const is 16 byte aligned
+    - reg + reg, alignment doesn't matter
+   The alignment matters in the reg+const case because lqd and stqd
+-  ignore the 4 least significant bits of the const.  (TODO: It might be
+-  preferable to allow any alignment and fix it up when splitting.) */
++  ignore the 4 least significant bits of the const.  
++
++  Addresses are handled in 4 phases. 
++  1) from the beginning of rtl expansion until the split0 pass.  Any
++     address is acceptable.  
++  2) The split0 pass. It is responsible for making every load and store
++     valid.  It calls legitimate_address with FOR_SPLIT set to 1.  This
++     is where non-16-byte aligned loads/stores are split into multiple
++     instructions to extract or insert just the part we care about.
++  3) From the split0 pass to the beginning of reload.  During this
++     phase the constant part of an address must be 16 byte aligned, and
++     we don't allow any loads/store of less than 4 bytes.  We also
++     allow a mask of -16 to be part of the address as an optimization.
++  4) From reload until the end.  Reload can change the modes of loads
++     and stores to something smaller than 4-bytes which we need to allow
++     now, and it also adjusts the address to match.  So in this phase we
++     allow that special case.  Still allow addresses with a mask of -16.
++
++  FOR_SPLIT is only set to 1 for phase 2, otherwise it is 0.  */
+ int
+-spu_legitimate_address (enum machine_mode mode ATTRIBUTE_UNUSED,
+-			rtx x, int reg_ok_strict)
++spu_legitimate_address (enum machine_mode mode, rtx x, int reg_ok_strict,
++			int for_split)
+ {
+-  if (mode == TImode && GET_CODE (x) == AND
+-      && GET_CODE (XEXP (x, 1)) == CONST_INT
+-      && INTVAL (XEXP (x, 1)) == (HOST_WIDE_INT) -16)
++  int aligned = (split0_completed || for_split)
++    && !reload_in_progress && !reload_completed;
++  int const_aligned = split0_completed || for_split;
++  if (GET_MODE_SIZE (mode) >= 16)
++    aligned = 0;
++  else if (aligned && GET_MODE_SIZE (mode) < 4)
++    return 0;
++  if (split0_completed
++      && (GET_CODE (x) == AND
++	  && GET_CODE (XEXP (x, 1)) == CONST_INT
++	  && INTVAL (XEXP (x, 1)) == (HOST_WIDE_INT) - 16
++	  && !CONSTANT_P (XEXP (x, 0))))
+     x = XEXP (x, 0);
+   switch (GET_CODE (x))
+     {
+-    case SYMBOL_REF:
+     case LABEL_REF:
+-      return !TARGET_LARGE_MEM;
++      return !TARGET_LARGE_MEM && !aligned;
++
++    case SYMBOL_REF:
++      return !TARGET_LARGE_MEM && (!aligned || ALIGNED_SYMBOL_REF_P (x));
+ 
+     case CONST:
+       if (!TARGET_LARGE_MEM && GET_CODE (XEXP (x, 0)) == PLUS)
+@@ -3555,22 +3583,30 @@ spu_legitimate_address (enum machine_mod
+ 	  rtx sym = XEXP (XEXP (x, 0), 0);
+ 	  rtx cst = XEXP (XEXP (x, 0), 1);
+ 
+-	  /* Accept any symbol_ref + constant, assuming it does not
+-	     wrap around the local store addressability limit.  */
+ 	  if (GET_CODE (sym) == SYMBOL_REF && GET_CODE (cst) == CONST_INT)
+-	    return 1;
++	    {
++	      /* Check for alignment if required.  */
++	      if (!aligned)
++		return 1;
++	      if ((INTVAL (cst) & 15) == 0 && ALIGNED_SYMBOL_REF_P (sym))
++		return 1;
++	    }
+ 	}
+       return 0;
+ 
+     case CONST_INT:
++      /* We don't test alignement here.  For an absolute address we
++         assume the user knows what they are doing. */
+       return INTVAL (x) >= 0 && INTVAL (x) <= 0x3ffff;
+ 
+     case SUBREG:
+       x = XEXP (x, 0);
+-      gcc_assert (GET_CODE (x) == REG);
++      if (GET_CODE (x) != REG)
++	return 0;
+ 
+     case REG:
+-      return INT_REG_OK_FOR_BASE_P (x, reg_ok_strict);
++      return INT_REG_OK_FOR_BASE_P (x, reg_ok_strict)
++	&& reg_aligned_for_addr (x, 0);
+ 
+     case PLUS:
+     case LO_SUM:
+@@ -3581,21 +3617,29 @@ spu_legitimate_address (enum machine_mod
+ 	  op0 = XEXP (op0, 0);
+ 	if (GET_CODE (op1) == SUBREG)
+ 	  op1 = XEXP (op1, 0);
+-	/* We can't just accept any aligned register because CSE can
+-	   change it to a register that is not marked aligned and then
+-	   recog will fail.   So we only accept frame registers because
+-	   they will only be changed to other frame registers. */
+ 	if (GET_CODE (op0) == REG
+ 	    && INT_REG_OK_FOR_BASE_P (op0, reg_ok_strict)
+ 	    && GET_CODE (op1) == CONST_INT
+ 	    && INTVAL (op1) >= -0x2000
+ 	    && INTVAL (op1) <= 0x1fff
+-	    && (regno_aligned_for_load (REGNO (op0)) || (INTVAL (op1) & 15) == 0))
++	    && reg_aligned_for_addr (op0, 0)
++	    && (!const_aligned
++		|| (INTVAL (op1) & 15) == 0
++		|| ((reload_in_progress || reload_completed)
++		    && GET_MODE_SIZE (mode) < 4
++		    && (INTVAL (op1) & 15) == 4 - GET_MODE_SIZE (mode))
++		/* Some passes create a fake register for testing valid
++		   addresses, be more lenient when we see those.  ivopts
++		   and reload do it. */
++		|| REGNO (op0) == LAST_VIRTUAL_REGISTER + 1
++		|| REGNO (op0) == LAST_VIRTUAL_REGISTER + 2))
+ 	  return 1;
+ 	if (GET_CODE (op0) == REG
+ 	    && INT_REG_OK_FOR_BASE_P (op0, reg_ok_strict)
++	    && reg_aligned_for_addr (op0, 0)
+ 	    && GET_CODE (op1) == REG
+-	    && INT_REG_OK_FOR_INDEX_P (op1, reg_ok_strict))
++	    && INT_REG_OK_FOR_INDEX_P (op1, reg_ok_strict)
++	    && reg_aligned_for_addr (op1, 0))
+ 	  return 1;
+       }
+       break;
+@@ -3633,7 +3677,7 @@ spu_legitimize_address (rtx x, rtx oldx
+       else if (GET_CODE (op1) != REG)
+ 	op1 = force_reg (Pmode, op1);
+       x = gen_rtx_PLUS (Pmode, op0, op1);
+-      if (spu_legitimate_address (mode, x, 0))
++      if (spu_legitimate_address (mode, x, 0, 0))
+ 	return x;
+     }
+   return NULL_RTX;
+@@ -4058,60 +4102,16 @@ spu_conditional_register_usage (void)
+     }
+ }
+ 
+-/* This is called to decide when we can simplify a load instruction.  We
+-   must only return true for registers which we know will always be
+-   aligned.  Taking into account that CSE might replace this reg with
+-   another one that has not been marked aligned.  
+-   So this is really only true for frame, stack and virtual registers,
+-   which we know are always aligned and should not be adversely effected
+-   by CSE.  */
++/* This is called any time we inspect the alignment of a register for
++   addresses.  */
+ static int
+-regno_aligned_for_load (int regno)
+-{
+-  return regno == FRAME_POINTER_REGNUM
+-    || (frame_pointer_needed && regno == HARD_FRAME_POINTER_REGNUM)
+-    || regno == ARG_POINTER_REGNUM
+-    || regno == STACK_POINTER_REGNUM
+-    || (regno >= FIRST_VIRTUAL_REGISTER 
+-	&& regno <= LAST_VIRTUAL_REGISTER);
+-}
+-
+-/* Return TRUE when mem is known to be 16-byte aligned. */
+-int
+-aligned_mem_p (rtx mem)
++reg_aligned_for_addr (rtx x, int aligned)
+ {
+-  if (MEM_ALIGN (mem) >= 128)
++  int regno =
++    REGNO (x) < FIRST_PSEUDO_REGISTER ? ORIGINAL_REGNO (x) : REGNO (x);
++  if (!aligned)
+     return 1;
+-  if (GET_MODE_SIZE (GET_MODE (mem)) >= 16)
+-    return 1;
+-  if (GET_CODE (XEXP (mem, 0)) == PLUS)
+-    {
+-      rtx p0 = XEXP (XEXP (mem, 0), 0);
+-      rtx p1 = XEXP (XEXP (mem, 0), 1);
+-      if (regno_aligned_for_load (REGNO (p0)))
+-	{
+-	  if (GET_CODE (p1) == REG && regno_aligned_for_load (REGNO (p1)))
+-	    return 1;
+-	  if (GET_CODE (p1) == CONST_INT && (INTVAL (p1) & 15) == 0)
+-	    return 1;
+-	}
+-    }
+-  else if (GET_CODE (XEXP (mem, 0)) == REG)
+-    {
+-      if (regno_aligned_for_load (REGNO (XEXP (mem, 0))))
+-	return 1;
+-    }
+-  else if (ALIGNED_SYMBOL_REF_P (XEXP (mem, 0)))
+-    return 1;
+-  else if (GET_CODE (XEXP (mem, 0)) == CONST)
+-    {
+-      rtx p0 = XEXP (XEXP (XEXP (mem, 0), 0), 0);
+-      rtx p1 = XEXP (XEXP (XEXP (mem, 0), 0), 1);
+-      if (GET_CODE (p0) == SYMBOL_REF
+-	  && GET_CODE (p1) == CONST_INT && (INTVAL (p1) & 15) == 0)
+-	return 1;
+-    }
+-  return 0;
++  return REGNO_POINTER_ALIGN (regno) >= 128;
+ }
+ 
+ /* Encode symbol attributes (local vs. global, tls model) of a SYMBOL_REF
+@@ -4140,9 +4140,12 @@ spu_encode_section_info (tree decl, rtx
+ static int
+ store_with_one_insn_p (rtx mem)
+ {
++  enum machine_mode mode = GET_MODE (mem);
+   rtx addr = XEXP (mem, 0);
+-  if (GET_MODE (mem) == BLKmode)
++  if (mode == BLKmode)
+     return 0;
++  if (GET_MODE_SIZE (mode) >= 16)
++    return 1;
+   /* Only static objects. */
+   if (GET_CODE (addr) == SYMBOL_REF)
+     {
+@@ -4166,6 +4169,22 @@ store_with_one_insn_p (rtx mem)
+   return 0;
+ }
+ 
++/* Return 1 when the address is not valid for a simple load and store as
++   required by the '_mov*' patterns.   We could make this less strict
++   for loads, but we prefer mem's to look the same so they are more
++   likely to be merged.  */
++static int
++address_needs_split (rtx mem)
++{
++  if (GET_MODE_SIZE (GET_MODE (mem)) < 16
++      && (GET_MODE_SIZE (GET_MODE (mem)) < 4
++	  || !(store_with_one_insn_p (mem)
++	       || mem_is_padded_component_ref (mem))))
++    return 1;
++
++  return 0;
++}
++
+ int
+ spu_expand_mov (rtx * ops, enum machine_mode mode)
+ {
+@@ -4213,25 +4232,6 @@ spu_expand_mov (rtx * ops, enum machine_
+     }
+   else
+     {
+-      if (GET_CODE (ops[0]) == MEM)
+-	{
+-	  if (!spu_valid_move (ops))
+-	    {
+-	      emit_insn (gen_store (ops[0], ops[1], gen_reg_rtx (TImode),
+-				    gen_reg_rtx (TImode)));
+-	      return 1;
+-	    }
+-	}
+-      else if (GET_CODE (ops[1]) == MEM)
+-	{
+-	  if (!spu_valid_move (ops))
+-	    {
+-	      emit_insn (gen_load
+-			 (ops[0], ops[1], gen_reg_rtx (TImode),
+-			  gen_reg_rtx (SImode)));
+-	      return 1;
+-	    }
+-	}
+       /* Catch the SImode immediates greater than 0x7fffffff, and sign
+          extend them. */
+       if (GET_CODE (ops[1]) == CONST_INT)
+@@ -4247,7 +4247,7 @@ spu_expand_mov (rtx * ops, enum machine_
+   return 0;
+ }
+ 
+-void
++int
+ spu_split_load (rtx * ops)
+ {
+   enum machine_mode mode = GET_MODE (ops[0]);
+@@ -4255,6 +4255,17 @@ spu_split_load (rtx * ops)
+   int rot_amt;
+ 
+   addr = XEXP (ops[1], 0);
++  gcc_assert (GET_CODE (addr) != AND);
++
++  if (!address_needs_split (ops[1]))
++    {
++      addr = XEXP (ops[1], 0);
++      if (spu_legitimate_address (mode, addr, 0, 1))
++	return 0;
++      ops[1] = change_address (ops[1], VOIDmode, force_reg (Pmode, addr));
++      emit_move_insn (ops[0], ops[1]);
++      return 1;
++    }
+ 
+   rot = 0;
+   rot_amt = 0;
+@@ -4272,12 +4283,32 @@ spu_split_load (rtx * ops)
+        */
+       p0 = XEXP (addr, 0);
+       p1 = XEXP (addr, 1);
+-      if (REG_P (p0) && !regno_aligned_for_load (REGNO (p0)))
++      if (!reg_aligned_for_addr (p0, 1))
+ 	{
+-	  if (REG_P (p1) && !regno_aligned_for_load (REGNO (p1)))
++	  if (GET_CODE (p1) == REG && !reg_aligned_for_addr (p1, 1))
+ 	    {
+-	      emit_insn (gen_addsi3 (ops[3], p0, p1));
+-	      rot = ops[3];
++	      rot = gen_reg_rtx (SImode);
++	      emit_insn (gen_addsi3 (rot, p0, p1));
++	    }
++	  else if (GET_CODE (p1) == CONST_INT && (INTVAL (p1) & 15))
++	    {
++	      if (INTVAL (p1) > 0
++		  && INTVAL (p1) * BITS_PER_UNIT < REG_ALIGN (p0))
++		{
++		  rot = gen_reg_rtx (SImode);
++		  emit_insn (gen_addsi3 (rot, p0, p1));
++		  addr = p0;
++		}
++	      else
++		{
++		  rtx x = gen_reg_rtx (SImode);
++		  emit_move_insn (x, p1);
++		  if (!spu_arith_operand (p1, SImode))
++		    p1 = x;
++		  rot = gen_reg_rtx (SImode);
++		  emit_insn (gen_addsi3 (rot, p0, p1));
++		  addr = gen_rtx_PLUS (Pmode, p0, x);
++		}
+ 	    }
+ 	  else
+ 	    rot = p0;
+@@ -4287,16 +4318,21 @@ spu_split_load (rtx * ops)
+ 	  if (GET_CODE (p1) == CONST_INT && (INTVAL (p1) & 15))
+ 	    {
+ 	      rot_amt = INTVAL (p1) & 15;
+-	      p1 = GEN_INT (INTVAL (p1) & -16);
+-	      addr = gen_rtx_PLUS (SImode, p0, p1);
++	      if (INTVAL (p1) & -16)
++		{
++		  p1 = GEN_INT (INTVAL (p1) & -16);
++		  addr = gen_rtx_PLUS (SImode, p0, p1);
++		}
++	      else
++		addr = p0;
+ 	    }
+-	  else if (REG_P (p1) && !regno_aligned_for_load (REGNO (p1)))
++	  else if (GET_CODE (p1) == REG && !reg_aligned_for_addr (p1, 1))
+ 	    rot = p1;
+ 	}
+     }
+   else if (GET_CODE (addr) == REG)
+     {
+-      if (!regno_aligned_for_load (REGNO (addr)))
++      if (!reg_aligned_for_addr (addr, 1))
+ 	rot = addr;
+     }
+   else if (GET_CODE (addr) == CONST)
+@@ -4315,7 +4351,10 @@ spu_split_load (rtx * ops)
+ 	    addr = XEXP (XEXP (addr, 0), 0);
+ 	}
+       else
+-	rot = addr;
++	{
++	  rot = gen_reg_rtx (Pmode);
++	  emit_move_insn (rot, addr);
++	}
+     }
+   else if (GET_CODE (addr) == CONST_INT)
+     {
+@@ -4323,7 +4362,10 @@ spu_split_load (rtx * ops)
+       addr = GEN_INT (rot_amt & -16);
+     }
+   else if (!ALIGNED_SYMBOL_REF_P (addr))
+-    rot = addr;
++    {
++      rot = gen_reg_rtx (Pmode);
++      emit_move_insn (rot, addr);
++    }
+ 
+   if (GET_MODE_SIZE (mode) < 4)
+     rot_amt += GET_MODE_SIZE (mode) - 4;
+@@ -4332,15 +4374,15 @@ spu_split_load (rtx * ops)
+ 
+   if (rot && rot_amt)
+     {
+-      emit_insn (gen_addsi3 (ops[3], rot, GEN_INT (rot_amt)));
+-      rot = ops[3];
++      rtx x = gen_reg_rtx (SImode);
++      emit_insn (gen_addsi3 (x, rot, GEN_INT (rot_amt)));
++      rot = x;
+       rot_amt = 0;
+     }
+ 
+-  load = ops[2];
++  load = gen_reg_rtx (TImode);
+ 
+-  addr = gen_rtx_AND (SImode, copy_rtx (addr), GEN_INT (-16));
+-  mem = change_address (ops[1], TImode, addr);
++  mem = change_address (ops[1], TImode, copy_rtx (addr));
+ 
+   emit_insn (gen_movti (load, mem));
+ 
+@@ -4349,23 +4391,31 @@ spu_split_load (rtx * ops)
+   else if (rot_amt)
+     emit_insn (gen_rotlti3 (load, load, GEN_INT (rot_amt * 8)));
+ 
+-  if (reload_completed)
+-    emit_move_insn (ops[0], gen_rtx_REG (GET_MODE (ops[0]), REGNO (load)));
+-  else
+-    emit_insn (gen_spu_convert (ops[0], load));
++  emit_insn (gen_spu_convert (ops[0], load));
++  return 1;
+ }
+ 
+-void
++int
+ spu_split_store (rtx * ops)
+ {
+   enum machine_mode mode = GET_MODE (ops[0]);
+-  rtx pat = ops[2];
+-  rtx reg = ops[3];
++  rtx reg;
+   rtx addr, p0, p1, p1_lo, smem;
+   int aform;
+   int scalar;
+ 
++  if (!address_needs_split (ops[0]))
++    {
++      addr = XEXP (ops[0], 0);
++      if (spu_legitimate_address (mode, addr, 0, 1))
++	return 0;
++      ops[0] = change_address (ops[0], VOIDmode, force_reg (Pmode, addr));
++      emit_move_insn (ops[0], ops[1]);
++      return 1;
++    }
++
+   addr = XEXP (ops[0], 0);
++  gcc_assert (GET_CODE (addr) != AND);
+ 
+   if (GET_CODE (addr) == PLUS)
+     {
+@@ -4377,7 +4427,7 @@ spu_split_store (rtx * ops)
+          unaligned reg + aligned reg     => lqx, c?x, shuf, stqx
+          unaligned reg + unaligned reg   => lqx, c?x, shuf, stqx
+          unaligned reg + aligned const   => lqd, c?d, shuf, stqx
+-         unaligned reg + unaligned const -> not allowed by legitimate address
++         unaligned reg + unaligned const -> lqx, c?d, shuf, stqx
+        */
+       aform = 0;
+       p0 = XEXP (addr, 0);
+@@ -4385,8 +4435,20 @@ spu_split_store (rtx * ops)
+       if (GET_CODE (p0) == REG && GET_CODE (p1) == CONST_INT)
+ 	{
+ 	  p1_lo = GEN_INT (INTVAL (p1) & 15);
+-	  p1 = GEN_INT (INTVAL (p1) & -16);
+-	  addr = gen_rtx_PLUS (SImode, p0, p1);
++	  if (reg_aligned_for_addr (p0, 1))
++	    {
++	      p1 = GEN_INT (INTVAL (p1) & -16);
++	      if (p1 == const0_rtx)
++		addr = p0;
++	      else
++		addr = gen_rtx_PLUS (SImode, p0, p1);
++	    }
++	  else
++	    {
++	      rtx x = gen_reg_rtx (SImode);
++	      emit_move_insn (x, p1);
++	      addr = gen_rtx_PLUS (SImode, p0, x);
++	    }
+ 	}
+     }
+   else if (GET_CODE (addr) == REG)
+@@ -4403,31 +4465,34 @@ spu_split_store (rtx * ops)
+       p1_lo = addr;
+       if (ALIGNED_SYMBOL_REF_P (addr))
+ 	p1_lo = const0_rtx;
+-      else if (GET_CODE (addr) == CONST)
++      else if (GET_CODE (addr) == CONST
++	       && GET_CODE (XEXP (addr, 0)) == PLUS
++	       && ALIGNED_SYMBOL_REF_P (XEXP (XEXP (addr, 0), 0))
++	       && GET_CODE (XEXP (XEXP (addr, 0), 1)) == CONST_INT)
+ 	{
+-	  if (GET_CODE (XEXP (addr, 0)) == PLUS
+-	      && ALIGNED_SYMBOL_REF_P (XEXP (XEXP (addr, 0), 0))
+-	      && GET_CODE (XEXP (XEXP (addr, 0), 1)) == CONST_INT)
+-	    {
+-	      HOST_WIDE_INT v = INTVAL (XEXP (XEXP (addr, 0), 1));
+-	      if ((v & -16) != 0)
+-		addr = gen_rtx_CONST (Pmode,
+-				      gen_rtx_PLUS (Pmode,
+-						    XEXP (XEXP (addr, 0), 0),
+-						    GEN_INT (v & -16)));
+-	      else
+-		addr = XEXP (XEXP (addr, 0), 0);
+-	      p1_lo = GEN_INT (v & 15);
+-	    }
++	  HOST_WIDE_INT v = INTVAL (XEXP (XEXP (addr, 0), 1));
++	  if ((v & -16) != 0)
++	    addr = gen_rtx_CONST (Pmode,
++				  gen_rtx_PLUS (Pmode,
++						XEXP (XEXP (addr, 0), 0),
++						GEN_INT (v & -16)));
++	  else
++	    addr = XEXP (XEXP (addr, 0), 0);
++	  p1_lo = GEN_INT (v & 15);
+ 	}
+       else if (GET_CODE (addr) == CONST_INT)
+ 	{
+ 	  p1_lo = GEN_INT (INTVAL (addr) & 15);
+ 	  addr = GEN_INT (INTVAL (addr) & -16);
+ 	}
++      else
++	{
++	  p1_lo = gen_reg_rtx (SImode);
++	  emit_move_insn (p1_lo, addr);
++	}
+     }
+ 
+-  addr = gen_rtx_AND (SImode, copy_rtx (addr), GEN_INT (-16));
++  reg = gen_reg_rtx (TImode);
+ 
+   scalar = store_with_one_insn_p (ops[0]);
+   if (!scalar)
+@@ -4437,11 +4502,12 @@ spu_split_store (rtx * ops)
+          possible, and copying the flags will prevent that in certain
+          cases, e.g. consider the volatile flag. */
+ 
++      rtx pat = gen_reg_rtx (TImode);
+       rtx lmem = change_address (ops[0], TImode, copy_rtx (addr));
+       set_mem_alias_set (lmem, 0);
+       emit_insn (gen_movti (reg, lmem));
+ 
+-      if (!p0 || regno_aligned_for_load (REGNO (p0)))
++      if (!p0 || reg_aligned_for_addr (p0, 1))
+ 	p0 = stack_pointer_rtx;
+       if (!p1_lo)
+ 	p1_lo = const0_rtx;
+@@ -4449,17 +4515,6 @@ spu_split_store (rtx * ops)
+       emit_insn (gen_cpat (pat, p0, p1_lo, GEN_INT (GET_MODE_SIZE (mode))));
+       emit_insn (gen_shufb (reg, ops[1], reg, pat));
+     }
+-  else if (reload_completed)
+-    {
+-      if (GET_CODE (ops[1]) == REG)
+-	emit_move_insn (reg, gen_rtx_REG (GET_MODE (reg), REGNO (ops[1])));
+-      else if (GET_CODE (ops[1]) == SUBREG)
+-	emit_move_insn (reg,
+-			gen_rtx_REG (GET_MODE (reg),
+-				     REGNO (SUBREG_REG (ops[1]))));
+-      else
+-	abort ();
+-    }
+   else
+     {
+       if (GET_CODE (ops[1]) == REG)
+@@ -4471,15 +4526,16 @@ spu_split_store (rtx * ops)
+     }
+ 
+   if (GET_MODE_SIZE (mode) < 4 && scalar)
+-    emit_insn (gen_shlqby_ti
+-	       (reg, reg, GEN_INT (4 - GET_MODE_SIZE (mode))));
++    emit_insn (gen_ashlti3
++	       (reg, reg, GEN_INT (32 - GET_MODE_BITSIZE (mode))));
+ 
+-  smem = change_address (ops[0], TImode, addr);
++  smem = change_address (ops[0], TImode, copy_rtx (addr));
+   /* We can't use the previous alias set because the memory has changed
+      size and can potentially overlap objects of other types.  */
+   set_mem_alias_set (smem, 0);
+ 
+   emit_insn (gen_movti (smem, reg));
++  return 1;
+ }
+ 
+ /* Return TRUE if X is MEM which is a struct member reference
+@@ -4578,37 +4634,6 @@ fix_range (const char *const_str)
+     }
+ }
+ 
+-int
+-spu_valid_move (rtx * ops)
+-{
+-  enum machine_mode mode = GET_MODE (ops[0]);
+-  if (!register_operand (ops[0], mode) && !register_operand (ops[1], mode))
+-    return 0;
+-
+-  /* init_expr_once tries to recog against load and store insns to set
+-     the direct_load[] and direct_store[] arrays.  We always want to
+-     consider those loads and stores valid.  init_expr_once is called in
+-     the context of a dummy function which does not have a decl. */
+-  if (cfun->decl == 0)
+-    return 1;
+-
+-  /* Don't allows loads/stores which would require more than 1 insn.
+-     During and after reload we assume loads and stores only take 1
+-     insn. */
+-  if (GET_MODE_SIZE (mode) < 16 && !reload_in_progress && !reload_completed)
+-    {
+-      if (GET_CODE (ops[0]) == MEM
+-	  && (GET_MODE_SIZE (mode) < 4
+-	      || !(store_with_one_insn_p (ops[0])
+-		   || mem_is_padded_component_ref (ops[0]))))
+-	return 0;
+-      if (GET_CODE (ops[1]) == MEM
+-	  && (GET_MODE_SIZE (mode) < 4 || !aligned_mem_p (ops[1])))
+-	return 0;
+-    }
+-  return 1;
+-}
+-
+ /* Return TRUE if x is a CONST_INT, CONST_DOUBLE or CONST_VECTOR that
+    can be generated using the fsmbi instruction. */
+ int
+@@ -6260,12 +6285,26 @@ spu_sms_res_mii (struct ddg *g)
+ 
+ void
+ spu_init_expanders (void)
+-{   
+-  /* HARD_FRAME_REGISTER is only 128 bit aligned when
+-   * frame_pointer_needed is true.  We don't know that until we're
+-   * expanding the prologue. */
++{
+   if (cfun)
+-    REGNO_POINTER_ALIGN (HARD_FRAME_POINTER_REGNUM) = 8;
++    {
++      rtx r0, r1;
++      /* HARD_FRAME_REGISTER is only 128 bit aligned when
++         frame_pointer_needed is true.  We don't know that until we're
++         expanding the prologue. */
++      REGNO_POINTER_ALIGN (HARD_FRAME_POINTER_REGNUM) = 8;
++
++      /* A number of passes use LAST_VIRTUAL_REGISTER+1 and
++         LAST_VIRTUAL_REGISTER+2 to test the back-end.  We want to
++         handle those cases specially, so we reserve those two registers
++         here by generating them. */
++      r0 = gen_reg_rtx (SImode);
++      r1 = gen_reg_rtx (SImode);
++      mark_reg_pointer (r0, 128);
++      mark_reg_pointer (r1, 128);
++      gcc_assert (REGNO (r0) == LAST_VIRTUAL_REGISTER + 1
++		  && REGNO (r1) == LAST_VIRTUAL_REGISTER + 2);
++    }
+ }
+ 
+ static enum machine_mode
+Index: gcc-4.3.4-20090804/gcc/config/spu/spu.h
+===================================================================
+--- gcc-4.3.4-20090804.orig/gcc/config/spu/spu.h	2009-09-21 11:42:15.000000000 +0200
++++ gcc-4.3.4-20090804/gcc/config/spu/spu.h	2009-09-21 11:47:27.000000000 +0200
+@@ -255,6 +255,11 @@ enum reg_class {
+ #define INT_REG_OK_FOR_BASE_P(X,STRICT) \
+ 	((!(STRICT) || REGNO_OK_FOR_BASE_P (REGNO (X))))
+ 
++#define REG_ALIGN(X) \
++	(REG_POINTER(X) \
++	 	? REGNO_POINTER_ALIGN (ORIGINAL_REGNO (X)) \
++		: 0)
++
+ #define PREFERRED_RELOAD_CLASS(X,CLASS)  (CLASS)
+ 
+ #define CLASS_MAX_NREGS(CLASS, MODE)	\
+@@ -440,7 +445,7 @@ targetm.resolve_overloaded_builtin = spu
+ #endif
+ 
+ #define GO_IF_LEGITIMATE_ADDRESS(MODE, X, ADDR)			\
+-    { if (spu_legitimate_address (MODE, X, REG_OK_STRICT_FLAG))	\
++    { if (spu_legitimate_address (MODE, X, REG_OK_STRICT_FLAG, 0))	\
+ 	goto ADDR;						\
+     }
+ 
+@@ -634,6 +639,8 @@ targetm.resolve_overloaded_builtin = spu
+ extern GTY(()) rtx spu_compare_op0;
+ extern GTY(()) rtx spu_compare_op1;
+ 
++#define SPLIT_BEFORE_CSE2 1
++
+ 
+ /* Builtins.  */
+ 
+Index: gcc-4.3.4-20090804/gcc/config/spu/spu.md
+===================================================================
+--- gcc-4.3.4-20090804.orig/gcc/config/spu/spu.md	2009-09-21 11:44:57.000000000 +0200
++++ gcc-4.3.4-20090804/gcc/config/spu/spu.md	2009-09-21 11:47:27.000000000 +0200
+@@ -276,8 +276,7 @@
+ (define_split 
+   [(set (match_operand 0 "spu_reg_operand")
+ 	(match_operand 1 "immediate_operand"))]
+-
+-  ""
++  "split0_completed"
+   [(set (match_dup 0)
+ 	(high (match_dup 1)))
+    (set (match_dup 0)
+@@ -314,9 +313,10 @@
+ ;; move internal
+ 
+ (define_insn "_mov<mode>"
+-  [(set (match_operand:MOV 0 "spu_nonimm_operand" "=r,r,r,r,r,m")
++  [(set (match_operand:MOV 0 "spu_dest_operand" "=r,r,r,r,r,m")
+ 	(match_operand:MOV 1 "spu_mov_operand" "r,A,f,j,m,r"))]
+-  "spu_valid_move (operands)"
++  "register_operand(operands[0], <MODE>mode)
++   || register_operand(operands[1], <MODE>mode)"
+   "@
+    ori\t%0,%1,0
+    il%s1\t%0,%S1
+@@ -334,9 +334,10 @@
+   "iohl\t%0,%2@l")
+ 
+ (define_insn "_movdi"
+-  [(set (match_operand:DI 0 "spu_nonimm_operand" "=r,r,r,r,r,m")
++  [(set (match_operand:DI 0 "spu_dest_operand" "=r,r,r,r,r,m")
+ 	(match_operand:DI 1 "spu_mov_operand" "r,a,f,k,m,r"))]
+-  "spu_valid_move (operands)"
++  "register_operand(operands[0], DImode)
++   || register_operand(operands[1], DImode)"
+   "@
+    ori\t%0,%1,0
+    il%d1\t%0,%D1
+@@ -347,9 +348,10 @@
+   [(set_attr "type" "fx2,fx2,shuf,shuf,load,store")])
+ 
+ (define_insn "_movti"
+-  [(set (match_operand:TI 0 "spu_nonimm_operand" "=r,r,r,r,r,m")
++  [(set (match_operand:TI 0 "spu_dest_operand" "=r,r,r,r,r,m")
+ 	(match_operand:TI 1 "spu_mov_operand" "r,U,f,l,m,r"))]
+-  "spu_valid_move (operands)"
++  "register_operand(operands[0], TImode)
++   || register_operand(operands[1], TImode)"
+   "@
+    ori\t%0,%1,0
+    il%t1\t%0,%T1
+@@ -359,29 +361,25 @@
+    stq%p0\t%1,%0"
+   [(set_attr "type" "fx2,fx2,shuf,shuf,load,store")])
+ 
+-(define_insn_and_split "load"
+-  [(set (match_operand 0 "spu_reg_operand" "=r")
+-	(match_operand 1 "memory_operand" "m"))
+-   (clobber (match_operand:TI 2 "spu_reg_operand" "=&r"))
+-   (clobber (match_operand:SI 3 "spu_reg_operand" "=&r"))]
+-  "GET_MODE(operands[0]) == GET_MODE(operands[1])"
+-  "#"
+-  ""
++(define_split
++  [(set (match_operand 0 "spu_reg_operand")
++	(match_operand 1 "memory_operand"))]
++  "GET_MODE(operands[0]) == GET_MODE(operands[1]) && !split0_completed"
+   [(set (match_dup 0)
+ 	(match_dup 1))]
+-  { spu_split_load(operands); DONE; })
++  { if (spu_split_load(operands))
++      DONE;
++  })
+ 
+-(define_insn_and_split "store"
+-  [(set (match_operand 0 "memory_operand" "=m")
+-	(match_operand 1 "spu_reg_operand" "r"))
+-   (clobber (match_operand:TI 2 "spu_reg_operand" "=&r"))
+-   (clobber (match_operand:TI 3 "spu_reg_operand" "=&r"))]
+-  "GET_MODE(operands[0]) == GET_MODE(operands[1])"
+-  "#"
+-  ""
++(define_split
++  [(set (match_operand 0 "memory_operand")
++	(match_operand 1 "spu_reg_operand"))]
++  "GET_MODE(operands[0]) == GET_MODE(operands[1]) && !split0_completed"
+   [(set (match_dup 0)
+ 	(match_dup 1))]
+-  { spu_split_store(operands); DONE; })
++  { if (spu_split_store(operands))
++      DONE;
++  })
+ 
+ ;; Operand 3 is the number of bytes. 1:b 2:h 4:w 8:d
+ 
+Index: gcc-4.3.4-20090804/gcc/config/spu/spu-protos.h
+===================================================================
+--- gcc-4.3.4-20090804.orig/gcc/config/spu/spu-protos.h	2009-09-21 11:42:15.000000000 +0200
++++ gcc-4.3.4-20090804/gcc/config/spu/spu-protos.h	2009-09-21 11:47:27.000000000 +0200
+@@ -54,7 +54,7 @@ extern int arith_immediate_p (rtx op, en
+ extern int spu_constant_address_p (rtx x);
+ extern int spu_legitimate_constant_p (rtx x);
+ extern int spu_legitimate_address (enum machine_mode mode, rtx x,
+-				   int reg_ok_strict);
++				   int reg_ok_strict, int for_split);
+ extern rtx spu_legitimize_address (rtx x, rtx oldx, enum machine_mode mode);
+ extern int spu_initial_elimination_offset (int from, int to);
+ extern rtx spu_function_value (const_tree type, const_tree func);
+@@ -64,11 +64,9 @@ extern void spu_setup_incoming_varargs (
+ 					tree type, int *pretend_size,
+ 					int no_rtl);
+ extern void spu_conditional_register_usage (void);
+-extern int aligned_mem_p (rtx mem);
+ extern int spu_expand_mov (rtx * ops, enum machine_mode mode);
+-extern void spu_split_load (rtx * ops);
+-extern void spu_split_store (rtx * ops);
+-extern int spu_valid_move (rtx * ops);
++extern int spu_split_load (rtx * ops);
++extern int spu_split_store (rtx * ops);
+ extern int fsmbi_const_p (rtx x);
+ extern int cpat_const_p (rtx x, enum machine_mode mode);
+ extern rtx gen_cpat_const (rtx * ops);
+Index: gcc-4.3.4-20090804/gcc/doc/tm.texi
+===================================================================
+--- gcc-4.3.4-20090804.orig/gcc/doc/tm.texi	2009-09-21 11:45:35.000000000 +0200
++++ gcc-4.3.4-20090804/gcc/doc/tm.texi	2009-09-21 11:47:27.000000000 +0200
+@@ -10383,3 +10383,15 @@ to the functions in @file{libgcc} that p
+ call stack unwinding.  It is used in declarations in @file{unwind-generic.h}
+ and the associated definitions of those functions.
+ @end defmac
++
++@defmac SPLIT_BEFORE_CSE2
++This macro determines whether to use an additional split pass before the
++second CSE pass.  @code{split0_completed} will be set after this pass is
++completed.
++
++For example, the Cell SPU target uses this for better optimization of
++the multiple instructions required to do simple loads and stores.  The
++optimizations before this pass work better on simple memory
++instructions, and the optimizations right after this pass (e.g., CSE and
++combine) are be able to optimize the split instructions.
++@end defmac
+Index: gcc-4.3.4-20090804/gcc/final.c
+===================================================================
+--- gcc-4.3.4-20090804.orig/gcc/final.c	2009-09-21 11:42:15.000000000 +0200
++++ gcc-4.3.4-20090804/gcc/final.c	2009-09-21 11:47:27.000000000 +0200
+@@ -4242,6 +4242,9 @@ rest_of_clean_state (void)
+ #ifdef STACK_REGS
+   regstack_completed = 0;
+ #endif
++#ifdef SPLIT_BEFORE_CSE2
++  split0_completed = 0;
++#endif
+ 
+   /* Clear out the insn_length contents now that they are no
+      longer valid.  */
+Index: gcc-4.3.4-20090804/gcc/passes.c
+===================================================================
+--- gcc-4.3.4-20090804.orig/gcc/passes.c	2009-09-21 11:45:25.000000000 +0200
++++ gcc-4.3.4-20090804/gcc/passes.c	2009-09-21 11:47:27.000000000 +0200
+@@ -716,6 +716,7 @@ init_optimization_passes (void)
+ 	}
+       NEXT_PASS (pass_web);
+       NEXT_PASS (pass_jump_bypass);
++      NEXT_PASS (pass_split_before_cse2);
+       NEXT_PASS (pass_cse2);
+       NEXT_PASS (pass_rtl_dse1);
+       NEXT_PASS (pass_rtl_fwprop_addr);
+Index: gcc-4.3.4-20090804/gcc/recog.c
+===================================================================
+--- gcc-4.3.4-20090804.orig/gcc/recog.c	2009-09-21 11:45:45.000000000 +0200
++++ gcc-4.3.4-20090804/gcc/recog.c	2009-09-21 11:47:27.000000000 +0200
+@@ -102,6 +102,11 @@ int reload_completed;
+ /* Nonzero after thread_prologue_and_epilogue_insns has run.  */
+ int epilogue_completed;
+ 
++#ifdef SPLIT_BEFORE_CSE2
++/* Nonzero after split0 pass has run.  */
++int split0_completed;
++#endif
++
+ /* Initialize data used by the function `recog'.
+    This must be called once in the compilation of a function
+    before any insn recognition may be done in the function.  */
+@@ -3577,4 +3582,40 @@ struct tree_opt_pass pass_split_for_shor
+   0                                     /* letter */
+ };
+ 
++static bool
++gate_handle_split_before_cse2 (void)
++{
++#ifdef SPLIT_BEFORE_CSE2
++  return SPLIT_BEFORE_CSE2;
++#else
++  return 0;
++#endif
++}
++
++static unsigned int
++rest_of_handle_split_before_cse2 (void)
++{
++#ifdef SPLIT_BEFORE_CSE2
++  split_all_insns_noflow ();
++  split0_completed = 1;
++#endif
++  return 0;
++}
++
++struct tree_opt_pass pass_split_before_cse2 =
++{
++  "split0",                             /* name */
++  gate_handle_split_before_cse2,        /* gate */
++  rest_of_handle_split_before_cse2,     /* execute */
++  NULL,                                 /* sub */
++  NULL,                                 /* next */
++  0,                                    /* static_pass_number */
++  0,                                    /* tv_id */
++  0,                                    /* properties_required */
++  0,                                    /* properties_provided */
++  0,                                    /* properties_destroyed */
++  0,                                    /* todo_flags_start */
++  TODO_dump_func,                       /* todo_flags_finish */
++  0                                     /* letter */
++};
+ 
+Index: gcc-4.3.4-20090804/gcc/rtl.h
+===================================================================
+--- gcc-4.3.4-20090804.orig/gcc/rtl.h	2009-09-21 11:42:15.000000000 +0200
++++ gcc-4.3.4-20090804/gcc/rtl.h	2009-09-21 11:47:27.000000000 +0200
+@@ -1996,6 +1996,11 @@ extern int reload_completed;
+ /* Nonzero after thread_prologue_and_epilogue_insns has run.  */
+ extern int epilogue_completed;
+ 
++#ifdef SPLIT_BEFORE_CSE2
++/* Nonzero after the split0 pass has completed. */
++extern int split0_completed;
++#endif
++
+ /* Set to 1 while reload_as_needed is operating.
+    Required by some machines to handle any generated moves differently.  */
+ 
+Index: gcc-4.3.4-20090804/gcc/testsuite/gcc.target/spu/split0-1.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc-4.3.4-20090804/gcc/testsuite/gcc.target/spu/split0-1.c	2009-09-21 11:47:27.000000000 +0200
+@@ -0,0 +1,17 @@
++/* Make sure there are only 2 loads. */
++/* { dg-do compile { target spu-*-* } } */
++/* { dg-options "-O2" } */
++/* { dg-final { scan-assembler-times "lqd	\\$\[0-9\]+,0\$\\$\[0-9\]+\$" 1 } } */
++/* { dg-final { scan-assembler-times "lqd	\\$\[0-9\]+,16\$\\$\[0-9\]+\$" 1 } } */
++/* { dg-final { scan-assembler-times "lq\[dx\]" 2 } } */
++  
++struct __attribute__ ((__aligned__(16))) S {
++  int a, b, c, d;
++  int e, f, g, h;
++};
++  
++int
++f(struct S *s)
++{ 
++  return s->a + s->b + s->c + s->d + s->e + s->f + s->g + s->h;
++} 
+Index: gcc-4.3.4-20090804/gcc/tree-pass.h
+===================================================================
+--- gcc-4.3.4-20090804.orig/gcc/tree-pass.h	2009-09-21 11:45:25.000000000 +0200
++++ gcc-4.3.4-20090804/gcc/tree-pass.h	2009-09-21 11:47:27.000000000 +0200
+@@ -386,6 +386,7 @@ extern struct tree_opt_pass pass_rtl_dol
+ extern struct tree_opt_pass pass_rtl_loop_done;
+ 
+ extern struct tree_opt_pass pass_web;
++extern struct tree_opt_pass pass_split_before_cse2;
+ extern struct tree_opt_pass pass_cse2;
+ extern struct tree_opt_pass pass_df_initialize_opt;
+ extern struct tree_opt_pass pass_df_initialize_no_opt;
--- ibm-cell-split-fixes.orig
+++ ibm-cell-split-fixes
@@ -11,115 +11,97 @@ ChangeLog:
 	* config/spu/spu.md ("_abs<mode>2"): Do not split in split0 pass.
 
 
-diff -crNp -x .svn gcc-4_3-orig/gcc/config/spu/spu.c gcc-4_3/gcc/config/spu/spu.c
-*** gcc-4_3-orig/gcc/config/spu/spu.c	2008-09-10 22:09:24.000000000 +0200
---- gcc-4_3/gcc/config/spu/spu.c	2008-09-11 00:40:35.000000000 +0200
-*************** spu_split_load (rtx * ops)
-*** 3596,3602 ****
-  
-    rot = 0;
-    rot_amt = 0;
-!   if (GET_CODE (addr) == PLUS)
-      {
-        /* 8 cases:
-           aligned reg   + aligned reg     => lqx
---- 3596,3605 ----
-  
-    rot = 0;
-    rot_amt = 0;
-! 
-!   if (MEM_ALIGN (ops[1]) >= 128)
-!     /* Address is already aligned; simply perform a TImode load.  */;
-!   else if (GET_CODE (addr) == PLUS)
-      {
-        /* 8 cases:
-           aligned reg   + aligned reg     => lqx
-*************** spu_split_load (rtx * ops)
-*** 3707,3712 ****
---- 3710,3723 ----
-        rot_amt = 0;
-      }
-  
-+   /* If the source is properly aligned, we don't need to split this insn into
-+      a TImode load plus a _spu_convert.  However, we want to perform the split
-+      anyway when optimizing to make the MEMs look the same as those used for
-+      stores so they are more easily merged.  When *not* optimizing, that will
-+      not happen anyway, so we prefer to avoid generating the _spu_convert.  */
-+   if (!rot && !rot_amt && !optimize)
-+     return 0;
-+ 
-    load = gen_reg_rtx (TImode);
-  
-    mem = change_address (ops[1], TImode, copy_rtx (addr));
-diff -crNp -x .svn gcc-4_3-orig/gcc/config/spu/spu.h gcc-4_3/gcc/config/spu/spu.h
-*** gcc-4_3-orig/gcc/config/spu/spu.h	2008-09-10 22:09:24.000000000 +0200
---- gcc-4_3/gcc/config/spu/spu.h	2008-09-10 21:19:30.000000000 +0200
-*************** extern GTY(()) rtx spu_compare_op1;
-*** 640,642 ****
---- 640,644 ----
-  
-  #define SPLIT_BEFORE_CSE2 1
-  
-+ #define ADDRESSES_NEVER_TRAP 1
-+ 
-diff -crNp -x .svn gcc-4_3-orig/gcc/config/spu/spu.md gcc-4_3/gcc/config/spu/spu.md
-*** gcc-4_3-orig/gcc/config/spu/spu.md	2008-09-10 22:09:32.000000000 +0200
---- gcc-4_3/gcc/config/spu/spu.md	2008-09-10 20:09:59.000000000 +0200
-***************
-*** 1246,1252 ****
-     (use (match_operand:<F2I> 2 "spu_reg_operand" "r"))]
-    ""
-    "#"
-!   ""
-    [(set (match_dup:<F2I> 3)
-  	(and:<F2I> (match_dup:<F2I> 4)
-  		   (match_dup:<F2I> 2)))]
---- 1246,1252 ----
-     (use (match_operand:<F2I> 2 "spu_reg_operand" "r"))]
-    ""
-    "#"
-!   "split0_completed"
-    [(set (match_dup:<F2I> 3)
-  	(and:<F2I> (match_dup:<F2I> 4)
-  		   (match_dup:<F2I> 2)))]
-diff -crNp -x .svn gcc-4_3-orig/gcc/doc/tm.texi gcc-4_3/gcc/doc/tm.texi
-*** gcc-4_3-orig/gcc/doc/tm.texi	2008-09-10 22:09:25.000000000 +0200
---- gcc-4_3/gcc/doc/tm.texi	2008-09-10 21:43:46.000000000 +0200
-*************** optimizations before this pass work bett
-*** 10384,10386 ****
---- 10384,10392 ----
-  instructions, and the optimizations right after this pass (e.g., CSE and
-  combine) are be able to optimize the split instructions.
-  @end defmac
-+ 
-+ @defmac ADDRESSES_NEVER_TRAP
-+ Define this macro if memory accesses will never cause a trap.
-+ This is the case for example on the Cell SPU processor.
-+ @end defmac
-+ 
-diff -crNp -x .svn gcc-4_3-orig/gcc/rtlanal.c gcc-4_3/gcc/rtlanal.c
-*** gcc-4_3-orig/gcc/rtlanal.c	2008-03-05 19:44:55.000000000 +0100
---- gcc-4_3/gcc/rtlanal.c	2008-09-10 21:18:53.000000000 +0200
-*************** rtx_varies_p (const_rtx x, bool for_alia
-*** 265,270 ****
---- 265,274 ----
-  static int
-  rtx_addr_can_trap_p_1 (const_rtx x, enum machine_mode mode, bool unaligned_mems)
-  {
-+ #ifdef ADDRESSES_NEVER_TRAP
-+   /* On some processors, like the SPU, memory accesses never trap.  */
-+   return 0;
-+ #else
-    enum rtx_code code = GET_CODE (x);
-  
-    switch (code)
-*************** rtx_addr_can_trap_p_1 (const_rtx x, enum
-*** 344,349 ****
---- 348,354 ----
-  
-    /* If it isn't one of the case above, it can cause a trap.  */
-    return 1;
-+ #endif
-  }
-  
-  /* Return nonzero if the use of X as an address in a MEM can cause a trap.  */
+Index: gcc-4.3.4-20090804/gcc/config/spu/spu.c
+===================================================================
+--- gcc-4.3.4-20090804.orig/gcc/config/spu/spu.c	2009-09-21 11:47:27.000000000 +0200
++++ gcc-4.3.4-20090804/gcc/config/spu/spu.c	2009-09-21 11:47:38.000000000 +0200
+@@ -4269,7 +4269,10 @@ spu_split_load (rtx * ops)
+ 
+   rot = 0;
+   rot_amt = 0;
+-  if (GET_CODE (addr) == PLUS)
++
++  if (MEM_ALIGN (ops[1]) >= 128)
++    /* Address is already aligned; simply perform a TImode load.  */;
++  else if (GET_CODE (addr) == PLUS)
+     {
+       /* 8 cases:
+          aligned reg   + aligned reg     => lqx
+@@ -4380,6 +4383,14 @@ spu_split_load (rtx * ops)
+       rot_amt = 0;
+     }
+ 
++  /* If the source is properly aligned, we don't need to split this insn into
++     a TImode load plus a _spu_convert.  However, we want to perform the split
++     anyway when optimizing to make the MEMs look the same as those used for
++     stores so they are more easily merged.  When *not* optimizing, that will
++     not happen anyway, so we prefer to avoid generating the _spu_convert.  */
++  if (!rot && !rot_amt && !optimize)
++    return 0;
++
+   load = gen_reg_rtx (TImode);
+ 
+   mem = change_address (ops[1], TImode, copy_rtx (addr));
+Index: gcc-4.3.4-20090804/gcc/config/spu/spu.h
+===================================================================
+--- gcc-4.3.4-20090804.orig/gcc/config/spu/spu.h	2009-09-21 11:47:27.000000000 +0200
++++ gcc-4.3.4-20090804/gcc/config/spu/spu.h	2009-09-21 11:47:38.000000000 +0200
+@@ -641,6 +641,8 @@ extern GTY(()) rtx spu_compare_op1;
+ 
+ #define SPLIT_BEFORE_CSE2 1
+ 
++#define ADDRESSES_NEVER_TRAP 1
++
+ 
+ /* Builtins.  */
+ 
+Index: gcc-4.3.4-20090804/gcc/config/spu/spu.md
+===================================================================
+--- gcc-4.3.4-20090804.orig/gcc/config/spu/spu.md	2009-09-21 11:47:27.000000000 +0200
++++ gcc-4.3.4-20090804/gcc/config/spu/spu.md	2009-09-21 11:47:38.000000000 +0200
+@@ -1249,7 +1249,7 @@
+    (use (match_operand:<F2I> 2 "spu_reg_operand" "r"))]
+   ""
+   "#"
+-  ""
++  "split0_completed"
+   [(set (match_dup:<F2I> 3)
+ 	(and:<F2I> (match_dup:<F2I> 4)
+ 		   (match_dup:<F2I> 2)))]
+Index: gcc-4.3.4-20090804/gcc/doc/tm.texi
+===================================================================
+--- gcc-4.3.4-20090804.orig/gcc/doc/tm.texi	2009-09-21 11:47:27.000000000 +0200
++++ gcc-4.3.4-20090804/gcc/doc/tm.texi	2009-09-21 11:47:38.000000000 +0200
+@@ -10395,3 +10395,9 @@ optimizations before this pass work bett
+ instructions, and the optimizations right after this pass (e.g., CSE and
+ combine) are be able to optimize the split instructions.
+ @end defmac
++
++@defmac ADDRESSES_NEVER_TRAP
++Define this macro if memory accesses will never cause a trap.
++This is the case for example on the Cell SPU processor.
++@end defmac
++
+Index: gcc-4.3.4-20090804/gcc/rtlanal.c
+===================================================================
+--- gcc-4.3.4-20090804.orig/gcc/rtlanal.c	2009-09-21 11:42:15.000000000 +0200
++++ gcc-4.3.4-20090804/gcc/rtlanal.c	2009-09-21 11:47:38.000000000 +0200
+@@ -266,6 +266,10 @@ static int
+ rtx_addr_can_trap_p_1 (const_rtx x, HOST_WIDE_INT offset, HOST_WIDE_INT size,
+ 		       enum machine_mode mode, bool unaligned_mems)
+ {
++#ifdef ADDRESSES_NEVER_TRAP
++  /* On some processors, like the SPU, memory accesses never trap.  */
++  return 0;
++#else
+   enum rtx_code code = GET_CODE (x);
+ 
+   if (STRICT_ALIGNMENT
+@@ -382,6 +386,7 @@ rtx_addr_can_trap_p_1 (const_rtx x, HOST
+ 
+   /* If it isn't one of the case above, it can cause a trap.  */
+   return 1;
++#endif
+ }
+ 
+ /* Return nonzero if the use of X as an address in a MEM can cause a trap.  */
--- ibm-vector-keyword-1.orig
+++ ibm-vector-keyword-1
@@ -42,8 +42,8 @@
 
 Index: gcc/doc/extend.texi
 ===================================================================
---- gcc/doc/extend.texi.orig	2008-08-05 13:59:49.000000000 +0200
-+++ gcc/doc/extend.texi	2008-08-05 14:00:09.000000000 +0200
+--- gcc/doc/extend.texi.orig	2009-09-21 11:45:56.000000000 +0200
++++ gcc/doc/extend.texi	2009-09-21 11:45:58.000000000 +0200
 @@ -8897,9 +8897,10 @@ always specify the signedness.
  
  @item
@@ -61,7 +61,7 @@ Index: gcc/doc/extend.texi
 Index: gcc/testsuite/gcc.target/powerpc/altivec-macros.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gcc/testsuite/gcc.target/powerpc/altivec-macros.c	2008-08-05 14:00:09.000000000 +0200
++++ gcc/testsuite/gcc.target/powerpc/altivec-macros.c	2009-09-21 11:45:58.000000000 +0200
 @@ -0,0 +1,63 @@
 +/* Copyright (C) 2007 Free Software Foundation, Inc.  */
 +
@@ -129,7 +129,7 @@ Index: gcc/testsuite/gcc.target/powerpc/
 Index: gcc/testsuite/gcc.target/powerpc/altivec-26.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gcc/testsuite/gcc.target/powerpc/altivec-26.c	2008-08-05 14:00:09.000000000 +0200
++++ gcc/testsuite/gcc.target/powerpc/altivec-26.c	2009-09-21 11:45:58.000000000 +0200
 @@ -0,0 +1,11 @@
 +/* { dg-do compile { target powerpc*-*-* } } */
 +/* { dg-require-effective-target powerpc_altivec_ok } */
@@ -145,7 +145,7 @@ Index: gcc/testsuite/gcc.target/powerpc/
 Index: gcc/testsuite/gcc.dg/vmx/1b-07-ansi.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gcc/testsuite/gcc.dg/vmx/1b-07-ansi.c	2008-08-05 14:00:09.000000000 +0200
++++ gcc/testsuite/gcc.dg/vmx/1b-07-ansi.c	2009-09-21 11:45:58.000000000 +0200
 @@ -0,0 +1,59 @@
 +/* { dg-do compile } */
 +/* { dg-options "-ansi -maltivec" } */
@@ -208,8 +208,8 @@ Index: gcc/testsuite/gcc.dg/vmx/1b-07-an
 +vector float _2674 ;
 Index: gcc/testsuite/gcc.dg/vmx/1b-07.c
 ===================================================================
---- gcc/testsuite/gcc.dg/vmx/1b-07.c.orig	2008-02-19 10:53:21.000000000 +0100
-+++ gcc/testsuite/gcc.dg/vmx/1b-07.c	2008-08-05 14:00:09.000000000 +0200
+--- gcc/testsuite/gcc.dg/vmx/1b-07.c.orig	2009-09-21 11:45:56.000000000 +0200
++++ gcc/testsuite/gcc.dg/vmx/1b-07.c	2009-09-21 11:45:58.000000000 +0200
 @@ -6,7 +6,6 @@ vector char unsigned _56 ;
  vector unsigned char _64 ;
  vector char signed _112 ;
@@ -221,7 +221,7 @@ Index: gcc/testsuite/gcc.dg/vmx/1b-07.c
 Index: gcc/testsuite/gcc.dg/vmx/1b-06-ansi.c
 ===================================================================
 --- /dev/null	1970-01-01 00:00:00.000000000 +0000
-+++ gcc/testsuite/gcc.dg/vmx/1b-06-ansi.c	2008-08-05 14:00:09.000000000 +0200
++++ gcc/testsuite/gcc.dg/vmx/1b-06-ansi.c	2009-09-21 11:45:58.000000000 +0200
 @@ -0,0 +1,24 @@
 +/* { dg-do compile } */
 +/* { dg-options "-ansi -maltivec" } */
@@ -249,8 +249,8 @@ Index: gcc/testsuite/gcc.dg/vmx/1b-06-an
 +vector float _339 ;
 Index: gcc/testsuite/gcc.dg/vmx/1b-06.c
 ===================================================================
---- gcc/testsuite/gcc.dg/vmx/1b-06.c.orig	2008-02-19 10:53:21.000000000 +0100
-+++ gcc/testsuite/gcc.dg/vmx/1b-06.c	2008-08-05 14:00:09.000000000 +0200
+--- gcc/testsuite/gcc.dg/vmx/1b-06.c.orig	2009-09-21 11:45:56.000000000 +0200
++++ gcc/testsuite/gcc.dg/vmx/1b-06.c	2009-09-21 11:45:58.000000000 +0200
 @@ -3,7 +3,6 @@
  vector char bool _4 ;
  vector char unsigned _31 ;
@@ -261,8 +261,8 @@ Index: gcc/testsuite/gcc.dg/vmx/1b-06.c
  vector short bool _102 ;
 Index: gcc/coretypes.h
 ===================================================================
---- gcc/coretypes.h.orig	2008-02-19 10:56:00.000000000 +0100
-+++ gcc/coretypes.h	2008-08-05 14:00:09.000000000 +0200
+--- gcc/coretypes.h.orig	2009-09-21 11:45:56.000000000 +0200
++++ gcc/coretypes.h	2009-09-21 11:45:58.000000000 +0200
 @@ -60,9 +60,11 @@ enum ir_type {
  
  /* Provide forward struct declaration so that we don't have to include
@@ -278,8 +278,8 @@ Index: gcc/coretypes.h
     or SYMBOL_REF.  This isn't used much, but both trees and RTL refer
 Index: gcc/c-common.h
 ===================================================================
---- gcc/c-common.h.orig	2008-02-19 10:56:00.000000000 +0100
-+++ gcc/c-common.h	2008-08-05 14:01:13.000000000 +0200
+--- gcc/c-common.h.orig	2009-09-21 11:45:56.000000000 +0200
++++ gcc/c-common.h	2009-09-21 11:45:58.000000000 +0200
 @@ -180,6 +180,8 @@ enum c_tree_index
      CTI_MAX
  };
@@ -291,8 +291,8 @@ Index: gcc/c-common.h
  /* Identifier part common to the C front ends.  Inherits from
 Index: gcc/config/rs6000/rs6000-c.c
 ===================================================================
---- gcc/config/rs6000/rs6000-c.c.orig	2008-02-19 10:55:53.000000000 +0100
-+++ gcc/config/rs6000/rs6000-c.c	2008-08-05 14:00:09.000000000 +0200
+--- gcc/config/rs6000/rs6000-c.c.orig	2009-09-21 11:45:56.000000000 +0200
++++ gcc/config/rs6000/rs6000-c.c	2009-09-21 11:45:58.000000000 +0200
 @@ -84,6 +84,149 @@ rs6000_pragma_longcall (cpp_reader *pfil
  #define builtin_define(TXT) cpp_define (pfile, TXT)
  #define builtin_assert(TXT) cpp_assert (pfile, TXT)
@@ -462,12 +462,12 @@ Index: gcc/config/rs6000/rs6000-c.c
 +	  cpp_get_callbacks (pfile)->macro_to_expand = rs6000_macro_to_expand;
 +	}
      }
-   if (TARGET_SPE)
-     builtin_define ("__SPE__");
+   if (rs6000_cpu == PROCESSOR_CELL)
+     builtin_define ("__PPU__");
 Index: libcpp/macro.c
 ===================================================================
---- libcpp/macro.c.orig	2008-02-19 10:59:44.000000000 +0100
-+++ libcpp/macro.c	2008-08-05 14:00:09.000000000 +0200
+--- libcpp/macro.c.orig	2009-09-21 11:45:56.000000000 +0200
++++ libcpp/macro.c	2009-09-21 11:45:58.000000000 +0200
 @@ -1224,16 +1224,21 @@ cpp_get_token (cpp_reader *pfile)
  
        if (!(node->flags & NODE_DISABLED))
@@ -565,8 +565,8 @@ Index: libcpp/macro.c
  
 Index: libcpp/include/cpplib.h
 ===================================================================
---- libcpp/include/cpplib.h.orig	2008-02-19 10:59:42.000000000 +0100
-+++ libcpp/include/cpplib.h	2008-08-05 14:01:51.000000000 +0200
+--- libcpp/include/cpplib.h.orig	2009-09-21 11:45:56.000000000 +0200
++++ libcpp/include/cpplib.h	2009-09-21 11:45:58.000000000 +0200
 @@ -476,6 +476,10 @@ struct cpp_callbacks
    void (*read_pch) (cpp_reader *, const char *, int, const char *);
    missing_header_cb missing_header;
@@ -607,8 +607,8 @@ Index: libcpp/include/cpplib.h
  extern cppchar_t cpp_interpret_charconst (cpp_reader *, const cpp_token *,
 Index: libcpp/internal.h
 ===================================================================
---- libcpp/internal.h.orig	2008-02-19 10:59:44.000000000 +0100
-+++ libcpp/internal.h	2008-08-05 14:00:09.000000000 +0200
+--- libcpp/internal.h.orig	2009-09-21 11:45:56.000000000 +0200
++++ libcpp/internal.h	2009-09-21 11:45:58.000000000 +0200
 @@ -527,6 +527,7 @@ extern const unsigned char *_cpp_builtin
  extern int _cpp_warn_if_unused_macro (cpp_reader *, cpp_hashnode *, void *);
  extern void _cpp_push_token_context (cpp_reader *, cpp_hashnode *,
@@ -619,8 +619,8 @@ Index: libcpp/internal.h
  extern void _cpp_init_hashtable (cpp_reader *, hash_table *);
 Index: libcpp/lex.c
 ===================================================================
---- libcpp/lex.c.orig	2008-02-19 10:59:44.000000000 +0100
-+++ libcpp/lex.c	2008-08-05 14:00:09.000000000 +0200
+--- libcpp/lex.c.orig	2009-09-21 11:45:56.000000000 +0200
++++ libcpp/lex.c	2009-09-21 11:45:58.000000000 +0200
 @@ -730,6 +730,49 @@ next_tokenrun (tokenrun *run)
    return run->next;
  }
--- ibm-vector-keyword-3.orig
+++ ibm-vector-keyword-3
@@ -15,8 +15,8 @@
  
 Index: gcc/testsuite/gcc.target/spu/vector.c
 ===================================================================
---- gcc/testsuite/gcc.target/spu/vector.c	(revision 0)
-+++ gcc/testsuite/gcc.target/spu/vector.c	(revision 138106)
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.target/spu/vector.c	2009-09-21 11:47:07.000000000 +0200
 @@ -0,0 +1,32 @@
 +/* { dg-do compile } */
 +/* { dg-options "" } */
@@ -52,8 +52,8 @@ Index: gcc/testsuite/gcc.target/spu/vect
 +vector double vd;
 Index: gcc/testsuite/gcc.target/spu/vector-ansi.c
 ===================================================================
---- gcc/testsuite/gcc.target/spu/vector-ansi.c	(revision 0)
-+++ gcc/testsuite/gcc.target/spu/vector-ansi.c	(revision 138106)
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.target/spu/vector-ansi.c	2009-09-21 11:47:07.000000000 +0200
 @@ -0,0 +1,35 @@
 +/* { dg-do compile } */
 +/* { dg-options "-ansi" } */
@@ -92,10 +92,10 @@ Index: gcc/testsuite/gcc.target/spu/vect
 +vector double vd;
 Index: gcc/config/spu/spu-c.c
 ===================================================================
---- gcc/config/spu/spu-c.c	(revision 138105)
-+++ gcc/config/spu/spu-c.c	(revision 138106)
-@@ -35,6 +35,64 @@
- #include "spu-builtins.h"
+--- gcc/config/spu/spu-c.c.orig	2009-09-21 11:42:15.000000000 +0200
++++ gcc/config/spu/spu-c.c	2009-09-21 11:47:07.000000000 +0200
+@@ -34,6 +34,64 @@
+ #include "optabs.h"
  
  
 +/* Keep the vector keywords handy for fast comparisons.  */
@@ -159,7 +159,7 @@ Index: gcc/config/spu/spu-c.c
  /* target hook for resolve_overloaded_builtin(). Returns a function call
     RTX if we can resolve the overloaded builtin */
  tree
-@@ -140,6 +198,22 @@ spu_cpu_cpp_builtins (struct cpp_reader
+@@ -142,6 +200,22 @@ spu_cpu_cpp_builtins (struct cpp_reader
    if (spu_arch == PROCESSOR_CELLEDP)
      builtin_define_std ("__SPU_EDP__");
    builtin_define_std ("__vector=__attribute__((__spu_vector__))");
--- libgcj43.changes.orig
+++ libgcj43.changes
@@ -1,7 +1,12 @@
 -------------------------------------------------------------------
+Mon Sep 21 11:32:05 CEST 2009 - rguenther@suse.de
+
+- Backport patch for avoiding SPU micrococded instructions.  [bnc#434505]
+
+-------------------------------------------------------------------
 Tue Aug  4 14:14:33 CEST 2009 - rguenther@suse.de
 
-- Update to GCC 4.3.4 release. 
+- Update to GCC 4.3.4 release.  [bnc#504421]
 - Disable -Wl,--as-needed.
 
 -------------------------------------------------------------------
--- libgcj43.spec.orig
+++ libgcj43.spec
@@ -1,5 +1,6 @@
-#
-# spec file for package libgcj43 (Version 4.3.4_20090804)
+%define building_libjava 1
+%define run_tests 1
+# spec file for package gcc43 (Version 4.3.x)
 #
 # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
 #
@@ -18,25 +19,12 @@
 # norootforbuild
 # icecream 0
 
-%define building_libjava 1
-%define run_tests 1
-# spec file for package gcc43 (Version 4.3.x)
-#
-#
-# All modifications and additions to the file contributed by third parties
-# remain the property of their copyright owners, unless otherwise agreed
-# upon. The license for this file, and modifications and additions to the
-# file, is the same license as for the pristine package itself (unless the
-# license for the pristine package is not an Open Source License, in which
-# case the license is the MIT License). An "Open Source License" is a
-# license that conforms to the Open Source Definition (Version 1.9)
-# published by the Open Source Initiative.
-# Please submit bugfixes or comments via http://bugs.opensuse.org/
-#
+
 # Run the testsuite if there's a file named RUN_TESTS in the source
 %if 0%{!?run_tests:1}
 %define run_tests %(test -f %_sourcedir/RUN_TESTS && echo 1 || echo 0)
 %endif
+
 # Ada currently fails to build on a few platforms, enable it only
 # on those that work
 # Note that AdaCore only supports %ix86, x86_64 and ia64
@@ -46,6 +34,7 @@
 # alpha ppc64 s390x hppa
 %define build_ada 0
 %endif
+
 # We don't want to build java on arm
 %ifarch mips %arm
 %define build_java 0
@@ -54,39 +43,44 @@
 %define build_java 1
 %define build_libjava 0%{?building_libjava:1}
 %endif
+
 %define build_cp 1
 %define build_fortran 1
 %define build_objc 1
 %define build_objcp 0%{!?building_libjava:1}
 %define build_with_mudflap 0
+
 %if %{build_objcp}
 %define build_cp 1
 %define build_objc 1
 %endif
+
 %if %{build_libjava}
 %define build_cp 1
 %endif
 
-Name:           libgcj43
-BuildRequires:  bison flex gettext-devel glibc-devel-32bit mpfr-devel perl texinfo zlib-devel
+
+Name: libgcj43
+BuildRequires: bison flex gettext-devel glibc-devel-32bit mpfr-devel perl texinfo zlib-devel
 %if %{build_ada}
 %if %{suse_version} > 1110
 %define hostsuffix -4.3
-BuildRequires:  gcc43-ada
+BuildRequires: gcc43-ada
 %else
 %define hostsuffix %{nil}
-BuildRequires:  gcc-ada
+BuildRequires: gcc-ada
 %endif
 %endif
 %if %{build_libjava}
-BuildRequires:  fastjar gtk2-devel libart_lgpl-devel unzip
+BuildRequires: fastjar gtk2-devel libart_lgpl-devel unzip
 %endif
 %ifarch ia64
-BuildRequires:  libunwind-devel
+BuildRequires: libunwind-devel
 %endif
 %if %{run_tests}
-BuildRequires:  dejagnu expect
+BuildRequires: dejagnu expect
 %endif
+
 # Define version number of libgcc_s
 %ifarch hppa
 %define libgcc_s 4
@@ -100,6 +94,7 @@ BuildRequires:  dejagnu expect
 %else
 %define build_nof 0
 %endif
+
 %define separate_bi32 0
 %define separate_bi64 0
 %ifarch ppc
@@ -110,6 +105,7 @@ BuildRequires:  dejagnu expect
 %ifarch x86_64 s390x ppc64
 %define separate_bi32 1
 %endif
+
 # Define two macros to trigger -32bit or -64bit package variants
 %define separate_biarch 0
 %if %{separate_bi32}
@@ -120,157 +116,165 @@ BuildRequires:  dejagnu expect
 %define separate_biarch 1
 %define separate_biarch_suffix -64bit
 %endif
+
 %ifarch x86_64 ia64 s390x alpha ppc64
 # 64-bit is primary build target
 %define build_primary_64bit 1
 %else
 %define build_primary_64bit 0
 %endif
+
 %define biarch_libjava 0
+
 # COMMON-BEGIN
 %define biarch_targets x86_64 s390x powerpc64 powerpc
-Url:            http://gcc.gnu.org/
-Version:        4.3.4_20090804
-Release:        1
+
+URL:          http://gcc.gnu.org/
+Version: 4.3.4_20090804
+Release:      1
 %define gcc_version %(echo %version | sed 's/_.*//')
 %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2)
 %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/')
 %define binsuffix -4.3
 # COMMON-END
+
 %if 0%{?!building_libjava:1}
-Requires:       binutils glibc-devel
-Requires:       cpp43 = %{version}-%{release}
-Requires:       libgcc%{libgcc_s} >= %{version}-%{release}
-Requires:       libgomp1 >= %{version}-%{release}
+Requires:     binutils glibc-devel
+Requires:     cpp43 = %{version}-%{release}
+Requires:     libgcc%{libgcc_s} >= %{version}-%{release}
+Requires:     libgomp1 >= %{version}-%{release}
 %if %{build_with_mudflap}
-Requires:       libmudflap0 >= %{version}-%{release}
-Requires:       libmudflapth0 >= %{version}-%{release}
+Requires:     libmudflap0 >= %{version}-%{release}
+Requires:     libmudflapth0 >= %{version}-%{release}
 %endif
 %if 0%{suse_version} > 1000
-Suggests:       gcc43-info gcc43-locale
+Suggests:     gcc43-info gcc43-locale
 %endif
 %endif
+
 # COMMON-BEGIN
-AutoReqProv:    on
-BuildRoot:      %{_tmppath}/%{name}-%{version}-build
-Source:         gcc-%{gcc_version}%{snapshot_date}.tar.bz2
-Source1:        change_spec
-Source2:        libgcj43-rpmlintrc
-Source3:        gcc43-rpmlintrc
-Source4:        ecj.jar
-Source5:        README.First-for.SuSE.packagers
-Patch1:         gcc-dir-version.patch
-Patch2:         gcc-sles-version.patch
-Patch3:         gcc-noalias-warn.diff
-Patch4:         gcc-add-defaultsspec.diff
-Patch5:         boehm-gc-strict-aliasing.patch
-Patch6:         suse-record-gcc-opts.diff
-Patch7:         acats-timeout.patch
-Patch10:        program-transform-name.diff
-Patch11:        program-transform-name-tools.diff
-Patch12:        gcc4-ppc64-m32-m64-multilib-only.patch
-Patch22:        libjava-no-static.diff
-Patch23:        libjava-no-multilib.diff
-Patch24:        tls-no-direct.diff
-Patch25:        pr27880.diff
-Patch28:        pr33763.diff
-Patch29:        pr40141.diff
-Patch30:        Wunprototyped-calls.diff
-Patch31:        pr27799-1.diff
-Patch32:        pr27799-2.diff
-Patch33:        pr27799-3.diff
-Patch41:        fpreserve-function-arguments43.patch
-Patch42:        pr27975.diff
-Patch43:        build-id.diff
-Patch44:        nvl428413.patch
-Patch45:        nvl423594.patch
+Autoreqprov:  on
+BuildRoot:    %{_tmppath}/%{name}-%{version}-build
+Source:       gcc-%{gcc_version}%{snapshot_date}.tar.bz2
+Source1:      change_spec
+Source2:      libgcj43-rpmlintrc
+Source3:      gcc43-rpmlintrc
+Source4:      ecj.jar
+Source5:      README.First-for.SuSE.packagers
+Patch1:		gcc-dir-version.patch
+Patch2:		gcc-sles-version.patch
+Patch3:		gcc-noalias-warn.diff
+Patch4:		gcc-add-defaultsspec.diff
+Patch5:		boehm-gc-strict-aliasing.patch
+Patch6:		suse-record-gcc-opts.diff
+Patch7:		acats-timeout.patch
+Patch10:	program-transform-name.diff
+Patch11:	program-transform-name-tools.diff
+Patch12:	gcc4-ppc64-m32-m64-multilib-only.patch
+Patch22:	libjava-no-static.diff
+Patch23:	libjava-no-multilib.diff
+Patch24:	tls-no-direct.diff
+Patch25:	pr27880.diff
+Patch28:	pr33763.diff
+Patch29:	pr40141.diff
+Patch30:	Wunprototyped-calls.diff
+Patch31:	pr27799-1.diff
+Patch32:	pr27799-2.diff
+Patch33:	pr27799-3.diff
+Patch41:	fpreserve-function-arguments43.patch
+Patch42:	pr27975.diff
+Patch43:	build-id.diff
+Patch44:	nvl428413.patch
+Patch45:	nvl423594.patch
 Patch46:        pr32277.diff
-Patch47:        gcc43-as-g0
-Patch202:       nvl440482.patch
-Patch204:       pr39675.diff
+Patch47:	gcc43-as-g0
+Patch202:	nvl440482.patch
+Patch204:	pr39675.diff
 # A set of patches from the RH srpm
-Patch50:        gcc43-c++-builtin-redecl.patch
-Patch51:        gcc41-ia64-stack-protector.patch
-Patch52:        gcc43-java-debug-iface-type.patch
-Patch53:        gcc43-libgomp-omp_h-multilib.patch
-Patch54:        gcc43-pr34037.patch
-Patch55:        gcc41-java-slow_pthread_self.patch
-Patch56:        gcc43-pr36741-revert.patch
-Patch57:        gcc41-ppc32-retaddr.patch
-Patch58:        gcc43-pr37189.patch
-Patch59:        gcc43-x86_64-va_start.patch
+Patch50:	gcc43-c++-builtin-redecl.patch
+Patch51:	gcc41-ia64-stack-protector.patch
+Patch52:	gcc43-java-debug-iface-type.patch
+Patch53:	gcc43-libgomp-omp_h-multilib.patch
+Patch54:	gcc43-pr34037.patch
+Patch55:	gcc41-java-slow_pthread_self.patch
+Patch56:	gcc43-pr36741-revert.patch
+Patch57:	gcc41-ppc32-retaddr.patch
+Patch58:	gcc43-pr37189.patch
+Patch59:	gcc43-x86_64-va_start.patch
 # Some patches taken from Debian
-Patch60:        gcc43-textdomain.patch
-Patch61:        gcc43-rename-info-files.patch
+Patch60:	gcc43-textdomain.patch
+Patch61:	gcc43-rename-info-files.patch
 # Patches for AMD features
-Patch70:        pr34043-1.diff
-Patch71:        pr34043-2.diff
-Patch72:        pr34043-3.diff
-Patch73:        pr34043-4.diff
-Patch74:        pr34043-5.diff
-Patch75:        amd-SSE5-shift-ppc-1.diff
-Patch76:        amd-SSE5-shift-ppc-2.diff
-Patch77:        amd-SSE5-shift.diff
-Patch78:        amd-cunroll-1.diff
-Patch79:        amd-cunroll-2.diff
-Patch81:        amd-cvect-1.diff
-Patch82:        amd-cvect-2.diff
+Patch70:	pr34043-1.diff
+Patch71:	pr34043-2.diff
+Patch72:	pr34043-3.diff
+Patch73:	pr34043-4.diff
+Patch74:	pr34043-5.diff
+Patch75:	amd-SSE5-shift-ppc-1.diff
+Patch76:	amd-SSE5-shift-ppc-2.diff
+Patch77:	amd-SSE5-shift.diff
+Patch78:	amd-cunroll-1.diff
+Patch79:	amd-cunroll-2.diff
+Patch81:	amd-cvect-1.diff
+Patch82:	amd-cvect-2.diff
 # Patches for Intel features
-Patch80:        intel303993-aes.diff
+Patch80:	intel303993-aes.diff
 # Patches for IBM features
-Patch90:        ibm304071-z10-1
-Patch91:        ibm304071-z10-2
-Patch92:        ibm304071-z10-3
-Patch93:        ibm304071-z10-4
-Patch94:        ibm304071-z10-5
-Patch95:        ibm304071-z10-6
-Patch96:        pr36745.diff
-Patch97:        pr36822.diff
-Patch99:        ibm-vector-keyword-1
-Patch100:       ibm-vector-keyword-2
-Patch101:       ibm-vector-keyword-3
-Patch102:       ibm304071-z10-7
-Patch103:       ibm304134-power7-1
-Patch104:       ibm-cell-split
-Patch105:       ibm-cell-split-fixes
-Patch106:       nvl425806.patch
-Patch109:       nvl425783.patch
-Patch110:       nvl425784.patch
-Patch111:       nvl425788.patch
-Patch112:       nvl425789.patch
-Patch114:       nvl425791.patch
-Patch115:       nvl425794.patch
-Patch116:       nvl425798-1.patch
-Patch117:       nvl425798-2.patch
-Patch118:       nvl425799.patch
-Patch119:       nvl426087.patch
-Patch120:       ibm304071-z10-8
-Patch121:       nvl434500.patch
-Patch122:       nvl436041.patch
+Patch90:	ibm304071-z10-1
+Patch91:	ibm304071-z10-2
+Patch92:	ibm304071-z10-3
+Patch93:	ibm304071-z10-4
+Patch94:	ibm304071-z10-5
+Patch95:	ibm304071-z10-6
+Patch96:	pr36745.diff
+Patch97:	pr36822.diff
+Patch99:	ibm-vector-keyword-1
+Patch100:	ibm-vector-keyword-2
+Patch101:	ibm-vector-keyword-3
+Patch102:	ibm304071-z10-7
+Patch103:	ibm304134-power7-1
+Patch104:	ibm-cell-split
+Patch105:	ibm-cell-split-fixes
+Patch106:	nvl425806.patch
+Patch109:	nvl425783.patch
+Patch110:	nvl425784.patch
+Patch111:	nvl425788.patch
+Patch112:	nvl425789.patch
+Patch114:	nvl425791.patch
+Patch115:	nvl425794.patch
+Patch116:	nvl425798-1.patch
+Patch117:	nvl425798-2.patch
+Patch118:	nvl425799.patch
+Patch119:	nvl426087.patch
+Patch120:	ibm304071-z10-8
+Patch121:	nvl434500.patch
+Patch122:	nvl436041.patch
 Patch123:       gcc43-no-unwind-tables.diff
-Patch124:       nvl441016.patch
+Patch124:	nvl441016.patch
 Patch126:       nvl447669.diff
-Patch127:       nvl464739.patch
+Patch127:	nvl464739.patch
+Patch128:	ibm434505-spu
 # Patches for SAP features
-Patch130:       sap303956-utf16-1.diff
-Patch131:       sap303956-utf16-2.diff
-Patch132:       sap303956-utf16-3.diff
-Patch133:       sap303956-utf16-4.diff
-Patch134:       sap303956-utf16-mangling.diff
-License:        GPL v2 or later ; LGPL v2.1 or later
-Summary:        Java Runtime Library for gcc
-Group:          System/Libraries
+Patch130:	sap303956-utf16-1.diff
+Patch131:	sap303956-utf16-2.diff
+Patch132:	sap303956-utf16-3.diff
+Patch133:	sap303956-utf16-4.diff
+Patch134:	sap303956-utf16-mangling.diff
+
+License:        GPL v2 or later; LGPL v2.1 or later
+Summary:      Java Runtime Library for gcc
+Group:        System/Libraries
 %define gcj_sover 9
 %if 0%{suse_version} > 1000
-Recommends:     libgcj43-jar = %{version}-%{release}
+Recommends:   libgcj43-jar = %{version}-%{release}
 %endif
-Provides:       libgcj%{gcj_sover} = %{version}-%{release}
-Obsoletes:      libgcj%{gcj_sover} < %{version}-%{release}
-Provides:       libgij%{gcj_sover} = %{version}-%{release}
-Obsoletes:      libgij%{gcj_sover} < %{version}-%{release}
-Provides:       libgcj-tools%{gcj_sover} = %{version}-%{release}
-Obsoletes:      libgcj-tools%{gcj_sover} < %{version}-%{release}
-AutoReqProv:    on
+Provides:     libgcj%{gcj_sover} = %{version}-%{release}
+Obsoletes:    libgcj%{gcj_sover} < %{version}-%{release}
+Provides:     libgij%{gcj_sover} = %{version}-%{release}
+Obsoletes:    libgij%{gcj_sover} < %{version}-%{release}
+Provides:     libgcj-tools%{gcj_sover} = %{version}-%{release}
+Obsoletes:    libgcj-tools%{gcj_sover} < %{version}-%{release}
+Autoreqprov:  on
 
 %description 
 This library is needed if you want to use the GNU Java compiler, gcj.
@@ -282,38 +286,40 @@ Source code for this package is in gcc.
 %postun 
 /sbin/ldconfig
 
+
 %package -n gcc43-java
 License:        GPL v3 or later
-Summary:        The GNU Java Compiler
-Group:          Development/Languages/Java
-AutoReqProv:    on
-Requires:       gcc43 = %{version}
-Requires:       libgcj43-devel = %{version}-%{release}
+Summary:      The GNU Java Compiler
+Group:        Development/Languages/Java
+Autoreqprov:  on
+Requires:     gcc43 = %{version}
+Requires:     libgcj43-devel = %{version}-%{release}
 
 %description -n gcc43-java
 The Java compiler from the GCC-tools-suite.
 
 
 %package -n libgcj_bc43
-License:        GPL v2 or later ; LGPL v2.1 or later
-Summary:        Fake library for BC-ABI compatibility.
-Group:          Development/Libraries/Java
-AutoReqProv:    on
-Provides:       libgcj_bc1 = %{version}-%{release}
-Obsoletes:      libgcj_bc1 < %{version}-%{release}
+License:        GPL v2 or later; LGPL v2.1 or later
+Summary:      Fake library for BC-ABI compatibility.
+Group:        Development/Libraries/Java
+Autoreqprov:  on
+Provides:     libgcj_bc1 = %{version}-%{release}
+Obsoletes:    libgcj_bc1 < %{version}-%{release}
 # libgcj_bc is special in that it just contains a symlink to
 # a proper libgcj version.  So require that library and add
 # provides for the shlib version as created at link time
-Requires:       libgcj%{gcj_sover}
+Requires:     libgcj%{gcj_sover}
 %ifarch x86_64 ia64 ppc64 s390x
-Provides:       libgcj_bc.so.1()(64bit)
+Provides:     libgcj_bc.so.1()(64bit)
 %else
-Provides:       libgcj_bc.so.1
+Provides:     libgcj_bc.so.1
 %endif
 # make rpm happy
-Obsoletes:      libgcj_bc42
+Obsoletes:    libgcj_bc42
 # make zypp happy
-Provides:       libgcj_bc42
+Provides:     libgcj_bc42
+
 
 %description -n libgcj_bc43
 A fake library that is used at link time only. It ensures that
@@ -323,29 +329,29 @@ libgcj.so changes.
 
 
 %package -n libgcj43-jar
-License:        GPL v2 or later ; LGPL v2.1 or later
-Summary:        Java runtime library (jar files).
-Group:          Development/Libraries/Java
+License:        GPL v2 or later; LGPL v2.1 or later
+Summary:      Java runtime library (jar files).
+Group:        Development/Libraries/Java
 
 %description -n libgcj43-jar
 These are the jar files that go along with the gcj front end to gcc.
 
 
 %package -n libgcj43-devel
-License:        GPL v2 or later ; LGPL v2.1 or later
-Summary:        Include Files and Libraries mandatory for Development.
-Group:          Development/Libraries/Java
-AutoReqProv:    on
-Requires:       libstdc++43-devel = %{version}
-Requires:       libgcj%{gcj_sover} >= %{version}-%{release}
-Requires:       libgcj_bc1 >= %{version}-%{release}
-Requires:       libgcj43-jar = %{version}-%{release}
-Requires:       gtk2-devel
-Requires:       libart_lgpl-devel
-Requires:       glibc-devel
-Requires:       zlib-devel
+License:        GPL v2 or later; LGPL v2.1 or later
+Summary:      Include Files and Libraries mandatory for Development.
+Group:        Development/Libraries/Java
+Autoreqprov:  on
+Requires:     libstdc++43-devel = %{version}
+Requires:     libgcj%{gcj_sover} >= %{version}-%{release}
+Requires:     libgcj_bc1 >= %{version}-%{release}
+Requires:     libgcj43-jar = %{version}-%{release}
+Requires:     gtk2-devel
+Requires:     libart_lgpl-devel
+Requires:     glibc-devel
+Requires:     zlib-devel
 %ifarch ia64
-Requires:       libunwind-devel
+Requires:     libunwind-devel
 %endif
 
 %description -n libgcj43-devel
@@ -355,27 +361,29 @@ to develop applications that require the
 
 %package -n gcc43-gij
 License:        GPL v3 or later
-Summary:        Java Bytecode Interpreter for gcc
-Group:          Development/Libraries/Java
-Requires:       libgcj%{gcj_sover} >= %{version}-%{release}
-AutoReqProv:    on
+Summary:      Java Bytecode Interpreter for gcc
+Group:        Development/Libraries/Java
+Requires:     libgcj%{gcj_sover} >= %{version}-%{release}
+Autoreqprov:  on
 
 %description -n gcc43-gij
 This package contains the java bytecode interpreter gij and related tools.
 
 
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libffi43
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Provides:       g-wrap:/usr/lib/libffi.so.4
-Provides:       libffi4 = %{version}-%{release}
-Obsoletes:      libffi4 < %{version}-%{release}
+License:        BSD 3-Clause
+Summary:      Foreign Function Interface library
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Provides:     g-wrap:/usr/lib/libffi.so.4
+Provides:     libffi4 = %{version}-%{release}
+Obsoletes:    libffi4 < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libffi41 libffi42
+Obsoletes:    libffi41 libffi42
 # make zypp happy
-Provides:       libffi41 libffi42
+Provides:     libffi41 libffi42
 
 %description -n libffi43
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
@@ -388,24 +396,20 @@ A foreign function interface is the popu
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libffi43-32bit
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Provides:       g-wrap:/usr/lib/libffi.so.4
-Provides:       libffi4 = %{version}-%{release}
-Obsoletes:      libffi4 < %{version}-%{release}
+License:        BSD 3-Clause
+Summary:      Foreign Function Interface library
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Provides:     g-wrap:/usr/lib/libffi.so.4
+Provides:     libffi4 = %{version}-%{release}
+Obsoletes:    libffi4 < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libffi41-32bit libffi42-32bit
+Obsoletes:    libffi41-32bit libffi42-32bit
 # make zypp happy
-Provides:       libffi41-32bit libffi42-32bit
+Provides:     libffi41-32bit libffi42-32bit
 
 %description -n libffi43-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
 
 %post -n libffi43-32bit
@@ -416,24 +420,20 @@ A foreign function interface is the popu
 # PACKAGE-END
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libffi43-64bit
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Provides:       g-wrap:/usr/lib/libffi.so.4
-Provides:       libffi4 = %{version}-%{release}
-Obsoletes:      libffi4 < %{version}-%{release}
+License:        BSD 3-Clause
+Summary:      Foreign Function Interface library
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Provides:     g-wrap:/usr/lib/libffi.so.4
+Provides:     libffi4 = %{version}-%{release}
+Obsoletes:    libffi4 < %{version}-%{release}
 # make rpm happy
-Obsoletes:      libffi41-64bit libffi42-64bit
+Obsoletes:    libffi41-64bit libffi42-64bit
 # make zypp happy
-Provides:       libffi41-64bit libffi42-64bit
+Provides:     libffi41-64bit libffi42-64bit
 
 %description -n libffi43-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
 
 %post -n libffi43-64bit
@@ -442,53 +442,56 @@ A foreign function interface is the popu
 %postun -n libffi43-64bit
 /sbin/ldconfig
 # PACKAGE-END
+
 # PACKAGE-BEGIN
 # PACKAGE-BEGIN
-
 %package -n libffi43-devel
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library development files
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Requires:       libffi43 >= %{version}-%{release}
+Summary:      Foreign Function Interface library development files
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Requires:     libffi43 >= %{version}-%{release}
 
 %description -n libffi43-devel
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
+# PACKAGE-END
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libffi43-devel-32bit
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library development files
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Requires:       libffi43-32bit >= %{version}-%{release}
+Summary:      Foreign Function Interface library development files
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Requires:     libffi43-32bit >= %{version}-%{release}
 
 %description -n libffi43-devel-32bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "32bit" ending
-
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
+# PACKAGE-END
+# PACKAGE-BEGIN
+# PACKAGE-BEGIN
 %package -n libffi43-devel-64bit
-License:        BSD 3-clause (or similar)
-Summary:        Foreign Function Interface library development files
-Group:          Development/Languages/C and C++
-AutoReqProv:    on
-Requires:       libffi43-64bit >= %{version}-%{release}
+Summary:      Foreign Function Interface library development files
+Group:        Development/Languages/C and C++
+Autoreqprov:  on
+Requires:     libffi43-64bit >= %{version}-%{release}
 
 %description -n libffi43-devel-64bit
-This is a re-packaged binary rpm. For the package source, please look
-for the source of the package without the "64bit" ending
-
 A foreign function interface is the popular name for the interface that allows code written in one language to call code written in another language.
+# PACKAGE-END
 
 %package -n gcc43-testresults
-License:        Public Domain, Freeware
-Summary:        Testsuite results
-Group:          Development/Languages/C and C++
+License:	Public Domain, Freeware
+Summary:      Testsuite results
+Group:        Development/Languages/C and C++
 
 %description -n gcc43-testresults
 Results from running the gcc and target library testsuites.
 
 
+# COMMON-BEGIN
 
+# Define the canonical target and host architecture
+#   %gcc_target_arch  is supposed to be the full target triple
+#   %TARGET_ARCH      is the canonicalized CPU part
+#   %CONFIGURE_TARGET is the target triple used for --target=
 %if 0%{?gcc_target_arch:1}
 %define CONFIGURE_TARGET %{gcc_target_arch}
 %define TARGET_ARCH %(echo %{gcc_target_arch} | cut -d - -f 1 | sed -e "s/i.86/i586/;s/ppc/powerpc/")
@@ -505,15 +508,20 @@ Results from running the gcc and target
 %define TARGET_ARCH %(echo %{_target_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/")
 %endif
 %define HOST_ARCH %(echo %{_host_cpu} | sed -e "s/i.86/i586/;s/ppc/powerpc/")
+
 %define biarch %(case " %{biarch_targets} " in (*" %{TARGET_ARCH} "*) echo 1;; (*) echo 0;; esac)
+
 %ifarch ppc
 %define GCCDIST powerpc64-suse-linux
 %else
 %define GCCDIST %{HOST_ARCH}-suse-linux
 %endif
+
 %define libsubdir %{_libdir}/gcc/%{GCCDIST}/%{gcc_dir_version}
 %define gxxinclude %{_prefix}/include/c++/%{gcc_dir_version}
+
 # COMMON-END
+
 # Versionspecific directories
 %define versmainlibdir %{libsubdir}
 %define versmainlibdirbi32 %{libsubdir}/32
@@ -531,6 +539,7 @@ Results from running the gcc and target
 %else
 %define versmainlibdirbi %{versmainlibdirbi64}
 %endif
+
 %define mainlibdir %{_libdir}
 %define mainlibdirbi32 %{_prefix}/lib
 %define mainlibdirbi64 %{_prefix}/lib64
@@ -540,6 +549,8 @@ Results from running the gcc and target
 %else
 %define mainlibdirbi %{mainlibdirbi64}
 %endif
+
+
 # Now define a few macros that make it easy to package libs and
 # related files just to the right package, without caring for the
 # exact path the files are in.
@@ -580,6 +591,7 @@ Results from running the gcc and target
 %endif
 %endif
 %endif
+
 %if %{build_nof}
 %define versmainlib() %{versmainlibdir}/%1\
 %{versnoflibdir}/%1\
@@ -614,6 +626,8 @@ Results from running the gcc and target
 %endif
 %endif
 %endif
+
+
 # COMMON-BEGIN
 
 %prep
@@ -716,6 +730,7 @@ Results from running the gcc and target
 %patch124 -p1
 %patch126
 %patch127
+%patch128
 %patch130
 %patch131
 %patch132
@@ -725,6 +740,7 @@ Results from running the gcc and target
 %build
 # Avoid rebuilding of generated files
 contrib/gcc_update --touch
+
 # Split version file into version used for directories (X.Y) and
 # version to report with --version (X.Y.Z).
 # See also gcc-dir-version.patch.
@@ -735,6 +751,7 @@ else
   mv gcc/BASE-VER gcc/FULL-VER
 fi
 cat gcc/FULL-VER | cut -d '.' -f 1-2 > gcc/BASE-VER
+
 rm -rf obj-%{GCCDIST}
 mkdir obj-%{GCCDIST}
 cd obj-%{GCCDIST}
@@ -756,6 +773,7 @@ RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -
 %endif
 # Replace 2 spaces by one finally
 RPM_OPT_FLAGS=`echo $RPM_OPT_FLAGS|sed -e 's/  / /g'`
+
 languages=c
 %if %{build_cp}
 languages=$languages,c++
@@ -775,6 +793,7 @@ languages=$languages,java
 %if %{build_ada}
 languages=$languages,ada
 %endif
+
 J=%{?jobs:%jobs}
 if test -z "$J"; then
   J=$(getconf _NPROCESSORS_CONF)
@@ -790,28 +809,35 @@ if test "$JL" == "0"; then
   JL=1
 fi
 PARALLEL="-j$J -l$JL"
+
 # we don't want some miscompiles in the testsuite, or some fault in
 # the compiler to kill the machine.  Hence we limit the amount of memory
 # by the physical RAM plus half of swap
 #MEM=$(free -m | awk '/^Mem:/ {print $2}')
 #SWAP=$(free -m | awk '/^Swap:/ {print $2}')
 #ulimit -v $(((MEM + SWAP/2)*1024))
+
 # In general we want to ship release checking enabled compilers
 # and run BETA with checking enabled.
 #ENABLE_CHECKING="--enable-checking=yes"
 ENABLE_CHECKING="--enable-checking=release"
+
 %if "%{name}" != "gcc43"
 export PATH=/opt/cross/bin:$PATH
 %endif
+
 # Work around tail/head -1 changes
 export _POSIX2_VERSION=199209
+
 # -Wl,-as-needed breaks the libgcj setup
 export SUSE_ASNEEDED=0
+
 # configure tries to parse include/features.h to detect
 # if glibc supports SSP.  When cross compiling we would need
 # to install a cross glibc, which we don't, or make the whole
 # thing point to the native glibc, which is in /, hence the
 # --with-sysroot=/
+
 %if %{build_ada}
 # Using the host gnatmake like
 #   CC="gcc%{hostsuffix}" GNATBIND="gnatbind%{hostsuffix}"
@@ -917,7 +943,9 @@ TCFLAGS="$RPM_OPT_FLAGS" GCJFLAGS="$RPM_
 	--with-long-double-128 \
 %endif
 	--build=%{GCCDIST}
+
 # COMMON-END
+
 # Only run profiled bootstrap on archs where it works
 #%ifarch %ix86 x86_64 ppc ppc64 ia64
 #%ifarch %ix86 x86_64 ia64 s390 s390x
@@ -969,6 +997,7 @@ rm $RPM_BUILD_ROOT%{libsubdir}/jc1
 rm $RPM_BUILD_ROOT%{libsubdir}/jvgenmain
 %endif
 %endif
+
 # Remove some useless .la files
 for lib in libobjc libgfortran libgfortranbegin libmudflap libmudflapth \
     libgomp libstdc++ libsupc++ libgcj-tools libgij; do
@@ -977,6 +1006,7 @@ for lib in libobjc libgfortran libgfortr
   rm -f $RPM_BUILD_ROOT%{versmainlibdirbi}/$lib.la
 %endif
 done
+
 mkdir -p $RPM_BUILD_ROOT%{_libdir}
 %if %{biarch}
 %if %{build_primary_64bit}
@@ -985,6 +1015,8 @@ mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
 mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib64
 %endif
 %endif
+
+
 # move shared libs from versionspecific dir to main libdir
 for libname in \
 %if 0%{?building_libjava:1}
@@ -1035,13 +1067,17 @@ done
 ln -s libgcj.so.%{gcj_sover} $RPM_BUILD_ROOT%{mainlibdirbi}/libgcj_bc.so.1
 %endif
 %endif
+
+
 %if %{build_ada}
 mv $RPM_BUILD_ROOT%{libsubdir}/adalib/lib*-*.so $RPM_BUILD_ROOT%{_libdir}
 ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir} && echo libgnarl-*.so) $RPM_BUILD_ROOT%{libsubdir}/adalib/libgnarl.so
 ln -sf %{_libdir}/$(cd $RPM_BUILD_ROOT%{_libdir} && echo libgnat-*.so) $RPM_BUILD_ROOT%{libsubdir}/adalib/libgnat.so
 chmod a+x $RPM_BUILD_ROOT%{_libdir}/libgna*-*.so
 %endif
+
 rm -f $RPM_BUILD_ROOT%{_prefix}/bin/c++%{binsuffix}
+
 # Remove some crap from the .la files:
 for l in `find $RPM_BUILD_ROOT -name '*.la'`; do
   echo "changing $l"
@@ -1061,6 +1097,7 @@ for l in `find $RPM_BUILD_ROOT -name '*.
       < $l  > $l.new
   mv $l.new $l
 done
+
 %if %{run_tests} 
 cp `find . -name "*.sum"` ../testresults/
 cp `find . -name "*.log"  \! -name "config.log" |grep -v 'acats/tests' ` ../testresults/
@@ -1095,6 +1132,7 @@ rm -rf $RPM_BUILD_ROOT%{libsubdir}/inclu
 rm -rf $RPM_BUILD_ROOT%{libsubdir}/include-fixed/sys
 rm -f  $RPM_BUILD_ROOT%{_infodir}/dir
 rm -f  $RPM_BUILD_ROOT%{_prefix}/bin/gccbug%{binsuffix}
+
 %if !0%{?building_libjava:1}
 # delete compile flag tracking from crt files
 crt_list=$RPM_BUILD_ROOT%{versmainlibdir}/crt*.o
@@ -1109,6 +1147,7 @@ for o in $crt_list $crt32_list $crt64_li
   objcopy -R ".comment.SUSE.OPTs" $o
 done
 %endif
+
 %if %{build_libjava}
 # gcj -static doesn't work properly anyway, unless using --whole-archive
 # let's save the space instead.
@@ -1120,8 +1159,10 @@ find $RPM_BUILD_ROOT -name libgcj.a \
 	-o -name libjvm.a \
 	-o -name libgcj_bc.a \
   | xargs rm -f
+
 find $RPM_BUILD_ROOT -name libgcj.spec | xargs \
   sed -i -e 's/lib: /&%%{static:%%eJava programs cannot be linked statically}/'
+
 # Move libffi headers, remove empty libffi libtool file
 mv $RPM_BUILD_ROOT%{libsubdir}/include/ffitarget.h $RPM_BUILD_ROOT%{_prefix}/include/
 mv $RPM_BUILD_ROOT%{libsubdir}/include/ffi.h $RPM_BUILD_ROOT%{_prefix}/include/
@@ -1129,6 +1170,7 @@ rm -f $RPM_BUILD_ROOT%{mainlibdir}/libff
 %if %{biarch}
 rm -f $RPM_BUILD_ROOT%{mainlibdirbi}/libffi.la
 %endif
+
 # security files have broken install locations, also they cause conflicts
 # between libgcj versions.  Simply delete them here, libgcj will use its
 # defaults in this case (which is what these files contain anyway).
@@ -1158,6 +1200,7 @@ rm -f $RPM_BUILD_ROOT%{_prefix}/lib/libi
 rm -f $RPM_BUILD_ROOT%{_prefix}/lib64/libiberty.a
 %endif
 %endif
+
 %if 0%{?building_libjava:1}
 # For building libjava only we need to delete other info docs
 rm $RPM_BUILD_ROOT%{_infodir}/cp-tools.info*
@@ -1174,9 +1217,11 @@ mv $RPM_BUILD_ROOT%{_infodir}/gnat_rm.in
 mv $RPM_BUILD_ROOT%{_infodir}/gnat_ugn_unw.info $RPM_BUILD_ROOT%{_infodir}/gnat_ugn_unw%{binsuffix}.info
 %endif
 %endif
+
+
+
 %if %{build_java}
 %if 0%{?building_libjava:1}
-
 %files -n gcc43-java
 %defattr(-,root,root)
 %{_prefix}/bin/gcj%{binsuffix}
@@ -1197,9 +1242,9 @@ mv $RPM_BUILD_ROOT%{_infodir}/gnat_ugn_u
 %doc %{_mandir}/man1/gc-analyze%{binsuffix}.1.gz
 %endif
 %endif
+
 %if %{build_java}
 %if %{build_libjava}
-
 %files 
 %defattr(-,root,root)
 %dir %{_libdir}/gcj-%{gcc_dir_version}-%{gcj_sover}
@@ -1327,7 +1372,6 @@ mv $RPM_BUILD_ROOT%{_infodir}/gnat_ugn_u
 %mainlib libffi.so.*
 
 %if %{separate_biarch}
-
 %files -n libffi43%{separate_biarch_suffix}
 %defattr(-,root,root)
 %biarchlib libffi.so.*
@@ -1343,7 +1387,6 @@ mv $RPM_BUILD_ROOT%{_infodir}/gnat_ugn_u
 %mainlib libffi.a
 
 %if %{separate_biarch}
-
 %files -n libffi43-devel%{separate_biarch_suffix}
 %defattr(-,root,root)
 %biarchlib libffi.so
@@ -1353,8 +1396,8 @@ mv $RPM_BUILD_ROOT%{_infodir}/gnat_ugn_u
 %endif
 %endif
 %endif
-%if %{run_tests}
 
+%if %{run_tests}
 %files -n gcc43-testresults
 %defattr(-,root,root)
 %doc testresults/test_summary.txt
@@ -1362,4 +1405,5 @@ mv $RPM_BUILD_ROOT%{_infodir}/gnat_ugn_u
 %doc testresults/*.log
 %endif
 
+
 %changelog
--- nvl434500.patch.orig
+++ nvl434500.patch
@@ -97,1699 +97,1586 @@ testsuite/ChangeLog:
 
 Index: gcc/testsuite/gcc.target/powerpc/altivec_check.h
 ===================================================================
-*** gcc/testsuite/gcc.target/powerpc/altivec_check.h	(revision 140819)
---- gcc/testsuite/gcc.target/powerpc/altivec_check.h	(revision 140821)
-*************** void altivec_check(void) {
-*** 22,24 ****
---- 22,38 ----
-  #endif
-    signal (SIGILL, SIG_DFL);
-  }
-+ 
-+ void altivec_cell_check (void)
-+ {
-+   /* Exit on systems without the Cell Altivec instructions.  */
-+   signal (SIGILL, sig_ill_handler);
-+ #ifdef __MACH__
-+   asm volatile ("vor v0,v0,v0");
-+   asm volatile ("lvlx v0,r0,r0");
-+ #else
-+   asm volatile ("vor 0,0,0");
-+   asm volatile ("lvlx 0,0,0");
-+ #endif
-+   signal (SIGILL, SIG_DFL);
-+ }
+--- gcc/testsuite/gcc.target/powerpc/altivec_check.h.orig	2009-09-21 11:42:14.000000000 +0200
++++ gcc/testsuite/gcc.target/powerpc/altivec_check.h	2009-09-21 11:48:32.000000000 +0200
+@@ -22,3 +22,17 @@ void altivec_check(void) {
+ #endif
+   signal (SIGILL, SIG_DFL);
+ }
++
++void altivec_cell_check (void)
++{
++  /* Exit on systems without the Cell Altivec instructions.  */
++  signal (SIGILL, sig_ill_handler);
++#ifdef __MACH__
++  asm volatile ("vor v0,v0,v0");
++  asm volatile ("lvlx v0,r0,r0");
++#else
++  asm volatile ("vor 0,0,0");
++  asm volatile ("lvlx 0,0,0");
++#endif
++  signal (SIGILL, SIG_DFL);
++}
 Index: gcc/testsuite/gcc.target/powerpc/altivec-cell-1.c
 ===================================================================
-*** gcc/testsuite/gcc.target/powerpc/altivec-cell-1.c	(revision 0)
---- gcc/testsuite/gcc.target/powerpc/altivec-cell-1.c	(revision 140821)
-***************
-*** 0 ****
---- 1,34 ----
-+ /* { dg-do compile { target powerpc*-*-* } } */
-+ /* { dg-require-effective-target powerpc_altivec_ok } */
-+ /* { dg-options "-maltivec" } */
-+ 
-+ /* Basic test for the new VMX intrinsics.  */
-+ #include <altivec.h>
-+ 
-+ int f(vector int a, int b)
-+ {
-+   return vec_extract (a, b);
-+ }
-+ short f1(vector short a, int b)
-+ {
-+   return vec_extract (a, b);
-+ }
-+ vector short f2(vector short a, int b)
-+ {
-+   return vec_insert (b, a, b);
-+ }
-+ vector float f3(vector float a, int b)
-+ {
-+   return vec_insert (b, a, b);
-+ }
-+ 
-+ float g(void);
-+ 
-+ vector float f4(float b, int t)
-+ {
-+   return vec_promote (g(), t);
-+ }
-+ vector float f5(float b)
-+ {
-+   return vec_splats (g());
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.target/powerpc/altivec-cell-1.c	2009-09-21 11:48:32.000000000 +0200
+@@ -0,0 +1,34 @@
++/* { dg-do compile { target powerpc*-*-* } } */
++/* { dg-require-effective-target powerpc_altivec_ok } */
++/* { dg-options "-maltivec" } */
++
++/* Basic test for the new VMX intrinsics.  */
++#include <altivec.h>
++
++int f(vector int a, int b)
++{
++  return vec_extract (a, b);
++}
++short f1(vector short a, int b)
++{
++  return vec_extract (a, b);
++}
++vector short f2(vector short a, int b)
++{
++  return vec_insert (b, a, b);
++}
++vector float f3(vector float a, int b)
++{
++  return vec_insert (b, a, b);
++}
++
++float g(void);
++
++vector float f4(float b, int t)
++{
++  return vec_promote (g(), t);
++}
++vector float f5(float b)
++{
++  return vec_splats (g());
++}
 Index: gcc/testsuite/gcc.target/powerpc/altivec-cell-5.c
 ===================================================================
-*** gcc/testsuite/gcc.target/powerpc/altivec-cell-5.c	(revision 0)
---- gcc/testsuite/gcc.target/powerpc/altivec-cell-5.c	(revision 140821)
-***************
-*** 0 ****
---- 1,25 ----
-+ /* { dg-do compile { target powerpc*-*-* } } */
-+ /* { dg-require-effective-target powerpc_altivec_ok } */
-+ /* { dg-options "-maltivec" } */
-+ 
-+ /* Basic test for the new VMX intrinsics and error messages.  */
-+ #include <altivec.h>
-+ 
-+ int main(int argc, char **argv)
-+ {
-+ vector float t;
-+     vec_promote();                      /* { dg-error "vec_promote only accepts 2" } */
-+     vec_promote(1.0f);                  /* { dg-error "vec_promote only accepts 2" } */
-+     vec_promote(1.0f, 2, 3);            /* { dg-error "vec_promote only accepts 2" } */
-+     vec_extract ();                     /* { dg-error "vec_extract only accepts 2" } */
-+     vec_extract (t);                    /* { dg-error "vec_extract only accepts 2" } */
-+     vec_extract (t, 2);
-+     vec_extract (t, 2, 5, 6);           /* { dg-error "vec_extract only accepts 2" } */
-+     vec_splats ();                      /* { dg-error "vec_splats only accepts 1" } */
-+     vec_splats (t, 3);                  /* { dg-error "vec_splats only accepts 1" } */
-+     vec_insert ();                      /* { dg-error "vec_insert only accepts 3" } */
-+     vec_insert (t);                     /* { dg-error "vec_insert only accepts 3" } */
-+     vec_insert (t, 3);                  /* { dg-error "vec_insert only accepts 3" } */
-+     vec_insert (t, 3, 2, 4, 6, 6);      /* { dg-error "vec_insert only accepts 3" } */
-+     return 0;
-+ }  
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.target/powerpc/altivec-cell-5.c	2009-09-21 11:48:32.000000000 +0200
+@@ -0,0 +1,25 @@
++/* { dg-do compile { target powerpc*-*-* } } */
++/* { dg-require-effective-target powerpc_altivec_ok } */
++/* { dg-options "-maltivec" } */
++
++/* Basic test for the new VMX intrinsics and error messages.  */
++#include <altivec.h>
++
++int main(int argc, char **argv)
++{
++vector float t;
++    vec_promote();                      /* { dg-error "vec_promote only accepts 2" } */
++    vec_promote(1.0f);                  /* { dg-error "vec_promote only accepts 2" } */
++    vec_promote(1.0f, 2, 3);            /* { dg-error "vec_promote only accepts 2" } */
++    vec_extract ();                     /* { dg-error "vec_extract only accepts 2" } */
++    vec_extract (t);                    /* { dg-error "vec_extract only accepts 2" } */
++    vec_extract (t, 2);
++    vec_extract (t, 2, 5, 6);           /* { dg-error "vec_extract only accepts 2" } */
++    vec_splats ();                      /* { dg-error "vec_splats only accepts 1" } */
++    vec_splats (t, 3);                  /* { dg-error "vec_splats only accepts 1" } */
++    vec_insert ();                      /* { dg-error "vec_insert only accepts 3" } */
++    vec_insert (t);                     /* { dg-error "vec_insert only accepts 3" } */
++    vec_insert (t, 3);                  /* { dg-error "vec_insert only accepts 3" } */
++    vec_insert (t, 3, 2, 4, 6, 6);      /* { dg-error "vec_insert only accepts 3" } */
++    return 0;
++}  
 Index: gcc/testsuite/gcc.target/powerpc/altivec-cell-2.c
 ===================================================================
-*** gcc/testsuite/gcc.target/powerpc/altivec-cell-2.c	(revision 0)
---- gcc/testsuite/gcc.target/powerpc/altivec-cell-2.c	(revision 140821)
-***************
-*** 0 ****
---- 1,142 ----
-+ /* { dg-do run { target powerpc*-*-* } } */
-+ /* { dg-require-effective-target powerpc_altivec_ok } */
-+ /* { dg-options "-maltivec" } */
-+ /* Test the vec_extract VMX intrinsics.  */
-+ #include <altivec.h>
-+ #include "altivec_check.h"
-+ 
-+ extern void abort (void);
-+ 
-+ vector int a = {0, 1, 2, 3};
-+ vector short b = {0, 1, 2, 3, 4, 5, 6, 7};
-+ 
-+ int f(vector int a, int b)
-+ {
-+   return vec_extract (a, b);
-+ }
-+ 
-+ int f0 (vector int a)
-+ {
-+   return vec_extract (a, 0);
-+ }
-+ int f1 (vector int a)
-+ {
-+   return vec_extract (a, 1);
-+ }
-+ int f2 (vector int a)
-+ {
-+   return vec_extract (a, 2);
-+ }
-+ int f3 (vector int a)
-+ {
-+   return vec_extract (a, 3);
-+ }
-+ int f4 (vector int a)
-+ {
-+   return vec_extract (a, 4);
-+ }
-+ 
-+ int g(vector short a, int b)
-+ {
-+   return vec_extract (a, b);
-+ }
-+ 
-+ int g0 (vector short a)
-+ {
-+   return vec_extract (a, 0);
-+ }
-+ int g1 (vector short a)
-+ {
-+   return vec_extract (a, 1);
-+ }
-+ int g2 (vector short a)
-+ {
-+   return vec_extract (a, 2);
-+ }
-+ int g3 (vector short a)
-+ {
-+   return vec_extract (a, 3);
-+ }
-+ 
-+ int g4 (vector short a)
-+ { 
-+   return vec_extract (a, 4);
-+ }
-+ int g5 (vector short a)
-+ { 
-+   return vec_extract (a, 5);
-+ }
-+ int g6 (vector short a)
-+ { 
-+   return vec_extract (a, 6);
-+ }
-+ int g7 (vector short a)
-+ { 
-+   return vec_extract (a, 7);
-+ }
-+ int g8 (vector short a)
-+ { 
-+   return vec_extract (a, 8);
-+ }
-+ int main1(void) __attribute__((noinline));
-+ int main1(void)
-+ { 
-+   int i;
-+   /* Check vec_extract with a non constant element numbering */
-+   for(i=0;i<10;i++)
-+     { 
-+       if (f(a, i) != (i&0x3))
-+         abort ();
-+     }
-+   
-+   /* Check vec_extract with a constant element numbering */
-+   if (f0(a) != 0)
-+     abort ();
-+   if (f1(a) != 1)
-+     abort ();
-+   if (f2(a) != 2)
-+     abort ();
-+   if (f3(a) != 3)
-+     abort ();
-+   /* Check that vec_extract works with a constant element higher than
-+      the number of elements.  */
-+   if (f4(a) != 0)
-+     abort ();
-+ 
-+   /* Check vec_extract with a non constant element numbering */
-+   for(i=0;i<10;i++)
-+     {
-+       if (g(b, i) != (i&0x7))
-+         abort ();
-+     }
-+   
-+   /* Check vec_extract with a constant element numbering */
-+   if (g0(b) != 0)
-+     abort ();
-+   if (g1(b) != 1)
-+     abort ();
-+   if (g2(b) != 2)
-+     abort ();
-+   if (g3(b) != 3)
-+     abort ();
-+   if (g4(b) != 4)
-+     abort ();
-+   if (g5(b) != 5)
-+     abort ();
-+   if (g6(b) != 6)
-+     abort ();
-+   if (g7(b) != 7)
-+     abort ();
-+   /* Check that vec_extract works with a constant element higher than
-+      the number of elements.  */
-+   if (g8(b) != 0)
-+     abort ();
-+   
-+   return 0;
-+ }
-+ 
-+ int main(void)
-+ { 
-+   altivec_check();  /* Exits if AltiVec not supported */
-+   return main1 ();
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.target/powerpc/altivec-cell-2.c	2009-09-21 11:48:32.000000000 +0200
+@@ -0,0 +1,142 @@
++/* { dg-do run { target powerpc*-*-* } } */
++/* { dg-require-effective-target powerpc_altivec_ok } */
++/* { dg-options "-maltivec" } */
++/* Test the vec_extract VMX intrinsics.  */
++#include <altivec.h>
++#include "altivec_check.h"
++
++extern void abort (void);
++
++vector int a = {0, 1, 2, 3};
++vector short b = {0, 1, 2, 3, 4, 5, 6, 7};
++
++int f(vector int a, int b)
++{
++  return vec_extract (a, b);
++}
++
++int f0 (vector int a)
++{
++  return vec_extract (a, 0);
++}
++int f1 (vector int a)
++{
++  return vec_extract (a, 1);
++}
++int f2 (vector int a)
++{
++  return vec_extract (a, 2);
++}
++int f3 (vector int a)
++{
++  return vec_extract (a, 3);
++}
++int f4 (vector int a)
++{
++  return vec_extract (a, 4);
++}
++
++int g(vector short a, int b)
++{
++  return vec_extract (a, b);
++}
++
++int g0 (vector short a)
++{
++  return vec_extract (a, 0);
++}
++int g1 (vector short a)
++{
++  return vec_extract (a, 1);
++}
++int g2 (vector short a)
++{
++  return vec_extract (a, 2);
++}
++int g3 (vector short a)
++{
++  return vec_extract (a, 3);
++}
++
++int g4 (vector short a)
++{ 
++  return vec_extract (a, 4);
++}
++int g5 (vector short a)
++{ 
++  return vec_extract (a, 5);
++}
++int g6 (vector short a)
++{ 
++  return vec_extract (a, 6);
++}
++int g7 (vector short a)
++{ 
++  return vec_extract (a, 7);
++}
++int g8 (vector short a)
++{ 
++  return vec_extract (a, 8);
++}
++int main1(void) __attribute__((noinline));
++int main1(void)
++{ 
++  int i;
++  /* Check vec_extract with a non constant element numbering */
++  for(i=0;i<10;i++)
++    { 
++      if (f(a, i) != (i&0x3))
++        abort ();
++    }
++  
++  /* Check vec_extract with a constant element numbering */
++  if (f0(a) != 0)
++    abort ();
++  if (f1(a) != 1)
++    abort ();
++  if (f2(a) != 2)
++    abort ();
++  if (f3(a) != 3)
++    abort ();
++  /* Check that vec_extract works with a constant element higher than
++     the number of elements.  */
++  if (f4(a) != 0)
++    abort ();
++
++  /* Check vec_extract with a non constant element numbering */
++  for(i=0;i<10;i++)
++    {
++      if (g(b, i) != (i&0x7))
++        abort ();
++    }
++  
++  /* Check vec_extract with a constant element numbering */
++  if (g0(b) != 0)
++    abort ();
++  if (g1(b) != 1)
++    abort ();
++  if (g2(b) != 2)
++    abort ();
++  if (g3(b) != 3)
++    abort ();
++  if (g4(b) != 4)
++    abort ();
++  if (g5(b) != 5)
++    abort ();
++  if (g6(b) != 6)
++    abort ();
++  if (g7(b) != 7)
++    abort ();
++  /* Check that vec_extract works with a constant element higher than
++     the number of elements.  */
++  if (g8(b) != 0)
++    abort ();
++  
++  return 0;
++}
++
++int main(void)
++{ 
++  altivec_check();  /* Exits if AltiVec not supported */
++  return main1 ();
++}
 Index: gcc/testsuite/gcc.target/powerpc/altivec-cell-6.c
 ===================================================================
-*** gcc/testsuite/gcc.target/powerpc/altivec-cell-6.c	(revision 0)
---- gcc/testsuite/gcc.target/powerpc/altivec-cell-6.c	(revision 140821)
-***************
-*** 0 ****
---- 1,12 ----
-+ /* { dg-do compile  } */
-+ /* { dg-require-effective-target powerpc_altivec_ok } */
-+ /* { dg-options "-O2 -maltivec -mabi=altivec -mcpu=cell" } */
-+ #include <altivec.h>
-+ 
-+ /* This used to ICE with reloading of a constant address. */
-+ 
-+ vector float f(void)
-+ {
-+   vector float * a = (void*)16;
-+   return vec_lvlx (0, a);
-+ } 
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.target/powerpc/altivec-cell-6.c	2009-09-21 11:48:32.000000000 +0200
+@@ -0,0 +1,12 @@
++/* { dg-do compile  } */
++/* { dg-require-effective-target powerpc_altivec_ok } */
++/* { dg-options "-O2 -maltivec -mabi=altivec -mcpu=cell" } */
++#include <altivec.h>
++
++/* This used to ICE with reloading of a constant address. */
++
++vector float f(void)
++{
++  vector float * a = (void*)16;
++  return vec_lvlx (0, a);
++} 
 Index: gcc/testsuite/gcc.target/powerpc/altivec-cell-3.c
 ===================================================================
-*** gcc/testsuite/gcc.target/powerpc/altivec-cell-3.c	(revision 0)
---- gcc/testsuite/gcc.target/powerpc/altivec-cell-3.c	(revision 140821)
-***************
-*** 0 ****
---- 1,38 ----
-+ /* { dg-do run { target powerpc*-*-* } } */
-+ /* { dg-require-effective-target powerpc_altivec_ok } */
-+ /* { dg-options "-maltivec" } */
-+ /* Test the vec_splats and vec_promote VMX intrinsics.  */
-+ #include <altivec.h>
-+ #include "altivec_check.h"
-+     
-+ extern void abort (void);
-+         
-+ vector int a = {0, 0, 0, 0};
-+ int main1(int t) __attribute__((noinline));
-+ int main1(int t)
-+ { 
-+   int i;
-+   vector int b = vec_splats(0);
-+   if (__builtin_memcmp (&a, &b, sizeof(vector int)))
-+     abort ();
-+   
-+   b = vec_splats(t);
-+   if (__builtin_memcmp (&a, &b, sizeof(vector int)))
-+     abort ();
-+   
-+   b = vec_promote(0, 1);
-+   if (vec_extract (b, 1) != 0)
-+     abort ();
-+   
-+   b = vec_promote(t, t);
-+   if (vec_extract (b, t) != 0)
-+     abort ();
-+   
-+   return 0;
-+ } 
-+     
-+ int main(void)
-+ { 
-+   altivec_check();  /* Exits if AltiVec not supported */
-+   return main1 (0);
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.target/powerpc/altivec-cell-3.c	2009-09-21 11:48:32.000000000 +0200
+@@ -0,0 +1,38 @@
++/* { dg-do run { target powerpc*-*-* } } */
++/* { dg-require-effective-target powerpc_altivec_ok } */
++/* { dg-options "-maltivec" } */
++/* Test the vec_splats and vec_promote VMX intrinsics.  */
++#include <altivec.h>
++#include "altivec_check.h"
++    
++extern void abort (void);
++        
++vector int a = {0, 0, 0, 0};
++int main1(int t) __attribute__((noinline));
++int main1(int t)
++{ 
++  int i;
++  vector int b = vec_splats(0);
++  if (__builtin_memcmp (&a, &b, sizeof(vector int)))
++    abort ();
++  
++  b = vec_splats(t);
++  if (__builtin_memcmp (&a, &b, sizeof(vector int)))
++    abort ();
++  
++  b = vec_promote(0, 1);
++  if (vec_extract (b, 1) != 0)
++    abort ();
++  
++  b = vec_promote(t, t);
++  if (vec_extract (b, t) != 0)
++    abort ();
++  
++  return 0;
++} 
++    
++int main(void)
++{ 
++  altivec_check();  /* Exits if AltiVec not supported */
++  return main1 (0);
++}
 Index: gcc/testsuite/gcc.target/powerpc/altivec-cell-7.c
 ===================================================================
-*** gcc/testsuite/gcc.target/powerpc/altivec-cell-7.c	(revision 0)
---- gcc/testsuite/gcc.target/powerpc/altivec-cell-7.c	(revision 140821)
-***************
-*** 0 ****
---- 1,28 ----
-+ /* { dg-do compile  } */
-+ /* { dg-require-effective-target powerpc_altivec_ok } */
-+ /* { dg-options "-O2 -maltivec -mabi=altivec -mcpu=cell" } */
-+ /* { dg-final { scan-assembler-times "vor" 2 } } */
-+ #include <altivec.h>
-+ 
-+ /* Make sure that lvlx and lvrx are not combined into one insn and
-+    we still get a vor. */
-+ 
-+ vector unsigned char
-+ lvx_float (long off, float *p)
-+ {
-+     vector unsigned char l, r;
-+ 
-+     l = (vector unsigned char) vec_lvlx (off, p);
-+     r = (vector unsigned char) vec_lvrx (off, p);
-+     return vec_or(l, r);
-+ }
-+ 
-+ vector unsigned char
-+ lvxl_float (long off, float *p)
-+ {
-+     vector unsigned char l, r;
-+ 
-+     l = (vector unsigned char) vec_lvlxl (off, p);
-+     r = (vector unsigned char) vec_lvrxl (off, p);
-+     return vec_or(l, r);
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.target/powerpc/altivec-cell-7.c	2009-09-21 11:48:32.000000000 +0200
+@@ -0,0 +1,28 @@
++/* { dg-do compile  } */
++/* { dg-require-effective-target powerpc_altivec_ok } */
++/* { dg-options "-O2 -maltivec -mabi=altivec -mcpu=cell" } */
++/* { dg-final { scan-assembler-times "vor" 2 } } */
++#include <altivec.h>
++
++/* Make sure that lvlx and lvrx are not combined into one insn and
++   we still get a vor. */
++
++vector unsigned char
++lvx_float (long off, float *p)
++{
++    vector unsigned char l, r;
++
++    l = (vector unsigned char) vec_lvlx (off, p);
++    r = (vector unsigned char) vec_lvrx (off, p);
++    return vec_or(l, r);
++}
++
++vector unsigned char
++lvxl_float (long off, float *p)
++{
++    vector unsigned char l, r;
++
++    l = (vector unsigned char) vec_lvlxl (off, p);
++    r = (vector unsigned char) vec_lvrxl (off, p);
++    return vec_or(l, r);
++}
 Index: gcc/testsuite/gcc.target/powerpc/altivec-cell-4.c
 ===================================================================
-*** gcc/testsuite/gcc.target/powerpc/altivec-cell-4.c	(revision 0)
---- gcc/testsuite/gcc.target/powerpc/altivec-cell-4.c	(revision 140821)
-***************
-*** 0 ****
---- 1,43 ----
-+ /* { dg-do run { target powerpc*-*-* } } */
-+ /* { dg-require-effective-target powerpc_altivec_ok } */
-+ /* { dg-options "-maltivec" } */
-+ 
-+ /* Test the vec_splats and vec_promote VMX intrinsics.  */
-+ #include <altivec.h>
-+ #include "altivec_check.h"
-+     
-+ extern void abort (void);
-+         
-+ vector int a[] = {{0, 0, 0, 0}, {1,0,0,0}, {1,2,0,0},{1,2,3,0},{1,2,3,4},{5,2,3,4},{5,6,3,4}};
-+ vector int c = {0,6,3,4};
-+ vector int d = {0,0,3,4};
-+ int main1(int t) __attribute__((noinline));
-+ int main1(int t)
-+ { 
-+   int i;
-+   vector int b = vec_splats(0);
-+   for(i = 0;i<sizeof(a)/sizeof(a[0])-1;i++)
-+     { 
-+ 	if (__builtin_memcmp (&b, &a[i], sizeof(vector int)))
-+           abort ();
-+         b = vec_insert(i+1, b, i);
-+     } 
-+   if (__builtin_memcmp (&b, &a[i], sizeof(vector int)))
-+     abort ();
-+   
-+   b = vec_insert(0, b, 0);
-+   if (__builtin_memcmp (&b, &c, sizeof(vector int)))
-+     abort ();
-+   
-+   b = vec_insert(0, b, 1);
-+   if (__builtin_memcmp (&b, &d, sizeof(vector int)))
-+     abort ();
-+   
-+   return 0;
-+ } 
-+   
-+ int main(void)
-+ {
-+   altivec_check();  /* Exits if AltiVec not supported */
-+   return main1 (0);
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.target/powerpc/altivec-cell-4.c	2009-09-21 11:48:32.000000000 +0200
+@@ -0,0 +1,43 @@
++/* { dg-do run { target powerpc*-*-* } } */
++/* { dg-require-effective-target powerpc_altivec_ok } */
++/* { dg-options "-maltivec" } */
++
++/* Test the vec_splats and vec_promote VMX intrinsics.  */
++#include <altivec.h>
++#include "altivec_check.h"
++    
++extern void abort (void);
++        
++vector int a[] = {{0, 0, 0, 0}, {1,0,0,0}, {1,2,0,0},{1,2,3,0},{1,2,3,4},{5,2,3,4},{5,6,3,4}};
++vector int c = {0,6,3,4};
++vector int d = {0,0,3,4};
++int main1(int t) __attribute__((noinline));
++int main1(int t)
++{ 
++  int i;
++  vector int b = vec_splats(0);
++  for(i = 0;i<sizeof(a)/sizeof(a[0])-1;i++)
++    { 
++	if (__builtin_memcmp (&b, &a[i], sizeof(vector int)))
++          abort ();
++        b = vec_insert(i+1, b, i);
++    } 
++  if (__builtin_memcmp (&b, &a[i], sizeof(vector int)))
++    abort ();
++  
++  b = vec_insert(0, b, 0);
++  if (__builtin_memcmp (&b, &c, sizeof(vector int)))
++    abort ();
++  
++  b = vec_insert(0, b, 1);
++  if (__builtin_memcmp (&b, &d, sizeof(vector int)))
++    abort ();
++  
++  return 0;
++} 
++  
++int main(void)
++{
++  altivec_check();  /* Exits if AltiVec not supported */
++  return main1 (0);
++}
 Index: gcc/testsuite/gcc.target/powerpc/altivec-cell-8.c
 ===================================================================
-*** gcc/testsuite/gcc.target/powerpc/altivec-cell-8.c	(revision 0)
---- gcc/testsuite/gcc.target/powerpc/altivec-cell-8.c	(revision 140821)
-***************
-*** 0 ****
---- 1,56 ----
-+ /* { dg-do run } */
-+ /* { dg-require-effective-target powerpc_altivec_ok } */
-+ /* { dg-options "-O2 -maltivec -mabi=altivec -mcpu=cell" } */
-+ #include <altivec.h>
-+ #include <string.h>
-+ #include "altivec_check.h"
-+ 
-+ typedef short int sint16;
-+ typedef signed char int8;
-+ 
-+ int main1(void) __attribute__((noinline));
-+ int main1(void)
-+ {
-+     sint16 test_vector[4] = { 1678, -2356, 19246, -17892 };
-+     int8 test_dst[128] __attribute__(( aligned( 16 )));
-+     float test_out[4] __attribute__(( aligned( 16 )));
-+     int p;
-+ 
-+     for( p = 0; p < 24; ++p )
-+     {
-+         memset( test_dst, 0, 128 );
-+         memcpy( &test_dst[p], test_vector, 8 );
-+         {
-+             vector float VR, VL, V;
-+    /* load the righthand section of the misaligned vector */
-+             VR = (vector float) vec_lvrx( 8, &test_dst[p] );
-+             VL = (vector float) vec_lvlx( 0, &test_dst[p] );
-+    /* Vector Shift Left Double by Octet Immediate, move the right hand section into the bytes */
-+             VR = vec_vsldoi( VR, VR, 2 << 2 ); 
-+    /* or those two together */
-+             V = vec_vor( VL, VR );
-+    /* sign extend */
-+             V = (vector float) vec_vupkhsh((vector bool short)V );
-+    /* fixed to float by S16_SHIFT_BITS bits */
-+             V = (vector float) vec_vcfsx ((vector signed int)V, 5 ); 
-+ 
-+             vec_stvx( V, 0, &test_out[0] );
-+             if (test_out[0] != 52.437500)
-+                 abort ();
-+             if (test_out[1] != -73.625000)
-+                 abort ();
-+             if (test_out[2] != 601.437500)
-+                 abort ();
-+             if (test_out[3] != -559.125000)
-+                 abort ();
-+         }
-+     }
-+ return 0;
-+ }
-+ 
-+ 
-+ int main(void)
-+ {
-+   altivec_cell_check ();
-+   return main1();
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.target/powerpc/altivec-cell-8.c	2009-09-21 11:48:32.000000000 +0200
+@@ -0,0 +1,56 @@
++/* { dg-do run } */
++/* { dg-require-effective-target powerpc_altivec_ok } */
++/* { dg-options "-O2 -maltivec -mabi=altivec -mcpu=cell" } */
++#include <altivec.h>
++#include <string.h>
++#include "altivec_check.h"
++
++typedef short int sint16;
++typedef signed char int8;
++
++int main1(void) __attribute__((noinline));
++int main1(void)
++{
++    sint16 test_vector[4] = { 1678, -2356, 19246, -17892 };
++    int8 test_dst[128] __attribute__(( aligned( 16 )));
++    float test_out[4] __attribute__(( aligned( 16 )));
++    int p;
++
++    for( p = 0; p < 24; ++p )
++    {
++        memset( test_dst, 0, 128 );
++        memcpy( &test_dst[p], test_vector, 8 );
++        {
++            vector float VR, VL, V;
++   /* load the righthand section of the misaligned vector */
++            VR = (vector float) vec_lvrx( 8, &test_dst[p] );
++            VL = (vector float) vec_lvlx( 0, &test_dst[p] );
++   /* Vector Shift Left Double by Octet Immediate, move the right hand section into the bytes */
++            VR = vec_vsldoi( VR, VR, 2 << 2 ); 
++   /* or those two together */
++            V = vec_vor( VL, VR );
++   /* sign extend */
++            V = (vector float) vec_vupkhsh((vector bool short)V );
++   /* fixed to float by S16_SHIFT_BITS bits */
++            V = (vector float) vec_vcfsx ((vector signed int)V, 5 ); 
++
++            vec_stvx( V, 0, &test_out[0] );
++            if (test_out[0] != 52.437500)
++                abort ();
++            if (test_out[1] != -73.625000)
++                abort ();
++            if (test_out[2] != 601.437500)
++                abort ();
++            if (test_out[3] != -559.125000)
++                abort ();
++        }
++    }
++return 0;
++}
++
++
++int main(void)
++{
++  altivec_cell_check ();
++  return main1();
++}
 Index: gcc/testsuite/g++.dg/ext/altivec-cell-1.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/altivec-cell-1.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/altivec-cell-1.C	(revision 140821)
-***************
-*** 0 ****
---- 1,94 ----
-+ /* { dg-do compile { target powerpc*-*-* } } */
-+ /* { dg-require-effective-target powerpc_altivec_ok } */
-+ /* { dg-options "-maltivec" } */
-+ 
-+ /* Basic test for the new VMX intrinsics.  */
-+ #include <altivec.h>
-+ 
-+ int f(vector int a, int b)
-+ {
-+   return vec_extract (a, b);
-+ }
-+ short f1(vector short a, int b)
-+ {
-+   return vec_extract (a, b);
-+ }
-+ vector short f2(vector short a, int b)
-+ {
-+   return vec_insert (b, a, b);
-+ }
-+ vector float f3(vector float a, int b)
-+ {
-+   return vec_insert (b, a, b);
-+ }
-+ 
-+ float g(void);
-+ 
-+ vector float f4(float b, int t)
-+ {
-+   return vec_promote (g(), t);
-+ }
-+ vector float f5(float b)
-+ {
-+   return vec_splats (g());
-+ }
-+ 
-+ 
-+ 
-+ 
-+ template <int> 
-+ int tf(vector int a, int b)
-+ {
-+   return vec_extract (a, b);
-+ }
-+ template <int> 
-+ short tf1(vector short a, int b)
-+ {
-+   return vec_extract (a, b);
-+ }
-+ template <int> 
-+ vector short tf2(vector short a, int b)
-+ {
-+   return vec_insert (b, a, b);
-+ }
-+ template <int> 
-+ vector float tf3(vector float a, int b)
-+ {
-+   return vec_insert (b, a, b);
-+ }
-+ 
-+ template <int> 
-+ vector float tf4(float b, int t)
-+ {
-+   return vec_promote (g(), t);
-+ }
-+ template <int> 
-+ vector float tf5(float b)
-+ {
-+   return vec_splats (g());
-+ }
-+ 
-+ int t(vector int a, int b)
-+ {
-+   return tf<1>(a, b);
-+ }
-+ short t1(vector short a, int b)
-+ {
-+   return tf1<1>(a, b);
-+ }
-+ vector short t2(vector short a, int b)
-+ {
-+   return tf2<1>(a, b);
-+ }
-+ vector float t3(vector float a, int b)
-+ {
-+   return tf3<1>(a, b);
-+ }
-+ vector float t4(float b, int t)
-+ {
-+   return tf4<1>(b, t);
-+ }
-+ vector float t5(float b)
-+ {
-+   return tf5<1>(b);
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/altivec-cell-1.C	2009-09-21 11:48:32.000000000 +0200
+@@ -0,0 +1,94 @@
++/* { dg-do compile { target powerpc*-*-* } } */
++/* { dg-require-effective-target powerpc_altivec_ok } */
++/* { dg-options "-maltivec" } */
++
++/* Basic test for the new VMX intrinsics.  */
++#include <altivec.h>
++
++int f(vector int a, int b)
++{
++  return vec_extract (a, b);
++}
++short f1(vector short a, int b)
++{
++  return vec_extract (a, b);
++}
++vector short f2(vector short a, int b)
++{
++  return vec_insert (b, a, b);
++}
++vector float f3(vector float a, int b)
++{
++  return vec_insert (b, a, b);
++}
++
++float g(void);
++
++vector float f4(float b, int t)
++{
++  return vec_promote (g(), t);
++}
++vector float f5(float b)
++{
++  return vec_splats (g());
++}
++
++
++
++
++template <int> 
++int tf(vector int a, int b)
++{
++  return vec_extract (a, b);
++}
++template <int> 
++short tf1(vector short a, int b)
++{
++  return vec_extract (a, b);
++}
++template <int> 
++vector short tf2(vector short a, int b)
++{
++  return vec_insert (b, a, b);
++}
++template <int> 
++vector float tf3(vector float a, int b)
++{
++  return vec_insert (b, a, b);
++}
++
++template <int> 
++vector float tf4(float b, int t)
++{
++  return vec_promote (g(), t);
++}
++template <int> 
++vector float tf5(float b)
++{
++  return vec_splats (g());
++}
++
++int t(vector int a, int b)
++{
++  return tf<1>(a, b);
++}
++short t1(vector short a, int b)
++{
++  return tf1<1>(a, b);
++}
++vector short t2(vector short a, int b)
++{
++  return tf2<1>(a, b);
++}
++vector float t3(vector float a, int b)
++{
++  return tf3<1>(a, b);
++}
++vector float t4(float b, int t)
++{
++  return tf4<1>(b, t);
++}
++vector float t5(float b)
++{
++  return tf5<1>(b);
++}
 Index: gcc/testsuite/g++.dg/ext/altivec-cell-2.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/altivec-cell-2.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/altivec-cell-2.C	(revision 140821)
-***************
-*** 0 ****
---- 1,142 ----
-+ /* { dg-do run { target powerpc*-*-* } } */
-+ /* { dg-require-effective-target powerpc_altivec_ok } */
-+ /* { dg-options "-maltivec" } */
-+ /* Test the vec_extract VMX intrinsics.  */
-+ #include <altivec.h>
-+ #include "altivec_check.h"
-+ 
-+ extern "C" void abort (void);
-+ 
-+ vector int a = {0, 1, 2, 3};
-+ vector short b = {0, 1, 2, 3, 4, 5, 6, 7};
-+ 
-+ int f(vector int a, int b)
-+ {
-+   return vec_extract (a, b);
-+ }
-+ 
-+ int f0 (vector int a)
-+ {
-+   return vec_extract (a, 0);
-+ }
-+ int f1 (vector int a)
-+ {
-+   return vec_extract (a, 1);
-+ }
-+ int f2 (vector int a)
-+ {
-+   return vec_extract (a, 2);
-+ }
-+ int f3 (vector int a)
-+ {
-+   return vec_extract (a, 3);
-+ }
-+ int f4 (vector int a)
-+ {
-+   return vec_extract (a, 4);
-+ }
-+ 
-+ int g(vector short a, int b)
-+ {
-+   return vec_extract (a, b);
-+ }
-+ 
-+ int g0 (vector short a)
-+ {
-+   return vec_extract (a, 0);
-+ }
-+ int g1 (vector short a)
-+ {
-+   return vec_extract (a, 1);
-+ }
-+ int g2 (vector short a)
-+ {
-+   return vec_extract (a, 2);
-+ }
-+ int g3 (vector short a)
-+ {
-+   return vec_extract (a, 3);
-+ }
-+ 
-+ int g4 (vector short a)
-+ { 
-+   return vec_extract (a, 4);
-+ }
-+ int g5 (vector short a)
-+ { 
-+   return vec_extract (a, 5);
-+ }
-+ int g6 (vector short a)
-+ { 
-+   return vec_extract (a, 6);
-+ }
-+ int g7 (vector short a)
-+ { 
-+   return vec_extract (a, 7);
-+ }
-+ int g8 (vector short a)
-+ { 
-+   return vec_extract (a, 8);
-+ }
-+ int main1(void) __attribute__((noinline));
-+ int main1(void)
-+ { 
-+   int i;
-+   /* Check vec_extract with a non constant element numbering */
-+   for(i=0;i<10;i++)
-+     { 
-+       if (f(a, i) != (i&0x3))
-+         abort ();
-+     }
-+   
-+   /* Check vec_extract with a constant element numbering */
-+   if (f0(a) != 0)
-+     abort ();
-+   if (f1(a) != 1)
-+     abort ();
-+   if (f2(a) != 2)
-+     abort ();
-+   if (f3(a) != 3)
-+     abort ();
-+   /* Check that vec_extract works with a constant element higher than
-+      the number of elements.  */
-+   if (f4(a) != 0)
-+     abort ();
-+ 
-+   /* Check vec_extract with a non constant element numbering */
-+   for(i=0;i<10;i++)
-+     {
-+       if (g(b, i) != (i&0x7))
-+         abort ();
-+     }
-+   
-+   /* Check vec_extract with a constant element numbering */
-+   if (g0(b) != 0)
-+     abort ();
-+   if (g1(b) != 1)
-+     abort ();
-+   if (g2(b) != 2)
-+     abort ();
-+   if (g3(b) != 3)
-+     abort ();
-+   if (g4(b) != 4)
-+     abort ();
-+   if (g5(b) != 5)
-+     abort ();
-+   if (g6(b) != 6)
-+     abort ();
-+   if (g7(b) != 7)
-+     abort ();
-+   /* Check that vec_extract works with a constant element higher than
-+      the number of elements.  */
-+   if (g8(b) != 0)
-+     abort ();
-+   
-+   return 0;
-+ }
-+ 
-+ int main(void)
-+ { 
-+   altivec_check();  /* Exits if AltiVec not supported */
-+   return main1 ();
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/altivec-cell-2.C	2009-09-21 11:48:32.000000000 +0200
+@@ -0,0 +1,142 @@
++/* { dg-do run { target powerpc*-*-* } } */
++/* { dg-require-effective-target powerpc_altivec_ok } */
++/* { dg-options "-maltivec" } */
++/* Test the vec_extract VMX intrinsics.  */
++#include <altivec.h>
++#include "altivec_check.h"
++
++extern "C" void abort (void);
++
++vector int a = {0, 1, 2, 3};
++vector short b = {0, 1, 2, 3, 4, 5, 6, 7};
++
++int f(vector int a, int b)
++{
++  return vec_extract (a, b);
++}
++
++int f0 (vector int a)
++{
++  return vec_extract (a, 0);
++}
++int f1 (vector int a)
++{
++  return vec_extract (a, 1);
++}
++int f2 (vector int a)
++{
++  return vec_extract (a, 2);
++}
++int f3 (vector int a)
++{
++  return vec_extract (a, 3);
++}
++int f4 (vector int a)
++{
++  return vec_extract (a, 4);
++}
++
++int g(vector short a, int b)
++{
++  return vec_extract (a, b);
++}
++
++int g0 (vector short a)
++{
++  return vec_extract (a, 0);
++}
++int g1 (vector short a)
++{
++  return vec_extract (a, 1);
++}
++int g2 (vector short a)
++{
++  return vec_extract (a, 2);
++}
++int g3 (vector short a)
++{
++  return vec_extract (a, 3);
++}
++
++int g4 (vector short a)
++{ 
++  return vec_extract (a, 4);
++}
++int g5 (vector short a)
++{ 
++  return vec_extract (a, 5);
++}
++int g6 (vector short a)
++{ 
++  return vec_extract (a, 6);
++}
++int g7 (vector short a)
++{ 
++  return vec_extract (a, 7);
++}
++int g8 (vector short a)
++{ 
++  return vec_extract (a, 8);
++}
++int main1(void) __attribute__((noinline));
++int main1(void)
++{ 
++  int i;
++  /* Check vec_extract with a non constant element numbering */
++  for(i=0;i<10;i++)
++    { 
++      if (f(a, i) != (i&0x3))
++        abort ();
++    }
++  
++  /* Check vec_extract with a constant element numbering */
++  if (f0(a) != 0)
++    abort ();
++  if (f1(a) != 1)
++    abort ();
++  if (f2(a) != 2)
++    abort ();
++  if (f3(a) != 3)
++    abort ();
++  /* Check that vec_extract works with a constant element higher than
++     the number of elements.  */
++  if (f4(a) != 0)
++    abort ();
++
++  /* Check vec_extract with a non constant element numbering */
++  for(i=0;i<10;i++)
++    {
++      if (g(b, i) != (i&0x7))
++        abort ();
++    }
++  
++  /* Check vec_extract with a constant element numbering */
++  if (g0(b) != 0)
++    abort ();
++  if (g1(b) != 1)
++    abort ();
++  if (g2(b) != 2)
++    abort ();
++  if (g3(b) != 3)
++    abort ();
++  if (g4(b) != 4)
++    abort ();
++  if (g5(b) != 5)
++    abort ();
++  if (g6(b) != 6)
++    abort ();
++  if (g7(b) != 7)
++    abort ();
++  /* Check that vec_extract works with a constant element higher than
++     the number of elements.  */
++  if (g8(b) != 0)
++    abort ();
++  
++  return 0;
++}
++
++int main(void)
++{ 
++  altivec_check();  /* Exits if AltiVec not supported */
++  return main1 ();
++}
 Index: gcc/testsuite/g++.dg/ext/altivec-cell-3.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/altivec-cell-3.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/altivec-cell-3.C	(revision 140821)
-***************
-*** 0 ****
---- 1,38 ----
-+ /* { dg-do run { target powerpc*-*-* } } */
-+ /* { dg-require-effective-target powerpc_altivec_ok } */
-+ /* { dg-options "-maltivec" } */
-+ /* Test the vec_splats and vec_promote VMX intrinsics.  */
-+ #include <altivec.h>
-+ #include "altivec_check.h"
-+     
-+ extern "C" void abort (void);
-+         
-+ vector int a = {0, 0, 0, 0};
-+ int main1(int t) __attribute__((noinline));
-+ int main1(int t)
-+ { 
-+   int i;
-+   vector int b = vec_splats(0);
-+   if (__builtin_memcmp (&a, &b, sizeof(vector int)))
-+     abort ();
-+   
-+   b = vec_splats(t);
-+   if (__builtin_memcmp (&a, &b, sizeof(vector int)))
-+     abort ();
-+   
-+   b = vec_promote(0, 1);
-+   if (vec_extract (b, 1) != 0)
-+     abort ();
-+   
-+   b = vec_promote(t, t);
-+   if (vec_extract (b, t) != 0)
-+     abort ();
-+   
-+   return 0;
-+ } 
-+     
-+ int main(void)
-+ { 
-+   altivec_check();  /* Exits if AltiVec not supported */
-+   return main1 (0);
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/altivec-cell-3.C	2009-09-21 11:48:32.000000000 +0200
+@@ -0,0 +1,38 @@
++/* { dg-do run { target powerpc*-*-* } } */
++/* { dg-require-effective-target powerpc_altivec_ok } */
++/* { dg-options "-maltivec" } */
++/* Test the vec_splats and vec_promote VMX intrinsics.  */
++#include <altivec.h>
++#include "altivec_check.h"
++    
++extern "C" void abort (void);
++        
++vector int a = {0, 0, 0, 0};
++int main1(int t) __attribute__((noinline));
++int main1(int t)
++{ 
++  int i;
++  vector int b = vec_splats(0);
++  if (__builtin_memcmp (&a, &b, sizeof(vector int)))
++    abort ();
++  
++  b = vec_splats(t);
++  if (__builtin_memcmp (&a, &b, sizeof(vector int)))
++    abort ();
++  
++  b = vec_promote(0, 1);
++  if (vec_extract (b, 1) != 0)
++    abort ();
++  
++  b = vec_promote(t, t);
++  if (vec_extract (b, t) != 0)
++    abort ();
++  
++  return 0;
++} 
++    
++int main(void)
++{ 
++  altivec_check();  /* Exits if AltiVec not supported */
++  return main1 (0);
++}
 Index: gcc/testsuite/g++.dg/ext/altivec-cell-4.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/altivec-cell-4.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/altivec-cell-4.C	(revision 140821)
-***************
-*** 0 ****
---- 1,43 ----
-+ /* { dg-do run { target powerpc*-*-* } } */
-+ /* { dg-require-effective-target powerpc_altivec_ok } */
-+ /* { dg-options "-maltivec" } */
-+ 
-+ /* Test the vec_splats and vec_promote VMX intrinsics.  */
-+ #include <altivec.h>
-+ #include "altivec_check.h"
-+     
-+ extern "C" void abort (void);
-+         
-+ vector int a[] = {{0, 0, 0, 0}, {1,0,0,0}, {1,2,0,0},{1,2,3,0},{1,2,3,4},{5,2,3,4},{5,6,3,4}};
-+ vector int c = {0,6,3,4};
-+ vector int d = {0,0,3,4};
-+ int main1(int t) __attribute__((noinline));
-+ int main1(int t)
-+ { 
-+   int i;
-+   vector int b = vec_splats(0);
-+   for(i = 0;i<sizeof(a)/sizeof(a[0])-1;i++)
-+     { 
-+         if (__builtin_memcmp (&b, &a[i], sizeof(vector int)))
-+           abort ();
-+         b = vec_insert(i+1, b, i);
-+     } 
-+   if (__builtin_memcmp (&b, &a[i], sizeof(vector int)))
-+     abort ();
-+   
-+   b = vec_insert(0, b, 0);
-+   if (__builtin_memcmp (&b, &c, sizeof(vector int)))
-+     abort ();
-+   
-+   b = vec_insert(0, b, 1);
-+   if (__builtin_memcmp (&b, &d, sizeof(vector int)))
-+     abort ();
-+   
-+   return 0;
-+ } 
-+   
-+ int main(void)
-+ {
-+   altivec_check();  /* Exits if AltiVec not supported */
-+   return main1 (0);
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/altivec-cell-4.C	2009-09-21 11:48:32.000000000 +0200
+@@ -0,0 +1,43 @@
++/* { dg-do run { target powerpc*-*-* } } */
++/* { dg-require-effective-target powerpc_altivec_ok } */
++/* { dg-options "-maltivec" } */
++
++/* Test the vec_splats and vec_promote VMX intrinsics.  */
++#include <altivec.h>
++#include "altivec_check.h"
++    
++extern "C" void abort (void);
++        
++vector int a[] = {{0, 0, 0, 0}, {1,0,0,0}, {1,2,0,0},{1,2,3,0},{1,2,3,4},{5,2,3,4},{5,6,3,4}};
++vector int c = {0,6,3,4};
++vector int d = {0,0,3,4};
++int main1(int t) __attribute__((noinline));
++int main1(int t)
++{ 
++  int i;
++  vector int b = vec_splats(0);
++  for(i = 0;i<sizeof(a)/sizeof(a[0])-1;i++)
++    { 
++        if (__builtin_memcmp (&b, &a[i], sizeof(vector int)))
++          abort ();
++        b = vec_insert(i+1, b, i);
++    } 
++  if (__builtin_memcmp (&b, &a[i], sizeof(vector int)))
++    abort ();
++  
++  b = vec_insert(0, b, 0);
++  if (__builtin_memcmp (&b, &c, sizeof(vector int)))
++    abort ();
++  
++  b = vec_insert(0, b, 1);
++  if (__builtin_memcmp (&b, &d, sizeof(vector int)))
++    abort ();
++  
++  return 0;
++} 
++  
++int main(void)
++{
++  altivec_check();  /* Exits if AltiVec not supported */
++  return main1 (0);
++}
 Index: gcc/testsuite/g++.dg/ext/altivec-cell-5.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/altivec-cell-5.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/altivec-cell-5.C	(revision 140821)
-***************
-*** 0 ****
---- 1,25 ----
-+ /* { dg-do compile { target powerpc*-*-* } } */
-+ /* { dg-require-effective-target powerpc_altivec_ok } */
-+ /* { dg-options "-maltivec" } */
-+ 
-+ /* Basic test for the new VMX intrinsics and error messages.  */
-+ #include <altivec.h>
-+ 
-+ int main(int argc, char **argv)
-+ {
-+ vector float t;
-+     vec_promote();                      /* { dg-error "vec_promote only accepts 2" } */
-+     vec_promote(1.0f);                  /* { dg-error "vec_promote only accepts 2" } */
-+     vec_promote(1.0f, 2, 3);            /* { dg-error "vec_promote only accepts 2" } */
-+     vec_extract ();                     /* { dg-error "vec_extract only accepts 2" } */
-+     vec_extract (t);                    /* { dg-error "vec_extract only accepts 2" } */
-+     vec_extract (t, 2);
-+     vec_extract (t, 2, 5, 6);           /* { dg-error "vec_extract only accepts 2" } */
-+     vec_splats ();                      /* { dg-error "vec_splats only accepts 1" } */
-+     vec_splats (t, 3);                  /* { dg-error "vec_splats only accepts 1" } */
-+     vec_insert ();                      /* { dg-error "vec_insert only accepts 3" } */
-+     vec_insert (t);                     /* { dg-error "vec_insert only accepts 3" } */
-+     vec_insert (t, 3);                  /* { dg-error "vec_insert only accepts 3" } */
-+     vec_insert (t, 3, 2, 4, 6, 6);      /* { dg-error "vec_insert only accepts 3" } */
-+     return 0;
-+ }  
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/altivec-cell-5.C	2009-09-21 11:48:32.000000000 +0200
+@@ -0,0 +1,25 @@
++/* { dg-do compile { target powerpc*-*-* } } */
++/* { dg-require-effective-target powerpc_altivec_ok } */
++/* { dg-options "-maltivec" } */
++
++/* Basic test for the new VMX intrinsics and error messages.  */
++#include <altivec.h>
++
++int main(int argc, char **argv)
++{
++vector float t;
++    vec_promote();                      /* { dg-error "vec_promote only accepts 2" } */
++    vec_promote(1.0f);                  /* { dg-error "vec_promote only accepts 2" } */
++    vec_promote(1.0f, 2, 3);            /* { dg-error "vec_promote only accepts 2" } */
++    vec_extract ();                     /* { dg-error "vec_extract only accepts 2" } */
++    vec_extract (t);                    /* { dg-error "vec_extract only accepts 2" } */
++    vec_extract (t, 2);
++    vec_extract (t, 2, 5, 6);           /* { dg-error "vec_extract only accepts 2" } */
++    vec_splats ();                      /* { dg-error "vec_splats only accepts 1" } */
++    vec_splats (t, 3);                  /* { dg-error "vec_splats only accepts 1" } */
++    vec_insert ();                      /* { dg-error "vec_insert only accepts 3" } */
++    vec_insert (t);                     /* { dg-error "vec_insert only accepts 3" } */
++    vec_insert (t, 3);                  /* { dg-error "vec_insert only accepts 3" } */
++    vec_insert (t, 3, 2, 4, 6, 6);      /* { dg-error "vec_insert only accepts 3" } */
++    return 0;
++}  
 Index: gcc/cp/tree.c
 ===================================================================
-*** gcc/cp/tree.c	(revision 140819)
---- gcc/cp/tree.c	(revision 140821)
-*************** lvalue_p_1 (const_tree ref,
-*** 129,134 ****
---- 129,135 ----
-        return op1_lvalue_kind;
-  
-      case STRING_CST:
-+     case COMPOUND_LITERAL_EXPR:
-        return clk_ordinary;
-  
-      case CONST_DECL:
+--- gcc/cp/tree.c.orig	2009-09-21 11:42:14.000000000 +0200
++++ gcc/cp/tree.c	2009-09-21 11:48:32.000000000 +0200
+@@ -133,6 +133,7 @@ lvalue_p_1 (tree ref,
+       return op1_lvalue_kind;
+ 
+     case STRING_CST:
++    case COMPOUND_LITERAL_EXPR:
+       return clk_ordinary;
+ 
+     case CONST_DECL:
 Index: gcc/config/rs6000/rs6000-c.c
 ===================================================================
-*** gcc/config/rs6000/rs6000-c.c	(revision 140819)
---- gcc/config/rs6000/rs6000-c.c	(revision 140821)
-*************** const struct altivec_builtin_types altiv
-*** 996,1001 ****
---- 996,1145 ----
-      RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_long, 0 },
-    { ALTIVEC_BUILTIN_VEC_LVSR, ALTIVEC_BUILTIN_LVSR,
-      RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_float, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
-+     RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_V4SF, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
-+     RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_float, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
-+     RS6000_BTI_bool_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V4SI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
-+     RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_V4SI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
-+     RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_INTSI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
-+     RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V4SI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
-+     RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTSI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
-+     RS6000_BTI_bool_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V8HI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
-+     RS6000_BTI_pixel_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_pixel_V8HI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
-+     RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_V8HI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
-+     RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_INTHI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
-+     RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V8HI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
-+     RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTHI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
-+     RS6000_BTI_bool_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V16QI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
-+     RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_V16QI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
-+     RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_INTQI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
-+     RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V16QI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
-+     RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTQI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
-+     RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_V4SF, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
-+     RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_float, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
-+     RS6000_BTI_bool_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V4SI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
-+     RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_V4SI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
-+     RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_INTSI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
-+     RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V4SI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
-+     RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTSI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
-+     RS6000_BTI_bool_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V8HI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
-+     RS6000_BTI_pixel_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_pixel_V8HI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
-+     RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_V8HI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
-+     RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_INTHI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
-+     RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V8HI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
-+     RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTHI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
-+     RS6000_BTI_bool_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V16QI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
-+     RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_V16QI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
-+     RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_INTQI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
-+     RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V16QI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
-+     RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTQI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
-+     RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_V4SF, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
-+     RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_float, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
-+     RS6000_BTI_bool_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V4SI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
-+     RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_V4SI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
-+     RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_INTSI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
-+     RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V4SI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
-+     RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTSI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
-+     RS6000_BTI_bool_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V8HI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
-+     RS6000_BTI_pixel_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_pixel_V8HI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
-+     RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_V8HI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
-+     RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_INTHI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
-+     RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V8HI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
-+     RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTHI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
-+     RS6000_BTI_bool_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V16QI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
-+     RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_V16QI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
-+     RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_INTQI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
-+     RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V16QI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
-+     RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTQI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
-+     RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_V4SF, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
-+     RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_float, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
-+     RS6000_BTI_bool_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V4SI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
-+     RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_V4SI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
-+     RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_INTSI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
-+     RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V4SI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
-+     RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTSI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
-+     RS6000_BTI_bool_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V8HI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
-+     RS6000_BTI_pixel_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_pixel_V8HI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
-+     RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_V8HI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
-+     RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_INTHI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
-+     RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V8HI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
-+     RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTHI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
-+     RS6000_BTI_bool_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V16QI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
-+     RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_V16QI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
-+     RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_INTQI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
-+     RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V16QI, 0 },
-+   { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
-+     RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTQI, 0 },
-    { ALTIVEC_BUILTIN_VEC_MAX, ALTIVEC_BUILTIN_VMAXUB,
-      RS6000_BTI_unsigned_V16QI, RS6000_BTI_bool_V16QI, RS6000_BTI_unsigned_V16QI, 0 },
-    { ALTIVEC_BUILTIN_VEC_MAX, ALTIVEC_BUILTIN_VMAXUB,
-*************** const struct altivec_builtin_types altiv
-*** 2432,2437 ****
---- 2576,2725 ----
-      RS6000_BTI_void, RS6000_BTI_bool_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_INTQI },
-    { ALTIVEC_BUILTIN_VEC_STL, ALTIVEC_BUILTIN_STVXL,
-      RS6000_BTI_void, RS6000_BTI_pixel_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_pixel_V8HI },
-+   { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
-+     RS6000_BTI_void, RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_V4SF },
-+   { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
-+     RS6000_BTI_void, RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_float },
-+   { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
-+     RS6000_BTI_void, RS6000_BTI_bool_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V4SI },
-+   { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
-+     RS6000_BTI_void, RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_V4SI },
-+   { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
-+     RS6000_BTI_void, RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_INTSI },
-+   { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V4SI },
-+   { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTSI },
-+   { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
-+     RS6000_BTI_void, RS6000_BTI_bool_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V8HI },
-+   { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
-+     RS6000_BTI_void, RS6000_BTI_pixel_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_pixel_V8HI },
-+   { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
-+     RS6000_BTI_void, RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_V8HI },
-+   { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
-+     RS6000_BTI_void, RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_INTHI },
-+   { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V8HI },
-+   { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTHI },
-+   { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
-+     RS6000_BTI_void, RS6000_BTI_bool_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V16QI },
-+   { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
-+     RS6000_BTI_void, RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_V16QI },
-+   { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
-+     RS6000_BTI_void, RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_INTQI },
-+   { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V16QI },
-+   { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTQI },
-+   { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
-+     RS6000_BTI_void, RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_V4SF },
-+   { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
-+     RS6000_BTI_void, RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_float },
-+   { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
-+     RS6000_BTI_void, RS6000_BTI_bool_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V4SI },
-+   { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
-+     RS6000_BTI_void, RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_V4SI },
-+   { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
-+     RS6000_BTI_void, RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_INTSI },
-+   { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V4SI },
-+   { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTSI },
-+   { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
-+     RS6000_BTI_void, RS6000_BTI_bool_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V8HI },
-+   { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
-+     RS6000_BTI_void, RS6000_BTI_pixel_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_pixel_V8HI },
-+   { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
-+     RS6000_BTI_void, RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_V8HI },
-+   { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
-+     RS6000_BTI_void, RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_INTHI },
-+   { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V8HI },
-+   { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTHI },
-+   { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
-+     RS6000_BTI_void, RS6000_BTI_bool_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V16QI },
-+   { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
-+     RS6000_BTI_void, RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_V16QI },
-+   { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
-+     RS6000_BTI_void, RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_INTQI },
-+   { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V16QI },
-+   { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTQI },
-+   { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
-+     RS6000_BTI_void, RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_V4SF },
-+   { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
-+     RS6000_BTI_void, RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_float },
-+   { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
-+     RS6000_BTI_void, RS6000_BTI_bool_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V4SI },
-+   { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
-+     RS6000_BTI_void, RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_V4SI },
-+   { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
-+     RS6000_BTI_void, RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_INTSI },
-+   { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V4SI },
-+   { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTSI },
-+   { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
-+     RS6000_BTI_void, RS6000_BTI_bool_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V8HI },
-+   { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
-+     RS6000_BTI_void, RS6000_BTI_pixel_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_pixel_V8HI },
-+   { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
-+     RS6000_BTI_void, RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_V8HI },
-+   { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
-+     RS6000_BTI_void, RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_INTHI },
-+   { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V8HI },
-+   { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTHI },
-+   { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
-+     RS6000_BTI_void, RS6000_BTI_bool_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V16QI },
-+   { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
-+     RS6000_BTI_void, RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_V16QI },
-+   { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
-+     RS6000_BTI_void, RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_INTQI },
-+   { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V16QI },
-+   { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTQI },
-+   { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
-+     RS6000_BTI_void, RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_V4SF },
-+   { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
-+     RS6000_BTI_void, RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_float },
-+   { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
-+     RS6000_BTI_void, RS6000_BTI_bool_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V4SI },
-+   { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
-+     RS6000_BTI_void, RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_V4SI },
-+   { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
-+     RS6000_BTI_void, RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_INTSI },
-+   { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V4SI },
-+   { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTSI },
-+   { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
-+     RS6000_BTI_void, RS6000_BTI_bool_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V8HI },
-+   { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
-+     RS6000_BTI_void, RS6000_BTI_pixel_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_pixel_V8HI },
-+   { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
-+     RS6000_BTI_void, RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_V8HI },
-+   { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
-+     RS6000_BTI_void, RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_INTHI },
-+   { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V8HI },
-+   { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTHI },
-+   { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
-+     RS6000_BTI_void, RS6000_BTI_bool_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V16QI },
-+   { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
-+     RS6000_BTI_void, RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_V16QI },
-+   { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
-+     RS6000_BTI_void, RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_INTQI },
-+   { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V16QI },
-+   { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
-+     RS6000_BTI_void, RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTQI },
-  
-    /* Predicates.  */
-    { ALTIVEC_BUILTIN_VCMPGT_P, ALTIVEC_BUILTIN_VCMPGTUB_P,
-*************** altivec_resolve_overloaded_builtin (tree
-*** 2685,2690 ****
---- 2973,3170 ----
-        || fcode > ALTIVEC_BUILTIN_OVERLOADED_LAST)
-      return NULL_TREE;
-  
-+   /* For now treat vec_splats and vec_promote as the same.  */
-+   if (fcode == ALTIVEC_BUILTIN_VEC_SPLATS
-+       || fcode == ALTIVEC_BUILTIN_VEC_PROMOTE)
-+     {
-+       tree type, arg;
-+       int size;
-+       int i;
-+       bool unsigned_p;
-+       VEC(constructor_elt,gc) *vec;
-+       const char *name = fcode == ALTIVEC_BUILTIN_VEC_SPLATS ? "vec_splats": "vec_promote";
-+ 
-+       if (!arglist)
-+ 	{
-+ 	  error ("%s only accepts %d arguments", name, (fcode == ALTIVEC_BUILTIN_VEC_PROMOTE)+1 );
-+ 	  return error_mark_node;
-+ 	}
-+       if (fcode == ALTIVEC_BUILTIN_VEC_SPLATS && TREE_CHAIN (arglist))
-+ 	{
-+ 	  error ("%s only accepts 1 argument", name);
-+ 	  return error_mark_node;
-+ 	}
-+       if (fcode == ALTIVEC_BUILTIN_VEC_PROMOTE && !TREE_CHAIN (arglist))
-+ 	{
-+ 	  error ("%s only accepts 2 arguments", name);
-+ 	  return error_mark_node;
-+ 	}
-+       /* Ignore promote's element argument.  */
-+       if (fcode == ALTIVEC_BUILTIN_VEC_PROMOTE
-+ 	  && TREE_CHAIN (TREE_CHAIN (arglist)))
-+ 	{
-+ 	  error ("%s only accepts 2 arguments", name);
-+ 	  return error_mark_node;
-+ 	}
-+       if (fcode == ALTIVEC_BUILTIN_VEC_PROMOTE
-+ 	  && !INTEGRAL_TYPE_P (TREE_TYPE (TREE_VALUE (TREE_CHAIN (arglist)))))
-+ 	goto bad;
-+ 
-+       arg = TREE_VALUE (arglist);
-+       type = TREE_TYPE (arg);
-+       if (!SCALAR_FLOAT_TYPE_P (type)
-+ 	  && !INTEGRAL_TYPE_P (type))
-+ 	goto bad;
-+       unsigned_p = TYPE_UNSIGNED (type);
-+       if (type == long_long_unsigned_type_node
-+           || type == long_long_integer_type_node)
-+ 	goto bad;
-+       switch (TYPE_MODE (type))
-+ 	{
-+ 	  case SImode:
-+ 	    type = (unsigned_p ? unsigned_V4SI_type_node : V4SI_type_node);
-+ 	    size = 4;
-+ 	    break;
-+ 	  case HImode:
-+ 	    type = (unsigned_p ? unsigned_V8HI_type_node : V8HI_type_node);
-+ 	    size = 8;
-+ 	    break;
-+ 	  case QImode:
-+ 	    type = (unsigned_p ? unsigned_V16QI_type_node : V16QI_type_node);
-+ 	    size = 16;
-+ 	    break;
-+ 	  case SFmode: type = V4SF_type_node; size = 4; break;
-+ 	  default:
-+ 	    goto bad;
-+ 	}
-+       arg = save_expr (fold_convert (TREE_TYPE (type), arg));
-+       vec = VEC_alloc (constructor_elt, gc, size);
-+       for(i = 0; i < size; i++)
-+ 	{
-+ 	  constructor_elt *elt;
-+ 
-+ 	  elt = VEC_quick_push (constructor_elt, vec, NULL);
-+ 	  elt->index = NULL_TREE;
-+ 	  elt->value = arg;
-+ 	}
-+ 	return build_constructor (type, vec);
-+     }
-+ 
-+   /* For now use pointer tricks to do the extaction.  */
-+   if (fcode == ALTIVEC_BUILTIN_VEC_EXTRACT)
-+     {
-+       tree arg1;
-+       tree arg1_type;
-+       tree arg2;
-+       tree arg1_inner_type;
-+       tree decl, stmt;
-+       tree innerptrtype;
-+ 
-+       /* No second argument. */
-+       if (!arglist || !TREE_CHAIN (arglist)
-+ 	  || TREE_CHAIN (TREE_CHAIN (arglist)))
-+ 	{
-+ 	  error ("vec_extract only accepts 2 arguments");
-+ 	  return error_mark_node;
-+ 	}
-+ 
-+       arg2 = TREE_VALUE (TREE_CHAIN (arglist));
-+       arg1 = TREE_VALUE (arglist);
-+       arg1_type = TREE_TYPE (arg1);
-+ 
-+       if (TREE_CODE (arg1_type) != VECTOR_TYPE)
-+ 	goto bad; 
-+       if (!INTEGRAL_TYPE_P (TREE_TYPE (arg2)))
-+ 	goto bad; 
-+       /* Build *(((arg1_inner_type*)&(vector type){arg1})+arg2). */
-+       arg1_inner_type = TREE_TYPE (arg1_type);
-+       arg2 = build_binary_op (BIT_AND_EXPR, arg2,
-+ 			      build_int_cst (TREE_TYPE (arg2),
-+ 					     TYPE_VECTOR_SUBPARTS (arg1_type)
-+ 					     - 1), 0);
-+       decl = build_decl (VAR_DECL, NULL_TREE, arg1_type);
-+       DECL_EXTERNAL (decl) = 0;
-+       TREE_PUBLIC (decl) = 0;
-+       DECL_CONTEXT (decl) = current_function_decl;
-+       TREE_USED (decl) = 1;
-+       TREE_TYPE (decl) = arg1_type;
-+       TREE_READONLY (decl) = TYPE_READONLY (arg1_type);
-+       DECL_INITIAL (decl) = arg1;
-+       stmt = build1 (DECL_EXPR, arg1_type, decl);
-+       TREE_ADDRESSABLE (decl) = 1;
-+       SET_EXPR_LOCATION (stmt, input_location);
-+       stmt = build1 (COMPOUND_LITERAL_EXPR, arg1_type, stmt);
-+ 
-+       innerptrtype = build_pointer_type (arg1_inner_type);
-+ 
-+       stmt = build_unary_op (ADDR_EXPR, stmt, 0);
-+       stmt = convert (innerptrtype, stmt);
-+       stmt = build_binary_op (PLUS_EXPR, stmt, arg2, 1);
-+       stmt = build_indirect_ref (stmt, NULL);
-+ 
-+       return stmt;
-+     }
-+ 
-+   /* For now use pointer tricks to do the insertation.  */
-+   if (fcode == ALTIVEC_BUILTIN_VEC_INSERT)
-+     {
-+       tree arg0;
-+       tree arg1;
-+       tree arg2;
-+       tree arg1_type;
-+       tree arg1_inner_type;
-+       tree decl, stmt;
-+       tree innerptrtype;
-+       
-+       /* No second or third arguments. */
-+       if (!arglist || !TREE_CHAIN (arglist)
-+ 	  || !TREE_CHAIN (TREE_CHAIN (arglist))
-+ 	  || TREE_CHAIN (TREE_CHAIN (TREE_CHAIN (arglist))))
-+ 	{
-+ 	  error ("vec_insert only accepts 3 arguments");
-+ 	  return error_mark_node;
-+ 	}
-+ 
-+       arg0 = TREE_VALUE (arglist);
-+       arg1 = TREE_VALUE (TREE_CHAIN (arglist));
-+       arg1_type = TREE_TYPE (arg1);
-+       arg2 = TREE_VALUE (TREE_CHAIN (TREE_CHAIN (arglist)));
-+ 
-+       if (TREE_CODE (arg1_type) != VECTOR_TYPE)
-+ 	goto bad; 
-+       if (!INTEGRAL_TYPE_P (TREE_TYPE (arg2)))
-+ 	goto bad; 
-+       /* Build *(((arg1_inner_type*)&(vector type){arg1})+arg2) = arg0. */
-+       arg1_inner_type = TREE_TYPE (arg1_type);
-+       arg2 = build_binary_op (BIT_AND_EXPR, arg2,
-+ 			      build_int_cst (TREE_TYPE (arg2),
-+ 					     TYPE_VECTOR_SUBPARTS (arg1_type)
-+ 					     - 1), 0);
-+       decl = build_decl (VAR_DECL, NULL_TREE, arg1_type);
-+       DECL_EXTERNAL (decl) = 0;
-+       TREE_PUBLIC (decl) = 0;
-+       DECL_CONTEXT (decl) = current_function_decl;
-+       TREE_USED (decl) = 1;
-+       TREE_TYPE (decl) = arg1_type;
-+       TREE_READONLY (decl) = TYPE_READONLY (arg1_type);
-+       DECL_INITIAL (decl) = arg1;
-+       stmt = build1 (DECL_EXPR, arg1_type, decl);
-+       TREE_ADDRESSABLE (decl) = 1;
-+       SET_EXPR_LOCATION (stmt, input_location);
-+       stmt = build1 (COMPOUND_LITERAL_EXPR, arg1_type, stmt);
-+ 
-+       innerptrtype = build_pointer_type (arg1_inner_type);
-+ 
-+       stmt = build_unary_op (ADDR_EXPR, stmt, 0);
-+       stmt = convert (innerptrtype, stmt);
-+       stmt = build_binary_op (PLUS_EXPR, stmt, arg2, 1);
-+       stmt = build_indirect_ref (stmt, NULL);
-+       stmt = build2 (MODIFY_EXPR, TREE_TYPE (stmt), stmt,
-+ 		     convert (TREE_TYPE (stmt), arg0));
-+       stmt = build2 (COMPOUND_EXPR, arg1_type, stmt, decl);
-+       return stmt;
-+     }
-+ 
-    for (n = 0;
-         !VOID_TYPE_P (TREE_VALUE (fnargs)) && arglist;
-         fnargs = TREE_CHAIN (fnargs), arglist = TREE_CHAIN (arglist), n++)
+--- gcc/config/rs6000/rs6000-c.c.orig	2009-09-21 11:47:06.000000000 +0200
++++ gcc/config/rs6000/rs6000-c.c	2009-09-21 11:48:32.000000000 +0200
+@@ -984,6 +984,150 @@ const struct altivec_builtin_types altiv
+     RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_long, 0 },
+   { ALTIVEC_BUILTIN_VEC_LVSR, ALTIVEC_BUILTIN_LVSR,
+     RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_float, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
++    RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_V4SF, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
++    RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_float, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
++    RS6000_BTI_bool_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V4SI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
++    RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_V4SI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
++    RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_INTSI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
++    RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V4SI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
++    RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTSI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
++    RS6000_BTI_bool_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V8HI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
++    RS6000_BTI_pixel_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_pixel_V8HI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
++    RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_V8HI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
++    RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_INTHI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
++    RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V8HI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
++    RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTHI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
++    RS6000_BTI_bool_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V16QI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
++    RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_V16QI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
++    RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_INTQI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
++    RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V16QI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLX, ALTIVEC_BUILTIN_LVLX,
++    RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTQI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
++    RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_V4SF, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
++    RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_float, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
++    RS6000_BTI_bool_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V4SI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
++    RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_V4SI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
++    RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_INTSI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
++    RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V4SI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
++    RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTSI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
++    RS6000_BTI_bool_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V8HI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
++    RS6000_BTI_pixel_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_pixel_V8HI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
++    RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_V8HI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
++    RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_INTHI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
++    RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V8HI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
++    RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTHI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
++    RS6000_BTI_bool_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V16QI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
++    RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_V16QI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
++    RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_INTQI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
++    RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V16QI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVLXL, ALTIVEC_BUILTIN_LVLXL,
++    RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTQI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
++    RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_V4SF, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
++    RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_float, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
++    RS6000_BTI_bool_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V4SI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
++    RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_V4SI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
++    RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_INTSI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
++    RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V4SI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
++    RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTSI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
++    RS6000_BTI_bool_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V8HI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
++    RS6000_BTI_pixel_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_pixel_V8HI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
++    RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_V8HI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
++    RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_INTHI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
++    RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V8HI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
++    RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTHI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
++    RS6000_BTI_bool_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V16QI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
++    RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_V16QI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
++    RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_INTQI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
++    RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V16QI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRX, ALTIVEC_BUILTIN_LVRX,
++    RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTQI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
++    RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_V4SF, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
++    RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_float, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
++    RS6000_BTI_bool_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V4SI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
++    RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_V4SI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
++    RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_INTSI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
++    RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V4SI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
++    RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTSI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
++    RS6000_BTI_bool_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V8HI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
++    RS6000_BTI_pixel_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_pixel_V8HI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
++    RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_V8HI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
++    RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_INTHI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
++    RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V8HI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
++    RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTHI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
++    RS6000_BTI_bool_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V16QI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
++    RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_V16QI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
++    RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_INTQI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
++    RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V16QI, 0 },
++  { ALTIVEC_BUILTIN_VEC_LVRXL, ALTIVEC_BUILTIN_LVRXL,
++    RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTQI, 0 },
+   { ALTIVEC_BUILTIN_VEC_MAX, ALTIVEC_BUILTIN_VMAXUB,
+     RS6000_BTI_unsigned_V16QI, RS6000_BTI_bool_V16QI, RS6000_BTI_unsigned_V16QI, 0 },
+   { ALTIVEC_BUILTIN_VEC_MAX, ALTIVEC_BUILTIN_VMAXUB,
+@@ -2420,6 +2564,150 @@ const struct altivec_builtin_types altiv
+     RS6000_BTI_void, RS6000_BTI_bool_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_INTQI },
+   { ALTIVEC_BUILTIN_VEC_STL, ALTIVEC_BUILTIN_STVXL,
+     RS6000_BTI_void, RS6000_BTI_pixel_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_pixel_V8HI },
++  { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
++    RS6000_BTI_void, RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_V4SF },
++  { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
++    RS6000_BTI_void, RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_float },
++  { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
++    RS6000_BTI_void, RS6000_BTI_bool_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V4SI },
++  { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
++    RS6000_BTI_void, RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_V4SI },
++  { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
++    RS6000_BTI_void, RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_INTSI },
++  { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V4SI },
++  { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTSI },
++  { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
++    RS6000_BTI_void, RS6000_BTI_bool_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V8HI },
++  { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
++    RS6000_BTI_void, RS6000_BTI_pixel_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_pixel_V8HI },
++  { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
++    RS6000_BTI_void, RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_V8HI },
++  { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
++    RS6000_BTI_void, RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_INTHI },
++  { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V8HI },
++  { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTHI },
++  { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
++    RS6000_BTI_void, RS6000_BTI_bool_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V16QI },
++  { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
++    RS6000_BTI_void, RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_V16QI },
++  { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
++    RS6000_BTI_void, RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_INTQI },
++  { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V16QI },
++  { ALTIVEC_BUILTIN_VEC_STVLX, ALTIVEC_BUILTIN_STVLX,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTQI },
++  { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
++    RS6000_BTI_void, RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_V4SF },
++  { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
++    RS6000_BTI_void, RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_float },
++  { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
++    RS6000_BTI_void, RS6000_BTI_bool_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V4SI },
++  { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
++    RS6000_BTI_void, RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_V4SI },
++  { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
++    RS6000_BTI_void, RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_INTSI },
++  { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V4SI },
++  { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTSI },
++  { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
++    RS6000_BTI_void, RS6000_BTI_bool_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V8HI },
++  { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
++    RS6000_BTI_void, RS6000_BTI_pixel_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_pixel_V8HI },
++  { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
++    RS6000_BTI_void, RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_V8HI },
++  { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
++    RS6000_BTI_void, RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_INTHI },
++  { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V8HI },
++  { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTHI },
++  { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
++    RS6000_BTI_void, RS6000_BTI_bool_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V16QI },
++  { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
++    RS6000_BTI_void, RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_V16QI },
++  { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
++    RS6000_BTI_void, RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_INTQI },
++  { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V16QI },
++  { ALTIVEC_BUILTIN_VEC_STVLXL, ALTIVEC_BUILTIN_STVLXL,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTQI },
++  { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
++    RS6000_BTI_void, RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_V4SF },
++  { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
++    RS6000_BTI_void, RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_float },
++  { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
++    RS6000_BTI_void, RS6000_BTI_bool_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V4SI },
++  { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
++    RS6000_BTI_void, RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_V4SI },
++  { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
++    RS6000_BTI_void, RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_INTSI },
++  { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V4SI },
++  { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTSI },
++  { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
++    RS6000_BTI_void, RS6000_BTI_bool_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V8HI },
++  { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
++    RS6000_BTI_void, RS6000_BTI_pixel_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_pixel_V8HI },
++  { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
++    RS6000_BTI_void, RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_V8HI },
++  { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
++    RS6000_BTI_void, RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_INTHI },
++  { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V8HI },
++  { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTHI },
++  { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
++    RS6000_BTI_void, RS6000_BTI_bool_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V16QI },
++  { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
++    RS6000_BTI_void, RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_V16QI },
++  { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
++    RS6000_BTI_void, RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_INTQI },
++  { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V16QI },
++  { ALTIVEC_BUILTIN_VEC_STVRX, ALTIVEC_BUILTIN_STVRX,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTQI },
++  { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
++    RS6000_BTI_void, RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_V4SF },
++  { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
++    RS6000_BTI_void, RS6000_BTI_V4SF, RS6000_BTI_INTSI, ~RS6000_BTI_float },
++  { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
++    RS6000_BTI_void, RS6000_BTI_bool_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V4SI },
++  { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
++    RS6000_BTI_void, RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_V4SI },
++  { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
++    RS6000_BTI_void, RS6000_BTI_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_INTSI },
++  { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V4SI },
++  { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V4SI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTSI },
++  { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
++    RS6000_BTI_void, RS6000_BTI_bool_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V8HI },
++  { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
++    RS6000_BTI_void, RS6000_BTI_pixel_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_pixel_V8HI },
++  { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
++    RS6000_BTI_void, RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_V8HI },
++  { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
++    RS6000_BTI_void, RS6000_BTI_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_INTHI },
++  { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V8HI },
++  { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V8HI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTHI },
++  { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
++    RS6000_BTI_void, RS6000_BTI_bool_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_bool_V16QI },
++  { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
++    RS6000_BTI_void, RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_V16QI },
++  { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
++    RS6000_BTI_void, RS6000_BTI_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_INTQI },
++  { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_unsigned_V16QI },
++  { ALTIVEC_BUILTIN_VEC_STVRXL, ALTIVEC_BUILTIN_STVRXL,
++    RS6000_BTI_void, RS6000_BTI_unsigned_V16QI, RS6000_BTI_INTSI, ~RS6000_BTI_UINTQI },
+ 
+   /* Predicates.  */
+   { ALTIVEC_BUILTIN_VCMPGT_P, ALTIVEC_BUILTIN_VCMPGTUB_P,
+@@ -2671,6 +2959,198 @@ altivec_resolve_overloaded_builtin (tree
+       || fcode > ALTIVEC_BUILTIN_OVERLOADED_LAST)
+     return NULL_TREE;
+ 
++  /* For now treat vec_splats and vec_promote as the same.  */
++  if (fcode == ALTIVEC_BUILTIN_VEC_SPLATS
++      || fcode == ALTIVEC_BUILTIN_VEC_PROMOTE)
++    {
++      tree type, arg;
++      int size;
++      int i;
++      bool unsigned_p;
++      VEC(constructor_elt,gc) *vec;
++      const char *name = fcode == ALTIVEC_BUILTIN_VEC_SPLATS ? "vec_splats": "vec_promote";
++
++      if (!arglist)
++	{
++	  error ("%s only accepts %d arguments", name, (fcode == ALTIVEC_BUILTIN_VEC_PROMOTE)+1 );
++	  return error_mark_node;
++	}
++      if (fcode == ALTIVEC_BUILTIN_VEC_SPLATS && TREE_CHAIN (arglist))
++	{
++	  error ("%s only accepts 1 argument", name);
++	  return error_mark_node;
++	}
++      if (fcode == ALTIVEC_BUILTIN_VEC_PROMOTE && !TREE_CHAIN (arglist))
++	{
++	  error ("%s only accepts 2 arguments", name);
++	  return error_mark_node;
++	}
++      /* Ignore promote's element argument.  */
++      if (fcode == ALTIVEC_BUILTIN_VEC_PROMOTE
++	  && TREE_CHAIN (TREE_CHAIN (arglist)))
++	{
++	  error ("%s only accepts 2 arguments", name);
++	  return error_mark_node;
++	}
++      if (fcode == ALTIVEC_BUILTIN_VEC_PROMOTE
++	  && !INTEGRAL_TYPE_P (TREE_TYPE (TREE_VALUE (TREE_CHAIN (arglist)))))
++	goto bad;
++
++      arg = TREE_VALUE (arglist);
++      type = TREE_TYPE (arg);
++      if (!SCALAR_FLOAT_TYPE_P (type)
++	  && !INTEGRAL_TYPE_P (type))
++	goto bad;
++      unsigned_p = TYPE_UNSIGNED (type);
++      if (type == long_long_unsigned_type_node
++          || type == long_long_integer_type_node)
++	goto bad;
++      switch (TYPE_MODE (type))
++	{
++	  case SImode:
++	    type = (unsigned_p ? unsigned_V4SI_type_node : V4SI_type_node);
++	    size = 4;
++	    break;
++	  case HImode:
++	    type = (unsigned_p ? unsigned_V8HI_type_node : V8HI_type_node);
++	    size = 8;
++	    break;
++	  case QImode:
++	    type = (unsigned_p ? unsigned_V16QI_type_node : V16QI_type_node);
++	    size = 16;
++	    break;
++	  case SFmode: type = V4SF_type_node; size = 4; break;
++	  default:
++	    goto bad;
++	}
++      arg = save_expr (fold_convert (TREE_TYPE (type), arg));
++      vec = VEC_alloc (constructor_elt, gc, size);
++      for(i = 0; i < size; i++)
++	{
++	  constructor_elt *elt;
++
++	  elt = VEC_quick_push (constructor_elt, vec, NULL);
++	  elt->index = NULL_TREE;
++	  elt->value = arg;
++	}
++	return build_constructor (type, vec);
++    }
++
++  /* For now use pointer tricks to do the extaction.  */
++  if (fcode == ALTIVEC_BUILTIN_VEC_EXTRACT)
++    {
++      tree arg1;
++      tree arg1_type;
++      tree arg2;
++      tree arg1_inner_type;
++      tree decl, stmt;
++      tree innerptrtype;
++
++      /* No second argument. */
++      if (!arglist || !TREE_CHAIN (arglist)
++	  || TREE_CHAIN (TREE_CHAIN (arglist)))
++	{
++	  error ("vec_extract only accepts 2 arguments");
++	  return error_mark_node;
++	}
++
++      arg2 = TREE_VALUE (TREE_CHAIN (arglist));
++      arg1 = TREE_VALUE (arglist);
++      arg1_type = TREE_TYPE (arg1);
++
++      if (TREE_CODE (arg1_type) != VECTOR_TYPE)
++	goto bad; 
++      if (!INTEGRAL_TYPE_P (TREE_TYPE (arg2)))
++	goto bad; 
++      /* Build *(((arg1_inner_type*)&(vector type){arg1})+arg2). */
++      arg1_inner_type = TREE_TYPE (arg1_type);
++      arg2 = build_binary_op (BIT_AND_EXPR, arg2,
++			      build_int_cst (TREE_TYPE (arg2),
++					     TYPE_VECTOR_SUBPARTS (arg1_type)
++					     - 1), 0);
++      decl = build_decl (VAR_DECL, NULL_TREE, arg1_type);
++      DECL_EXTERNAL (decl) = 0;
++      TREE_PUBLIC (decl) = 0;
++      DECL_CONTEXT (decl) = current_function_decl;
++      TREE_USED (decl) = 1;
++      TREE_TYPE (decl) = arg1_type;
++      TREE_READONLY (decl) = TYPE_READONLY (arg1_type);
++      DECL_INITIAL (decl) = arg1;
++      stmt = build1 (DECL_EXPR, arg1_type, decl);
++      TREE_ADDRESSABLE (decl) = 1;
++      SET_EXPR_LOCATION (stmt, input_location);
++      stmt = build1 (COMPOUND_LITERAL_EXPR, arg1_type, stmt);
++
++      innerptrtype = build_pointer_type (arg1_inner_type);
++
++      stmt = build_unary_op (ADDR_EXPR, stmt, 0);
++      stmt = convert (innerptrtype, stmt);
++      stmt = build_binary_op (PLUS_EXPR, stmt, arg2, 1);
++      stmt = build_indirect_ref (stmt, NULL);
++
++      return stmt;
++    }
++
++  /* For now use pointer tricks to do the insertation.  */
++  if (fcode == ALTIVEC_BUILTIN_VEC_INSERT)
++    {
++      tree arg0;
++      tree arg1;
++      tree arg2;
++      tree arg1_type;
++      tree arg1_inner_type;
++      tree decl, stmt;
++      tree innerptrtype;
++      
++      /* No second or third arguments. */
++      if (!arglist || !TREE_CHAIN (arglist)
++	  || !TREE_CHAIN (TREE_CHAIN (arglist))
++	  || TREE_CHAIN (TREE_CHAIN (TREE_CHAIN (arglist))))
++	{
++	  error ("vec_insert only accepts 3 arguments");
++	  return error_mark_node;
++	}
++
++      arg0 = TREE_VALUE (arglist);
++      arg1 = TREE_VALUE (TREE_CHAIN (arglist));
++      arg1_type = TREE_TYPE (arg1);
++      arg2 = TREE_VALUE (TREE_CHAIN (TREE_CHAIN (arglist)));
++
++      if (TREE_CODE (arg1_type) != VECTOR_TYPE)
++	goto bad; 
++      if (!INTEGRAL_TYPE_P (TREE_TYPE (arg2)))
++	goto bad; 
++      /* Build *(((arg1_inner_type*)&(vector type){arg1})+arg2) = arg0. */
++      arg1_inner_type = TREE_TYPE (arg1_type);
++      arg2 = build_binary_op (BIT_AND_EXPR, arg2,
++			      build_int_cst (TREE_TYPE (arg2),
++					     TYPE_VECTOR_SUBPARTS (arg1_type)
++					     - 1), 0);
++      decl = build_decl (VAR_DECL, NULL_TREE, arg1_type);
++      DECL_EXTERNAL (decl) = 0;
++      TREE_PUBLIC (decl) = 0;
++      DECL_CONTEXT (decl) = current_function_decl;
++      TREE_USED (decl) = 1;
++      TREE_TYPE (decl) = arg1_type;
++      TREE_READONLY (decl) = TYPE_READONLY (arg1_type);
++      DECL_INITIAL (decl) = arg1;
++      stmt = build1 (DECL_EXPR, arg1_type, decl);
++      TREE_ADDRESSABLE (decl) = 1;
++      SET_EXPR_LOCATION (stmt, input_location);
++      stmt = build1 (COMPOUND_LITERAL_EXPR, arg1_type, stmt);
++
++      innerptrtype = build_pointer_type (arg1_inner_type);
++
++      stmt = build_unary_op (ADDR_EXPR, stmt, 0);
++      stmt = convert (innerptrtype, stmt);
++      stmt = build_binary_op (PLUS_EXPR, stmt, arg2, 1);
++      stmt = build_indirect_ref (stmt, NULL);
++      stmt = build2 (MODIFY_EXPR, TREE_TYPE (stmt), stmt,
++		     convert (TREE_TYPE (stmt), arg0));
++      stmt = build2 (COMPOUND_EXPR, arg1_type, stmt, decl);
++      return stmt;
++    }
++
+   for (n = 0;
+        !VOID_TYPE_P (TREE_VALUE (fnargs)) && arglist;
+        fnargs = TREE_CHAIN (fnargs), arglist = TREE_CHAIN (arglist), n++)
 Index: gcc/config/rs6000/rs6000.c
 ===================================================================
-*** gcc/config/rs6000/rs6000.c	(revision 140819)
---- gcc/config/rs6000/rs6000.c	(revision 140821)
-*************** static rtx altivec_expand_dst_builtin (t
-*** 905,911 ****
-  static rtx altivec_expand_abs_builtin (enum insn_code, tree, rtx);
-  static rtx altivec_expand_predicate_builtin (enum insn_code,
-  					     const char *, tree, rtx);
-- static rtx altivec_expand_lv_builtin (enum insn_code, tree, rtx);
-  static rtx altivec_expand_stv_builtin (enum insn_code, tree);
-  static rtx altivec_expand_vec_init_builtin (tree, tree, rtx);
-  static rtx altivec_expand_vec_set_builtin (tree);
---- 905,910 ----
-*************** paired_expand_lv_builtin (enum insn_code
-*** 8065,8071 ****
-  }
-  
-  static rtx
-! altivec_expand_lv_builtin (enum insn_code icode, tree exp, rtx target)
-  {
-    rtx pat, addr;
-    tree arg0 = CALL_EXPR_ARG (exp, 0);
---- 8064,8070 ----
-  }
-  
-  static rtx
-! altivec_expand_lv_builtin (enum insn_code icode, tree exp, rtx target, bool blk)
-  {
-    rtx pat, addr;
-    tree arg0 = CALL_EXPR_ARG (exp, 0);
-*************** altivec_expand_lv_builtin (enum insn_cod
-*** 8093,8104 ****
-  
-    if (op0 == const0_rtx)
-      {
-!       addr = gen_rtx_MEM (tmode, op1);
-      }
-    else
-      {
-        op0 = copy_to_mode_reg (mode0, op0);
-!       addr = gen_rtx_MEM (tmode, gen_rtx_PLUS (Pmode, op0, op1));
-      }
-  
-    pat = GEN_FCN (icode) (target, addr);
---- 8092,8103 ----
-  
-    if (op0 == const0_rtx)
-      {
-!       addr = gen_rtx_MEM (blk ? BLKmode : tmode, op1);
-      }
-    else
-      {
-        op0 = copy_to_mode_reg (mode0, op0);
-!       addr = gen_rtx_MEM (blk ? BLKmode : tmode, gen_rtx_PLUS (Pmode, op0, op1));
-      }
-  
-    pat = GEN_FCN (icode) (target, addr);
-*************** altivec_expand_builtin (tree exp, rtx ta
-*** 8605,8610 ****
---- 8604,8618 ----
-      case ALTIVEC_BUILTIN_STVXL:
-        return altivec_expand_stv_builtin (CODE_FOR_altivec_stvxl, exp);
-  
-+     case ALTIVEC_BUILTIN_STVLX:
-+       return altivec_expand_stv_builtin (CODE_FOR_altivec_stvlx, exp);
-+     case ALTIVEC_BUILTIN_STVLXL:
-+       return altivec_expand_stv_builtin (CODE_FOR_altivec_stvlxl, exp);
-+     case ALTIVEC_BUILTIN_STVRX:
-+       return altivec_expand_stv_builtin (CODE_FOR_altivec_stvrx, exp);
-+     case ALTIVEC_BUILTIN_STVRXL:
-+       return altivec_expand_stv_builtin (CODE_FOR_altivec_stvrxl, exp);
-+ 
-      case ALTIVEC_BUILTIN_MFVSCR:
-        icode = CODE_FOR_altivec_mfvscr;
-        tmode = insn_data[icode].operand[0].mode;
-*************** altivec_expand_builtin (tree exp, rtx ta
-*** 8707,8731 ****
-      {
-      case ALTIVEC_BUILTIN_LVSL:
-        return altivec_expand_lv_builtin (CODE_FOR_altivec_lvsl,
-! 					exp, target);
-      case ALTIVEC_BUILTIN_LVSR:
-        return altivec_expand_lv_builtin (CODE_FOR_altivec_lvsr,
-! 					exp, target);
-      case ALTIVEC_BUILTIN_LVEBX:
-        return altivec_expand_lv_builtin (CODE_FOR_altivec_lvebx,
-! 					exp, target);
-      case ALTIVEC_BUILTIN_LVEHX:
-        return altivec_expand_lv_builtin (CODE_FOR_altivec_lvehx,
-! 					exp, target);
-      case ALTIVEC_BUILTIN_LVEWX:
-        return altivec_expand_lv_builtin (CODE_FOR_altivec_lvewx,
-! 					exp, target);
-      case ALTIVEC_BUILTIN_LVXL:
-        return altivec_expand_lv_builtin (CODE_FOR_altivec_lvxl,
-! 					exp, target);
-      case ALTIVEC_BUILTIN_LVX:
-        return altivec_expand_lv_builtin (CODE_FOR_altivec_lvx,
-! 					exp, target);
-      default:
-        break;
-        /* Fall through.  */
---- 8715,8751 ----
-      {
-      case ALTIVEC_BUILTIN_LVSL:
-        return altivec_expand_lv_builtin (CODE_FOR_altivec_lvsl,
-! 					exp, target, false);
-      case ALTIVEC_BUILTIN_LVSR:
-        return altivec_expand_lv_builtin (CODE_FOR_altivec_lvsr,
-! 					exp, target, false);
-      case ALTIVEC_BUILTIN_LVEBX:
-        return altivec_expand_lv_builtin (CODE_FOR_altivec_lvebx,
-! 					exp, target, false);
-      case ALTIVEC_BUILTIN_LVEHX:
-        return altivec_expand_lv_builtin (CODE_FOR_altivec_lvehx,
-! 					exp, target, false);
-      case ALTIVEC_BUILTIN_LVEWX:
-        return altivec_expand_lv_builtin (CODE_FOR_altivec_lvewx,
-! 					exp, target, false);
-      case ALTIVEC_BUILTIN_LVXL:
-        return altivec_expand_lv_builtin (CODE_FOR_altivec_lvxl,
-! 					exp, target, false);
-      case ALTIVEC_BUILTIN_LVX:
-        return altivec_expand_lv_builtin (CODE_FOR_altivec_lvx,
-! 					exp, target, false);
-!     case ALTIVEC_BUILTIN_LVLX:
-!       return altivec_expand_lv_builtin (CODE_FOR_altivec_lvlx,
-! 					exp, target, true);
-!     case ALTIVEC_BUILTIN_LVLXL:
-!       return altivec_expand_lv_builtin (CODE_FOR_altivec_lvlxl,
-! 					exp, target, true);
-!     case ALTIVEC_BUILTIN_LVRX:
-!       return altivec_expand_lv_builtin (CODE_FOR_altivec_lvrx,
-! 					exp, target, true);
-!     case ALTIVEC_BUILTIN_LVRXL:
-!       return altivec_expand_lv_builtin (CODE_FOR_altivec_lvrxl,
-! 					exp, target, true);
-      default:
-        break;
-        /* Fall through.  */
-*************** altivec_init_builtins (void)
-*** 9764,9770 ****
-    tree int_ftype_opaque
-      = build_function_type_list (integer_type_node,
-  				opaque_V4SI_type_node, NULL_TREE);
-! 
-    tree opaque_ftype_opaque_int
-      = build_function_type_list (opaque_V4SI_type_node,
-  				opaque_V4SI_type_node, integer_type_node, NULL_TREE);
---- 9784,9792 ----
-    tree int_ftype_opaque
-      = build_function_type_list (integer_type_node,
-  				opaque_V4SI_type_node, NULL_TREE);
-!   tree opaque_ftype_opaque
-!     = build_function_type (integer_type_node,
-! 				NULL_TREE);
-    tree opaque_ftype_opaque_int
-      = build_function_type_list (opaque_V4SI_type_node,
-  				opaque_V4SI_type_node, integer_type_node, NULL_TREE);
-*************** altivec_init_builtins (void)
-*** 9910,9919 ****
---- 9932,9967 ----
-    def_builtin (MASK_ALTIVEC, "__builtin_vec_stvebx", void_ftype_opaque_long_pvoid, ALTIVEC_BUILTIN_VEC_STVEBX);
-    def_builtin (MASK_ALTIVEC, "__builtin_vec_stvehx", void_ftype_opaque_long_pvoid, ALTIVEC_BUILTIN_VEC_STVEHX);
-  
-+   if (rs6000_cpu == PROCESSOR_CELL)
-+     {
-+       def_builtin (MASK_ALTIVEC, "__builtin_altivec_lvlx",  v16qi_ftype_long_pcvoid, ALTIVEC_BUILTIN_LVLX);
-+       def_builtin (MASK_ALTIVEC, "__builtin_altivec_lvlxl", v16qi_ftype_long_pcvoid, ALTIVEC_BUILTIN_LVLXL);
-+       def_builtin (MASK_ALTIVEC, "__builtin_altivec_lvrx",  v16qi_ftype_long_pcvoid, ALTIVEC_BUILTIN_LVRX);
-+       def_builtin (MASK_ALTIVEC, "__builtin_altivec_lvrxl", v16qi_ftype_long_pcvoid, ALTIVEC_BUILTIN_LVRXL);
-+ 
-+       def_builtin (MASK_ALTIVEC, "__builtin_vec_lvlx",  v16qi_ftype_long_pcvoid, ALTIVEC_BUILTIN_VEC_LVLX);
-+       def_builtin (MASK_ALTIVEC, "__builtin_vec_lvlxl", v16qi_ftype_long_pcvoid, ALTIVEC_BUILTIN_VEC_LVLXL);
-+       def_builtin (MASK_ALTIVEC, "__builtin_vec_lvrx",  v16qi_ftype_long_pcvoid, ALTIVEC_BUILTIN_VEC_LVRX);
-+       def_builtin (MASK_ALTIVEC, "__builtin_vec_lvrxl", v16qi_ftype_long_pcvoid, ALTIVEC_BUILTIN_VEC_LVRXL);
-+ 
-+       def_builtin (MASK_ALTIVEC, "__builtin_altivec_stvlx",  void_ftype_v16qi_long_pvoid, ALTIVEC_BUILTIN_STVLX);
-+       def_builtin (MASK_ALTIVEC, "__builtin_altivec_stvlxl", void_ftype_v16qi_long_pvoid, ALTIVEC_BUILTIN_STVLXL);
-+       def_builtin (MASK_ALTIVEC, "__builtin_altivec_stvrx",  void_ftype_v16qi_long_pvoid, ALTIVEC_BUILTIN_STVRX);
-+       def_builtin (MASK_ALTIVEC, "__builtin_altivec_stvrxl", void_ftype_v16qi_long_pvoid, ALTIVEC_BUILTIN_STVRXL);
-+ 
-+       def_builtin (MASK_ALTIVEC, "__builtin_vec_stvlx",  void_ftype_v16qi_long_pvoid, ALTIVEC_BUILTIN_VEC_STVLX);
-+       def_builtin (MASK_ALTIVEC, "__builtin_vec_stvlxl", void_ftype_v16qi_long_pvoid, ALTIVEC_BUILTIN_VEC_STVLXL);
-+       def_builtin (MASK_ALTIVEC, "__builtin_vec_stvrx",  void_ftype_v16qi_long_pvoid, ALTIVEC_BUILTIN_VEC_STVRX);
-+       def_builtin (MASK_ALTIVEC, "__builtin_vec_stvrxl", void_ftype_v16qi_long_pvoid, ALTIVEC_BUILTIN_VEC_STVRXL);
-+     }
-    def_builtin (MASK_ALTIVEC, "__builtin_vec_step", int_ftype_opaque, ALTIVEC_BUILTIN_VEC_STEP);
-+   def_builtin (MASK_ALTIVEC, "__builtin_vec_splats", opaque_ftype_opaque, ALTIVEC_BUILTIN_VEC_SPLATS);
-+   def_builtin (MASK_ALTIVEC, "__builtin_vec_promote", opaque_ftype_opaque, ALTIVEC_BUILTIN_VEC_PROMOTE);
-  
-    def_builtin (MASK_ALTIVEC, "__builtin_vec_sld", opaque_ftype_opaque_opaque_int, ALTIVEC_BUILTIN_VEC_SLD);
-    def_builtin (MASK_ALTIVEC, "__builtin_vec_splat", opaque_ftype_opaque_int, ALTIVEC_BUILTIN_VEC_SPLAT);
-+   def_builtin (MASK_ALTIVEC, "__builtin_vec_extract", opaque_ftype_opaque_int, ALTIVEC_BUILTIN_VEC_EXTRACT);
-+   def_builtin (MASK_ALTIVEC, "__builtin_vec_insert", opaque_ftype_opaque_opaque_int, ALTIVEC_BUILTIN_VEC_INSERT);
-    def_builtin (MASK_ALTIVEC, "__builtin_vec_vspltw", opaque_ftype_opaque_int, ALTIVEC_BUILTIN_VEC_VSPLTW);
-    def_builtin (MASK_ALTIVEC, "__builtin_vec_vsplth", opaque_ftype_opaque_int, ALTIVEC_BUILTIN_VEC_VSPLTH);
-    def_builtin (MASK_ALTIVEC, "__builtin_vec_vspltb", opaque_ftype_opaque_int, ALTIVEC_BUILTIN_VEC_VSPLTB);
+--- gcc/config/rs6000/rs6000.c.orig	2009-09-21 11:48:29.000000000 +0200
++++ gcc/config/rs6000/rs6000.c	2009-09-21 11:48:32.000000000 +0200
+@@ -851,7 +851,6 @@ static rtx altivec_expand_dst_builtin (t
+ static rtx altivec_expand_abs_builtin (enum insn_code, tree, rtx);
+ static rtx altivec_expand_predicate_builtin (enum insn_code,
+ 					     const char *, tree, rtx);
+-static rtx altivec_expand_lv_builtin (enum insn_code, tree, rtx);
+ static rtx altivec_expand_stv_builtin (enum insn_code, tree);
+ static rtx altivec_expand_vec_init_builtin (tree, tree, rtx);
+ static rtx altivec_expand_vec_set_builtin (tree);
+@@ -7834,7 +7833,7 @@ paired_expand_lv_builtin (enum insn_code
+ }
+ 
+ static rtx
+-altivec_expand_lv_builtin (enum insn_code icode, tree exp, rtx target)
++altivec_expand_lv_builtin (enum insn_code icode, tree exp, rtx target, bool blk)
+ {
+   rtx pat, addr;
+   tree arg0 = CALL_EXPR_ARG (exp, 0);
+@@ -7862,12 +7861,12 @@ altivec_expand_lv_builtin (enum insn_cod
+ 
+   if (op0 == const0_rtx)
+     {
+-      addr = gen_rtx_MEM (tmode, op1);
++      addr = gen_rtx_MEM (blk ? BLKmode : tmode, op1);
+     }
+   else
+     {
+       op0 = copy_to_mode_reg (mode0, op0);
+-      addr = gen_rtx_MEM (tmode, gen_rtx_PLUS (Pmode, op0, op1));
++      addr = gen_rtx_MEM (blk ? BLKmode : tmode, gen_rtx_PLUS (Pmode, op0, op1));
+     }
+ 
+   pat = GEN_FCN (icode) (target, addr);
+@@ -8374,6 +8373,15 @@ altivec_expand_builtin (tree exp, rtx ta
+     case ALTIVEC_BUILTIN_STVXL:
+       return altivec_expand_stv_builtin (CODE_FOR_altivec_stvxl, exp);
+ 
++    case ALTIVEC_BUILTIN_STVLX:
++      return altivec_expand_stv_builtin (CODE_FOR_altivec_stvlx, exp);
++    case ALTIVEC_BUILTIN_STVLXL:
++      return altivec_expand_stv_builtin (CODE_FOR_altivec_stvlxl, exp);
++    case ALTIVEC_BUILTIN_STVRX:
++      return altivec_expand_stv_builtin (CODE_FOR_altivec_stvrx, exp);
++    case ALTIVEC_BUILTIN_STVRXL:
++      return altivec_expand_stv_builtin (CODE_FOR_altivec_stvrxl, exp);
++
+     case ALTIVEC_BUILTIN_MFVSCR:
+       icode = CODE_FOR_altivec_mfvscr;
+       tmode = insn_data[icode].operand[0].mode;
+@@ -8476,25 +8484,37 @@ altivec_expand_builtin (tree exp, rtx ta
+     {
+     case ALTIVEC_BUILTIN_LVSL:
+       return altivec_expand_lv_builtin (CODE_FOR_altivec_lvsl,
+-					exp, target);
++					exp, target, false);
+     case ALTIVEC_BUILTIN_LVSR:
+       return altivec_expand_lv_builtin (CODE_FOR_altivec_lvsr,
+-					exp, target);
++					exp, target, false);
+     case ALTIVEC_BUILTIN_LVEBX:
+       return altivec_expand_lv_builtin (CODE_FOR_altivec_lvebx,
+-					exp, target);
++					exp, target, false);
+     case ALTIVEC_BUILTIN_LVEHX:
+       return altivec_expand_lv_builtin (CODE_FOR_altivec_lvehx,
+-					exp, target);
++					exp, target, false);
+     case ALTIVEC_BUILTIN_LVEWX:
+       return altivec_expand_lv_builtin (CODE_FOR_altivec_lvewx,
+-					exp, target);
++					exp, target, false);
+     case ALTIVEC_BUILTIN_LVXL:
+       return altivec_expand_lv_builtin (CODE_FOR_altivec_lvxl,
+-					exp, target);
++					exp, target, false);
+     case ALTIVEC_BUILTIN_LVX:
+       return altivec_expand_lv_builtin (CODE_FOR_altivec_lvx,
+-					exp, target);
++					exp, target, false);
++    case ALTIVEC_BUILTIN_LVLX:
++      return altivec_expand_lv_builtin (CODE_FOR_altivec_lvlx,
++					exp, target, true);
++    case ALTIVEC_BUILTIN_LVLXL:
++      return altivec_expand_lv_builtin (CODE_FOR_altivec_lvlxl,
++					exp, target, true);
++    case ALTIVEC_BUILTIN_LVRX:
++      return altivec_expand_lv_builtin (CODE_FOR_altivec_lvrx,
++					exp, target, true);
++    case ALTIVEC_BUILTIN_LVRXL:
++      return altivec_expand_lv_builtin (CODE_FOR_altivec_lvrxl,
++					exp, target, true);
+     default:
+       break;
+       /* Fall through.  */
+@@ -9531,7 +9551,9 @@ altivec_init_builtins (void)
+   tree int_ftype_opaque
+     = build_function_type_list (integer_type_node,
+ 				opaque_V4SI_type_node, NULL_TREE);
+-
++  tree opaque_ftype_opaque
++    = build_function_type (integer_type_node,
++				NULL_TREE);
+   tree opaque_ftype_opaque_int
+     = build_function_type_list (opaque_V4SI_type_node,
+ 				opaque_V4SI_type_node, integer_type_node, NULL_TREE);
+@@ -9677,10 +9699,36 @@ altivec_init_builtins (void)
+   def_builtin (MASK_ALTIVEC, "__builtin_vec_stvebx", void_ftype_opaque_long_pvoid, ALTIVEC_BUILTIN_VEC_STVEBX);
+   def_builtin (MASK_ALTIVEC, "__builtin_vec_stvehx", void_ftype_opaque_long_pvoid, ALTIVEC_BUILTIN_VEC_STVEHX);
+ 
++  if (rs6000_cpu == PROCESSOR_CELL)
++    {
++      def_builtin (MASK_ALTIVEC, "__builtin_altivec_lvlx",  v16qi_ftype_long_pcvoid, ALTIVEC_BUILTIN_LVLX);
++      def_builtin (MASK_ALTIVEC, "__builtin_altivec_lvlxl", v16qi_ftype_long_pcvoid, ALTIVEC_BUILTIN_LVLXL);
++      def_builtin (MASK_ALTIVEC, "__builtin_altivec_lvrx",  v16qi_ftype_long_pcvoid, ALTIVEC_BUILTIN_LVRX);
++      def_builtin (MASK_ALTIVEC, "__builtin_altivec_lvrxl", v16qi_ftype_long_pcvoid, ALTIVEC_BUILTIN_LVRXL);
++
++      def_builtin (MASK_ALTIVEC, "__builtin_vec_lvlx",  v16qi_ftype_long_pcvoid, ALTIVEC_BUILTIN_VEC_LVLX);
++      def_builtin (MASK_ALTIVEC, "__builtin_vec_lvlxl", v16qi_ftype_long_pcvoid, ALTIVEC_BUILTIN_VEC_LVLXL);
++      def_builtin (MASK_ALTIVEC, "__builtin_vec_lvrx",  v16qi_ftype_long_pcvoid, ALTIVEC_BUILTIN_VEC_LVRX);
++      def_builtin (MASK_ALTIVEC, "__builtin_vec_lvrxl", v16qi_ftype_long_pcvoid, ALTIVEC_BUILTIN_VEC_LVRXL);
++
++      def_builtin (MASK_ALTIVEC, "__builtin_altivec_stvlx",  void_ftype_v16qi_long_pvoid, ALTIVEC_BUILTIN_STVLX);
++      def_builtin (MASK_ALTIVEC, "__builtin_altivec_stvlxl", void_ftype_v16qi_long_pvoid, ALTIVEC_BUILTIN_STVLXL);
++      def_builtin (MASK_ALTIVEC, "__builtin_altivec_stvrx",  void_ftype_v16qi_long_pvoid, ALTIVEC_BUILTIN_STVRX);
++      def_builtin (MASK_ALTIVEC, "__builtin_altivec_stvrxl", void_ftype_v16qi_long_pvoid, ALTIVEC_BUILTIN_STVRXL);
++
++      def_builtin (MASK_ALTIVEC, "__builtin_vec_stvlx",  void_ftype_v16qi_long_pvoid, ALTIVEC_BUILTIN_VEC_STVLX);
++      def_builtin (MASK_ALTIVEC, "__builtin_vec_stvlxl", void_ftype_v16qi_long_pvoid, ALTIVEC_BUILTIN_VEC_STVLXL);
++      def_builtin (MASK_ALTIVEC, "__builtin_vec_stvrx",  void_ftype_v16qi_long_pvoid, ALTIVEC_BUILTIN_VEC_STVRX);
++      def_builtin (MASK_ALTIVEC, "__builtin_vec_stvrxl", void_ftype_v16qi_long_pvoid, ALTIVEC_BUILTIN_VEC_STVRXL);
++    }
+   def_builtin (MASK_ALTIVEC, "__builtin_vec_step", int_ftype_opaque, ALTIVEC_BUILTIN_VEC_STEP);
++  def_builtin (MASK_ALTIVEC, "__builtin_vec_splats", opaque_ftype_opaque, ALTIVEC_BUILTIN_VEC_SPLATS);
++  def_builtin (MASK_ALTIVEC, "__builtin_vec_promote", opaque_ftype_opaque, ALTIVEC_BUILTIN_VEC_PROMOTE);
+ 
+   def_builtin (MASK_ALTIVEC, "__builtin_vec_sld", opaque_ftype_opaque_opaque_int, ALTIVEC_BUILTIN_VEC_SLD);
+   def_builtin (MASK_ALTIVEC, "__builtin_vec_splat", opaque_ftype_opaque_int, ALTIVEC_BUILTIN_VEC_SPLAT);
++  def_builtin (MASK_ALTIVEC, "__builtin_vec_extract", opaque_ftype_opaque_int, ALTIVEC_BUILTIN_VEC_EXTRACT);
++  def_builtin (MASK_ALTIVEC, "__builtin_vec_insert", opaque_ftype_opaque_opaque_int, ALTIVEC_BUILTIN_VEC_INSERT);
+   def_builtin (MASK_ALTIVEC, "__builtin_vec_vspltw", opaque_ftype_opaque_int, ALTIVEC_BUILTIN_VEC_VSPLTW);
+   def_builtin (MASK_ALTIVEC, "__builtin_vec_vsplth", opaque_ftype_opaque_int, ALTIVEC_BUILTIN_VEC_VSPLTH);
+   def_builtin (MASK_ALTIVEC, "__builtin_vec_vspltb", opaque_ftype_opaque_int, ALTIVEC_BUILTIN_VEC_VSPLTB);
 Index: gcc/config/rs6000/rs6000.h
 ===================================================================
-*** gcc/config/rs6000/rs6000.h	(revision 140819)
---- gcc/config/rs6000/rs6000.h	(revision 140821)
-*************** enum rs6000_builtins
-*** 2543,2552 ****
---- 2543,2560 ----
-    ALTIVEC_BUILTIN_LVXL,
-    ALTIVEC_BUILTIN_LVX,
-    ALTIVEC_BUILTIN_STVX,
-+   ALTIVEC_BUILTIN_LVLX,
-+   ALTIVEC_BUILTIN_LVLXL,
-+   ALTIVEC_BUILTIN_LVRX,
-+   ALTIVEC_BUILTIN_LVRXL,
-    ALTIVEC_BUILTIN_STVEBX,
-    ALTIVEC_BUILTIN_STVEHX,
-    ALTIVEC_BUILTIN_STVEWX,
-    ALTIVEC_BUILTIN_STVXL,
-+   ALTIVEC_BUILTIN_STVLX,
-+   ALTIVEC_BUILTIN_STVLXL,
-+   ALTIVEC_BUILTIN_STVRX,
-+   ALTIVEC_BUILTIN_STVRXL,
-    ALTIVEC_BUILTIN_VCMPBFP_P,
-    ALTIVEC_BUILTIN_VCMPEQFP_P,
-    ALTIVEC_BUILTIN_VCMPEQUB_P,
-*************** enum rs6000_builtins
-*** 2595,2600 ****
---- 2603,2609 ----
-    ALTIVEC_BUILTIN_VEC_AND,
-    ALTIVEC_BUILTIN_VEC_ANDC,
-    ALTIVEC_BUILTIN_VEC_AVG,
-+   ALTIVEC_BUILTIN_VEC_EXTRACT,
-    ALTIVEC_BUILTIN_VEC_CEIL,
-    ALTIVEC_BUILTIN_VEC_CMPB,
-    ALTIVEC_BUILTIN_VEC_CMPEQ,
-*************** enum rs6000_builtins
-*** 2621,2626 ****
---- 2630,2639 ----
-    ALTIVEC_BUILTIN_VEC_LVEBX,
-    ALTIVEC_BUILTIN_VEC_LVEHX,
-    ALTIVEC_BUILTIN_VEC_LVEWX,
-+   ALTIVEC_BUILTIN_VEC_LVLX,
-+   ALTIVEC_BUILTIN_VEC_LVLXL,
-+   ALTIVEC_BUILTIN_VEC_LVRX,
-+   ALTIVEC_BUILTIN_VEC_LVRXL,
-    ALTIVEC_BUILTIN_VEC_LVSL,
-    ALTIVEC_BUILTIN_VEC_LVSR,
-    ALTIVEC_BUILTIN_VEC_MADD,
-*************** enum rs6000_builtins
-*** 2680,2685 ****
---- 2693,2702 ----
-    ALTIVEC_BUILTIN_VEC_STVEBX,
-    ALTIVEC_BUILTIN_VEC_STVEHX,
-    ALTIVEC_BUILTIN_VEC_STVEWX,
-+   ALTIVEC_BUILTIN_VEC_STVLX,
-+   ALTIVEC_BUILTIN_VEC_STVLXL,
-+   ALTIVEC_BUILTIN_VEC_STVRX,
-+   ALTIVEC_BUILTIN_VEC_STVRXL,
-    ALTIVEC_BUILTIN_VEC_SUB,
-    ALTIVEC_BUILTIN_VEC_SUBC,
-    ALTIVEC_BUILTIN_VEC_SUBS,
-*************** enum rs6000_builtins
-*** 2796,2802 ****
-    ALTIVEC_BUILTIN_VEC_VUPKLSH,
-    ALTIVEC_BUILTIN_VEC_XOR,
-    ALTIVEC_BUILTIN_VEC_STEP,
-!   ALTIVEC_BUILTIN_OVERLOADED_LAST = ALTIVEC_BUILTIN_VEC_STEP,
-  
-    /* SPE builtins.  */
-    SPE_BUILTIN_EVADDW,
---- 2813,2822 ----
-    ALTIVEC_BUILTIN_VEC_VUPKLSH,
-    ALTIVEC_BUILTIN_VEC_XOR,
-    ALTIVEC_BUILTIN_VEC_STEP,
-!   ALTIVEC_BUILTIN_VEC_PROMOTE,
-!   ALTIVEC_BUILTIN_VEC_INSERT,
-!   ALTIVEC_BUILTIN_VEC_SPLATS,
-!   ALTIVEC_BUILTIN_OVERLOADED_LAST = ALTIVEC_BUILTIN_VEC_SPLATS,
-  
-    /* SPE builtins.  */
-    SPE_BUILTIN_EVADDW,
-
+--- gcc/config/rs6000/rs6000.h.orig	2009-09-21 11:48:22.000000000 +0200
++++ gcc/config/rs6000/rs6000.h	2009-09-21 11:48:32.000000000 +0200
+@@ -2509,10 +2509,18 @@ enum rs6000_builtins
+   ALTIVEC_BUILTIN_LVXL,
+   ALTIVEC_BUILTIN_LVX,
+   ALTIVEC_BUILTIN_STVX,
++  ALTIVEC_BUILTIN_LVLX,
++  ALTIVEC_BUILTIN_LVLXL,
++  ALTIVEC_BUILTIN_LVRX,
++  ALTIVEC_BUILTIN_LVRXL,
+   ALTIVEC_BUILTIN_STVEBX,
+   ALTIVEC_BUILTIN_STVEHX,
+   ALTIVEC_BUILTIN_STVEWX,
+   ALTIVEC_BUILTIN_STVXL,
++  ALTIVEC_BUILTIN_STVLX,
++  ALTIVEC_BUILTIN_STVLXL,
++  ALTIVEC_BUILTIN_STVRX,
++  ALTIVEC_BUILTIN_STVRXL,
+   ALTIVEC_BUILTIN_VCMPBFP_P,
+   ALTIVEC_BUILTIN_VCMPEQFP_P,
+   ALTIVEC_BUILTIN_VCMPEQUB_P,
+@@ -2561,6 +2569,7 @@ enum rs6000_builtins
+   ALTIVEC_BUILTIN_VEC_AND,
+   ALTIVEC_BUILTIN_VEC_ANDC,
+   ALTIVEC_BUILTIN_VEC_AVG,
++  ALTIVEC_BUILTIN_VEC_EXTRACT,
+   ALTIVEC_BUILTIN_VEC_CEIL,
+   ALTIVEC_BUILTIN_VEC_CMPB,
+   ALTIVEC_BUILTIN_VEC_CMPEQ,
+@@ -2587,6 +2596,10 @@ enum rs6000_builtins
+   ALTIVEC_BUILTIN_VEC_LVEBX,
+   ALTIVEC_BUILTIN_VEC_LVEHX,
+   ALTIVEC_BUILTIN_VEC_LVEWX,
++  ALTIVEC_BUILTIN_VEC_LVLX,
++  ALTIVEC_BUILTIN_VEC_LVLXL,
++  ALTIVEC_BUILTIN_VEC_LVRX,
++  ALTIVEC_BUILTIN_VEC_LVRXL,
+   ALTIVEC_BUILTIN_VEC_LVSL,
+   ALTIVEC_BUILTIN_VEC_LVSR,
+   ALTIVEC_BUILTIN_VEC_MADD,
+@@ -2646,6 +2659,10 @@ enum rs6000_builtins
+   ALTIVEC_BUILTIN_VEC_STVEBX,
+   ALTIVEC_BUILTIN_VEC_STVEHX,
+   ALTIVEC_BUILTIN_VEC_STVEWX,
++  ALTIVEC_BUILTIN_VEC_STVLX,
++  ALTIVEC_BUILTIN_VEC_STVLXL,
++  ALTIVEC_BUILTIN_VEC_STVRX,
++  ALTIVEC_BUILTIN_VEC_STVRXL,
+   ALTIVEC_BUILTIN_VEC_SUB,
+   ALTIVEC_BUILTIN_VEC_SUBC,
+   ALTIVEC_BUILTIN_VEC_SUBS,
+@@ -2762,7 +2779,10 @@ enum rs6000_builtins
+   ALTIVEC_BUILTIN_VEC_VUPKLSH,
+   ALTIVEC_BUILTIN_VEC_XOR,
+   ALTIVEC_BUILTIN_VEC_STEP,
+-  ALTIVEC_BUILTIN_OVERLOADED_LAST = ALTIVEC_BUILTIN_VEC_STEP,
++  ALTIVEC_BUILTIN_VEC_PROMOTE,
++  ALTIVEC_BUILTIN_VEC_INSERT,
++  ALTIVEC_BUILTIN_VEC_SPLATS,
++  ALTIVEC_BUILTIN_OVERLOADED_LAST = ALTIVEC_BUILTIN_VEC_SPLATS,
+ 
+   /* SPE builtins.  */
+   SPE_BUILTIN_EVADDW,
 Index: gcc/config/rs6000/altivec.h
 ===================================================================
-*** gcc/config/rs6000/altivec.h	(revision 140819)
---- gcc/config/rs6000/altivec.h	(revision 140821)
-***************
-*** 205,210 ****
---- 205,217 ----
-  #define vec_lvebx __builtin_vec_lvebx
-  #define vec_lvehx __builtin_vec_lvehx
-  #define vec_lvewx __builtin_vec_lvewx
-+ /* Cell only intrinsics.  */
-+ #ifdef __PPU__
-+ #define vec_lvlx __builtin_vec_lvlx
-+ #define vec_lvlxl __builtin_vec_lvlxl
-+ #define vec_lvrx __builtin_vec_lvrx
-+ #define vec_lvrxl __builtin_vec_lvrxl
-+ #endif
-  #define vec_lvsl __builtin_vec_lvsl
-  #define vec_lvsr __builtin_vec_lvsr
-  #define vec_max __builtin_vec_max
-***************
-*** 239,244 ****
---- 246,258 ----
-  #define vec_stvebx __builtin_vec_stvebx
-  #define vec_stvehx __builtin_vec_stvehx
-  #define vec_stvewx __builtin_vec_stvewx
-+ /* Cell only intrinsics.  */
-+ #ifdef __PPU__
-+ #define vec_stvlx __builtin_vec_stvlx
-+ #define vec_stvlxl __builtin_vec_stvlxl
-+ #define vec_stvrx __builtin_vec_stvrx
-+ #define vec_stvrxl __builtin_vec_stvrxl
-+ #endif
-  #define vec_sub __builtin_vec_sub
-  #define vec_subs __builtin_vec_subs
-  #define vec_sum __builtin_vec_sum
-***************
-*** 290,295 ****
---- 304,314 ----
-  #define vec_vsubuws __builtin_vec_vsubuws
-  #define vec_xor __builtin_vec_xor
-  
-+ #define vec_extract __builtin_vec_extract
-+ #define vec_insert __builtin_vec_insert
-+ #define vec_splats __builtin_vec_splats
-+ #define vec_promote __builtin_vec_promote
-+ 
-  /* Predicates.
-     For C++, we use templates in order to allow non-parenthesized arguments.
-     For C, instead, we use macros since non-parenthesized arguments were
-
-diff -urNp gcc.orig/config/rs6000/altivec.md gcc/config/rs6000/altivec.md
---- gcc.orig/config/rs6000/altivec.md	2008-10-08 18:22:03.000000000 +0200
-+++ gcc/config/rs6000/altivec.md	2008-10-08 20:28:51.000000000 +0200
+--- gcc/config/rs6000/altivec.h.orig	2009-09-21 11:42:14.000000000 +0200
++++ gcc/config/rs6000/altivec.h	2009-09-21 11:48:32.000000000 +0200
+@@ -205,6 +205,13 @@
+ #define vec_lvebx __builtin_vec_lvebx
+ #define vec_lvehx __builtin_vec_lvehx
+ #define vec_lvewx __builtin_vec_lvewx
++/* Cell only intrinsics.  */
++#ifdef __PPU__
++#define vec_lvlx __builtin_vec_lvlx
++#define vec_lvlxl __builtin_vec_lvlxl
++#define vec_lvrx __builtin_vec_lvrx
++#define vec_lvrxl __builtin_vec_lvrxl
++#endif
+ #define vec_lvsl __builtin_vec_lvsl
+ #define vec_lvsr __builtin_vec_lvsr
+ #define vec_max __builtin_vec_max
+@@ -239,6 +246,13 @@
+ #define vec_stvebx __builtin_vec_stvebx
+ #define vec_stvehx __builtin_vec_stvehx
+ #define vec_stvewx __builtin_vec_stvewx
++/* Cell only intrinsics.  */
++#ifdef __PPU__
++#define vec_stvlx __builtin_vec_stvlx
++#define vec_stvlxl __builtin_vec_stvlxl
++#define vec_stvrx __builtin_vec_stvrx
++#define vec_stvrxl __builtin_vec_stvrxl
++#endif
+ #define vec_sub __builtin_vec_sub
+ #define vec_subs __builtin_vec_subs
+ #define vec_sum __builtin_vec_sum
+@@ -290,6 +304,11 @@
+ #define vec_vsubuws __builtin_vec_vsubuws
+ #define vec_xor __builtin_vec_xor
+ 
++#define vec_extract __builtin_vec_extract
++#define vec_insert __builtin_vec_insert
++#define vec_splats __builtin_vec_splats
++#define vec_promote __builtin_vec_promote
++
+ /* Predicates.
+    For C++, we use templates in order to allow non-parenthesized arguments.
+    For C, instead, we use macros since non-parenthesized arguments were
+Index: gcc/config/rs6000/altivec.md
+===================================================================
+--- gcc/config/rs6000/altivec.md.orig	2009-09-21 11:44:57.000000000 +0200
++++ gcc/config/rs6000/altivec.md	2009-09-21 11:48:32.000000000 +0200
 @@ -130,6 +130,14 @@
     (UNSPEC_INTERLO_V8HI 233)
     (UNSPEC_INTERLO_V16QI 234)
@@ -1882,4 +1769,3 @@ diff -urNp gcc.orig/config/rs6000/altive
  (define_expand "vec_extract_evenv4si"
   [(set (match_operand:V4SI 0 "register_operand" "")
          (unspec:V8HI [(match_operand:V4SI 1 "register_operand" "")
-
--- pr40141.diff.orig
+++ pr40141.diff
@@ -43,810 +43,500 @@
 
 Index: gcc/tree-ssa-structalias.c
 ===================================================================
-*** gcc/tree-ssa-structalias.c	(revision 147534)
---- gcc/tree-ssa-structalias.c	(working copy)
-*************** update_alias_info (tree stmt, struct ali
-*** 3536,3548 ****
-  	     all the variables OP points to.  */
-  	  pi->is_dereferenced = 1;
-  
-! 	  /* If this is a store operation, mark OP as being
-! 	     dereferenced to store, otherwise mark it as being
-! 	     dereferenced to load.  */
-! 	  if (num_stores > 0)
-! 	    pointer_set_insert (ai->dereferenced_ptrs_store, var);
-! 	  else
-! 	    pointer_set_insert (ai->dereferenced_ptrs_load, var);
-  
-  	  /* Update the frequency estimate for all the dereferences of
-  	     pointer OP.  */
---- 3536,3543 ----
-  	     all the variables OP points to.  */
-  	  pi->is_dereferenced = 1;
-  
-! 	  /* Mark OP as being dereferenced.  */
-! 	  pointer_set_insert (ai->dereferenced_ptrs, var);
-  
-  	  /* Update the frequency estimate for all the dereferences of
-  	     pointer OP.  */
-*************** update_alias_info (tree stmt, struct ali
-*** 3567,3573 ****
-  	  if (get_call_expr_in (stmt)
-  	      || stmt_escape_type == ESCAPE_STORED_IN_GLOBAL)
-  	    {
-! 	      pointer_set_insert (ai->dereferenced_ptrs_store, var);
-  	      pi->is_dereferenced = 1;
-  	    }
-  	}
---- 3562,3568 ----
-  	  if (get_call_expr_in (stmt)
-  	      || stmt_escape_type == ESCAPE_STORED_IN_GLOBAL)
-  	    {
-! 	      pointer_set_insert (ai->dereferenced_ptrs, var);
-  	      pi->is_dereferenced = 1;
-  	    }
-  	}
-*************** update_alias_info (tree stmt, struct ali
-*** 3585,3613 ****
-  
-        mem_ref_stats->num_mem_stmts++;
-  
--       /* Add all decls written to to the list of written variables.  */
--       if (TREE_CODE (stmt) == GIMPLE_MODIFY_STMT
-- 	  && TREE_CODE (GIMPLE_STMT_OPERAND (stmt, 0)) != SSA_NAME)
-- 	{
-- 	  tree lhs = GIMPLE_STMT_OPERAND (stmt, 0);
-- 	  while (handled_component_p (lhs))
-- 	    lhs = TREE_OPERAND (lhs, 0);
-- 	  if (DECL_P (lhs))
-- 	    {
-- 	      subvar_t svars;
-- 	      if (var_can_have_subvars (lhs)
-- 		  && (svars = get_subvars_for_var (lhs)))
-- 		{
-- 		  unsigned int i;
-- 		  tree subvar;
-- 		  for (i = 0; VEC_iterate (tree, svars, i, subvar); ++i)
-- 		    pointer_set_insert (ai->written_vars, subvar);
-- 		}
-- 	      else
-- 		pointer_set_insert (ai->written_vars, lhs);
-- 	    }
-- 	}
-- 
-        /* Notice that we only update memory reference stats for symbols
-  	 loaded and stored by the statement if the statement does not
-  	 contain pointer dereferences and it is not a call/asm site.
---- 3580,3585 ----
-*************** find_what_p_points_to (tree p)
-*** 5026,5042 ****
-  
-  	  /* Instead of using pt_anything, we merge in the SMT aliases
-  	     for the underlying SMT.  In addition, if they could have
-! 	     pointed to anything, they could point to global memory.
-! 	     But we cannot do that for ref-all pointers because these
-! 	     aliases have not been computed yet.  */
-  	  if (was_pt_anything)
-  	    {
-- 	      if (PTR_IS_REF_ALL (p))
-- 		{
-- 		  pi->pt_anything = 1;
-- 		  return false;
-- 		}
-- 
-  	      merge_smts_into (p, finished_solution);
-  	      pi->pt_global_mem = 1;
-  	    }
---- 4998,5006 ----
-  
-  	  /* Instead of using pt_anything, we merge in the SMT aliases
-  	     for the underlying SMT.  In addition, if they could have
-! 	     pointed to anything, they could point to global memory.  */
-  	  if (was_pt_anything)
-  	    {
-  	      merge_smts_into (p, finished_solution);
-  	      pi->pt_global_mem = 1;
-  	    }
+--- gcc/tree-ssa-structalias.c.orig	2009-09-21 11:42:18.000000000 +0200
++++ gcc/tree-ssa-structalias.c	2009-09-21 11:43:45.000000000 +0200
+@@ -3536,13 +3536,8 @@ update_alias_info (tree stmt, struct ali
+ 	     all the variables OP points to.  */
+ 	  pi->is_dereferenced = 1;
+ 
+-	  /* If this is a store operation, mark OP as being
+-	     dereferenced to store, otherwise mark it as being
+-	     dereferenced to load.  */
+-	  if (num_stores > 0)
+-	    pointer_set_insert (ai->dereferenced_ptrs_store, var);
+-	  else
+-	    pointer_set_insert (ai->dereferenced_ptrs_load, var);
++	  /* Mark OP as being dereferenced.  */
++	  pointer_set_insert (ai->dereferenced_ptrs, var);
+ 
+ 	  /* Update the frequency estimate for all the dereferences of
+ 	     pointer OP.  */
+@@ -3567,7 +3562,7 @@ update_alias_info (tree stmt, struct ali
+ 	  if (get_call_expr_in (stmt)
+ 	      || stmt_escape_type == ESCAPE_STORED_IN_GLOBAL)
+ 	    {
+-	      pointer_set_insert (ai->dereferenced_ptrs_store, var);
++	      pointer_set_insert (ai->dereferenced_ptrs, var);
+ 	      pi->is_dereferenced = 1;
+ 	    }
+ 	}
+@@ -3585,29 +3580,6 @@ update_alias_info (tree stmt, struct ali
+ 
+       mem_ref_stats->num_mem_stmts++;
+ 
+-      /* Add all decls written to to the list of written variables.  */
+-      if (TREE_CODE (stmt) == GIMPLE_MODIFY_STMT
+-	  && TREE_CODE (GIMPLE_STMT_OPERAND (stmt, 0)) != SSA_NAME)
+-	{
+-	  tree lhs = GIMPLE_STMT_OPERAND (stmt, 0);
+-	  while (handled_component_p (lhs))
+-	    lhs = TREE_OPERAND (lhs, 0);
+-	  if (DECL_P (lhs))
+-	    {
+-	      subvar_t svars;
+-	      if (var_can_have_subvars (lhs)
+-		  && (svars = get_subvars_for_var (lhs)))
+-		{
+-		  unsigned int i;
+-		  tree subvar;
+-		  for (i = 0; VEC_iterate (tree, svars, i, subvar); ++i)
+-		    pointer_set_insert (ai->written_vars, subvar);
+-		}
+-	      else
+-		pointer_set_insert (ai->written_vars, lhs);
+-	    }
+-	}
+-
+       /* Notice that we only update memory reference stats for symbols
+ 	 loaded and stored by the statement if the statement does not
+ 	 contain pointer dereferences and it is not a call/asm site.
+@@ -5026,17 +4998,9 @@ find_what_p_points_to (tree p)
+ 
+ 	  /* Instead of using pt_anything, we merge in the SMT aliases
+ 	     for the underlying SMT.  In addition, if they could have
+-	     pointed to anything, they could point to global memory.
+-	     But we cannot do that for ref-all pointers because these
+-	     aliases have not been computed yet.  */
++	     pointed to anything, they could point to global memory.  */
+ 	  if (was_pt_anything)
+ 	    {
+-	      if (PTR_IS_REF_ALL (p))
+-		{
+-		  pi->pt_anything = 1;
+-		  return false;
+-		}
+-
+ 	      merge_smts_into (p, finished_solution);
+ 	      pi->pt_global_mem = 1;
+ 	    }
 Index: gcc/tree-ssa-structalias.h
 ===================================================================
-*** gcc/tree-ssa-structalias.h	(revision 147534)
---- gcc/tree-ssa-structalias.h	(working copy)
-***************
-*** 21,29 ****
-  #ifndef TREE_SSA_STRUCTALIAS_H
-  #define TREE_SSA_STRUCTALIAS_H
-  
-- /* True if the data pointed to by PTR can alias anything.  */
-- #define PTR_IS_REF_ALL(PTR) TYPE_REF_CAN_ALIAS_ALL (TREE_TYPE (PTR))
-- 
-  struct constraint;
-  typedef struct constraint *constraint_t;
-  
---- 21,26 ----
-*************** struct alias_info
-*** 48,65 ****
-    struct alias_map_d **pointers;
-    size_t num_pointers;
-  
-!   /* Variables that have been written to directly (i.e., not through a
-!      pointer dereference).  */
-!   struct pointer_set_t *written_vars;
-! 
-!   /* Pointers that have been used in an indirect store operation.  */
-!   struct pointer_set_t *dereferenced_ptrs_store;
-! 
-!   /* Pointers that have been used in an indirect load operation.  */
-!   struct pointer_set_t *dereferenced_ptrs_load;
-! 
-!   /* Memory tag for all the PTR_IS_REF_ALL pointers.  */
-!   tree ref_all_symbol_mem_tag;
-  };
-  
-  /* In tree-ssa-alias.c.  */
---- 45,52 ----
-    struct alias_map_d **pointers;
-    size_t num_pointers;
-  
-!   /* Pointers that have been used in an indirect load/store operation.  */
-!   struct pointer_set_t *dereferenced_ptrs;
-  };
-  
-  /* In tree-ssa-alias.c.  */
+--- gcc/tree-ssa-structalias.h.orig	2009-09-21 11:42:18.000000000 +0200
++++ gcc/tree-ssa-structalias.h	2009-09-21 11:43:45.000000000 +0200
+@@ -21,9 +21,6 @@
+ #ifndef TREE_SSA_STRUCTALIAS_H
+ #define TREE_SSA_STRUCTALIAS_H
+ 
+-/* True if the data pointed to by PTR can alias anything.  */
+-#define PTR_IS_REF_ALL(PTR) TYPE_REF_CAN_ALIAS_ALL (TREE_TYPE (PTR))
+-
+ struct constraint;
+ typedef struct constraint *constraint_t;
+ 
+@@ -48,18 +45,8 @@ struct alias_info
+   struct alias_map_d **pointers;
+   size_t num_pointers;
+ 
+-  /* Variables that have been written to directly (i.e., not through a
+-     pointer dereference).  */
+-  struct pointer_set_t *written_vars;
+-
+-  /* Pointers that have been used in an indirect store operation.  */
+-  struct pointer_set_t *dereferenced_ptrs_store;
+-
+-  /* Pointers that have been used in an indirect load operation.  */
+-  struct pointer_set_t *dereferenced_ptrs_load;
+-
+-  /* Memory tag for all the PTR_IS_REF_ALL pointers.  */
+-  tree ref_all_symbol_mem_tag;
++  /* Pointers that have been used in an indirect load/store operation.  */
++  struct pointer_set_t *dereferenced_ptrs;
+ };
+ 
+ /* In tree-ssa-alias.c.  */
 Index: gcc/tree-ssa-alias.c
 ===================================================================
-*** gcc/tree-ssa-alias.c	(revision 147534)
---- gcc/tree-ssa-alias.c	(working copy)
-*************** static bitmap_obstack alias_bitmap_obsta
-*** 196,202 ****
-  
-  /* Local functions.  */
-  static void compute_flow_insensitive_aliasing (struct alias_info *);
-- static void finalize_ref_all_pointers (struct alias_info *);
-  static void dump_alias_stats (FILE *);
-  static bool may_alias_p (tree, alias_set_type, tree, alias_set_type, bool);
-  static tree create_memory_tag (tree type, bool is_type_tag);
---- 196,201 ----
-*************** compute_may_aliases (void)
-*** 1894,1905 ****
-       avoid invalid transformations on them.  */
-    maybe_create_global_var ();
-  
--   /* If the program contains ref-all pointers, finalize may-alias information
--      for them.  This pass needs to be run after call-clobbering information
--      has been computed.  */
--   if (ai->ref_all_symbol_mem_tag)
--     finalize_ref_all_pointers (ai);
-- 
-    /* Compute memory partitions for every memory variable.  */
-    compute_memory_partitions ();
-  
---- 1893,1898 ----
-*************** init_alias_info (void)
-*** 2220,2228 ****
-    ai->ssa_names_visited = sbitmap_alloc (num_ssa_names);
-    sbitmap_zero (ai->ssa_names_visited);
-    ai->processed_ptrs = VEC_alloc (tree, heap, 50);
-!   ai->written_vars = pointer_set_create ();
-!   ai->dereferenced_ptrs_store = pointer_set_create ();
-!   ai->dereferenced_ptrs_load = pointer_set_create ();
-  
-    /* Clear out all memory reference stats.  */
-    init_mem_ref_stats ();
---- 2213,2219 ----
-    ai->ssa_names_visited = sbitmap_alloc (num_ssa_names);
-    sbitmap_zero (ai->ssa_names_visited);
-    ai->processed_ptrs = VEC_alloc (tree, heap, 50);
-!   ai->dereferenced_ptrs = pointer_set_create ();
-  
-    /* Clear out all memory reference stats.  */
-    init_mem_ref_stats ();
-*************** delete_alias_info (struct alias_info *ai
-*** 2269,2277 ****
-      free (ai->pointers[i]);
-    free (ai->pointers);
-  
-!   pointer_set_destroy (ai->written_vars);
-!   pointer_set_destroy (ai->dereferenced_ptrs_store);
-!   pointer_set_destroy (ai->dereferenced_ptrs_load);
-    free (ai);
-  
-    delete_mem_ref_stats (cfun);
---- 2260,2266 ----
-      free (ai->pointers[i]);
-    free (ai->pointers);
-  
-!   pointer_set_destroy (ai->dereferenced_ptrs);
-    free (ai);
-  
-    delete_mem_ref_stats (cfun);
-*************** compute_flow_insensitive_aliasing (struc
-*** 2518,2548 ****
-        tree tag = symbol_mem_tag (p_map->var);
-        tree var;
-  
--       /* Call-clobbering information is not finalized yet at this point.  */
--       if (PTR_IS_REF_ALL (p_map->var))
-- 	continue;
-- 
-        for (j = 0; j < ai->num_addressable_vars; j++)
-  	{
-  	  struct alias_map_d *v_map;
-  	  var_ann_t v_ann;
-- 	  bool tag_stored_p, var_stored_p;
-  	  
-  	  v_map = ai->addressable_vars[j];
-  	  var = v_map->var;
-  	  v_ann = var_ann (var);
-  
-! 	  /* Skip memory tags and variables that have never been
-! 	     written to.  We also need to check if the variables are
-! 	     call-clobbered because they may be overwritten by
-! 	     function calls.  */
-! 	  tag_stored_p = pointer_set_contains (ai->written_vars, tag)
-! 	                 || is_call_clobbered (tag);
-! 	  var_stored_p = pointer_set_contains (ai->written_vars, var)
-! 	                 || is_call_clobbered (var);
-! 	  if (!tag_stored_p && !var_stored_p)
-! 	    continue;
-! 	     
-  	  if (may_alias_p (p_map->var, p_map->set, var, v_map->set, false))
-  	    {
-  	      /* We should never have a var with subvars here, because
---- 2507,2528 ----
-        tree tag = symbol_mem_tag (p_map->var);
-        tree var;
-  
-        for (j = 0; j < ai->num_addressable_vars; j++)
-  	{
-  	  struct alias_map_d *v_map;
-  	  var_ann_t v_ann;
-  	  
-  	  v_map = ai->addressable_vars[j];
-  	  var = v_map->var;
-  	  v_ann = var_ann (var);
-  
-! 	  /* We used to skip variables that have never been written to
-! 	     if the memory tag has been never written to directly (or
-! 	     either of them were call clobbered).  This is not enough
-! 	     though, as this misses writes through the tags aliases.
-! 	     So, for correctness we need to include any aliased
-! 	     variable here.  */
-! 
-  	  if (may_alias_p (p_map->var, p_map->set, var, v_map->set, false))
-  	    {
-  	      /* We should never have a var with subvars here, because
-*************** compute_flow_insensitive_aliasing (struc
-*** 2583,2600 ****
-        tree tag1 = symbol_mem_tag (p_map1->var);
-        bitmap may_aliases1 = MTAG_ALIASES (tag1);
-  
--       if (PTR_IS_REF_ALL (p_map1->var))
-- 	continue;
-- 
-        for (j = i + 1; j < ai->num_pointers; j++)
-  	{
-  	  struct alias_map_d *p_map2 = ai->pointers[j];
-  	  tree tag2 = symbol_mem_tag (p_map2->var);
-  	  bitmap may_aliases2 = may_aliases (tag2);
-  
-- 	  if (PTR_IS_REF_ALL (p_map2->var))
-- 	    continue;
-- 
-  	  /* If the pointers may not point to each other, do nothing.  */
-  	  if (!may_alias_p (p_map1->var, p_map1->set, tag2, p_map2->set, true))
-  	    continue;
---- 2563,2574 ----
-*************** compute_flow_insensitive_aliasing (struc
-*** 2639,2687 ****
-  }
-  
-  
-- /* Finalize may-alias information for ref-all pointers.  Traverse all
--    the addressable variables found in setup_pointers_and_addressables.
-- 
--    If flow-sensitive alias analysis has attached a name memory tag to
--    a ref-all pointer, we will use it for the dereferences because that
--    will have more precise aliasing information.  But if there is no
--    name tag, we will use a special symbol tag that aliases all the
--    call-clobbered addressable variables.  */
-- 
-- static void
-- finalize_ref_all_pointers (struct alias_info *ai)
-- {
--   size_t i;
-- 
--   /* First add the real call-clobbered variables.  */
--   for (i = 0; i < ai->num_addressable_vars; i++)
--     {
--       tree var = ai->addressable_vars[i]->var;
--       if (is_call_clobbered (var))
-- 	add_may_alias (ai->ref_all_symbol_mem_tag, var);
--     }
-- 
--   /* Then add the call-clobbered pointer memory tags.  See
--      compute_flow_insensitive_aliasing for the rationale.  */
--   for (i = 0; i < ai->num_pointers; i++)
--     {
--       tree ptr = ai->pointers[i]->var, tag;
--       /* Avoid adding to self and clean up.  */
--       if (PTR_IS_REF_ALL (ptr))
-- 	{
-- 	  struct ptr_info_def *pi = get_ptr_info (ptr);
-- 	  if (pi->is_dereferenced)
-- 	    pi->pt_anything = 0;
-- 	  continue;
-- 	}
--       tag = symbol_mem_tag (ptr);
--       if (is_call_clobbered (tag))
-- 	add_may_alias (ai->ref_all_symbol_mem_tag, tag);
--     }
-- 
-- }
-- 
-- 
-  /* Create a new alias set entry for VAR in AI->ADDRESSABLE_VARS.  */
-  
-  static void
---- 2613,2618 ----
-*************** setup_pointers_and_addressables (struct
-*** 2723,2729 ****
-  	  /* Since we don't keep track of volatile variables, assume that
-  	     these pointers are used in indirect store operations.  */
-  	  if (TREE_THIS_VOLATILE (var))
-! 	    pointer_set_insert (ai->dereferenced_ptrs_store, var);
-  
-  	  num_pointers++;
-  	}
---- 2654,2660 ----
-  	  /* Since we don't keep track of volatile variables, assume that
-  	     these pointers are used in indirect store operations.  */
-  	  if (TREE_THIS_VOLATILE (var))
-! 	    pointer_set_insert (ai->dereferenced_ptrs, var);
-  
-  	  num_pointers++;
-  	}
-*************** setup_pointers_and_addressables (struct
-*** 2821,2828 ****
-           array and create a symbol memory tag for them.  */
-        if (POINTER_TYPE_P (TREE_TYPE (var)))
-  	{
-! 	  if ((pointer_set_contains (ai->dereferenced_ptrs_store, var)
-! 	       || pointer_set_contains (ai->dereferenced_ptrs_load, var)))
-  	    {
-  	      tree tag, old_tag;
-  	      var_ann_t t_ann;
---- 2752,2758 ----
-           array and create a symbol memory tag for them.  */
-        if (POINTER_TYPE_P (TREE_TYPE (var)))
-  	{
-! 	  if (pointer_set_contains (ai->dereferenced_ptrs, var))
-  	    {
-  	      tree tag, old_tag;
-  	      var_ann_t t_ann;
-*************** setup_pointers_and_addressables (struct
-*** 2848,2858 ****
-  
-  	      /* Associate the tag with pointer VAR.  */
-  	      set_symbol_mem_tag (var, tag);
-- 
-- 	      /* If pointer VAR has been used in a store operation,
-- 		 then its memory tag must be marked as written-to.  */
-- 	      if (pointer_set_contains (ai->dereferenced_ptrs_store, var))
-- 		pointer_set_insert (ai->written_vars, tag);
-  	    }
-  	  else
-  	    {
---- 2778,2783 ----
-*************** may_alias_p (tree ptr, alias_set_type me
-*** 2966,3039 ****
-        return false;
-      }
-  
-    gcc_assert (TREE_CODE (mem) == SYMBOL_MEMORY_TAG);
-  
-!   if (!DECL_NO_TBAA_P (ptr))
-      {
-!       alias_stats.tbaa_queries++;
-  
-!       /* If the alias sets don't conflict then MEM cannot alias VAR.  */
-!       if (!alias_sets_conflict_p (mem_alias_set, var_alias_set))
-! 	{
-! 	  alias_stats.alias_noalias++;
-! 	  alias_stats.tbaa_resolved++;
-! 	  return false;
-! 	}
-  
-!       /* If VAR is a record or union type, PTR cannot point into VAR
-! 	 unless there is some explicit address operation in the
-! 	 program that can reference a field of the type pointed-to by
-! 	 PTR.  This also assumes that the types of both VAR and PTR
-! 	 are contained within the compilation unit, and that there is
-! 	 no fancy addressing arithmetic associated with any of the
-! 	 types involved.  */
-!       if (mem_alias_set != 0 && var_alias_set != 0)
-! 	{
-! 	  tree ptr_type = TREE_TYPE (ptr);
-! 	  tree var_type = TREE_TYPE (var);
-!       
-! 	  /* The star count is -1 if the type at the end of the
-! 	     pointer_to chain is not a record or union type. */ 
-! 	  if ((!alias_set_only) && 
-! 	      ipa_type_escape_star_count_of_interesting_type (var_type) >= 0)
-  	    {
-! 	      int ptr_star_count = 0;
-! 	  
-! 	      /* ipa_type_escape_star_count_of_interesting_type is a
-! 		 little too restrictive for the pointer type, need to
-! 		 allow pointers to primitive types as long as those
-! 		 types cannot be pointers to everything.  */
-! 	      while (POINTER_TYPE_P (ptr_type))
-! 		{
-! 		  /* Strip the *s off.  */ 
-! 		  ptr_type = TREE_TYPE (ptr_type);
-! 		  ptr_star_count++;
-! 		}
-! 	  
-! 	      /* There does not appear to be a better test to see if
-! 		 the pointer type was one of the pointer to everything
-! 		 types.  */
-! 	      if (ptr_star_count > 0)
-! 		{
-! 		  alias_stats.structnoaddress_queries++;
-! 		  if (ipa_type_escape_field_does_not_clobber_p (var_type, 
-! 								TREE_TYPE (ptr)))
-! 		    {
-! 		      alias_stats.structnoaddress_resolved++;
-! 		      alias_stats.alias_noalias++;
-! 		      return false;
-! 		    }
-! 		}
-! 	      else if (ptr_star_count == 0)
-  		{
-- 		  /* If PTR_TYPE was not really a pointer to type, it cannot 
-- 		     alias.  */ 
-- 		  alias_stats.structnoaddress_queries++;
-  		  alias_stats.structnoaddress_resolved++;
-  		  alias_stats.alias_noalias++;
-  		  return false;
-  		}
-  	    }
-  	}
-      }
-  
---- 2891,2974 ----
-        return false;
-      }
-  
-+   /* If the pointed to memory has alias set zero, or the pointer
-+      is ref-all, or the pointer decl is marked that no TBAA is to
-+      be applied, the MEM can alias VAR.  */
-+   if (mem_alias_set == 0
-+       || DECL_POINTER_ALIAS_SET (ptr) == 0
-+       || TYPE_REF_CAN_ALIAS_ALL (TREE_TYPE (ptr))
-+       || DECL_NO_TBAA_P (ptr))
-+     {
-+       alias_stats.alias_mayalias++;
-+       alias_stats.simple_resolved++;
-+       return true;
-+     }
-+ 
-    gcc_assert (TREE_CODE (mem) == SYMBOL_MEMORY_TAG);
-  
-!   alias_stats.tbaa_queries++;
-! 
-!   /* If the alias sets don't conflict then MEM cannot alias VAR.  */
-!   if (!alias_sets_conflict_p (mem_alias_set, var_alias_set))
-      {
-!       alias_stats.alias_noalias++;
-!       alias_stats.tbaa_resolved++;
-!       return false;
-!     }
-  
-!   /* If VAR is a record or union type, PTR cannot point into VAR
-!      unless there is some explicit address operation in the
-!      program that can reference a field of the type pointed-to by
-!      PTR.  This also assumes that the types of both VAR and PTR
-!      are contained within the compilation unit, and that there is
-!      no fancy addressing arithmetic associated with any of the
-!      types involved.  */
-!   if (mem_alias_set != 0 && var_alias_set != 0)
-!     {
-!       tree ptr_type = TREE_TYPE (ptr);
-!       tree var_type = TREE_TYPE (var);
-! 
-!       /* The star count is -1 if the type at the end of the
-! 	 pointer_to chain is not a record or union type. */ 
-!       if (!alias_set_only
-! 	  && ipa_type_escape_star_count_of_interesting_type (var_type) >= 0)
-! 	{
-! 	  int ptr_star_count = 0;
-! 
-! 	  /* ipa_type_escape_star_count_of_interesting_type is a
-! 	     little too restrictive for the pointer type, need to
-! 	     allow pointers to primitive types as long as those
-! 	     types cannot be pointers to everything.  */
-! 	  while (POINTER_TYPE_P (ptr_type))
-! 	    {
-! 	      /* Strip the *s off.  */ 
-! 	      ptr_type = TREE_TYPE (ptr_type);
-! 	      ptr_star_count++;
-! 	    }
-  
-! 	  /* There does not appear to be a better test to see if
-! 	     the pointer type was one of the pointer to everything
-! 	     types.  */
-! 	  if (ptr_star_count > 0)
-  	    {
-! 	      alias_stats.structnoaddress_queries++;
-! 	      if (ipa_type_escape_field_does_not_clobber_p (var_type, 
-! 							    TREE_TYPE (ptr)))
-  		{
-  		  alias_stats.structnoaddress_resolved++;
-  		  alias_stats.alias_noalias++;
-  		  return false;
-  		}
-  	    }
-+ 	  else if (ptr_star_count == 0)
-+ 	    {
-+ 	      /* If PTR_TYPE was not really a pointer to type, it cannot 
-+ 		 alias.  */ 
-+ 	      alias_stats.structnoaddress_queries++;
-+ 	      alias_stats.structnoaddress_resolved++;
-+ 	      alias_stats.alias_noalias++;
-+ 	      return false;
-+ 	    }
-  	}
-      }
-  
-*************** is_escape_site (tree stmt)
-*** 3139,3150 ****
-  	     pointer escapes since we can't track the integer.  */
-  	  if (POINTER_TYPE_P (from) && !POINTER_TYPE_P (to))
-  	    return ESCAPE_BAD_CAST;
-- 
-- 	  /* Same if the RHS is a conversion between a regular pointer and a
-- 	     ref-all pointer since we can't track the SMT of the former.  */
-- 	  if (POINTER_TYPE_P (from) && !TYPE_REF_CAN_ALIAS_ALL (from)
-- 	      && POINTER_TYPE_P (to) && TYPE_REF_CAN_ALIAS_ALL (to))
-- 	    return ESCAPE_BAD_CAST;
-  	}
-  
-        /* If the LHS is an SSA name, it can't possibly represent a non-local
---- 3074,3079 ----
-*************** get_smt_for (tree ptr, struct alias_info
-*** 3248,3261 ****
-    size_t i;
-    tree tag;
-    tree tag_type = TREE_TYPE (TREE_TYPE (ptr));
-!   alias_set_type tag_set = get_alias_set (tag_type);
-  
-!   /* We use a unique memory tag for all the ref-all pointers.  */
-!   if (PTR_IS_REF_ALL (ptr))
-      {
-!       if (!ai->ref_all_symbol_mem_tag)
-! 	ai->ref_all_symbol_mem_tag = create_memory_tag (void_type_node, true);
-!       return ai->ref_all_symbol_mem_tag;
-      }
-  
-    /* To avoid creating unnecessary memory tags, only create one memory tag
---- 3177,3197 ----
-    size_t i;
-    tree tag;
-    tree tag_type = TREE_TYPE (TREE_TYPE (ptr));
-!   alias_set_type tag_set;
-  
-!   /* Get the alias set to be used for the pointed-to memory.  If that
-!      differs from what we would get from looking at the type adjust
-!      the tag_type to void to make sure we get a proper alias set from
-!      just looking at the SMT we create.  */
-!   tag_set = get_alias_set (tag_type);
-!   if (TYPE_REF_CAN_ALIAS_ALL (TREE_TYPE (ptr))
-!       /* This is overly conservative but we do not want to assign
-!          restrict alias sets here (which if they are not assigned
-!          are -2 but still "known").  */
-!       || DECL_POINTER_ALIAS_SET_KNOWN_P (ptr))
-      {
-!       tag_set = 0;
-!       tag_type = void_type_node;
-      }
-  
-    /* To avoid creating unnecessary memory tags, only create one memory tag
-*************** get_smt_for (tree ptr, struct alias_info
-*** 3287,3293 ****
-  	 artificial variable representing the memory location
-  	 pointed-to by PTR.  */
-        tag = symbol_mem_tag (ptr);
-!       if (tag == NULL_TREE)
-  	tag = create_memory_tag (tag_type, true);
-  
-        /* Add PTR to the POINTERS array.  Note that we are not interested in
---- 3223,3230 ----
-  	 artificial variable representing the memory location
-  	 pointed-to by PTR.  */
-        tag = symbol_mem_tag (ptr);
-!       if (tag == NULL_TREE
-! 	  || tag_set != get_alias_set (tag))
-  	tag = create_memory_tag (tag_type, true);
-  
-        /* Add PTR to the POINTERS array.  Note that we are not interested in
-Index: gcc/config/i386/i386.c
-===================================================================
-*** gcc/config/i386/i386.c	(revision 147534)
---- gcc/config/i386/i386.c	(working copy)
-*************** ix86_gimplify_va_arg (tree valist, tree
-*** 5336,5341 ****
---- 5336,5343 ----
-  	      enum machine_mode mode = GET_MODE (reg);
-  	      tree piece_type = lang_hooks.types.type_for_mode (mode, 1);
-  	      tree addr_type = build_pointer_type (piece_type);
-+ 	      tree daddr_type = build_pointer_type_for_mode (piece_type,
-+ 							     ptr_mode, true);
-  	      tree src_addr, src;
-  	      int src_offset;
-  	      tree dest_addr, dest;
-*************** ix86_gimplify_va_arg (tree valist, tree
-*** 5355,5362 ****
-  				      size_int (src_offset));
-  	      src = build_va_arg_indirect_ref (src_addr);
-  
-! 	      dest_addr = fold_convert (addr_type, addr);
-! 	      dest_addr = fold_build2 (POINTER_PLUS_EXPR, addr_type, dest_addr,
-  				       size_int (INTVAL (XEXP (slot, 1))));
-  	      dest = build_va_arg_indirect_ref (dest_addr);
-  
---- 5357,5364 ----
-  				      size_int (src_offset));
-  	      src = build_va_arg_indirect_ref (src_addr);
-  
-! 	      dest_addr = fold_convert (daddr_type, addr);
-! 	      dest_addr = fold_build2 (POINTER_PLUS_EXPR, daddr_type, dest_addr,
-  				       size_int (INTVAL (XEXP (slot, 1))));
-  	      dest = build_va_arg_indirect_ref (dest_addr);
-  
-Index: gcc/testsuite/gcc.c-torture/execute/pr38151.c
-===================================================================
-*** gcc/testsuite/gcc.c-torture/execute/pr38151.c	(revision 0)
---- gcc/testsuite/gcc.c-torture/execute/pr38151.c	(revision 0)
-***************
-*** 0 ****
---- 1,46 ----
-+ void abort (void);
-+ 
-+ struct S2848
-+ {
-+   unsigned int a;
-+   _Complex int b;
-+   struct
-+   {
-+   } __attribute__ ((aligned)) c;
-+ };
-+ 
-+ struct S2848 s2848;
-+ 
-+ int fails;
-+ 
-+ void  __attribute__((noinline))
-+ check2848va (int z, ...)
-+ {
-+   struct S2848 arg;
-+   __builtin_va_list ap;
-+ 
-+   __builtin_va_start (ap, z);
-+ 
-+   arg = __builtin_va_arg (ap, struct S2848);
-+ 
-+   if (s2848.a != arg.a)
-+     ++fails;
-+   if (s2848.b != arg.b)
-+     ++fails;
-+ 
-+   __builtin_va_end (ap);
-+ }
-+ 
-+ int main (void)
-+ {
-+   s2848.a = 4027477739U;
-+   s2848.b = (723419448 + -218144346 * __extension__ 1i);
-+ 
-+   check2848va (1, s2848);
-+ 
-+   if (fails)
-+     abort ();
-+ 
-+   return 0;
-+ }
-+ 
-Index: gcc/testsuite/gcc.c-torture/execute/pr38236.c
-===================================================================
-*** gcc/testsuite/gcc.c-torture/execute/pr38236.c	(revision 0)
---- gcc/testsuite/gcc.c-torture/execute/pr38236.c	(revision 0)
-***************
-*** 0 ****
---- 1,22 ----
-+ struct X { int i; };
-+ 
-+ int __attribute__((noinline))
-+ foo (struct X *p, int *q, int a, int b)
-+ {
-+   struct X x, y;
-+   if (a)
-+     p = &x;
-+   if (b)
-+     q = &x.i;
-+   else
-+     q = &y.i;
-+   *q = 1;
-+   return p->i; 
-+ }
-+ extern void abort (void);
-+ int main()
-+ {
-+   if (foo((void *)0, (void *)0, 1, 1) != 1)
-+     abort ();
-+   return 0;
-+ }
-Index: gcc/testsuite/gcc.c-torture/execute/pr40141.c
-===================================================================
-*** gcc/testsuite/gcc.c-torture/execute/pr40141.c	(revision 0)
---- gcc/testsuite/gcc.c-torture/execute/pr40141.c	(revision 0)
-***************
-*** 0 ****
---- 1,16 ----
-+ extern void abort (void);
-+ typedef int __m128 __attribute__((vector_size(16),may_alias));
-+ typedef float floatA __attribute__((may_alias));
-+ 
-+ int main()
-+ {
-+   __m128 x = { 0, 0, 0, 0 };
-+   int i;
-+   for (i = 0; i < 4; ++i) {
-+       const float xx = ((floatA*)&x)[i];
-+       if (xx != 0.f)
-+ 	abort ();
-+   }
-+   return 0;
-+ }
-+ 
-Index: gcc/testsuite/gcc.target/i386/pr38151-1.c
-===================================================================
---- gcc/testsuite/gcc.target/i386/pr38151-1.c	(revision 0)
-+++ gcc/testsuite/gcc.target/i386/pr38151-1.c	(revision 142059)
-@@ -0,0 +1,29 @@
-+/* { dg-do run } */
-+/* { dg-options "-O2" } */
+--- gcc/tree-ssa-alias.c.orig	2009-09-21 11:42:18.000000000 +0200
++++ gcc/tree-ssa-alias.c	2009-09-21 11:43:45.000000000 +0200
+@@ -196,7 +196,6 @@ static bitmap_obstack alias_bitmap_obsta
+ 
+ /* Local functions.  */
+ static void compute_flow_insensitive_aliasing (struct alias_info *);
+-static void finalize_ref_all_pointers (struct alias_info *);
+ static void dump_alias_stats (FILE *);
+ static bool may_alias_p (tree, alias_set_type, tree, alias_set_type, bool);
+ static tree create_memory_tag (tree type, bool is_type_tag);
+@@ -1894,12 +1893,6 @@ compute_may_aliases (void)
+      avoid invalid transformations on them.  */
+   maybe_create_global_var ();
+ 
+-  /* If the program contains ref-all pointers, finalize may-alias information
+-     for them.  This pass needs to be run after call-clobbering information
+-     has been computed.  */
+-  if (ai->ref_all_symbol_mem_tag)
+-    finalize_ref_all_pointers (ai);
+-
+   /* Compute memory partitions for every memory variable.  */
+   compute_memory_partitions ();
+ 
+@@ -2220,9 +2213,7 @@ init_alias_info (void)
+   ai->ssa_names_visited = sbitmap_alloc (num_ssa_names);
+   sbitmap_zero (ai->ssa_names_visited);
+   ai->processed_ptrs = VEC_alloc (tree, heap, 50);
+-  ai->written_vars = pointer_set_create ();
+-  ai->dereferenced_ptrs_store = pointer_set_create ();
+-  ai->dereferenced_ptrs_load = pointer_set_create ();
++  ai->dereferenced_ptrs = pointer_set_create ();
+ 
+   /* Clear out all memory reference stats.  */
+   init_mem_ref_stats ();
+@@ -2269,9 +2260,7 @@ delete_alias_info (struct alias_info *ai
+     free (ai->pointers[i]);
+   free (ai->pointers);
+ 
+-  pointer_set_destroy (ai->written_vars);
+-  pointer_set_destroy (ai->dereferenced_ptrs_store);
+-  pointer_set_destroy (ai->dereferenced_ptrs_load);
++  pointer_set_destroy (ai->dereferenced_ptrs);
+   free (ai);
+ 
+   delete_mem_ref_stats (cfun);
+@@ -2518,31 +2507,22 @@ compute_flow_insensitive_aliasing (struc
+       tree tag = symbol_mem_tag (p_map->var);
+       tree var;
+ 
+-      /* Call-clobbering information is not finalized yet at this point.  */
+-      if (PTR_IS_REF_ALL (p_map->var))
+-	continue;
+-
+       for (j = 0; j < ai->num_addressable_vars; j++)
+ 	{
+ 	  struct alias_map_d *v_map;
+ 	  var_ann_t v_ann;
+-	  bool tag_stored_p, var_stored_p;
+ 	  
+ 	  v_map = ai->addressable_vars[j];
+ 	  var = v_map->var;
+ 	  v_ann = var_ann (var);
+ 
+-	  /* Skip memory tags and variables that have never been
+-	     written to.  We also need to check if the variables are
+-	     call-clobbered because they may be overwritten by
+-	     function calls.  */
+-	  tag_stored_p = pointer_set_contains (ai->written_vars, tag)
+-	                 || is_call_clobbered (tag);
+-	  var_stored_p = pointer_set_contains (ai->written_vars, var)
+-	                 || is_call_clobbered (var);
+-	  if (!tag_stored_p && !var_stored_p)
+-	    continue;
+-	     
++	  /* We used to skip variables that have never been written to
++	     if the memory tag has been never written to directly (or
++	     either of them were call clobbered).  This is not enough
++	     though, as this misses writes through the tags aliases.
++	     So, for correctness we need to include any aliased
++	     variable here.  */
 +
-+void abort (void);
+ 	  if (may_alias_p (p_map->var, p_map->set, var, v_map->set, false))
+ 	    {
+ 	      /* We should never have a var with subvars here, because
+@@ -2583,18 +2563,12 @@ compute_flow_insensitive_aliasing (struc
+       tree tag1 = symbol_mem_tag (p_map1->var);
+       bitmap may_aliases1 = MTAG_ALIASES (tag1);
+ 
+-      if (PTR_IS_REF_ALL (p_map1->var))
+-	continue;
+-
+       for (j = i + 1; j < ai->num_pointers; j++)
+ 	{
+ 	  struct alias_map_d *p_map2 = ai->pointers[j];
+ 	  tree tag2 = symbol_mem_tag (p_map2->var);
+ 	  bitmap may_aliases2 = may_aliases (tag2);
+ 
+-	  if (PTR_IS_REF_ALL (p_map2->var))
+-	    continue;
+-
+ 	  /* If the pointers may not point to each other, do nothing.  */
+ 	  if (!may_alias_p (p_map1->var, p_map1->set, tag2, p_map2->set, true))
+ 	    continue;
+@@ -2639,49 +2613,6 @@ compute_flow_insensitive_aliasing (struc
+ }
+ 
+ 
+-/* Finalize may-alias information for ref-all pointers.  Traverse all
+-   the addressable variables found in setup_pointers_and_addressables.
+-
+-   If flow-sensitive alias analysis has attached a name memory tag to
+-   a ref-all pointer, we will use it for the dereferences because that
+-   will have more precise aliasing information.  But if there is no
+-   name tag, we will use a special symbol tag that aliases all the
+-   call-clobbered addressable variables.  */
+-
+-static void
+-finalize_ref_all_pointers (struct alias_info *ai)
+-{
+-  size_t i;
+-
+-  /* First add the real call-clobbered variables.  */
+-  for (i = 0; i < ai->num_addressable_vars; i++)
+-    {
+-      tree var = ai->addressable_vars[i]->var;
+-      if (is_call_clobbered (var))
+-	add_may_alias (ai->ref_all_symbol_mem_tag, var);
+-    }
+-
+-  /* Then add the call-clobbered pointer memory tags.  See
+-     compute_flow_insensitive_aliasing for the rationale.  */
+-  for (i = 0; i < ai->num_pointers; i++)
+-    {
+-      tree ptr = ai->pointers[i]->var, tag;
+-      /* Avoid adding to self and clean up.  */
+-      if (PTR_IS_REF_ALL (ptr))
+-	{
+-	  struct ptr_info_def *pi = get_ptr_info (ptr);
+-	  if (pi->is_dereferenced)
+-	    pi->pt_anything = 0;
+-	  continue;
+-	}
+-      tag = symbol_mem_tag (ptr);
+-      if (is_call_clobbered (tag))
+-	add_may_alias (ai->ref_all_symbol_mem_tag, tag);
+-    }
+-
+-}
+-
+-
+ /* Create a new alias set entry for VAR in AI->ADDRESSABLE_VARS.  */
+ 
+ static void
+@@ -2723,7 +2654,7 @@ setup_pointers_and_addressables (struct
+ 	  /* Since we don't keep track of volatile variables, assume that
+ 	     these pointers are used in indirect store operations.  */
+ 	  if (TREE_THIS_VOLATILE (var))
+-	    pointer_set_insert (ai->dereferenced_ptrs_store, var);
++	    pointer_set_insert (ai->dereferenced_ptrs, var);
+ 
+ 	  num_pointers++;
+ 	}
+@@ -2821,8 +2752,7 @@ setup_pointers_and_addressables (struct
+          array and create a symbol memory tag for them.  */
+       if (POINTER_TYPE_P (TREE_TYPE (var)))
+ 	{
+-	  if ((pointer_set_contains (ai->dereferenced_ptrs_store, var)
+-	       || pointer_set_contains (ai->dereferenced_ptrs_load, var)))
++	  if (pointer_set_contains (ai->dereferenced_ptrs, var))
+ 	    {
+ 	      tree tag, old_tag;
+ 	      var_ann_t t_ann;
+@@ -2848,11 +2778,6 @@ setup_pointers_and_addressables (struct
+ 
+ 	      /* Associate the tag with pointer VAR.  */
+ 	      set_symbol_mem_tag (var, tag);
+-
+-	      /* If pointer VAR has been used in a store operation,
+-		 then its memory tag must be marked as written-to.  */
+-	      if (pointer_set_contains (ai->dereferenced_ptrs_store, var))
+-		pointer_set_insert (ai->written_vars, tag);
+ 	    }
+ 	  else
+ 	    {
+@@ -2966,74 +2891,84 @@ may_alias_p (tree ptr, alias_set_type me
+       return false;
+     }
+ 
++  /* If the pointed to memory has alias set zero, or the pointer
++     is ref-all, or the pointer decl is marked that no TBAA is to
++     be applied, the MEM can alias VAR.  */
++  if (mem_alias_set == 0
++      || DECL_POINTER_ALIAS_SET (ptr) == 0
++      || TYPE_REF_CAN_ALIAS_ALL (TREE_TYPE (ptr))
++      || DECL_NO_TBAA_P (ptr))
++    {
++      alias_stats.alias_mayalias++;
++      alias_stats.simple_resolved++;
++      return true;
++    }
 +
-+struct S2848
-+{
-+  unsigned int a;
-+  _Complex int b;
-+};
-+
-+struct S2848 s2848;
-+
-+void __attribute__((noinline))
-+check2848 (struct S2848 arg0)
-+{
-+  if (arg0.b != s2848.b)
-+    abort ();
-+}
+   gcc_assert (TREE_CODE (mem) == SYMBOL_MEMORY_TAG);
+ 
+-  if (!DECL_NO_TBAA_P (ptr))
++  alias_stats.tbaa_queries++;
 +
-+int main()
-+{
-+  s2848.a = 4027477739U;
-+  s2848.b = (723419448 + -218144346 * __extension__ 1i);
++  /* If the alias sets don't conflict then MEM cannot alias VAR.  */
++  if (!alias_sets_conflict_p (mem_alias_set, var_alias_set))
+     {
+-      alias_stats.tbaa_queries++;
++      alias_stats.alias_noalias++;
++      alias_stats.tbaa_resolved++;
++      return false;
++    }
+ 
+-      /* If the alias sets don't conflict then MEM cannot alias VAR.  */
+-      if (!alias_sets_conflict_p (mem_alias_set, var_alias_set))
+-	{
+-	  alias_stats.alias_noalias++;
+-	  alias_stats.tbaa_resolved++;
+-	  return false;
+-	}
++  /* If VAR is a record or union type, PTR cannot point into VAR
++     unless there is some explicit address operation in the
++     program that can reference a field of the type pointed-to by
++     PTR.  This also assumes that the types of both VAR and PTR
++     are contained within the compilation unit, and that there is
++     no fancy addressing arithmetic associated with any of the
++     types involved.  */
++  if (mem_alias_set != 0 && var_alias_set != 0)
++    {
++      tree ptr_type = TREE_TYPE (ptr);
++      tree var_type = TREE_TYPE (var);
 +
-+  check2848 (s2848);
++      /* The star count is -1 if the type at the end of the
++	 pointer_to chain is not a record or union type. */ 
++      if (!alias_set_only
++	  && ipa_type_escape_star_count_of_interesting_type (var_type) >= 0)
++	{
++	  int ptr_star_count = 0;
 +
-+  return 0;
-+}
++	  /* ipa_type_escape_star_count_of_interesting_type is a
++	     little too restrictive for the pointer type, need to
++	     allow pointers to primitive types as long as those
++	     types cannot be pointers to everything.  */
++	  while (POINTER_TYPE_P (ptr_type))
++	    {
++	      /* Strip the *s off.  */ 
++	      ptr_type = TREE_TYPE (ptr_type);
++	      ptr_star_count++;
++	    }
+ 
+-      /* If VAR is a record or union type, PTR cannot point into VAR
+-	 unless there is some explicit address operation in the
+-	 program that can reference a field of the type pointed-to by
+-	 PTR.  This also assumes that the types of both VAR and PTR
+-	 are contained within the compilation unit, and that there is
+-	 no fancy addressing arithmetic associated with any of the
+-	 types involved.  */
+-      if (mem_alias_set != 0 && var_alias_set != 0)
+-	{
+-	  tree ptr_type = TREE_TYPE (ptr);
+-	  tree var_type = TREE_TYPE (var);
+-      
+-	  /* The star count is -1 if the type at the end of the
+-	     pointer_to chain is not a record or union type. */ 
+-	  if ((!alias_set_only) && 
+-	      ipa_type_escape_star_count_of_interesting_type (var_type) >= 0)
++	  /* There does not appear to be a better test to see if
++	     the pointer type was one of the pointer to everything
++	     types.  */
++	  if (ptr_star_count > 0)
+ 	    {
+-	      int ptr_star_count = 0;
+-	  
+-	      /* ipa_type_escape_star_count_of_interesting_type is a
+-		 little too restrictive for the pointer type, need to
+-		 allow pointers to primitive types as long as those
+-		 types cannot be pointers to everything.  */
+-	      while (POINTER_TYPE_P (ptr_type))
+-		{
+-		  /* Strip the *s off.  */ 
+-		  ptr_type = TREE_TYPE (ptr_type);
+-		  ptr_star_count++;
+-		}
+-	  
+-	      /* There does not appear to be a better test to see if
+-		 the pointer type was one of the pointer to everything
+-		 types.  */
+-	      if (ptr_star_count > 0)
+-		{
+-		  alias_stats.structnoaddress_queries++;
+-		  if (ipa_type_escape_field_does_not_clobber_p (var_type, 
+-								TREE_TYPE (ptr)))
+-		    {
+-		      alias_stats.structnoaddress_resolved++;
+-		      alias_stats.alias_noalias++;
+-		      return false;
+-		    }
+-		}
+-	      else if (ptr_star_count == 0)
++	      alias_stats.structnoaddress_queries++;
++	      if (ipa_type_escape_field_does_not_clobber_p (var_type, 
++							    TREE_TYPE (ptr)))
+ 		{
+-		  /* If PTR_TYPE was not really a pointer to type, it cannot 
+-		     alias.  */ 
+-		  alias_stats.structnoaddress_queries++;
+ 		  alias_stats.structnoaddress_resolved++;
+ 		  alias_stats.alias_noalias++;
+ 		  return false;
+ 		}
+ 	    }
++	  else if (ptr_star_count == 0)
++	    {
++	      /* If PTR_TYPE was not really a pointer to type, it cannot 
++		 alias.  */ 
++	      alias_stats.structnoaddress_queries++;
++	      alias_stats.structnoaddress_resolved++;
++	      alias_stats.alias_noalias++;
++	      return false;
++	    }
+ 	}
+     }
+ 
+@@ -3139,12 +3074,6 @@ is_escape_site (tree stmt)
+ 	     pointer escapes since we can't track the integer.  */
+ 	  if (POINTER_TYPE_P (from) && !POINTER_TYPE_P (to))
+ 	    return ESCAPE_BAD_CAST;
+-
+-	  /* Same if the RHS is a conversion between a regular pointer and a
+-	     ref-all pointer since we can't track the SMT of the former.  */
+-	  if (POINTER_TYPE_P (from) && !TYPE_REF_CAN_ALIAS_ALL (from)
+-	      && POINTER_TYPE_P (to) && TYPE_REF_CAN_ALIAS_ALL (to))
+-	    return ESCAPE_BAD_CAST;
+ 	}
+ 
+       /* If the LHS is an SSA name, it can't possibly represent a non-local
+@@ -3248,14 +3177,21 @@ get_smt_for (tree ptr, struct alias_info
+   size_t i;
+   tree tag;
+   tree tag_type = TREE_TYPE (TREE_TYPE (ptr));
+-  alias_set_type tag_set = get_alias_set (tag_type);
++  alias_set_type tag_set;
+ 
+-  /* We use a unique memory tag for all the ref-all pointers.  */
+-  if (PTR_IS_REF_ALL (ptr))
++  /* Get the alias set to be used for the pointed-to memory.  If that
++     differs from what we would get from looking at the type adjust
++     the tag_type to void to make sure we get a proper alias set from
++     just looking at the SMT we create.  */
++  tag_set = get_alias_set (tag_type);
++  if (TYPE_REF_CAN_ALIAS_ALL (TREE_TYPE (ptr))
++      /* This is overly conservative but we do not want to assign
++         restrict alias sets here (which if they are not assigned
++         are -2 but still "known").  */
++      || DECL_POINTER_ALIAS_SET_KNOWN_P (ptr))
+     {
+-      if (!ai->ref_all_symbol_mem_tag)
+-	ai->ref_all_symbol_mem_tag = create_memory_tag (void_type_node, true);
+-      return ai->ref_all_symbol_mem_tag;
++      tag_set = 0;
++      tag_type = void_type_node;
+     }
+ 
+   /* To avoid creating unnecessary memory tags, only create one memory tag
+@@ -3287,7 +3223,8 @@ get_smt_for (tree ptr, struct alias_info
+ 	 artificial variable representing the memory location
+ 	 pointed-to by PTR.  */
+       tag = symbol_mem_tag (ptr);
+-      if (tag == NULL_TREE)
++      if (tag == NULL_TREE
++	  || tag_set != get_alias_set (tag))
+ 	tag = create_memory_tag (tag_type, true);
+ 
+       /* Add PTR to the POINTERS array.  Note that we are not interested in
 Index: gcc/config/i386/i386.c
 ===================================================================
---- gcc/config/i386/i386.c	(revision 142058)
-+++ gcc/config/i386/i386.c	(revision 142059)
-@@ -5029,11 +5029,33 @@ classify_argument (enum machine_mode mod
+--- gcc/config/i386/i386.c.orig	2009-09-21 11:42:18.000000000 +0200
++++ gcc/config/i386/i386.c	2009-09-21 11:43:45.000000000 +0200
+@@ -3855,11 +3855,33 @@ classify_argument (enum machine_mode mod
      case CSImode:
      case CHImode:
      case CQImode:
@@ -885,3 +575,156 @@ Index: gcc/config/i386/i386.c
      case CDImode:
      case TImode:
        classes[0] = classes[1] = X86_64_INTEGER_CLASS;
+@@ -5336,6 +5358,8 @@ ix86_gimplify_va_arg (tree valist, tree
+ 	      enum machine_mode mode = GET_MODE (reg);
+ 	      tree piece_type = lang_hooks.types.type_for_mode (mode, 1);
+ 	      tree addr_type = build_pointer_type (piece_type);
++	      tree daddr_type = build_pointer_type_for_mode (piece_type,
++							     ptr_mode, true);
+ 	      tree src_addr, src;
+ 	      int src_offset;
+ 	      tree dest_addr, dest;
+@@ -5355,8 +5379,8 @@ ix86_gimplify_va_arg (tree valist, tree
+ 				      size_int (src_offset));
+ 	      src = build_va_arg_indirect_ref (src_addr);
+ 
+-	      dest_addr = fold_convert (addr_type, addr);
+-	      dest_addr = fold_build2 (POINTER_PLUS_EXPR, addr_type, dest_addr,
++	      dest_addr = fold_convert (daddr_type, addr);
++	      dest_addr = fold_build2 (POINTER_PLUS_EXPR, daddr_type, dest_addr,
+ 				       size_int (INTVAL (XEXP (slot, 1))));
+ 	      dest = build_va_arg_indirect_ref (dest_addr);
+ 
+Index: gcc/testsuite/gcc.c-torture/execute/pr38151.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.c-torture/execute/pr38151.c	2009-09-21 11:43:45.000000000 +0200
+@@ -0,0 +1,46 @@
++void abort (void);
++
++struct S2848
++{
++  unsigned int a;
++  _Complex int b;
++  struct
++  {
++  } __attribute__ ((aligned)) c;
++};
++
++struct S2848 s2848;
++
++int fails;
++
++void  __attribute__((noinline))
++check2848va (int z, ...)
++{
++  struct S2848 arg;
++  __builtin_va_list ap;
++
++  __builtin_va_start (ap, z);
++
++  arg = __builtin_va_arg (ap, struct S2848);
++
++  if (s2848.a != arg.a)
++    ++fails;
++  if (s2848.b != arg.b)
++    ++fails;
++
++  __builtin_va_end (ap);
++}
++
++int main (void)
++{
++  s2848.a = 4027477739U;
++  s2848.b = (723419448 + -218144346 * __extension__ 1i);
++
++  check2848va (1, s2848);
++
++  if (fails)
++    abort ();
++
++  return 0;
++}
++
+Index: gcc/testsuite/gcc.c-torture/execute/pr38236.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.c-torture/execute/pr38236.c	2009-09-21 11:43:45.000000000 +0200
+@@ -0,0 +1,22 @@
++struct X { int i; };
++
++int __attribute__((noinline))
++foo (struct X *p, int *q, int a, int b)
++{
++  struct X x, y;
++  if (a)
++    p = &x;
++  if (b)
++    q = &x.i;
++  else
++    q = &y.i;
++  *q = 1;
++  return p->i; 
++}
++extern void abort (void);
++int main()
++{
++  if (foo((void *)0, (void *)0, 1, 1) != 1)
++    abort ();
++  return 0;
++}
+Index: gcc/testsuite/gcc.c-torture/execute/pr40141.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.c-torture/execute/pr40141.c	2009-09-21 11:43:45.000000000 +0200
+@@ -0,0 +1,16 @@
++extern void abort (void);
++typedef int __m128 __attribute__((vector_size(16),may_alias));
++typedef float floatA __attribute__((may_alias));
++
++int main()
++{
++  __m128 x = { 0, 0, 0, 0 };
++  int i;
++  for (i = 0; i < 4; ++i) {
++      const float xx = ((floatA*)&x)[i];
++      if (xx != 0.f)
++	abort ();
++  }
++  return 0;
++}
++
+Index: gcc/testsuite/gcc.target/i386/pr38151-1.c
+===================================================================
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.target/i386/pr38151-1.c	2009-09-21 11:43:45.000000000 +0200
+@@ -0,0 +1,29 @@
++/* { dg-do run } */
++/* { dg-options "-O2" } */
++
++void abort (void);
++
++struct S2848
++{
++  unsigned int a;
++  _Complex int b;
++};
++
++struct S2848 s2848;
++
++void __attribute__((noinline))
++check2848 (struct S2848 arg0)
++{
++  if (arg0.b != s2848.b)
++    abort ();
++}
++
++int main()
++{
++  s2848.a = 4027477739U;
++  s2848.b = (723419448 + -218144346 * __extension__ 1i);
++
++  check2848 (s2848);
++
++  return 0;
++}
--- program-transform-name.diff.orig
+++ program-transform-name.diff
@@ -1,6 +1,8 @@
---- gcc/ada/Make-lang.in
-+++ gcc/ada/Make-lang.in
-@@ -436,6 +436,24 @@
+Index: gcc/ada/Make-lang.in
+===================================================================
+--- gcc/ada/Make-lang.in.orig	2009-09-21 11:42:18.000000000 +0200
++++ gcc/ada/Make-lang.in	2009-09-21 11:42:49.000000000 +0200
+@@ -491,6 +491,24 @@ doc/gnat-style.pdf: ada/gnat-style.texi
  # likewise for gnatf, gnatchop, and gnatlink, gnatkr, gnatmake, gnat,
  # gnatprep, gnatbl, gnatls, gnatxref, gnatfind, gnatname, gnatclean,
  # gnatsym, gprmake
@@ -25,7 +27,7 @@
  ada.install-common:
  	$(MKDIR) $(DESTDIR)$(bindir)
  	-if [ -f gnat1$(exeext) ] ; \
-@@ -449,8 +467,8 @@
+@@ -504,8 +522,8 @@ ada.install-common:
  	      $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext); \
  	    fi; \
  	  else \
@@ -36,7 +38,7 @@
  	  fi ; \
  	fi
  	-if [ -f gnat1$(exeext) ] ; \
-@@ -464,8 +482,8 @@
+@@ -519,8 +537,8 @@ ada.install-common:
  	       $(INSTALL_PROGRAM) gnatbl-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatbl$(exeext); \
  	    fi; \
  	  else \
@@ -47,9 +49,9 @@
  	  fi ; \
  	fi
  	-if [ -f gnat1$(exeext) ] ; \
-@@ -479,8 +497,8 @@
+@@ -534,8 +552,8 @@ ada.install-common:
  	       $(INSTALL_PROGRAM) gnatchop-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatchop$(exeext); \
-             fi; \
+ 	    fi ; \
  	  else \
 -	    $(RM) $(DESTDIR)$(bindir)/gnatchop$(exeext); \
 -	    $(INSTALL_PROGRAM) gnatchop$(exeext) $(DESTDIR)$(bindir)/gnatchop$(exeext); \
@@ -58,7 +60,7 @@
  	  fi ; \
  	fi
  	-if [ -f gnat1$(exeext) ] ; \
-@@ -494,8 +512,8 @@
+@@ -549,8 +567,8 @@ ada.install-common:
  	       $(INSTALL_PROGRAM) gnat-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnat$(exeext); \
  	    fi; \
  	  else \
@@ -69,7 +71,7 @@
  	  fi ; \
  	fi
  	-if [ -f gnat1$(exeext) ] ; \
-@@ -509,8 +527,8 @@
+@@ -564,8 +582,8 @@ ada.install-common:
  	       $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatkr$(exeext); \
  	    fi; \
  	  else \
@@ -80,7 +82,7 @@
  	  fi ; \
  	fi
  	-if [ -f gnat1$(exeext) ] ; \
-@@ -524,8 +542,8 @@
+@@ -579,8 +597,8 @@ ada.install-common:
  	       $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatlink$(exeext); \
  	    fi; \
  	  else \
@@ -91,7 +93,7 @@
  	  fi ; \
  	fi
  	-if [ -f gnat1$(exeext) ] ; \
-@@ -539,8 +557,8 @@
+@@ -594,8 +612,8 @@ ada.install-common:
  	       $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatls$(exeext); \
  	    fi; \
  	  else \
@@ -102,7 +104,7 @@
  	  fi ; \
  	fi
  	-if [ -f gnat1$(exeext) ] ; \
-@@ -554,8 +572,8 @@
+@@ -609,8 +627,8 @@ ada.install-common:
  	       $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatmake$(exeext); \
  	    fi; \
  	  else \
@@ -113,7 +115,7 @@
  	  fi ; \
  	fi
  	-if [ -f gnat1$(exeext) ] ; \
-@@ -565,8 +583,8 @@
+@@ -620,8 +638,8 @@ ada.install-common:
  	    $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext); \
  	    $(INSTALL_PROGRAM) gnatname-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext); \
  	  else \
@@ -124,7 +126,7 @@
  	  fi ; \
  	fi
  	-if [ -f gnat1$(exeext) ] ; \
-@@ -580,8 +598,8 @@
+@@ -635,8 +653,8 @@ ada.install-common:
  	       $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatprep$(exeext); \
  	    fi; \
  	  else \
@@ -135,7 +137,7 @@
  	  fi ; \
  	fi
  	-if [ -f gnat1$(exeext) ] ; \
-@@ -591,8 +609,8 @@
+@@ -646,8 +664,8 @@ ada.install-common:
  	    $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext); \
  	    $(INSTALL_PROGRAM) gnatxref-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext); \
  	  else \
@@ -146,7 +148,7 @@
  	  fi ; \
  	fi
  	-if [ -f gnat1$(exeext) ] ; \
-@@ -602,8 +620,8 @@
+@@ -657,8 +675,8 @@ ada.install-common:
  	    $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext); \
  	    $(INSTALL_PROGRAM) gnatfind-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext); \
  	  else \
@@ -157,7 +159,7 @@
  	  fi ; \
  	fi
  	-if [ -f gnat1$(exeext) ] ; \
-@@ -613,8 +631,8 @@
+@@ -668,8 +686,8 @@ ada.install-common:
  	    $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatclean$(exeext); \
  	    $(INSTALL_PROGRAM) gnatclean-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatclean$(exeext); \
  	  else \
@@ -168,7 +170,7 @@
  	  fi ; \
  	fi
  	-if [ -f gnat1$(exeext) ] ; \
-@@ -624,8 +642,8 @@
+@@ -679,8 +697,8 @@ ada.install-common:
  	    $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gprmake$(exeext); \
  	    $(INSTALL_PROGRAM) gprmake-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gprmake$(exeext); \
  	  else \
@@ -179,7 +181,7 @@
  	  fi ; \
  	fi
  #
-@@ -635,8 +653,8 @@
+@@ -690,8 +708,8 @@ ada.install-common:
  	then \
  	  if [ -f gnatsym$(exeext) ] ; \
  	  then \
@@ -190,7 +192,7 @@
  	  fi ; \
  	fi
  #
-@@ -646,8 +664,8 @@
+@@ -701,8 +719,8 @@ ada.install-common:
  	then \
  	  if [ -f gnatlbr$(exeext) ] ; \
  	  then \
@@ -201,7 +203,7 @@
  	  fi ; \
  	fi
  #
-@@ -655,8 +673,8 @@
+@@ -710,8 +728,8 @@ ada.install-common:
  #
  	-if [ -f gnat1$(exeext) ] ; \
  	then \
@@ -212,7 +214,7 @@
  	fi
  #
  # vxaddr2line is only used for cross ports (it calls the underlying cross
-@@ -666,8 +684,8 @@
+@@ -721,8 +739,8 @@ ada.install-common:
  	then \
  	  if [ -f vxaddr2line$(exeext) ] ; \
  	  then \
@@ -223,7 +225,7 @@
  	  fi ; \
  	fi
  
-@@ -688,22 +706,22 @@
+@@ -743,22 +761,22 @@ install-gnatlib-obj:
  ada.install-man:
  
  ada.uninstall:
@@ -262,7 +264,7 @@
  	-$(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatbind$(exeext)
  	-$(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatbl$(exeext)
  	-$(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatchop$(exeext)
-@@ -736,8 +754,6 @@
+@@ -791,8 +809,6 @@ ada.uninstall:
  	-$(RM) $(DESTDIR)$(tooldir)/bin/gnatxref$(exeext)
  	-$(RM) $(DESTDIR)$(tooldir)/bin/gnatclean$(exeext)
  	-$(RM) $(DESTDIR)$(tooldir)/bin/gnatsym$(exeext)
--- sap303956-utf16-1.diff.orig
+++ sap303956-utf16-1.diff
@@ -123,3178 +123,2505 @@ libcpp/
 
 Index: gcc/c-lex.c
 ===================================================================
-*** gcc/c-lex.c	(revision 134437)
---- gcc/c-lex.c	(revision 134438)
-*************** cb_ident (cpp_reader * ARG_UNUSED (pfile
-*** 174,180 ****
-      {
-        /* Convert escapes in the string.  */
-        cpp_string cstr = { 0, 0 };
-!       if (cpp_interpret_string (pfile, str, 1, &cstr, false))
-  	{
-  	  ASM_OUTPUT_IDENT (asm_out_file, (const char *) cstr.text);
-  	  free (CONST_CAST (unsigned char *, cstr.text));
---- 174,180 ----
-      {
-        /* Convert escapes in the string.  */
-        cpp_string cstr = { 0, 0 };
-!       if (cpp_interpret_string (pfile, str, 1, &cstr, CPP_STRING))
-  	{
-  	  ASM_OUTPUT_IDENT (asm_out_file, (const char *) cstr.text);
-  	  free (CONST_CAST (unsigned char *, cstr.text));
-*************** c_lex_with_flags (tree *value, location_
-*** 361,366 ****
---- 361,368 ----
-  
-  	    case CPP_STRING:
-  	    case CPP_WSTRING:
-+ 	    case CPP_STRING16:
-+ 	    case CPP_STRING32:
-  	      type = lex_string (tok, value, true, true);
-  	      break;
-  
-*************** c_lex_with_flags (tree *value, location_
-*** 410,420 ****
---- 412,426 ----
-  
-      case CPP_CHAR:
-      case CPP_WCHAR:
-+     case CPP_CHAR16:
-+     case CPP_CHAR32:
-        *value = lex_charconst (tok);
-        break;
-  
-      case CPP_STRING:
-      case CPP_WSTRING:
-+     case CPP_STRING16:
-+     case CPP_STRING32:
-        if ((lex_flags & C_LEX_RAW_STRINGS) == 0)
-  	{
-  	  type = lex_string (tok, value, false,
-*************** interpret_fixed (const cpp_token *token,
-*** 822,833 ****
-    return value;
-  }
-  
-! /* Convert a series of STRING and/or WSTRING tokens into a tree,
-!    performing string constant concatenation.  TOK is the first of
-!    these.  VALP is the location to write the string into.  OBJC_STRING
-!    indicates whether an '@' token preceded the incoming token.
-     Returns the CPP token type of the result (CPP_STRING, CPP_WSTRING,
-!    or CPP_OBJC_STRING).
-  
-     This is unfortunately more work than it should be.  If any of the
-     strings in the series has an L prefix, the result is a wide string
---- 828,839 ----
-    return value;
-  }
-  
-! /* Convert a series of STRING, WSTRING, STRING16 and/or STRING32 tokens
-!    into a tree, performing string constant concatenation.  TOK is the
-!    first of these.  VALP is the location to write the string into.
-!    OBJC_STRING indicates whether an '@' token preceded the incoming token.
-     Returns the CPP token type of the result (CPP_STRING, CPP_WSTRING,
-!    CPP_STRING32, CPP_STRING16, or CPP_OBJC_STRING).
-  
-     This is unfortunately more work than it should be.  If any of the
-     strings in the series has an L prefix, the result is a wide string
-*************** static enum cpp_ttype
-*** 842,860 ****
-  lex_string (const cpp_token *tok, tree *valp, bool objc_string, bool translate)
-  {
-    tree value;
--   bool wide = false;
-    size_t concats = 0;
-    struct obstack str_ob;
-    cpp_string istr;
-  
-    /* Try to avoid the overhead of creating and destroying an obstack
-       for the common case of just one string.  */
-    cpp_string str = tok->val.str;
-    cpp_string *strs = &str;
-  
--   if (tok->type == CPP_WSTRING)
--     wide = true;
-- 
-   retry:
-    tok = cpp_get_token (parse_in);
-    switch (tok->type)
---- 848,863 ----
-  lex_string (const cpp_token *tok, tree *valp, bool objc_string, bool translate)
-  {
-    tree value;
-    size_t concats = 0;
-    struct obstack str_ob;
-    cpp_string istr;
-+   enum cpp_ttype type = tok->type;
-  
-    /* Try to avoid the overhead of creating and destroying an obstack
-       for the common case of just one string.  */
-    cpp_string str = tok->val.str;
-    cpp_string *strs = &str;
-  
-   retry:
-    tok = cpp_get_token (parse_in);
-    switch (tok->type)
-*************** lex_string (const cpp_token *tok, tree *
-*** 873,880 ****
-        break;
-  
-      case CPP_WSTRING:
-!       wide = true;
-!       /* FALLTHROUGH */
-  
-      case CPP_STRING:
-        if (!concats)
---- 876,890 ----
-        break;
-  
-      case CPP_WSTRING:
-!     case CPP_STRING16:
-!     case CPP_STRING32:
-!       if (type != tok->type)
-! 	{
-! 	  if (type == CPP_STRING)
-! 	    type = tok->type;
-! 	  else
-! 	    error ("unsupported non-standard concatenation of string literals");
-! 	}
-  
-      case CPP_STRING:
-        if (!concats)
-*************** lex_string (const cpp_token *tok, tree *
-*** 899,905 ****
-  
-    if ((translate
-         ? cpp_interpret_string : cpp_interpret_string_notranslate)
-!       (parse_in, strs, concats + 1, &istr, wide))
-      {
-        value = build_string (istr.len, (const char *) istr.text);
-        free (CONST_CAST (unsigned char *, istr.text));
---- 909,915 ----
-  
-    if ((translate
-         ? cpp_interpret_string : cpp_interpret_string_notranslate)
-!       (parse_in, strs, concats + 1, &istr, type))
-      {
-        value = build_string (istr.len, (const char *) istr.text);
-        free (CONST_CAST (unsigned char *, istr.text));
-*************** lex_string (const cpp_token *tok, tree *
-*** 909,930 ****
-        /* Callers cannot generally handle error_mark_node in this context,
-  	 so return the empty string instead.  cpp_interpret_string has
-  	 issued an error.  */
-!       if (wide)
-! 	value = build_string (TYPE_PRECISION (wchar_type_node)
-! 			      / TYPE_PRECISION (char_type_node),
-! 			      "\0\0\0");  /* widest supported wchar_t
-! 					     is 32 bits */
-!       else
-! 	value = build_string (1, "");
-      }
-  
-!   TREE_TYPE (value) = wide ? wchar_array_type_node : char_array_type_node;
-    *valp = fix_string_type (value);
-  
-    if (concats)
-      obstack_free (&str_ob, 0);
-  
-!   return objc_string ? CPP_OBJC_STRING : wide ? CPP_WSTRING : CPP_STRING;
-  }
-  
-  /* Converts a (possibly wide) character constant token into a tree.  */
---- 919,970 ----
-        /* Callers cannot generally handle error_mark_node in this context,
-  	 so return the empty string instead.  cpp_interpret_string has
-  	 issued an error.  */
-!       switch (type)
-! 	{
-! 	default:
-! 	case CPP_STRING:
-! 	  value = build_string (1, "");
-! 	  break;
-! 	case CPP_STRING16:
-! 	  value = build_string (TYPE_PRECISION (char16_type_node)
-! 				/ TYPE_PRECISION (char_type_node),
-! 				"\0");  /* char16_t is 16 bits */
-! 	  break;
-! 	case CPP_STRING32:
-! 	  value = build_string (TYPE_PRECISION (char32_type_node)
-! 				/ TYPE_PRECISION (char_type_node),
-! 				"\0\0\0");  /* char32_t is 32 bits */
-! 	  break;
-! 	case CPP_WSTRING:
-! 	  value = build_string (TYPE_PRECISION (wchar_type_node)
-! 				/ TYPE_PRECISION (char_type_node),
-! 				"\0\0\0");  /* widest supported wchar_t
-! 					       is 32 bits */
-! 	  break;
-!         }
-      }
-  
-!   switch (type)
-!     {
-!     default:
-!     case CPP_STRING:
-!       TREE_TYPE (value) = char_array_type_node;
-!       break;
-!     case CPP_STRING16:
-!       TREE_TYPE (value) = char16_array_type_node;
-!       break;
-!     case CPP_STRING32:
-!       TREE_TYPE (value) = char32_array_type_node;
-!       break;
-!     case CPP_WSTRING:
-!       TREE_TYPE (value) = wchar_array_type_node;
-!     }
-    *valp = fix_string_type (value);
-  
-    if (concats)
-      obstack_free (&str_ob, 0);
-  
-!   return objc_string ? CPP_OBJC_STRING : type;
-  }
-  
-  /* Converts a (possibly wide) character constant token into a tree.  */
-*************** lex_charconst (const cpp_token *token)
-*** 941,946 ****
---- 981,990 ----
-  
-    if (token->type == CPP_WCHAR)
-      type = wchar_type_node;
-+   else if (token->type == CPP_CHAR32)
-+     type = char32_type_node;
-+   else if (token->type == CPP_CHAR16)
-+     type = char16_type_node;
-    /* In C, a character constant has type 'int'.
-       In C++ 'char', but multi-char charconsts have type 'int'.  */
-    else if (!c_dialect_cxx () || chars_seen > 1)
+--- gcc/c-lex.c.orig	2008-06-12 14:00:42.000000000 +0200
++++ gcc/c-lex.c	2009-09-21 11:51:53.000000000 +0200
+@@ -174,7 +174,7 @@ cb_ident (cpp_reader * ARG_UNUSED (pfile
+     {
+       /* Convert escapes in the string.  */
+       cpp_string cstr = { 0, 0 };
+-      if (cpp_interpret_string (pfile, str, 1, &cstr, false))
++      if (cpp_interpret_string (pfile, str, 1, &cstr, CPP_STRING))
+ 	{
+ 	  ASM_OUTPUT_IDENT (asm_out_file, (const char *) cstr.text);
+ 	  free (CONST_CAST (unsigned char *, cstr.text));
+@@ -405,6 +405,8 @@ c_lex_with_flags (tree *value, location_
+ 
+ 	    case CPP_STRING:
+ 	    case CPP_WSTRING:
++	    case CPP_STRING16:
++	    case CPP_STRING32:
+ 	      type = lex_string (tok, value, true, true);
+ 	      break;
+ 
+@@ -456,11 +458,15 @@ c_lex_with_flags (tree *value, location_
+ 
+     case CPP_CHAR:
+     case CPP_WCHAR:
++    case CPP_CHAR16:
++    case CPP_CHAR32:
+       *value = lex_charconst (tok);
+       break;
+ 
+     case CPP_STRING:
+     case CPP_WSTRING:
++    case CPP_STRING16:
++    case CPP_STRING32:
+       if ((lex_flags & C_LEX_RAW_STRINGS) == 0)
+ 	{
+ 	  type = lex_string (tok, value, false,
+@@ -868,12 +874,12 @@ interpret_fixed (const cpp_token *token,
+   return value;
+ }
+ 
+-/* Convert a series of STRING and/or WSTRING tokens into a tree,
+-   performing string constant concatenation.  TOK is the first of
+-   these.  VALP is the location to write the string into.  OBJC_STRING
+-   indicates whether an '@' token preceded the incoming token.
++/* Convert a series of STRING, WSTRING, STRING16 and/or STRING32 tokens
++   into a tree, performing string constant concatenation.  TOK is the
++   first of these.  VALP is the location to write the string into.
++   OBJC_STRING indicates whether an '@' token preceded the incoming token.
+    Returns the CPP token type of the result (CPP_STRING, CPP_WSTRING,
+-   or CPP_OBJC_STRING).
++   CPP_STRING32, CPP_STRING16, or CPP_OBJC_STRING).
+ 
+    This is unfortunately more work than it should be.  If any of the
+    strings in the series has an L prefix, the result is a wide string
+@@ -888,19 +894,16 @@ static enum cpp_ttype
+ lex_string (const cpp_token *tok, tree *valp, bool objc_string, bool translate)
+ {
+   tree value;
+-  bool wide = false;
+   size_t concats = 0;
+   struct obstack str_ob;
+   cpp_string istr;
++  enum cpp_ttype type = tok->type;
+ 
+   /* Try to avoid the overhead of creating and destroying an obstack
+      for the common case of just one string.  */
+   cpp_string str = tok->val.str;
+   cpp_string *strs = &str;
+ 
+-  if (tok->type == CPP_WSTRING)
+-    wide = true;
+-
+  retry:
+   tok = cpp_get_token (parse_in);
+   switch (tok->type)
+@@ -919,8 +922,15 @@ lex_string (const cpp_token *tok, tree *
+       break;
+ 
+     case CPP_WSTRING:
+-      wide = true;
+-      /* FALLTHROUGH */
++    case CPP_STRING16:
++    case CPP_STRING32:
++      if (type != tok->type)
++	{
++	  if (type == CPP_STRING)
++	    type = tok->type;
++	  else
++	    error ("unsupported non-standard concatenation of string literals");
++	}
+ 
+     case CPP_STRING:
+       if (!concats)
+@@ -945,7 +955,7 @@ lex_string (const cpp_token *tok, tree *
+ 
+   if ((translate
+        ? cpp_interpret_string : cpp_interpret_string_notranslate)
+-      (parse_in, strs, concats + 1, &istr, wide))
++      (parse_in, strs, concats + 1, &istr, type))
+     {
+       value = build_string (istr.len, (const char *) istr.text);
+       free (CONST_CAST (unsigned char *, istr.text));
+@@ -955,22 +965,52 @@ lex_string (const cpp_token *tok, tree *
+       /* Callers cannot generally handle error_mark_node in this context,
+ 	 so return the empty string instead.  cpp_interpret_string has
+ 	 issued an error.  */
+-      if (wide)
+-	value = build_string (TYPE_PRECISION (wchar_type_node)
+-			      / TYPE_PRECISION (char_type_node),
+-			      "\0\0\0");  /* widest supported wchar_t
+-					     is 32 bits */
+-      else
+-	value = build_string (1, "");
++      switch (type)
++	{
++	default:
++	case CPP_STRING:
++	  value = build_string (1, "");
++	  break;
++	case CPP_STRING16:
++	  value = build_string (TYPE_PRECISION (char16_type_node)
++				/ TYPE_PRECISION (char_type_node),
++				"\0");  /* char16_t is 16 bits */
++	  break;
++	case CPP_STRING32:
++	  value = build_string (TYPE_PRECISION (char32_type_node)
++				/ TYPE_PRECISION (char_type_node),
++				"\0\0\0");  /* char32_t is 32 bits */
++	  break;
++	case CPP_WSTRING:
++	  value = build_string (TYPE_PRECISION (wchar_type_node)
++				/ TYPE_PRECISION (char_type_node),
++				"\0\0\0");  /* widest supported wchar_t
++					       is 32 bits */
++	  break;
++        }
+     }
+ 
+-  TREE_TYPE (value) = wide ? wchar_array_type_node : char_array_type_node;
++  switch (type)
++    {
++    default:
++    case CPP_STRING:
++      TREE_TYPE (value) = char_array_type_node;
++      break;
++    case CPP_STRING16:
++      TREE_TYPE (value) = char16_array_type_node;
++      break;
++    case CPP_STRING32:
++      TREE_TYPE (value) = char32_array_type_node;
++      break;
++    case CPP_WSTRING:
++      TREE_TYPE (value) = wchar_array_type_node;
++    }
+   *valp = fix_string_type (value);
+ 
+   if (concats)
+     obstack_free (&str_ob, 0);
+ 
+-  return objc_string ? CPP_OBJC_STRING : wide ? CPP_WSTRING : CPP_STRING;
++  return objc_string ? CPP_OBJC_STRING : type;
+ }
+ 
+ /* Converts a (possibly wide) character constant token into a tree.  */
+@@ -987,6 +1027,10 @@ lex_charconst (const cpp_token *token)
+ 
+   if (token->type == CPP_WCHAR)
+     type = wchar_type_node;
++  else if (token->type == CPP_CHAR32)
++    type = char32_type_node;
++  else if (token->type == CPP_CHAR16)
++    type = char16_type_node;
+   /* In C, a character constant has type 'int'.
+      In C++ 'char', but multi-char charconsts have type 'int'.  */
+   else if (!c_dialect_cxx () || chars_seen > 1)
 Index: gcc/testsuite/gcc.dg/utf32-2.c
 ===================================================================
-*** gcc/testsuite/gcc.dg/utf32-2.c	(revision 0)
---- gcc/testsuite/gcc.dg/utf32-2.c	(revision 134438)
-***************
-*** 0 ****
---- 1,31 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Test the support for char32_t* string constants. */
-+ /* { dg-do run } */
-+ /* { dg-options "-std=gnu99 -Wall -Werror" } */
-+ 
-+ typedef unsigned int char32_t;
-+ 
-+ extern void abort (void);
-+ 
-+ char32_t	*s0 = U"ab";
-+ char32_t	*s1 = U"a\u0024";
-+ char32_t	*s2 = U"a\u2029";
-+ char32_t	*s3 = U"a\U00064321";
-+ 
-+ #define A	0x00000061
-+ #define B	0x00000062
-+ #define D	0x00000024
-+ #define X	0x00002029
-+ #define Y	0x00064321
-+ 
-+ int main ()
-+ {
-+     if (s0[0] != A || s0[1] != B || s0[2] != 0x00000000)
-+ 	abort ();
-+     if (s1[0] != A || s1[1] != D || s0[2] != 0x00000000)
-+ 	abort ();
-+     if (s2[0] != A || s2[1] != X || s0[2] != 0x00000000)
-+ 	abort ();
-+     if (s3[0] != A || s3[1] != Y || s3[2] != 0x00000000)
-+ 	abort ();
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.dg/utf32-2.c	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,31 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Test the support for char32_t* string constants. */
++/* { dg-do run } */
++/* { dg-options "-std=gnu99 -Wall -Werror" } */
++
++typedef unsigned int char32_t;
++
++extern void abort (void);
++
++char32_t	*s0 = U"ab";
++char32_t	*s1 = U"a\u0024";
++char32_t	*s2 = U"a\u2029";
++char32_t	*s3 = U"a\U00064321";
++
++#define A	0x00000061
++#define B	0x00000062
++#define D	0x00000024
++#define X	0x00002029
++#define Y	0x00064321
++
++int main ()
++{
++    if (s0[0] != A || s0[1] != B || s0[2] != 0x00000000)
++	abort ();
++    if (s1[0] != A || s1[1] != D || s0[2] != 0x00000000)
++	abort ();
++    if (s2[0] != A || s2[1] != X || s0[2] != 0x00000000)
++	abort ();
++    if (s3[0] != A || s3[1] != Y || s3[2] != 0x00000000)
++	abort ();
++}
 Index: gcc/testsuite/gcc.dg/utf32-4.c
 ===================================================================
-*** gcc/testsuite/gcc.dg/utf32-4.c	(revision 0)
---- gcc/testsuite/gcc.dg/utf32-4.c	(revision 134438)
-***************
-*** 0 ****
---- 1,20 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Expected errors for char32_t character constants. */
-+ /* { dg-do compile } */
-+ /* { dg-options "-std=gnu99" } */
-+ 
-+ typedef unsigned int char32_t;
-+ 
-+ char32_t	c0 = U'';		/* { dg-error "empty character" } */
-+ char32_t	c1 = U'ab';		/* { dg-warning "constant too long" } */
-+ char32_t	c2 = U'\U00064321';
-+ 
-+ char32_t	c3 = 'a';
-+ char32_t	c4 = u'a';
-+ char32_t	c5 = u'\u2029';
-+ char32_t	c6 = u'\U00064321';	/* { dg-warning "constant too long" } */
-+ char32_t	c7 = L'a';
-+ char32_t	c8 = L'\u2029';
-+ char32_t	c9 = L'\U00064321';
-+ 
-+ int main () {}
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.dg/utf32-4.c	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,20 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Expected errors for char32_t character constants. */
++/* { dg-do compile } */
++/* { dg-options "-std=gnu99" } */
++
++typedef unsigned int char32_t;
++
++char32_t	c0 = U'';		/* { dg-error "empty character" } */
++char32_t	c1 = U'ab';		/* { dg-warning "constant too long" } */
++char32_t	c2 = U'\U00064321';
++
++char32_t	c3 = 'a';
++char32_t	c4 = u'a';
++char32_t	c5 = u'\u2029';
++char32_t	c6 = u'\U00064321';	/* { dg-warning "constant too long" } */
++char32_t	c7 = L'a';
++char32_t	c8 = L'\u2029';
++char32_t	c9 = L'\U00064321';
++
++int main () {}
 Index: gcc/testsuite/gcc.dg/utf16-2.c
 ===================================================================
-*** gcc/testsuite/gcc.dg/utf16-2.c	(revision 0)
---- gcc/testsuite/gcc.dg/utf16-2.c	(revision 134438)
-***************
-*** 0 ****
---- 1,32 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Test the support for char16_t* string literals. */
-+ /* { dg-do run } */
-+ /* { dg-options "-std=gnu99 -Wall -Werror" } */
-+ 
-+ typedef short unsigned int char16_t;
-+ 
-+ extern void abort (void);
-+ 
-+ char16_t	*s0 = u"ab";
-+ char16_t	*s1 = u"a\u0024";
-+ char16_t	*s2 = u"a\u2029";
-+ char16_t	*s3 = u"a\U00064321";
-+ 
-+ #define A	0x0061
-+ #define B	0x0062
-+ #define D	0x0024
-+ #define X	0x2029
-+ #define Y1	0xD950
-+ #define Y2	0xDF21
-+ 
-+ int main ()
-+ {
-+     if (s0[0] != A || s0[1] != B || s0[2] != 0x0000)
-+ 	abort ();
-+     if (s1[0] != A || s1[1] != D || s0[2] != 0x0000)
-+ 	abort ();
-+     if (s2[0] != A || s2[1] != X || s0[2] != 0x0000)
-+ 	abort ();
-+     if (s3[0] != A || s3[1] != Y1 || s3[2] != Y2 || s3[3] != 0x0000)
-+ 	abort ();
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.dg/utf16-2.c	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,32 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Test the support for char16_t* string literals. */
++/* { dg-do run } */
++/* { dg-options "-std=gnu99 -Wall -Werror" } */
++
++typedef short unsigned int char16_t;
++
++extern void abort (void);
++
++char16_t	*s0 = u"ab";
++char16_t	*s1 = u"a\u0024";
++char16_t	*s2 = u"a\u2029";
++char16_t	*s3 = u"a\U00064321";
++
++#define A	0x0061
++#define B	0x0062
++#define D	0x0024
++#define X	0x2029
++#define Y1	0xD950
++#define Y2	0xDF21
++
++int main ()
++{
++    if (s0[0] != A || s0[1] != B || s0[2] != 0x0000)
++	abort ();
++    if (s1[0] != A || s1[1] != D || s0[2] != 0x0000)
++	abort ();
++    if (s2[0] != A || s2[1] != X || s0[2] != 0x0000)
++	abort ();
++    if (s3[0] != A || s3[1] != Y1 || s3[2] != Y2 || s3[3] != 0x0000)
++	abort ();
++}
 Index: gcc/testsuite/gcc.dg/utf16-4.c
 ===================================================================
-*** gcc/testsuite/gcc.dg/utf16-4.c	(revision 0)
---- gcc/testsuite/gcc.dg/utf16-4.c	(revision 134438)
-***************
-*** 0 ****
---- 1,20 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Expected errors for char16_t character constants. */
-+ /* { dg-do compile } */
-+ /* { dg-options "-std=gnu99" } */
-+ 
-+ typedef short unsigned int char16_t;
-+ 
-+ char16_t	c0 = u'';		/* { dg-error "empty character" } */
-+ char16_t	c1 = u'ab';		/* { dg-warning "constant too long" } */
-+ char16_t	c2 = u'\U00064321';	/* { dg-warning "constant too long" } */
-+ 
-+ char16_t	c3 = 'a';
-+ char16_t	c4 = U'a';
-+ char16_t	c5 = U'\u2029';
-+ char16_t	c6 = U'\U00064321';	/* { dg-warning "implicitly truncated" } */
-+ char16_t	c7 = L'a';
-+ char16_t	c8 = L'\u2029';
-+ char16_t	c9 = L'\U00064321';	/* { dg-warning "implicitly truncated" } */
-+ 
-+ int main () {}
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.dg/utf16-4.c	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,20 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Expected errors for char16_t character constants. */
++/* { dg-do compile } */
++/* { dg-options "-std=gnu99" } */
++
++typedef short unsigned int char16_t;
++
++char16_t	c0 = u'';		/* { dg-error "empty character" } */
++char16_t	c1 = u'ab';		/* { dg-warning "constant too long" } */
++char16_t	c2 = u'\U00064321';	/* { dg-warning "constant too long" } */
++
++char16_t	c3 = 'a';
++char16_t	c4 = U'a';
++char16_t	c5 = U'\u2029';
++char16_t	c6 = U'\U00064321';	/* { dg-warning "implicitly truncated" } */
++char16_t	c7 = L'a';
++char16_t	c8 = L'\u2029';
++char16_t	c9 = L'\U00064321';	/* { dg-warning "implicitly truncated" } */
++
++int main () {}
 Index: gcc/testsuite/gcc.dg/utf-badconcat.c
 ===================================================================
-*** gcc/testsuite/gcc.dg/utf-badconcat.c	(revision 0)
---- gcc/testsuite/gcc.dg/utf-badconcat.c	(revision 134438)
-***************
-*** 0 ****
---- 1,22 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Test unsupported concatenation of char16_t/char32_t* string literals. */
-+ /* { dg-do compile } */
-+ /* { dg-options "-std=gnu99" } */
-+ 
-+ void	*s0	= u"a"  "b";
-+ void	*s1	=  "a" u"b";
-+ void	*s2	= u"a" U"b";	/* { dg-error "non-standard concatenation" } */
-+ void	*s3	= U"a" u"b";	/* { dg-error "non-standard concatenation" } */
-+ void	*s4	= u"a" L"b";	/* { dg-error "non-standard concatenation" } */
-+ void	*s5	= L"a" u"b";	/* { dg-error "non-standard concatenation" } */
-+ void	*s6	= u"a" u"b";
-+ void	*s7	= U"a"  "b";
-+ void	*s8	=  "a" U"b";
-+ void	*s9	= U"a" L"b";	/* { dg-error "non-standard concatenation" } */
-+ void	*sa	= L"a" U"b";	/* { dg-error "non-standard concatenation" } */
-+ void	*sb	= U"a" U"b";
-+ void	*sc	= L"a"  "b";
-+ void	*sd	=  "a" L"b";
-+ void	*se	= L"a" L"b";
-+ 
-+ int main () {}
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.dg/utf-badconcat.c	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,22 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Test unsupported concatenation of char16_t/char32_t* string literals. */
++/* { dg-do compile } */
++/* { dg-options "-std=gnu99" } */
++
++void	*s0	= u"a"  "b";
++void	*s1	=  "a" u"b";
++void	*s2	= u"a" U"b";	/* { dg-error "non-standard concatenation" } */
++void	*s3	= U"a" u"b";	/* { dg-error "non-standard concatenation" } */
++void	*s4	= u"a" L"b";	/* { dg-error "non-standard concatenation" } */
++void	*s5	= L"a" u"b";	/* { dg-error "non-standard concatenation" } */
++void	*s6	= u"a" u"b";
++void	*s7	= U"a"  "b";
++void	*s8	=  "a" U"b";
++void	*s9	= U"a" L"b";	/* { dg-error "non-standard concatenation" } */
++void	*sa	= L"a" U"b";	/* { dg-error "non-standard concatenation" } */
++void	*sb	= U"a" U"b";
++void	*sc	= L"a"  "b";
++void	*sd	=  "a" L"b";
++void	*se	= L"a" L"b";
++
++int main () {}
 Index: gcc/testsuite/gcc.dg/utf32-1.c
 ===================================================================
-*** gcc/testsuite/gcc.dg/utf32-1.c	(revision 0)
---- gcc/testsuite/gcc.dg/utf32-1.c	(revision 134438)
-***************
-*** 0 ****
---- 1,44 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Test the support for char32_t character constants. */
-+ /* { dg-do run } */
-+ /* { dg-options "-std=gnu99 -Wall -Werror" } */
-+ 
-+ typedef unsigned int char32_t;
-+ 
-+ extern void abort (void);
-+ 
-+ char32_t	c0 = U'a';
-+ char32_t	c1 = U'\0';
-+ char32_t	c2 = U'\u0024';
-+ char32_t	c3 = U'\u2029';
-+ char32_t	c4 = U'\U00064321';
-+ 
-+ #define A	0x00000061
-+ #define D	0x00000024
-+ #define X	0x00002029
-+ #define Y	0x00064321
-+ 
-+ int main ()
-+ {
-+     if (sizeof (U'a') != sizeof (char32_t))
-+ 	abort ();
-+     if (sizeof (U'\0') != sizeof (char32_t))
-+ 	abort ();
-+     if (sizeof (U'\u0024') != sizeof (char32_t))
-+ 	abort ();
-+     if (sizeof (U'\u2029') != sizeof (char32_t))
-+ 	abort ();
-+     if (sizeof (U'\U00064321') != sizeof (char32_t))
-+ 	abort ();
-+ 
-+     if (c0 != A)
-+ 	abort ();
-+     if (c1 != 0x0000)
-+ 	abort ();
-+     if (c2 != D)
-+ 	abort ();
-+     if (c3 != X)
-+ 	abort ();
-+     if (c4 != Y)
-+ 	abort ();
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.dg/utf32-1.c	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,44 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Test the support for char32_t character constants. */
++/* { dg-do run } */
++/* { dg-options "-std=gnu99 -Wall -Werror" } */
++
++typedef unsigned int char32_t;
++
++extern void abort (void);
++
++char32_t	c0 = U'a';
++char32_t	c1 = U'\0';
++char32_t	c2 = U'\u0024';
++char32_t	c3 = U'\u2029';
++char32_t	c4 = U'\U00064321';
++
++#define A	0x00000061
++#define D	0x00000024
++#define X	0x00002029
++#define Y	0x00064321
++
++int main ()
++{
++    if (sizeof (U'a') != sizeof (char32_t))
++	abort ();
++    if (sizeof (U'\0') != sizeof (char32_t))
++	abort ();
++    if (sizeof (U'\u0024') != sizeof (char32_t))
++	abort ();
++    if (sizeof (U'\u2029') != sizeof (char32_t))
++	abort ();
++    if (sizeof (U'\U00064321') != sizeof (char32_t))
++	abort ();
++
++    if (c0 != A)
++	abort ();
++    if (c1 != 0x0000)
++	abort ();
++    if (c2 != D)
++	abort ();
++    if (c3 != X)
++	abort ();
++    if (c4 != Y)
++	abort ();
++}
 Index: gcc/testsuite/gcc.dg/utf32-3.c
 ===================================================================
-*** gcc/testsuite/gcc.dg/utf32-3.c	(revision 0)
---- gcc/testsuite/gcc.dg/utf32-3.c	(revision 134438)
-***************
-*** 0 ****
---- 1,48 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Test concatenation of char32_t* string literals. */
-+ /* { dg-do run } */
-+ /* { dg-options "-std=gnu99 -Wall -Werror" } */
-+ 
-+ typedef unsigned int char32_t;
-+ 
-+ extern void abort (void);
-+ 
-+ char32_t	*s0 = U"a" U"b";
-+ 
-+ char32_t	*s1 = U"a" "b";
-+ char32_t	*s2 = "a" U"b";
-+ char32_t	*s3 = U"a" "\u2029";
-+ char32_t	*s4 = "\u2029" U"b";
-+ char32_t	*s5 = U"a" "\U00064321";
-+ char32_t	*s6 = "\U00064321" U"b";
-+ 
-+ #define A	0x00000061
-+ #define B	0x00000062
-+ #define X	0x00002029
-+ #define Y	0x00064321
-+ 
-+ int main ()
-+ {
-+     if (sizeof ((U"a" U"b")[0]) != sizeof (char32_t))
-+ 	abort ();
-+     if (sizeof ((U"a"  "b")[0]) != sizeof (char32_t))
-+ 	abort ();
-+     if (sizeof (( "a" U"b")[0]) != sizeof (char32_t))
-+ 	abort ();
-+ 
-+     if (s0[0] != A || s0[1] != B || s0[2] != 0x00000000)
-+ 	abort ();
-+ 
-+     if (s1[0] != A || s1[1] != B || s1[2] != 0x00000000)
-+ 	abort ();
-+     if (s2[0] != A || s2[1] != B || s2[2] != 0x00000000)
-+ 	abort ();
-+     if (s3[0] != A || s3[1] != X || s3[2] != 0x00000000)
-+ 	abort ();
-+     if (s4[0] != X || s4[1] != B || s4[2] != 0x00000000)
-+ 	abort ();
-+     if (s5[0] != A || s5[1] != Y || s5[2] != 0x00000000)
-+ 	abort ();
-+     if (s6[0] != Y || s6[1] != B || s6[2] != 0x00000000)
-+ 	abort ();
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.dg/utf32-3.c	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,48 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Test concatenation of char32_t* string literals. */
++/* { dg-do run } */
++/* { dg-options "-std=gnu99 -Wall -Werror" } */
++
++typedef unsigned int char32_t;
++
++extern void abort (void);
++
++char32_t	*s0 = U"a" U"b";
++
++char32_t	*s1 = U"a" "b";
++char32_t	*s2 = "a" U"b";
++char32_t	*s3 = U"a" "\u2029";
++char32_t	*s4 = "\u2029" U"b";
++char32_t	*s5 = U"a" "\U00064321";
++char32_t	*s6 = "\U00064321" U"b";
++
++#define A	0x00000061
++#define B	0x00000062
++#define X	0x00002029
++#define Y	0x00064321
++
++int main ()
++{
++    if (sizeof ((U"a" U"b")[0]) != sizeof (char32_t))
++	abort ();
++    if (sizeof ((U"a"  "b")[0]) != sizeof (char32_t))
++	abort ();
++    if (sizeof (( "a" U"b")[0]) != sizeof (char32_t))
++	abort ();
++
++    if (s0[0] != A || s0[1] != B || s0[2] != 0x00000000)
++	abort ();
++
++    if (s1[0] != A || s1[1] != B || s1[2] != 0x00000000)
++	abort ();
++    if (s2[0] != A || s2[1] != B || s2[2] != 0x00000000)
++	abort ();
++    if (s3[0] != A || s3[1] != X || s3[2] != 0x00000000)
++	abort ();
++    if (s4[0] != X || s4[1] != B || s4[2] != 0x00000000)
++	abort ();
++    if (s5[0] != A || s5[1] != Y || s5[2] != 0x00000000)
++	abort ();
++    if (s6[0] != Y || s6[1] != B || s6[2] != 0x00000000)
++	abort ();
++}
 Index: gcc/testsuite/gcc.dg/utf16-1.c
 ===================================================================
-*** gcc/testsuite/gcc.dg/utf16-1.c	(revision 0)
---- gcc/testsuite/gcc.dg/utf16-1.c	(revision 134438)
-***************
-*** 0 ****
---- 1,67 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Test the support for char16_t character constants. */
-+ /* { dg-do run } */
-+ /* { dg-options "-std=gnu99 -Wall -Werror" } */
-+ 
-+ typedef short unsigned int char16_t;
-+ 
-+ extern void abort (void);
-+ 
-+ char16_t	c0 = u'a';
-+ char16_t	c1 = u'\0';
-+ char16_t	c2 = u'\u0024';
-+ char16_t	c3 = u'\u2029';
-+ char16_t	c4 = u'\u8010';
-+ 
-+ char16_t	c5 = 'a';
-+ char16_t	c6 = U'a';
-+ char16_t	c7 = U'\u2029';
-+ char16_t	c8 = U'\u8010';
-+ char16_t	c9 = L'a';
-+ char16_t	ca = L'\u2029';
-+ char16_t	cb = L'\u8010';
-+ 
-+ #define A	0x0061
-+ #define D	0x0024
-+ #define X	0x2029
-+ #define Y	0x8010
-+ 
-+ int main ()
-+ {
-+     if (sizeof (u'a') != sizeof (char16_t))
-+ 	abort ();
-+     if (sizeof (u'\0') != sizeof (char16_t))
-+ 	abort ();
-+     if (sizeof (u'\u0024') != sizeof (char16_t))
-+ 	abort ();
-+     if (sizeof (u'\u2029') != sizeof (char16_t))
-+ 	abort ();
-+     if (sizeof (u'\u8010') != sizeof (char16_t))
-+ 	abort ();
-+ 
-+     if (c0 != A)
-+ 	abort ();
-+     if (c1 != 0x0000)
-+ 	abort ();
-+     if (c2 != D)
-+ 	abort ();
-+     if (c3 != X)
-+ 	abort ();
-+     if (c4 != Y)
-+ 	abort ();
-+ 
-+     if (c5 != A)
-+ 	abort ();
-+     if (c6 != A)
-+ 	abort ();
-+     if (c7 != X)
-+ 	abort ();
-+     if (c8 != Y)
-+ 	abort ();
-+     if (c9 != A)
-+ 	abort ();
-+     if (ca != X)
-+ 	abort ();
-+     if (cb != Y)
-+ 	abort ();
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.dg/utf16-1.c	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,67 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Test the support for char16_t character constants. */
++/* { dg-do run } */
++/* { dg-options "-std=gnu99 -Wall -Werror" } */
++
++typedef short unsigned int char16_t;
++
++extern void abort (void);
++
++char16_t	c0 = u'a';
++char16_t	c1 = u'\0';
++char16_t	c2 = u'\u0024';
++char16_t	c3 = u'\u2029';
++char16_t	c4 = u'\u8010';
++
++char16_t	c5 = 'a';
++char16_t	c6 = U'a';
++char16_t	c7 = U'\u2029';
++char16_t	c8 = U'\u8010';
++char16_t	c9 = L'a';
++char16_t	ca = L'\u2029';
++char16_t	cb = L'\u8010';
++
++#define A	0x0061
++#define D	0x0024
++#define X	0x2029
++#define Y	0x8010
++
++int main ()
++{
++    if (sizeof (u'a') != sizeof (char16_t))
++	abort ();
++    if (sizeof (u'\0') != sizeof (char16_t))
++	abort ();
++    if (sizeof (u'\u0024') != sizeof (char16_t))
++	abort ();
++    if (sizeof (u'\u2029') != sizeof (char16_t))
++	abort ();
++    if (sizeof (u'\u8010') != sizeof (char16_t))
++	abort ();
++
++    if (c0 != A)
++	abort ();
++    if (c1 != 0x0000)
++	abort ();
++    if (c2 != D)
++	abort ();
++    if (c3 != X)
++	abort ();
++    if (c4 != Y)
++	abort ();
++
++    if (c5 != A)
++	abort ();
++    if (c6 != A)
++	abort ();
++    if (c7 != X)
++	abort ();
++    if (c8 != Y)
++	abort ();
++    if (c9 != A)
++	abort ();
++    if (ca != X)
++	abort ();
++    if (cb != Y)
++	abort ();
++}
 Index: gcc/testsuite/gcc.dg/utf16-3.c
 ===================================================================
-*** gcc/testsuite/gcc.dg/utf16-3.c	(revision 0)
---- gcc/testsuite/gcc.dg/utf16-3.c	(revision 134438)
-***************
-*** 0 ****
---- 1,49 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Test concatenation of char16_t* string literals. */
-+ /* { dg-do run } */
-+ /* { dg-options "-std=gnu99 -Wall -Werror" } */
-+ 
-+ typedef short unsigned int char16_t;
-+ 
-+ extern void abort (void);
-+ 
-+ char16_t	*s0 = u"a" u"b";
-+ 
-+ char16_t	*s1 = u"a" "b";
-+ char16_t	*s2 = "a" u"b";
-+ char16_t	*s3 = u"a" "\u2029";
-+ char16_t	*s4 = "\u2029" u"b";
-+ char16_t	*s5 = u"a" "\U00064321";
-+ char16_t	*s6 = "\U00064321" u"b";
-+ 
-+ #define A	0x0061
-+ #define B	0x0062
-+ #define X	0x2029
-+ #define Y1	0xD950
-+ #define Y2	0xDF21
-+ 
-+ int main ()
-+ {
-+     if (sizeof ((u"a" u"b")[0]) != sizeof (char16_t))
-+ 	abort ();
-+     if (sizeof ((u"a"  "b")[0]) != sizeof (char16_t))
-+ 	abort ();
-+     if (sizeof (( "a" u"b")[0]) != sizeof (char16_t))
-+ 	abort ();
-+ 
-+     if (s0[0] != A || s0[1] != B || s0[2] != 0x0000)
-+ 	abort ();
-+ 
-+     if (s1[0] != A || s1[1] != B || s1[2] != 0x0000)
-+ 	abort ();
-+     if (s2[0] != A || s2[1] != B || s2[2] != 0x0000)
-+ 	abort ();
-+     if (s3[0] != A || s3[1] != X || s3[2] != 0x0000)
-+ 	abort ();
-+     if (s4[0] != X || s4[1] != B || s4[2] != 0x0000)
-+ 	abort ();
-+     if (s5[0] != A || s5[1] != Y1 || s5[2] != Y2 || s5[3] != 0x0000)
-+ 	abort ();
-+     if (s6[0] != Y1 || s6[1] != Y2 || s6[2] != B || s6[3] != 0x0000)
-+ 	abort ();
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.dg/utf16-3.c	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,49 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Test concatenation of char16_t* string literals. */
++/* { dg-do run } */
++/* { dg-options "-std=gnu99 -Wall -Werror" } */
++
++typedef short unsigned int char16_t;
++
++extern void abort (void);
++
++char16_t	*s0 = u"a" u"b";
++
++char16_t	*s1 = u"a" "b";
++char16_t	*s2 = "a" u"b";
++char16_t	*s3 = u"a" "\u2029";
++char16_t	*s4 = "\u2029" u"b";
++char16_t	*s5 = u"a" "\U00064321";
++char16_t	*s6 = "\U00064321" u"b";
++
++#define A	0x0061
++#define B	0x0062
++#define X	0x2029
++#define Y1	0xD950
++#define Y2	0xDF21
++
++int main ()
++{
++    if (sizeof ((u"a" u"b")[0]) != sizeof (char16_t))
++	abort ();
++    if (sizeof ((u"a"  "b")[0]) != sizeof (char16_t))
++	abort ();
++    if (sizeof (( "a" u"b")[0]) != sizeof (char16_t))
++	abort ();
++
++    if (s0[0] != A || s0[1] != B || s0[2] != 0x0000)
++	abort ();
++
++    if (s1[0] != A || s1[1] != B || s1[2] != 0x0000)
++	abort ();
++    if (s2[0] != A || s2[1] != B || s2[2] != 0x0000)
++	abort ();
++    if (s3[0] != A || s3[1] != X || s3[2] != 0x0000)
++	abort ();
++    if (s4[0] != X || s4[1] != B || s4[2] != 0x0000)
++	abort ();
++    if (s5[0] != A || s5[1] != Y1 || s5[2] != Y2 || s5[3] != 0x0000)
++	abort ();
++    if (s6[0] != Y1 || s6[1] != Y2 || s6[2] != B || s6[3] != 0x0000)
++	abort ();
++}
 Index: gcc/testsuite/gcc.dg/utf-cvt.c
 ===================================================================
-*** gcc/testsuite/gcc.dg/utf-cvt.c	(revision 0)
---- gcc/testsuite/gcc.dg/utf-cvt.c	(revision 134438)
-***************
-*** 0 ****
---- 1,49 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Test the char16_t and char32_t promotion rules. */
-+ /* { dg-do compile } */
-+ /* { dg-options "-std=gnu99 -Wall -Wconversion -Wsign-conversion" } */
-+ 
-+ typedef unsigned short	char16_t;
-+ typedef unsigned int	char32_t;
-+ 
-+ extern void f_c (char);
-+ extern void fsc (signed char);
-+ extern void fuc (unsigned char);
-+ extern void f_s (short);
-+ extern void fss (signed short);
-+ extern void fus (unsigned short);
-+ extern void f_i (int);
-+ extern void fsi (signed int);
-+ extern void fui (unsigned int);
-+ extern void f_l (long);
-+ extern void fsl (signed long);
-+ extern void ful (unsigned long);
-+ 
-+ void m (char16_t c0, char32_t c1)
-+ {
-+     f_c (c0);				/* { dg-warning "alter its value" } */
-+     fsc (c0);				/* { dg-warning "alter its value" } */
-+     fuc (c0);				/* { dg-warning "alter its value" } */
-+     f_s (c0);				/* { dg-warning "change the sign" } */
-+     fss (c0);				/* { dg-warning "change the sign" } */
-+     fus (c0);
-+     f_i (c0);
-+     fsi (c0);
-+     fui (c0);
-+     f_l (c0);
-+     fsl (c0);
-+     ful (c0);
-+ 
-+     f_c (c1);				/* { dg-warning "alter its value" } */
-+     fsc (c1);				/* { dg-warning "alter its value" } */
-+     fuc (c1);				/* { dg-warning "alter its value" } */
-+     f_s (c1);				/* { dg-warning "alter its value" } */
-+     fss (c1);				/* { dg-warning "alter its value" } */
-+     fus (c1);				/* { dg-warning "alter its value" } */
-+     f_i (c1);				/* { dg-warning "change the sign" } */
-+     fsi (c1);				/* { dg-warning "change the sign" } */
-+     fui (c1);
-+     f_l (c1);				/* { dg-warning "change the sign" } */
-+     fsl (c1);				/* { dg-warning "change the sign" } */
-+     ful (c1);
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.dg/utf-cvt.c	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,49 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Test the char16_t and char32_t promotion rules. */
++/* { dg-do compile } */
++/* { dg-options "-std=gnu99 -Wall -Wconversion -Wsign-conversion" } */
++
++typedef unsigned short	char16_t;
++typedef unsigned int	char32_t;
++
++extern void f_c (char);
++extern void fsc (signed char);
++extern void fuc (unsigned char);
++extern void f_s (short);
++extern void fss (signed short);
++extern void fus (unsigned short);
++extern void f_i (int);
++extern void fsi (signed int);
++extern void fui (unsigned int);
++extern void f_l (long);
++extern void fsl (signed long);
++extern void ful (unsigned long);
++
++void m (char16_t c0, char32_t c1)
++{
++    f_c (c0);				/* { dg-warning "alter its value" } */
++    fsc (c0);				/* { dg-warning "alter its value" } */
++    fuc (c0);				/* { dg-warning "alter its value" } */
++    f_s (c0);				/* { dg-warning "change the sign" } */
++    fss (c0);				/* { dg-warning "change the sign" } */
++    fus (c0);
++    f_i (c0);
++    fsi (c0);
++    fui (c0);
++    f_l (c0);
++    fsl (c0);
++    ful (c0);
++
++    f_c (c1);				/* { dg-warning "alter its value" } */
++    fsc (c1);				/* { dg-warning "alter its value" } */
++    fuc (c1);				/* { dg-warning "alter its value" } */
++    f_s (c1);				/* { dg-warning "alter its value" } */
++    fss (c1);				/* { dg-warning "alter its value" } */
++    fus (c1);				/* { dg-warning "alter its value" } */
++    f_i (c1);				/* { dg-warning "change the sign" } */
++    fsi (c1);				/* { dg-warning "change the sign" } */
++    fui (c1);
++    f_l (c1);				/* { dg-warning "change the sign" } */
++    fsl (c1);				/* { dg-warning "change the sign" } */
++    ful (c1);
++}
 Index: gcc/testsuite/gcc.dg/utf-dflt.c
 ===================================================================
-*** gcc/testsuite/gcc.dg/utf-dflt.c	(revision 0)
---- gcc/testsuite/gcc.dg/utf-dflt.c	(revision 134438)
-***************
-*** 0 ****
---- 1,25 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* If not gnu99, the u and U prefixes should be parsed as separate tokens. */
-+ /* { dg-do compile } */
-+ /* { dg-options "" } */
-+ 
-+ const unsigned short	c0	= u'a';		/* { dg-error "undeclared" } */
-+ 		/* { dg-error "expected ',' or ';'" "" { target *-*-* } 6 } */
-+ const unsigned long	c1	= U'a';		/* { dg-error "undeclared" } */
-+ 		/* { dg-error "expected ',' or ';'" "" { target *-*-* } 8 } */
-+ 
-+ #define u	1 +
-+ #define U	2 +
-+ 
-+ const unsigned short	c2	= u'a';
-+ const unsigned long	c3	= U'a';
-+ 
-+ #undef u
-+ #undef U
-+ #define u	"a"
-+ #define U	"b"
-+ 
-+ const void		*s0	= u"a";
-+ const void		*s1	= U"a";
-+ 
-+ int main () {}
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/gcc.dg/utf-dflt.c	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,25 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* If not gnu99, the u and U prefixes should be parsed as separate tokens. */
++/* { dg-do compile } */
++/* { dg-options "" } */
++
++const unsigned short	c0	= u'a';		/* { dg-error "undeclared" } */
++		/* { dg-error "expected ',' or ';'" "" { target *-*-* } 6 } */
++const unsigned long	c1	= U'a';		/* { dg-error "undeclared" } */
++		/* { dg-error "expected ',' or ';'" "" { target *-*-* } 8 } */
++
++#define u	1 +
++#define U	2 +
++
++const unsigned short	c2	= u'a';
++const unsigned long	c3	= U'a';
++
++#undef u
++#undef U
++#define u	"a"
++#define U	"b"
++
++const void		*s0	= u"a";
++const void		*s1	= U"a";
++
++int main () {}
 Index: gcc/testsuite/g++.dg/ext/utf16-1.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/utf16-1.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/utf16-1.C	(revision 134438)
-***************
-*** 0 ****
---- 1,65 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Test the support for char16_t character constants. */
-+ /* { dg-do run } */
-+ /* { dg-options "-std=c++0x -Wall -Werror" } */
-+ 
-+ extern "C" void abort (void);
-+ 
-+ const static char16_t	c0 = u'a';
-+ const static char16_t	c1 = u'\0';
-+ const static char16_t	c2 = u'\u0024';
-+ const static char16_t	c3 = u'\u2029';
-+ const static char16_t	c4 = u'\u8010';
-+ 
-+ const static char16_t	c5 = 'a';
-+ const static char16_t	c6 = U'a';
-+ const static char16_t	c7 = U'\u2029';
-+ const static char16_t	c8 = U'\u8010';
-+ const static char16_t	c9 = L'a';
-+ const static char16_t	ca = L'\u2029';
-+ const static char16_t	cb = L'\u8010';
-+ 
-+ #define A	0x0061
-+ #define D	0x0024
-+ #define X	0x2029
-+ #define Y	0x8010
-+ 
-+ int main ()
-+ {
-+     if (sizeof (u'a') != sizeof (char16_t))
-+ 	abort ();
-+     if (sizeof (u'\0') != sizeof (char16_t))
-+ 	abort ();
-+     if (sizeof (u'\u0024') != sizeof (char16_t))
-+ 	abort ();
-+     if (sizeof (u'\u2029') != sizeof (char16_t))
-+ 	abort ();
-+     if (sizeof (u'\u8010') != sizeof (char16_t))
-+ 	abort ();
-+ 
-+     if (c0 != A)
-+ 	abort ();
-+     if (c1 != 0x0000)
-+ 	abort ();
-+     if (c2 != D)
-+ 	abort ();
-+     if (c3 != X)
-+ 	abort ();
-+     if (c4 != Y)
-+ 	abort ();
-+ 
-+     if (c5 != A)
-+ 	abort ();
-+     if (c6 != A)
-+ 	abort ();
-+     if (c7 != X)
-+ 	abort ();
-+     if (c8 != Y)
-+ 	abort ();
-+     if (c9 != A)
-+ 	abort ();
-+     if (ca != X)
-+ 	abort ();
-+     if (cb != Y)
-+ 	abort ();
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/utf16-1.C	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,65 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Test the support for char16_t character constants. */
++/* { dg-do run } */
++/* { dg-options "-std=c++0x -Wall -Werror" } */
++
++extern "C" void abort (void);
++
++const static char16_t	c0 = u'a';
++const static char16_t	c1 = u'\0';
++const static char16_t	c2 = u'\u0024';
++const static char16_t	c3 = u'\u2029';
++const static char16_t	c4 = u'\u8010';
++
++const static char16_t	c5 = 'a';
++const static char16_t	c6 = U'a';
++const static char16_t	c7 = U'\u2029';
++const static char16_t	c8 = U'\u8010';
++const static char16_t	c9 = L'a';
++const static char16_t	ca = L'\u2029';
++const static char16_t	cb = L'\u8010';
++
++#define A	0x0061
++#define D	0x0024
++#define X	0x2029
++#define Y	0x8010
++
++int main ()
++{
++    if (sizeof (u'a') != sizeof (char16_t))
++	abort ();
++    if (sizeof (u'\0') != sizeof (char16_t))
++	abort ();
++    if (sizeof (u'\u0024') != sizeof (char16_t))
++	abort ();
++    if (sizeof (u'\u2029') != sizeof (char16_t))
++	abort ();
++    if (sizeof (u'\u8010') != sizeof (char16_t))
++	abort ();
++
++    if (c0 != A)
++	abort ();
++    if (c1 != 0x0000)
++	abort ();
++    if (c2 != D)
++	abort ();
++    if (c3 != X)
++	abort ();
++    if (c4 != Y)
++	abort ();
++
++    if (c5 != A)
++	abort ();
++    if (c6 != A)
++	abort ();
++    if (c7 != X)
++	abort ();
++    if (c8 != Y)
++	abort ();
++    if (c9 != A)
++	abort ();
++    if (ca != X)
++	abort ();
++    if (cb != Y)
++	abort ();
++}
 Index: gcc/testsuite/g++.dg/ext/utf32-4.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/utf32-4.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/utf32-4.C	(revision 134438)
-***************
-*** 0 ****
---- 1,18 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Expected errors for char32_t character constants. */
-+ /* { dg-do compile } */
-+ /* { dg-options "-std=c++0x" } */
-+ 
-+ const static char32_t	c0 = U'';		/* { dg-error "empty character" } */
-+ const static char32_t	c1 = U'ab';		/* { dg-warning "constant too long" } */
-+ const static char32_t	c2 = U'\U00064321';
-+ 
-+ const static char32_t	c3 = 'a';
-+ const static char32_t	c4 = u'a';
-+ const static char32_t	c5 = u'\u2029';
-+ const static char32_t	c6 = u'\U00064321';	/* { dg-warning "constant too long" } */
-+ const static char32_t	c7 = L'a';
-+ const static char32_t	c8 = L'\u2029';
-+ const static char32_t	c9 = L'\U00064321';
-+ 
-+ int main () {}
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/utf32-4.C	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,18 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Expected errors for char32_t character constants. */
++/* { dg-do compile } */
++/* { dg-options "-std=c++0x" } */
++
++const static char32_t	c0 = U'';		/* { dg-error "empty character" } */
++const static char32_t	c1 = U'ab';		/* { dg-warning "constant too long" } */
++const static char32_t	c2 = U'\U00064321';
++
++const static char32_t	c3 = 'a';
++const static char32_t	c4 = u'a';
++const static char32_t	c5 = u'\u2029';
++const static char32_t	c6 = u'\U00064321';	/* { dg-warning "constant too long" } */
++const static char32_t	c7 = L'a';
++const static char32_t	c8 = L'\u2029';
++const static char32_t	c9 = L'\U00064321';
++
++int main () {}
 Index: gcc/testsuite/g++.dg/ext/utf-cxx98.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/utf-cxx98.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/utf-cxx98.C	(revision 134438)
-***************
-*** 0 ****
---- 1,29 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Expected errors for char16_t/char32_t in c++98. */
-+ /* Ensure u and U prefixes are parsed as separate tokens in c++98. */
-+ /* { dg-do compile } */
-+ /* { dg-options "-std=c++98" } */
-+ 
-+ const static char16_t	c0	= 'a';	/* { dg-error "not name a type" } */
-+ const static char32_t	c1	= 'a';	/* { dg-error "not name a type" } */
-+ 
-+ const unsigned short	c2	= u'a';	/* { dg-error "not declared" } */
-+ 	/* { dg-error "expected ',' or ';'" "" { target *-*-* } 10 } */
-+ const unsigned long	c3	= U'a';	/* { dg-error "not declared" } */
-+ 	/* { dg-error "expected ',' or ';'" "" { target *-*-* } 12 } */
-+ 
-+ #define u	1 +
-+ #define U	2 +
-+ 
-+ const unsigned short	c5	= u'a';
-+ const unsigned long	c6	= U'a';
-+ 
-+ #undef u
-+ #undef U
-+ #define u	"a"
-+ #define U	"b"
-+ 
-+ const void		*s0	= u"a";
-+ const void		*s1	= U"a";
-+ 
-+ int main () {}
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/utf-cxx98.C	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,29 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Expected errors for char16_t/char32_t in c++98. */
++/* Ensure u and U prefixes are parsed as separate tokens in c++98. */
++/* { dg-do compile } */
++/* { dg-options "-std=c++98" } */
++
++const static char16_t	c0	= 'a';	/* { dg-error "not name a type" } */
++const static char32_t	c1	= 'a';	/* { dg-error "not name a type" } */
++
++const unsigned short	c2	= u'a';	/* { dg-error "not declared" } */
++	/* { dg-error "expected ',' or ';'" "" { target *-*-* } 10 } */
++const unsigned long	c3	= U'a';	/* { dg-error "not declared" } */
++	/* { dg-error "expected ',' or ';'" "" { target *-*-* } 12 } */
++
++#define u	1 +
++#define U	2 +
++
++const unsigned short	c5	= u'a';
++const unsigned long	c6	= U'a';
++
++#undef u
++#undef U
++#define u	"a"
++#define U	"b"
++
++const void		*s0	= u"a";
++const void		*s1	= U"a";
++
++int main () {}
 Index: gcc/testsuite/g++.dg/ext/utf16-2.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/utf16-2.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/utf16-2.C	(revision 134438)
-***************
-*** 0 ****
---- 1,30 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Test the support for char16_t* string literals. */
-+ /* { dg-do run } */
-+ /* { dg-options "-std=c++0x -Wall -Werror" } */
-+ 
-+ extern "C" void abort (void);
-+ 
-+ const static char16_t	*s0 = u"ab";
-+ const static char16_t	*s1 = u"a\u0024";
-+ const static char16_t	*s2 = u"a\u2029";
-+ const static char16_t	*s3 = u"a\U00064321";
-+ 
-+ #define A	0x0061
-+ #define B	0x0062
-+ #define D	0x0024
-+ #define X	0x2029
-+ #define Y1	0xD950
-+ #define Y2	0xDF21
-+ 
-+ int main ()
-+ {
-+     if (s0[0] != A || s0[1] != B || s0[2] != 0x0000)
-+ 	abort ();
-+     if (s1[0] != A || s1[1] != D || s0[2] != 0x0000)
-+ 	abort ();
-+     if (s2[0] != A || s2[1] != X || s0[2] != 0x0000)
-+ 	abort ();
-+     if (s3[0] != A || s3[1] != Y1 || s3[2] != Y2 || s3[3] != 0x0000)
-+ 	abort ();
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/utf16-2.C	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,30 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Test the support for char16_t* string literals. */
++/* { dg-do run } */
++/* { dg-options "-std=c++0x -Wall -Werror" } */
++
++extern "C" void abort (void);
++
++const static char16_t	*s0 = u"ab";
++const static char16_t	*s1 = u"a\u0024";
++const static char16_t	*s2 = u"a\u2029";
++const static char16_t	*s3 = u"a\U00064321";
++
++#define A	0x0061
++#define B	0x0062
++#define D	0x0024
++#define X	0x2029
++#define Y1	0xD950
++#define Y2	0xDF21
++
++int main ()
++{
++    if (s0[0] != A || s0[1] != B || s0[2] != 0x0000)
++	abort ();
++    if (s1[0] != A || s1[1] != D || s0[2] != 0x0000)
++	abort ();
++    if (s2[0] != A || s2[1] != X || s0[2] != 0x0000)
++	abort ();
++    if (s3[0] != A || s3[1] != Y1 || s3[2] != Y2 || s3[3] != 0x0000)
++	abort ();
++}
 Index: gcc/testsuite/g++.dg/ext/utf16-3.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/utf16-3.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/utf16-3.C	(revision 134438)
-***************
-*** 0 ****
---- 1,47 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Test concatenation of char16_t* string literals. */
-+ /* { dg-do run } */
-+ /* { dg-options "-std=c++0x -Wall -Werror" } */
-+ 
-+ extern "C" void abort (void);
-+ 
-+ const static char16_t	*s0 = u"a" u"b";
-+ 
-+ const static char16_t	*s1 = u"a" "b";
-+ const static char16_t	*s2 = "a" u"b";
-+ const static char16_t	*s3 = u"a" "\u2029";
-+ const static char16_t	*s4 = "\u2029" u"b";
-+ const static char16_t	*s5 = u"a" "\U00064321";
-+ const static char16_t	*s6 = "\U00064321" u"b";
-+ 
-+ #define A	0x0061
-+ #define B	0x0062
-+ #define X	0x2029
-+ #define Y1	0xD950
-+ #define Y2	0xDF21
-+ 
-+ int main ()
-+ {
-+     if (sizeof ((u"a" u"b")[0]) != sizeof (char16_t))
-+ 	abort ();
-+     if (sizeof ((u"a"  "b")[0]) != sizeof (char16_t))
-+ 	abort ();
-+     if (sizeof (( "a" u"b")[0]) != sizeof (char16_t))
-+ 	abort ();
-+ 
-+     if (s0[0] != A || s0[1] != B || s0[2] != 0x0000)
-+ 	abort ();
-+ 
-+     if (s1[0] != A || s1[1] != B || s1[2] != 0x0000)
-+ 	abort ();
-+     if (s2[0] != A || s2[1] != B || s2[2] != 0x0000)
-+ 	abort ();
-+     if (s3[0] != A || s3[1] != X || s3[2] != 0x0000)
-+ 	abort ();
-+     if (s4[0] != X || s4[1] != B || s4[2] != 0x0000)
-+ 	abort ();
-+     if (s5[0] != A || s5[1] != Y1 || s5[2] != Y2 || s5[3] != 0x0000)
-+ 	abort ();
-+     if (s6[0] != Y1 || s6[1] != Y2 || s6[2] != B || s6[3] != 0x0000)
-+ 	abort ();
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/utf16-3.C	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,47 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Test concatenation of char16_t* string literals. */
++/* { dg-do run } */
++/* { dg-options "-std=c++0x -Wall -Werror" } */
++
++extern "C" void abort (void);
++
++const static char16_t	*s0 = u"a" u"b";
++
++const static char16_t	*s1 = u"a" "b";
++const static char16_t	*s2 = "a" u"b";
++const static char16_t	*s3 = u"a" "\u2029";
++const static char16_t	*s4 = "\u2029" u"b";
++const static char16_t	*s5 = u"a" "\U00064321";
++const static char16_t	*s6 = "\U00064321" u"b";
++
++#define A	0x0061
++#define B	0x0062
++#define X	0x2029
++#define Y1	0xD950
++#define Y2	0xDF21
++
++int main ()
++{
++    if (sizeof ((u"a" u"b")[0]) != sizeof (char16_t))
++	abort ();
++    if (sizeof ((u"a"  "b")[0]) != sizeof (char16_t))
++	abort ();
++    if (sizeof (( "a" u"b")[0]) != sizeof (char16_t))
++	abort ();
++
++    if (s0[0] != A || s0[1] != B || s0[2] != 0x0000)
++	abort ();
++
++    if (s1[0] != A || s1[1] != B || s1[2] != 0x0000)
++	abort ();
++    if (s2[0] != A || s2[1] != B || s2[2] != 0x0000)
++	abort ();
++    if (s3[0] != A || s3[1] != X || s3[2] != 0x0000)
++	abort ();
++    if (s4[0] != X || s4[1] != B || s4[2] != 0x0000)
++	abort ();
++    if (s5[0] != A || s5[1] != Y1 || s5[2] != Y2 || s5[3] != 0x0000)
++	abort ();
++    if (s6[0] != Y1 || s6[1] != Y2 || s6[2] != B || s6[3] != 0x0000)
++	abort ();
++}
 Index: gcc/testsuite/g++.dg/ext/utf-badconcat.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/utf-badconcat.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/utf-badconcat.C	(revision 134438)
-***************
-*** 0 ****
---- 1,22 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Test unsupported concatenation of char16_t/char32_t* string literals. */
-+ /* { dg-do compile } */
-+ /* { dg-options "-std=c++0x" } */
-+ 
-+ const void *s0	= u"a"  "b";
-+ const void *s1	=  "a" u"b";
-+ const void *s2	= u"a" U"b";	/* { dg-error "non-standard concatenation" } */
-+ const void *s3	= U"a" u"b";	/* { dg-error "non-standard concatenation" } */
-+ const void *s4	= u"a" L"b";	/* { dg-error "non-standard concatenation" } */
-+ const void *s5	= L"a" u"b";	/* { dg-error "non-standard concatenation" } */
-+ const void *s6	= u"a" u"b";
-+ const void *s7	= U"a"  "b";
-+ const void *s8	=  "a" U"b";
-+ const void *s9	= U"a" L"b";	/* { dg-error "non-standard concatenation" } */
-+ const void *sa	= L"a" U"b";	/* { dg-error "non-standard concatenation" } */
-+ const void *sb	= U"a" U"b";
-+ const void *sc	= L"a"  "b";
-+ const void *sd	=  "a" L"b";
-+ const void *se	= L"a" L"b";
-+ 
-+ int main () {}
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/utf-badconcat.C	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,22 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Test unsupported concatenation of char16_t/char32_t* string literals. */
++/* { dg-do compile } */
++/* { dg-options "-std=c++0x" } */
++
++const void *s0	= u"a"  "b";
++const void *s1	=  "a" u"b";
++const void *s2	= u"a" U"b";	/* { dg-error "non-standard concatenation" } */
++const void *s3	= U"a" u"b";	/* { dg-error "non-standard concatenation" } */
++const void *s4	= u"a" L"b";	/* { dg-error "non-standard concatenation" } */
++const void *s5	= L"a" u"b";	/* { dg-error "non-standard concatenation" } */
++const void *s6	= u"a" u"b";
++const void *s7	= U"a"  "b";
++const void *s8	=  "a" U"b";
++const void *s9	= U"a" L"b";	/* { dg-error "non-standard concatenation" } */
++const void *sa	= L"a" U"b";	/* { dg-error "non-standard concatenation" } */
++const void *sb	= U"a" U"b";
++const void *sc	= L"a"  "b";
++const void *sd	=  "a" L"b";
++const void *se	= L"a" L"b";
++
++int main () {}
 Index: gcc/testsuite/g++.dg/ext/utf-typedef-cxx0x.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/utf-typedef-cxx0x.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/utf-typedef-cxx0x.C	(revision 134438)
-***************
-*** 0 ****
---- 1,7 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Ensure that a typedef to char16_t/char32_t issues a warning in c++0x. */
-+ /* { dg-do compile } */
-+ /* { dg-options "-std=c++0x" } */
-+ 
-+ typedef short unsigned int	char16_t; /* { dg-warning "redeclaration" } */
-+ typedef unsigned int		char32_t; /* { dg-warning "redeclaration" } */
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/utf-typedef-cxx0x.C	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,7 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Ensure that a typedef to char16_t/char32_t issues a warning in c++0x. */
++/* { dg-do compile } */
++/* { dg-options "-std=c++0x" } */
++
++typedef short unsigned int	char16_t; /* { dg-warning "redeclaration" } */
++typedef unsigned int		char32_t; /* { dg-warning "redeclaration" } */
 Index: gcc/testsuite/g++.dg/ext/utf16-4.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/utf16-4.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/utf16-4.C	(revision 134438)
-***************
-*** 0 ****
---- 1,18 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Expected errors for char16_t character constants. */
-+ /* { dg-do compile } */
-+ /* { dg-options "-std=c++0x" } */
-+ 
-+ const static char16_t	c0 = u'';		/* { dg-error "empty character" } */
-+ const static char16_t	c1 = u'ab';		/* { dg-warning "constant too long" } */
-+ const static char16_t	c2 = u'\U00064321';	/* { dg-warning "constant too long" } */
-+ 
-+ const static char16_t	c3 = 'a';
-+ const static char16_t	c4 = U'a';
-+ const static char16_t	c5 = U'\u2029';
-+ const static char16_t	c6 = U'\U00064321';	/* { dg-warning "implicitly truncated" } */
-+ const static char16_t	c7 = L'a';
-+ const static char16_t	c8 = L'\u2029';
-+ const static char16_t	c9 = L'\U00064321';	/* { dg-warning "implicitly truncated" } */
-+ 
-+ int main () {}
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/utf16-4.C	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,18 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Expected errors for char16_t character constants. */
++/* { dg-do compile } */
++/* { dg-options "-std=c++0x" } */
++
++const static char16_t	c0 = u'';		/* { dg-error "empty character" } */
++const static char16_t	c1 = u'ab';		/* { dg-warning "constant too long" } */
++const static char16_t	c2 = u'\U00064321';	/* { dg-warning "constant too long" } */
++
++const static char16_t	c3 = 'a';
++const static char16_t	c4 = U'a';
++const static char16_t	c5 = U'\u2029';
++const static char16_t	c6 = U'\U00064321';	/* { dg-warning "implicitly truncated" } */
++const static char16_t	c7 = L'a';
++const static char16_t	c8 = L'\u2029';
++const static char16_t	c9 = L'\U00064321';	/* { dg-warning "implicitly truncated" } */
++
++int main () {}
 Index: gcc/testsuite/g++.dg/ext/utf-gnuxx98.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/utf-gnuxx98.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/utf-gnuxx98.C	(revision 134438)
-***************
-*** 0 ****
---- 1,29 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Expected errors for char16_t/char32_t in gnu++98. */
-+ /* Ensure u and U prefixes are parsed as separate tokens in gnu++98. */
-+ /* { dg-do compile } */
-+ /* { dg-options "-std=gnu++98" } */
-+ 
-+ const static char16_t	c0	= 'a';	/* { dg-error "not name a type" } */
-+ const static char32_t	c1	= 'a';	/* { dg-error "not name a type" } */
-+ 
-+ const unsigned short	c2	= u'a';	/* { dg-error "not declared" } */
-+ 	/* { dg-error "expected ',' or ';'" "" { target *-*-* } 10 } */
-+ const unsigned long	c3	= U'a';	/* { dg-error "not declared" } */
-+ 	/* { dg-error "expected ',' or ';'" "" { target *-*-* } 12 } */
-+ 
-+ #define u	1 +
-+ #define U	2 +
-+ 
-+ const unsigned short	c5	= u'a';
-+ const unsigned long	c6	= U'a';
-+ 
-+ #undef u
-+ #undef U
-+ #define u	"a"
-+ #define U	"b"
-+ 
-+ const void		*s0	= u"a";
-+ const void		*s1	= U"a";
-+ 
-+ int main () {}
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/utf-gnuxx98.C	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,29 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Expected errors for char16_t/char32_t in gnu++98. */
++/* Ensure u and U prefixes are parsed as separate tokens in gnu++98. */
++/* { dg-do compile } */
++/* { dg-options "-std=gnu++98" } */
++
++const static char16_t	c0	= 'a';	/* { dg-error "not name a type" } */
++const static char32_t	c1	= 'a';	/* { dg-error "not name a type" } */
++
++const unsigned short	c2	= u'a';	/* { dg-error "not declared" } */
++	/* { dg-error "expected ',' or ';'" "" { target *-*-* } 10 } */
++const unsigned long	c3	= U'a';	/* { dg-error "not declared" } */
++	/* { dg-error "expected ',' or ';'" "" { target *-*-* } 12 } */
++
++#define u	1 +
++#define U	2 +
++
++const unsigned short	c5	= u'a';
++const unsigned long	c6	= U'a';
++
++#undef u
++#undef U
++#define u	"a"
++#define U	"b"
++
++const void		*s0	= u"a";
++const void		*s1	= U"a";
++
++int main () {}
 Index: gcc/testsuite/g++.dg/ext/utf-cvt.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/utf-cvt.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/utf-cvt.C	(revision 134438)
-***************
-*** 0 ****
---- 1,46 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Test the char16_t and char32_t promotion rules. */
-+ /* { dg-do compile } */
-+ /* { dg-options "-std=c++0x -Wall -Wconversion -Wsign-conversion -Wsign-promo" } */
-+ 
-+ extern void f_c (char);
-+ extern void fsc (signed char);
-+ extern void fuc (unsigned char);
-+ extern void f_s (short);
-+ extern void fss (signed short);
-+ extern void fus (unsigned short);
-+ extern void f_i (int);
-+ extern void fsi (signed int);
-+ extern void fui (unsigned int);
-+ extern void f_l (long);
-+ extern void fsl (signed long);
-+ extern void ful (unsigned long);
-+ 
-+ void m(char16_t c0, char32_t c1)
-+ {
-+     f_c (c0);			/* { dg-warning "alter its value" } */
-+     fsc (c0);			/* { dg-warning "alter its value" } */
-+     fuc (c0);			/* { dg-warning "alter its value" } */
-+     f_s (c0);			/* { dg-warning "change the sign" } */
-+     fss (c0);			/* { dg-warning "change the sign" } */
-+     fus (c0);
-+     f_i (c0);
-+     fsi (c0);
-+     fui (c0);
-+     f_l (c0);
-+     fsl (c0);
-+     ful (c0);
-+ 
-+     f_c (c1);			/* { dg-warning "alter its value" } */
-+     fsc (c1);			/* { dg-warning "alter its value" } */
-+     fuc (c1);			/* { dg-warning "alter its value" } */
-+     f_s (c1);			/* { dg-warning "alter its value" } */
-+     fss (c1);			/* { dg-warning "alter its value" } */
-+     fus (c1);			/* { dg-warning "alter its value" } */
-+     f_i (c1);			/* { dg-warning "change the sign" } */
-+     fsi (c1);			/* { dg-warning "change the sign" } */
-+     fui (c1);
-+     f_l (c1);			/* { dg-warning "change the sign" } */
-+     fsl (c1);			/* { dg-warning "change the sign" } */
-+     ful (c1);
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/utf-cvt.C	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,46 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Test the char16_t and char32_t promotion rules. */
++/* { dg-do compile } */
++/* { dg-options "-std=c++0x -Wall -Wconversion -Wsign-conversion -Wsign-promo" } */
++
++extern void f_c (char);
++extern void fsc (signed char);
++extern void fuc (unsigned char);
++extern void f_s (short);
++extern void fss (signed short);
++extern void fus (unsigned short);
++extern void f_i (int);
++extern void fsi (signed int);
++extern void fui (unsigned int);
++extern void f_l (long);
++extern void fsl (signed long);
++extern void ful (unsigned long);
++
++void m(char16_t c0, char32_t c1)
++{
++    f_c (c0);			/* { dg-warning "alter its value" } */
++    fsc (c0);			/* { dg-warning "alter its value" } */
++    fuc (c0);			/* { dg-warning "alter its value" } */
++    f_s (c0);			/* { dg-warning "change the sign" } */
++    fss (c0);			/* { dg-warning "change the sign" } */
++    fus (c0);
++    f_i (c0);
++    fsi (c0);
++    fui (c0);
++    f_l (c0);
++    fsl (c0);
++    ful (c0);
++
++    f_c (c1);			/* { dg-warning "alter its value" } */
++    fsc (c1);			/* { dg-warning "alter its value" } */
++    fuc (c1);			/* { dg-warning "alter its value" } */
++    f_s (c1);			/* { dg-warning "alter its value" } */
++    fss (c1);			/* { dg-warning "alter its value" } */
++    fus (c1);			/* { dg-warning "alter its value" } */
++    f_i (c1);			/* { dg-warning "change the sign" } */
++    fsi (c1);			/* { dg-warning "change the sign" } */
++    fui (c1);
++    f_l (c1);			/* { dg-warning "change the sign" } */
++    fsl (c1);			/* { dg-warning "change the sign" } */
++    ful (c1);
++}
 Index: gcc/testsuite/g++.dg/ext/utf-dflt.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/utf-dflt.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/utf-dflt.C	(revision 134438)
-***************
-*** 0 ****
---- 1,29 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Expected errors for char16_t/char32_t in default std. */
-+ /* Ensure u and U prefixes are parsed as separate tokens in default std. */
-+ /* { dg-do compile } */
-+ /* { dg-options "" } */
-+ 
-+ const static char16_t	c0	= 'a';	/* { dg-error "not name a type" } */
-+ const static char32_t	c1	= 'a';	/* { dg-error "not name a type" } */
-+ 
-+ const unsigned short	c2	= u'a';	/* { dg-error "not declared" } */
-+ 	/* { dg-error "expected ',' or ';'" "" { target *-*-* } 10 } */
-+ const unsigned long	c3	= U'a';	/* { dg-error "not declared" } */
-+ 	/* { dg-error "expected ',' or ';'" "" { target *-*-* } 12 } */
-+ 
-+ #define u	1 +
-+ #define U	2 +
-+ 
-+ const unsigned short	c4	= u'a';
-+ const unsigned long	c5	= U'a';
-+ 
-+ #undef u
-+ #undef U
-+ #define u	"a"
-+ #define U	"b"
-+ 
-+ const void		*s0	= u"a";
-+ const void		*s1	= U"a";
-+ 
-+ int main () {}
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/utf-dflt.C	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,29 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Expected errors for char16_t/char32_t in default std. */
++/* Ensure u and U prefixes are parsed as separate tokens in default std. */
++/* { dg-do compile } */
++/* { dg-options "" } */
++
++const static char16_t	c0	= 'a';	/* { dg-error "not name a type" } */
++const static char32_t	c1	= 'a';	/* { dg-error "not name a type" } */
++
++const unsigned short	c2	= u'a';	/* { dg-error "not declared" } */
++	/* { dg-error "expected ',' or ';'" "" { target *-*-* } 10 } */
++const unsigned long	c3	= U'a';	/* { dg-error "not declared" } */
++	/* { dg-error "expected ',' or ';'" "" { target *-*-* } 12 } */
++
++#define u	1 +
++#define U	2 +
++
++const unsigned short	c4	= u'a';
++const unsigned long	c5	= U'a';
++
++#undef u
++#undef U
++#define u	"a"
++#define U	"b"
++
++const void		*s0	= u"a";
++const void		*s1	= U"a";
++
++int main () {}
 Index: gcc/testsuite/g++.dg/ext/utf-cxx0x.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/utf-cxx0x.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/utf-cxx0x.C	(revision 134438)
-***************
-*** 0 ****
---- 1,14 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Test parsing of u and U prefixes when also used as macros. */
-+ /* { dg-do compile } */
-+ /* { dg-options "-std=c++0x" } */
-+ 
-+ #define u	L
-+ #define U	L
-+ 
-+ const unsigned short	c2	= u'a';
-+ const unsigned long	c3	= U'a';
-+ const void		*s0	= u"a";
-+ const void		*s1	= U"a";
-+ 
-+ int main () {}
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/utf-cxx0x.C	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,14 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Test parsing of u and U prefixes when also used as macros. */
++/* { dg-do compile } */
++/* { dg-options "-std=c++0x" } */
++
++#define u	L
++#define U	L
++
++const unsigned short	c2	= u'a';
++const unsigned long	c3	= U'a';
++const void		*s0	= u"a";
++const void		*s1	= U"a";
++
++int main () {}
 Index: gcc/testsuite/g++.dg/ext/utf32-1.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/utf32-1.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/utf32-1.C	(revision 134438)
-***************
-*** 0 ****
---- 1,42 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Test the support for char32_t character constants. */
-+ /* { dg-do run } */
-+ /* { dg-options "-std=c++0x -Wall -Werror" } */
-+ 
-+ extern "C" void abort (void);
-+ 
-+ const static char32_t	c0 = U'a';
-+ const static char32_t	c1 = U'\0';
-+ const static char32_t	c2 = U'\u0024';
-+ const static char32_t	c3 = U'\u2029';
-+ const static char32_t	c4 = U'\U00064321';
-+ 
-+ #define A	0x00000061
-+ #define D	0x00000024
-+ #define X	0x00002029
-+ #define Y	0x00064321
-+ 
-+ int main ()
-+ {
-+     if (sizeof (U'a') != sizeof (char32_t))
-+ 	abort ();
-+     if (sizeof (U'\0') != sizeof (char32_t))
-+ 	abort ();
-+     if (sizeof (U'\u0024') != sizeof (char32_t))
-+ 	abort ();
-+     if (sizeof (U'\u2029') != sizeof (char32_t))
-+ 	abort ();
-+     if (sizeof (U'\U00064321') != sizeof (char32_t))
-+ 	abort ();
-+ 
-+     if (c0 != A)
-+ 	abort ();
-+     if (c1 != 0x0000)
-+ 	abort ();
-+     if (c2 != D)
-+ 	abort ();
-+     if (c3 != X)
-+ 	abort ();
-+     if (c4 != Y)
-+ 	abort ();
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/utf32-1.C	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,42 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Test the support for char32_t character constants. */
++/* { dg-do run } */
++/* { dg-options "-std=c++0x -Wall -Werror" } */
++
++extern "C" void abort (void);
++
++const static char32_t	c0 = U'a';
++const static char32_t	c1 = U'\0';
++const static char32_t	c2 = U'\u0024';
++const static char32_t	c3 = U'\u2029';
++const static char32_t	c4 = U'\U00064321';
++
++#define A	0x00000061
++#define D	0x00000024
++#define X	0x00002029
++#define Y	0x00064321
++
++int main ()
++{
++    if (sizeof (U'a') != sizeof (char32_t))
++	abort ();
++    if (sizeof (U'\0') != sizeof (char32_t))
++	abort ();
++    if (sizeof (U'\u0024') != sizeof (char32_t))
++	abort ();
++    if (sizeof (U'\u2029') != sizeof (char32_t))
++	abort ();
++    if (sizeof (U'\U00064321') != sizeof (char32_t))
++	abort ();
++
++    if (c0 != A)
++	abort ();
++    if (c1 != 0x0000)
++	abort ();
++    if (c2 != D)
++	abort ();
++    if (c3 != X)
++	abort ();
++    if (c4 != Y)
++	abort ();
++}
 Index: gcc/testsuite/g++.dg/ext/utf-typespec.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/utf-typespec.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/utf-typespec.C	(revision 134438)
-***************
-*** 0 ****
---- 1,25 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Ensure that type specifiers are not allowed for char16_t/char32_t. */
-+ /* { dg-do compile } */
-+ /* { dg-options "-std=c++0x" } */
-+ 
-+ signed char16_t		c0;		/* { dg-error "signed" } */
-+ signed char32_t		c1;		/* { dg-error "signed" } */
-+ unsigned char16_t	c2;		/* { dg-error "unsigned" } */
-+ unsigned char32_t	c3;		/* { dg-error "unsigned" } */
-+ 
-+ short char16_t		c4;		/* { dg-error "short" } */
-+ long char16_t		c5;		/* { dg-error "long" } */
-+ short char32_t		c6;		/* { dg-error "short" } */
-+ long char32_t		c7;		/* { dg-error "long" } */
-+ 
-+ signed short char16_t	c8;		/* { dg-error "signed" } */
-+ signed short char32_t	c9;		/* { dg-error "signed" } */
-+ signed long char16_t	ca;		/* { dg-error "signed" } */
-+ signed long char32_t	cb;		/* { dg-error "signed" } */
-+ unsigned short char16_t	cc;		/* { dg-error "unsigned" } */
-+ unsigned short char32_t	cd;		/* { dg-error "unsigned" } */
-+ unsigned long char16_t	ce;		/* { dg-error "unsigned" } */
-+ unsigned long char32_t	cf;		/* { dg-error "unsigned" } */
-+ 
-+ int main () {}
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/utf-typespec.C	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,25 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Ensure that type specifiers are not allowed for char16_t/char32_t. */
++/* { dg-do compile } */
++/* { dg-options "-std=c++0x" } */
++
++signed char16_t		c0;		/* { dg-error "signed" } */
++signed char32_t		c1;		/* { dg-error "signed" } */
++unsigned char16_t	c2;		/* { dg-error "unsigned" } */
++unsigned char32_t	c3;		/* { dg-error "unsigned" } */
++
++short char16_t		c4;		/* { dg-error "short" } */
++long char16_t		c5;		/* { dg-error "long" } */
++short char32_t		c6;		/* { dg-error "short" } */
++long char32_t		c7;		/* { dg-error "long" } */
++
++signed short char16_t	c8;		/* { dg-error "signed" } */
++signed short char32_t	c9;		/* { dg-error "signed" } */
++signed long char16_t	ca;		/* { dg-error "signed" } */
++signed long char32_t	cb;		/* { dg-error "signed" } */
++unsigned short char16_t	cc;		/* { dg-error "unsigned" } */
++unsigned short char32_t	cd;		/* { dg-error "unsigned" } */
++unsigned long char16_t	ce;		/* { dg-error "unsigned" } */
++unsigned long char32_t	cf;		/* { dg-error "unsigned" } */
++
++int main () {}
 Index: gcc/testsuite/g++.dg/ext/utf32-2.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/utf32-2.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/utf32-2.C	(revision 134438)
-***************
-*** 0 ****
---- 1,29 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Test the support for char32_t* string constants. */
-+ /* { dg-do run } */
-+ /* { dg-options "-std=c++0x -Wall -Werror" } */
-+ 
-+ extern "C" void abort (void);
-+ 
-+ const static char32_t	*s0 = U"ab";
-+ const static char32_t	*s1 = U"a\u0024";
-+ const static char32_t	*s2 = U"a\u2029";
-+ const static char32_t	*s3 = U"a\U00064321";
-+ 
-+ #define A	0x00000061
-+ #define B	0x00000062
-+ #define D	0x00000024
-+ #define X	0x00002029
-+ #define Y	0x00064321
-+ 
-+ int main ()
-+ {
-+     if (s0[0] != A || s0[1] != B || s0[2] != 0x00000000)
-+ 	abort ();
-+     if (s1[0] != A || s1[1] != D || s0[2] != 0x00000000)
-+ 	abort ();
-+     if (s2[0] != A || s2[1] != X || s0[2] != 0x00000000)
-+ 	abort ();
-+     if (s3[0] != A || s3[1] != Y || s3[2] != 0x00000000)
-+ 	abort ();
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/utf32-2.C	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,29 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Test the support for char32_t* string constants. */
++/* { dg-do run } */
++/* { dg-options "-std=c++0x -Wall -Werror" } */
++
++extern "C" void abort (void);
++
++const static char32_t	*s0 = U"ab";
++const static char32_t	*s1 = U"a\u0024";
++const static char32_t	*s2 = U"a\u2029";
++const static char32_t	*s3 = U"a\U00064321";
++
++#define A	0x00000061
++#define B	0x00000062
++#define D	0x00000024
++#define X	0x00002029
++#define Y	0x00064321
++
++int main ()
++{
++    if (s0[0] != A || s0[1] != B || s0[2] != 0x00000000)
++	abort ();
++    if (s1[0] != A || s1[1] != D || s0[2] != 0x00000000)
++	abort ();
++    if (s2[0] != A || s2[1] != X || s0[2] != 0x00000000)
++	abort ();
++    if (s3[0] != A || s3[1] != Y || s3[2] != 0x00000000)
++	abort ();
++}
 Index: gcc/testsuite/g++.dg/ext/utf-gnuxx0x.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/utf-gnuxx0x.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/utf-gnuxx0x.C	(revision 134438)
-***************
-*** 0 ****
---- 1,14 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Test parsing of u and U prefixes when also used as macros. */
-+ /* { dg-do compile } */
-+ /* { dg-options "-std=gnu++0x" } */
-+ 
-+ #define u	L
-+ #define U	L
-+ 
-+ const unsigned short	c2	= u'a';
-+ const unsigned long	c3	= U'a';
-+ const void		*s0	= u"a";
-+ const void		*s1	= U"a";
-+ 
-+ int main () {}
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/utf-gnuxx0x.C	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,14 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Test parsing of u and U prefixes when also used as macros. */
++/* { dg-do compile } */
++/* { dg-options "-std=gnu++0x" } */
++
++#define u	L
++#define U	L
++
++const unsigned short	c2	= u'a';
++const unsigned long	c3	= U'a';
++const void		*s0	= u"a";
++const void		*s1	= U"a";
++
++int main () {}
 Index: gcc/testsuite/g++.dg/ext/utf32-3.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/utf32-3.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/utf32-3.C	(revision 134438)
-***************
-*** 0 ****
---- 1,46 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Test concatenation of char32_t* string literals. */
-+ /* { dg-do run } */
-+ /* { dg-options "-std=c++0x -Wall -Werror" } */
-+ 
-+ extern "C" void abort (void);
-+ 
-+ const static char32_t	*s0 = U"a" U"b";
-+ 
-+ const static char32_t	*s1 = U"a" "b";
-+ const static char32_t	*s2 = "a" U"b";
-+ const static char32_t	*s3 = U"a" "\u2029";
-+ const static char32_t	*s4 = "\u2029" U"b";
-+ const static char32_t	*s5 = U"a" "\U00064321";
-+ const static char32_t	*s6 = "\U00064321" U"b";
-+ 
-+ #define A	0x00000061
-+ #define B	0x00000062
-+ #define X	0x00002029
-+ #define Y	0x00064321
-+ 
-+ int main ()
-+ {
-+     if (sizeof ((U"a" U"b")[0]) != sizeof (char32_t))
-+ 	abort ();
-+     if (sizeof ((U"a"  "b")[0]) != sizeof (char32_t))
-+ 	abort ();
-+     if (sizeof (( "a" U"b")[0]) != sizeof (char32_t))
-+ 	abort ();
-+ 
-+     if (s0[0] != A || s0[1] != B || s0[2] != 0x00000000)
-+ 	abort ();
-+ 
-+     if (s1[0] != A || s1[1] != B || s1[2] != 0x00000000)
-+ 	abort ();
-+     if (s2[0] != A || s2[1] != B || s2[2] != 0x00000000)
-+ 	abort ();
-+     if (s3[0] != A || s3[1] != X || s3[2] != 0x00000000)
-+ 	abort ();
-+     if (s4[0] != X || s4[1] != B || s4[2] != 0x00000000)
-+ 	abort ();
-+     if (s5[0] != A || s5[1] != Y || s5[2] != 0x00000000)
-+ 	abort ();
-+     if (s6[0] != Y || s6[1] != B || s6[2] != 0x00000000)
-+ 	abort ();
-+ }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/utf32-3.C	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,46 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Test concatenation of char32_t* string literals. */
++/* { dg-do run } */
++/* { dg-options "-std=c++0x -Wall -Werror" } */
++
++extern "C" void abort (void);
++
++const static char32_t	*s0 = U"a" U"b";
++
++const static char32_t	*s1 = U"a" "b";
++const static char32_t	*s2 = "a" U"b";
++const static char32_t	*s3 = U"a" "\u2029";
++const static char32_t	*s4 = "\u2029" U"b";
++const static char32_t	*s5 = U"a" "\U00064321";
++const static char32_t	*s6 = "\U00064321" U"b";
++
++#define A	0x00000061
++#define B	0x00000062
++#define X	0x00002029
++#define Y	0x00064321
++
++int main ()
++{
++    if (sizeof ((U"a" U"b")[0]) != sizeof (char32_t))
++	abort ();
++    if (sizeof ((U"a"  "b")[0]) != sizeof (char32_t))
++	abort ();
++    if (sizeof (( "a" U"b")[0]) != sizeof (char32_t))
++	abort ();
++
++    if (s0[0] != A || s0[1] != B || s0[2] != 0x00000000)
++	abort ();
++
++    if (s1[0] != A || s1[1] != B || s1[2] != 0x00000000)
++	abort ();
++    if (s2[0] != A || s2[1] != B || s2[2] != 0x00000000)
++	abort ();
++    if (s3[0] != A || s3[1] != X || s3[2] != 0x00000000)
++	abort ();
++    if (s4[0] != X || s4[1] != B || s4[2] != 0x00000000)
++	abort ();
++    if (s5[0] != A || s5[1] != Y || s5[2] != 0x00000000)
++	abort ();
++    if (s6[0] != Y || s6[1] != B || s6[2] != 0x00000000)
++	abort ();
++}
 Index: gcc/testsuite/g++.dg/ext/utf-typedef-cxx98.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/utf-typedef-cxx98.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/utf-typedef-cxx98.C	(revision 134438)
-***************
-*** 0 ****
---- 1,7 ----
-+ /* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
-+ /* Ensure that a typedef to char16_t/char32_t is fine in c++98. */
-+ /* { dg-do compile } */
-+ /* { dg-options "-std=c++98" } */
-+ 
-+ typedef short unsigned int	char16_t;
-+ typedef unsigned int		char32_t;
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/utf-typedef-cxx98.C	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,7 @@
++/* Contributed by Kris Van Hees <kris.van.hees@oracle.com> */
++/* Ensure that a typedef to char16_t/char32_t is fine in c++98. */
++/* { dg-do compile } */
++/* { dg-options "-std=c++98" } */
++
++typedef short unsigned int	char16_t;
++typedef unsigned int		char32_t;
 Index: gcc/testsuite/g++.dg/ext/utf-mangle.C
 ===================================================================
-*** gcc/testsuite/g++.dg/ext/utf-mangle.C	(revision 0)
---- gcc/testsuite/g++.dg/ext/utf-mangle.C	(revision 134438)
-***************
-*** 0 ****
---- 1,14 ----
-+ // Contributed by Kris Van Hees <kris.van.hees@oracle.com>
-+ // Test the support for char16_t character constants.
-+ // { dg-do compile }
-+ // { dg-options "-std=c++0x" }
-+ 
-+ void f0 (char16_t c) {}
-+ void f1 (char32_t c) {}
-+ void f2 (char16_t *s) {}
-+ void f3 (char32_t *s) {}
-+ 
-+ // { dg-final { scan-assembler "_Z2f0u8char16_t:" } }
-+ // { dg-final { scan-assembler "_Z2f1u8char32_t:" } }
-+ // { dg-final { scan-assembler "_Z2f2Pu8char16_t:" } }
-+ // { dg-final { scan-assembler "_Z2f3Pu8char32_t:" } }
+--- /dev/null	1970-01-01 00:00:00.000000000 +0000
++++ gcc/testsuite/g++.dg/ext/utf-mangle.C	2009-09-21 11:51:53.000000000 +0200
+@@ -0,0 +1,14 @@
++// Contributed by Kris Van Hees <kris.van.hees@oracle.com>
++// Test the support for char16_t character constants.
++// { dg-do compile }
++// { dg-options "-std=c++0x" }
++
++void f0 (char16_t c) {}
++void f1 (char32_t c) {}
++void f2 (char16_t *s) {}
++void f3 (char32_t *s) {}
++
++// { dg-final { scan-assembler "_Z2f0u8char16_t:" } }
++// { dg-final { scan-assembler "_Z2f1u8char32_t:" } }
++// { dg-final { scan-assembler "_Z2f2Pu8char16_t:" } }
++// { dg-final { scan-assembler "_Z2f3Pu8char32_t:" } }
 Index: gcc/cp/typeck.c
 ===================================================================
-*** gcc/cp/typeck.c	(revision 134437)
---- gcc/cp/typeck.c	(revision 134438)
-*************** string_conv_p (const_tree totype, const_
-*** 1722,1733 ****
-  
-    t = TREE_TYPE (totype);
-    if (!same_type_p (t, char_type_node)
-        && !same_type_p (t, wchar_type_node))
-      return 0;
-  
-    if (TREE_CODE (exp) == STRING_CST)
-      {
-!       /* Make sure that we don't try to convert between char and wchar_t.  */
-        if (!same_type_p (TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (exp))), t))
-  	return 0;
-      }
---- 1722,1735 ----
-  
-    t = TREE_TYPE (totype);
-    if (!same_type_p (t, char_type_node)
-+       && !same_type_p (t, char16_type_node)
-+       && !same_type_p (t, char32_type_node)
-        && !same_type_p (t, wchar_type_node))
-      return 0;
-  
-    if (TREE_CODE (exp) == STRING_CST)
-      {
-!       /* Make sure that we don't try to convert between char and wide chars.  */
-        if (!same_type_p (TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (exp))), t))
-  	return 0;
-      }
+--- gcc/cp/typeck.c.orig	2009-04-27 10:15:35.000000000 +0200
++++ gcc/cp/typeck.c	2009-09-21 11:51:53.000000000 +0200
+@@ -1701,12 +1701,14 @@ string_conv_p (const_tree totype, const_
+ 
+   t = TREE_TYPE (totype);
+   if (!same_type_p (t, char_type_node)
++      && !same_type_p (t, char16_type_node)
++      && !same_type_p (t, char32_type_node)
+       && !same_type_p (t, wchar_type_node))
+     return 0;
+ 
+   if (TREE_CODE (exp) == STRING_CST)
+     {
+-      /* Make sure that we don't try to convert between char and wchar_t.  */
++      /* Make sure that we don't try to convert between char and wide chars.  */
+       if (!same_type_p (TYPE_MAIN_VARIANT (TREE_TYPE (TREE_TYPE (exp))), t))
+ 	return 0;
+     }
 Index: gcc/cp/decl.c
 ===================================================================
-*** gcc/cp/decl.c	(revision 134437)
---- gcc/cp/decl.c	(revision 134438)
-*************** grokdeclarator (const cp_declarator *dec
-*** 7732,7737 ****
---- 7732,7744 ----
-  	error ("%<long%> or %<short%> specified with char for %qs", name);
-        else if (long_p && short_p)
-  	error ("%<long%> and %<short%> specified together for %qs", name);
-+       else if (type == char16_type_node || type == char32_type_node)
-+ 	{
-+ 	  if (signed_p || unsigned_p)
-+ 	    error ("%<signed%> or %<unsigned%> invalid for %qs", name);
-+ 	  else if (short_p || long_p)
-+ 	    error ("%<short%> or %<long%> invalid for %qs", name);
-+ 	}
-        else
-  	{
-  	  ok = 1;
+--- gcc/cp/decl.c.orig	2009-09-21 11:44:36.000000000 +0200
++++ gcc/cp/decl.c	2009-09-21 11:51:53.000000000 +0200
+@@ -7751,6 +7751,13 @@ grokdeclarator (const cp_declarator *dec
+ 	error ("%<long%> or %<short%> specified with char for %qs", name);
+       else if (long_p && short_p)
+ 	error ("%<long%> and %<short%> specified together for %qs", name);
++      else if (type == char16_type_node || type == char32_type_node)
++	{
++	  if (signed_p || unsigned_p)
++	    error ("%<signed%> or %<unsigned%> invalid for %qs", name);
++	  else if (short_p || long_p)
++	    error ("%<short%> or %<long%> invalid for %qs", name);
++	}
+       else
+ 	{
+ 	  ok = 1;
 Index: gcc/cp/cvt.c
 ===================================================================
-*** gcc/cp/cvt.c	(revision 134437)
---- gcc/cp/cvt.c	(revision 134438)
-*************** type_promotes_to (tree type)
-*** 1219,1224 ****
---- 1219,1226 ----
-    /* Normally convert enums to int, but convert wide enums to something
-       wider.  */
-    else if (TREE_CODE (type) == ENUMERAL_TYPE
-+ 	   || type == char16_type_node
-+ 	   || type == char32_type_node
-  	   || type == wchar_type_node)
-      {
-        int precision = MAX (TYPE_PRECISION (type),
+--- gcc/cp/cvt.c.orig	2009-04-27 10:15:35.000000000 +0200
++++ gcc/cp/cvt.c	2009-09-21 11:51:53.000000000 +0200
+@@ -1210,6 +1210,8 @@ type_promotes_to (tree type)
+   /* Normally convert enums to int, but convert wide enums to something
+      wider.  */
+   else if (TREE_CODE (type) == ENUMERAL_TYPE
++	   || type == char16_type_node
++	   || type == char32_type_node
+ 	   || type == wchar_type_node)
+     {
+       int precision = MAX (TYPE_PRECISION (type),
 Index: gcc/cp/tree.c
 ===================================================================
-*** gcc/cp/tree.c	(revision 134437)
---- gcc/cp/tree.c	(revision 134438)
-*************** char_type_p (tree type)
-*** 2474,2479 ****
---- 2474,2481 ----
-    return (same_type_p (type, char_type_node)
-  	  || same_type_p (type, unsigned_char_type_node)
-  	  || same_type_p (type, signed_char_type_node)
-+ 	  || same_type_p (type, char16_type_node)
-+ 	  || same_type_p (type, char32_type_node)
-  	  || same_type_p (type, wchar_type_node));
-  }
-  
+--- gcc/cp/tree.c.orig	2009-09-21 11:48:32.000000000 +0200
++++ gcc/cp/tree.c	2009-09-21 11:51:53.000000000 +0200
+@@ -2492,6 +2492,8 @@ char_type_p (tree type)
+   return (same_type_p (type, char_type_node)
+ 	  || same_type_p (type, unsigned_char_type_node)
+ 	  || same_type_p (type, signed_char_type_node)
++	  || same_type_p (type, char16_type_node)
++	  || same_type_p (type, char32_type_node)
+ 	  || same_type_p (type, wchar_type_node));
+ }
+ 
 Index: gcc/cp/mangle.c
 ===================================================================
-*** gcc/cp/mangle.c	(revision 134437)
---- gcc/cp/mangle.c	(revision 134438)
-*************** write_builtin_type (tree type)
-*** 1782,1791 ****
-        break;
-  
-      case INTEGER_TYPE:
-!       /* TYPE may still be wchar_t, since that isn't in
-! 	 integer_type_nodes.  */
-        if (type == wchar_type_node)
-  	write_char ('w');
-        else if (TYPE_FOR_JAVA (type))
-  	write_java_integer_type_codes (type);
-        else
---- 1782,1795 ----
-        break;
-  
-      case INTEGER_TYPE:
-!       /* TYPE may still be wchar_t, char16_t, or char32_t, since that
-! 	 isn't in integer_type_nodes.  */
-        if (type == wchar_type_node)
-  	write_char ('w');
-+       else if (type == char16_type_node)
-+ 	write_string ("u8char16_t");
-+       else if (type == char32_type_node)
-+ 	write_string ("u8char32_t");
-        else if (TYPE_FOR_JAVA (type))
-  	write_java_integer_type_codes (type);
-        else
+--- gcc/cp/mangle.c.orig	2008-02-19 10:54:28.000000000 +0100
++++ gcc/cp/mangle.c	2009-09-21 11:51:53.000000000 +0200
+@@ -1782,10 +1782,14 @@ write_builtin_type (tree type)
+       break;
+ 
+     case INTEGER_TYPE:
+-      /* TYPE may still be wchar_t, since that isn't in
+-	 integer_type_nodes.  */
++      /* TYPE may still be wchar_t, char16_t, or char32_t, since that
++	 isn't in integer_type_nodes.  */
+       if (type == wchar_type_node)
+ 	write_char ('w');
++      else if (type == char16_type_node)
++	write_string ("u8char16_t");
++      else if (type == char32_type_node)
++	write_string ("u8char32_t");
+       else if (TYPE_FOR_JAVA (type))
+ 	write_java_integer_type_codes (type);
+       else
 Index: gcc/cp/lex.c
 ===================================================================
-*** gcc/cp/lex.c	(revision 134437)
---- gcc/cp/lex.c	(revision 134438)
-*************** static const struct resword reswords[] =
-*** 241,246 ****
---- 241,248 ----
-    { "case",		RID_CASE,	0 },
-    { "catch",		RID_CATCH,	0 },
-    { "char",		RID_CHAR,	0 },
-+   { "char16_t",		RID_CHAR16,	D_CXX0X },
-+   { "char32_t",		RID_CHAR32,	D_CXX0X },
-    { "class",		RID_CLASS,	0 },
-    { "const",		RID_CONST,	0 },
-    { "const_cast",	RID_CONSTCAST,	0 },
+--- gcc/cp/lex.c.orig	2008-02-19 10:54:28.000000000 +0100
++++ gcc/cp/lex.c	2009-09-21 11:51:53.000000000 +0200
+@@ -241,6 +241,8 @@ static const struct resword reswords[] =
+   { "case",		RID_CASE,	0 },
+   { "catch",		RID_CATCH,	0 },
+   { "char",		RID_CHAR,	0 },
++  { "char16_t",		RID_CHAR16,	D_CXX0X },
++  { "char32_t",		RID_CHAR32,	D_CXX0X },
+   { "class",		RID_CLASS,	0 },
+   { "const",		RID_CONST,	0 },
+   { "const_cast",	RID_CONSTCAST,	0 },
 Index: gcc/cp/parser.c
 ===================================================================
-*** gcc/cp/parser.c	(revision 134437)
---- gcc/cp/parser.c	(revision 134438)
-*************** cp_lexer_next_token_is_decl_specifier_ke
-*** 556,561 ****
---- 556,563 ----
-      case RID_TYPENAME:
-        /* Simple type specifiers.  */
-      case RID_CHAR:
-+     case RID_CHAR16:
-+     case RID_CHAR32:
-      case RID_WCHAR:
-      case RID_BOOL:
-      case RID_SHORT:
-*************** cp_lexer_print_token (FILE * stream, cp_
-*** 789,794 ****
---- 791,798 ----
-        break;
-  
-      case CPP_STRING:
-+     case CPP_STRING16:
-+     case CPP_STRING32:
-      case CPP_WSTRING:
-        fprintf (stream, " \"%s\"", TREE_STRING_POINTER (token->u.value));
-        break;
-*************** cp_parser_parsing_tentatively (cp_parser
-*** 2033,2039 ****
-  static bool
-  cp_parser_is_string_literal (cp_token* token)
-  {
-!   return (token->type == CPP_STRING || token->type == CPP_WSTRING);
-  }
-  
-  /* Returns nonzero if TOKEN is the indicated KEYWORD.  */
---- 2037,2046 ----
-  static bool
-  cp_parser_is_string_literal (cp_token* token)
-  {
-!   return (token->type == CPP_STRING ||
-! 	  token->type == CPP_STRING16 ||
-! 	  token->type == CPP_STRING32 ||
-! 	  token->type == CPP_WSTRING);
-  }
-  
-  /* Returns nonzero if TOKEN is the indicated KEYWORD.  */
-*************** static tree
-*** 2867,2877 ****
-  cp_parser_string_literal (cp_parser *parser, bool translate, bool wide_ok)
-  {
-    tree value;
--   bool wide = false;
-    size_t count;
-    struct obstack str_ob;
-    cpp_string str, istr, *strs;
-    cp_token *tok;
-  
-    tok = cp_lexer_peek_token (parser->lexer);
-    if (!cp_parser_is_string_literal (tok))
---- 2874,2884 ----
-  cp_parser_string_literal (cp_parser *parser, bool translate, bool wide_ok)
-  {
-    tree value;
-    size_t count;
-    struct obstack str_ob;
-    cpp_string str, istr, *strs;
-    cp_token *tok;
-+   enum cpp_ttype type;
-  
-    tok = cp_lexer_peek_token (parser->lexer);
-    if (!cp_parser_is_string_literal (tok))
-*************** cp_parser_string_literal (cp_parser *par
-*** 2880,2885 ****
---- 2887,2894 ----
-        return error_mark_node;
-      }
-  
-+   type = tok->type;
-+ 
-    /* Try to avoid the overhead of creating and destroying an obstack
-       for the common case of just one string.  */
-    if (!cp_parser_is_string_literal
-*************** cp_parser_string_literal (cp_parser *par
-*** 2890,2897 ****
-        str.text = (const unsigned char *)TREE_STRING_POINTER (tok->u.value);
-        str.len = TREE_STRING_LENGTH (tok->u.value);
-        count = 1;
--       if (tok->type == CPP_WSTRING)
-- 	wide = true;
-  
-        strs = &str;
-      }
---- 2899,2904 ----
-*************** cp_parser_string_literal (cp_parser *par
-*** 2906,2913 ****
-  	  count++;
-  	  str.text = (const unsigned char *)TREE_STRING_POINTER (tok->u.value);
-  	  str.len = TREE_STRING_LENGTH (tok->u.value);
-! 	  if (tok->type == CPP_WSTRING)
-! 	    wide = true;
-  
-  	  obstack_grow (&str_ob, &str, sizeof (cpp_string));
-  
---- 2913,2926 ----
-  	  count++;
-  	  str.text = (const unsigned char *)TREE_STRING_POINTER (tok->u.value);
-  	  str.len = TREE_STRING_LENGTH (tok->u.value);
-! 
-! 	  if (type != tok->type)
-! 	    {
-! 	      if (type == CPP_STRING)
-! 		type = tok->type;
-! 	      else if (tok->type != CPP_STRING)
-! 		error ("unsupported non-standard concatenation of string literals");
-! 	    }
-  
-  	  obstack_grow (&str_ob, &str, sizeof (cpp_string));
-  
-*************** cp_parser_string_literal (cp_parser *par
-*** 2918,2936 ****
-        strs = (cpp_string *) obstack_finish (&str_ob);
-      }
-  
-!   if (wide && !wide_ok)
-      {
-        cp_parser_error (parser, "a wide string is invalid in this context");
-!       wide = false;
-      }
-  
-    if ((translate ? cpp_interpret_string : cpp_interpret_string_notranslate)
-!       (parse_in, strs, count, &istr, wide))
-      {
-        value = build_string (istr.len, (const char *)istr.text);
-        free (CONST_CAST (unsigned char *, istr.text));
-  
-!       TREE_TYPE (value) = wide ? wchar_array_type_node : char_array_type_node;
-        value = fix_string_type (value);
-      }
-    else
---- 2931,2965 ----
-        strs = (cpp_string *) obstack_finish (&str_ob);
-      }
-  
-!   if (type != CPP_STRING && !wide_ok)
-      {
-        cp_parser_error (parser, "a wide string is invalid in this context");
-!       type = CPP_STRING;
-      }
-  
-    if ((translate ? cpp_interpret_string : cpp_interpret_string_notranslate)
-!       (parse_in, strs, count, &istr, type))
-      {
-        value = build_string (istr.len, (const char *)istr.text);
-        free (CONST_CAST (unsigned char *, istr.text));
-  
-!       switch (type)
-! 	{
-! 	default:
-! 	case CPP_STRING:
-! 	  TREE_TYPE (value) = char_array_type_node;
-! 	  break;
-! 	case CPP_STRING16:
-! 	  TREE_TYPE (value) = char16_array_type_node;
-! 	  break;
-! 	case CPP_STRING32:
-! 	  TREE_TYPE (value) = char32_array_type_node;
-! 	  break;
-! 	case CPP_WSTRING:
-! 	  TREE_TYPE (value) = wchar_array_type_node;
-! 	  break;
-! 	}
-! 
-        value = fix_string_type (value);
-      }
-    else
-*************** cp_parser_primary_expression (cp_parser
-*** 3085,3090 ****
---- 3114,3121 ----
-  	   string-literal
-  	   boolean-literal  */
-      case CPP_CHAR:
-+     case CPP_CHAR16:
-+     case CPP_CHAR32:
-      case CPP_WCHAR:
-      case CPP_NUMBER:
-        token = cp_lexer_consume_token (parser->lexer);
-*************** cp_parser_primary_expression (cp_parser
-*** 3136,3141 ****
---- 3167,3174 ----
-        return token->u.value;
-  
-      case CPP_STRING:
-+     case CPP_STRING16:
-+     case CPP_STRING32:
-      case CPP_WSTRING:
-        /* ??? Should wide strings be allowed when parser->translate_strings_p
-  	 is false (i.e. in attributes)?  If not, we can kill the third
-*************** cp_parser_type_specifier (cp_parser* par
-*** 10762,10767 ****
---- 10795,10802 ----
-     simple-type-specifier:
-       auto
-       decltype ( expression )   
-+      char16_t
-+      char32_t
-  
-     GNU Extension:
-  
-*************** cp_parser_simple_type_specifier (cp_pars
-*** 10791,10796 ****
---- 10826,10837 ----
-  	decl_specs->explicit_char_p = true;
-        type = char_type_node;
-        break;
-+     case RID_CHAR16:
-+       type = char16_type_node;
-+       break;
-+     case RID_CHAR32:
-+       type = char32_type_node;
-+       break;
-      case RID_WCHAR:
-        type = wchar_type_node;
-        break;
-*************** cp_parser_set_decl_spec_type (cp_decl_sp
-*** 17754,17766 ****
-  {
-    decl_specs->any_specifiers_p = true;
-  
-!   /* If the user tries to redeclare bool or wchar_t (with, for
-!      example, in "typedef int wchar_t;") we remember that this is what
-!      happened.  In system headers, we ignore these declarations so
-!      that G++ can work with system headers that are not C++-safe.  */
-    if (decl_specs->specs[(int) ds_typedef]
-        && !user_defined_p
-        && (type_spec == boolean_type_node
-  	  || type_spec == wchar_type_node)
-        && (decl_specs->type
-  	  || decl_specs->specs[(int) ds_long]
---- 17795,17810 ----
-  {
-    decl_specs->any_specifiers_p = true;
-  
-!   /* If the user tries to redeclare bool, char16_t, char32_t, or wchar_t
-!      (with, for example, in "typedef int wchar_t;") we remember that
-!      this is what happened.  In system headers, we ignore these
-!      declarations so that G++ can work with system headers that are not
-!      C++-safe.  */
-    if (decl_specs->specs[(int) ds_typedef]
-        && !user_defined_p
-        && (type_spec == boolean_type_node
-+ 	  || type_spec == char16_type_node
-+ 	  || type_spec == char32_type_node
-  	  || type_spec == wchar_type_node)
-        && (decl_specs->type
-  	  || decl_specs->specs[(int) ds_long]
+--- gcc/cp/parser.c.orig	2009-07-13 14:58:57.000000000 +0200
++++ gcc/cp/parser.c	2009-09-21 11:51:53.000000000 +0200
+@@ -562,6 +562,8 @@ cp_lexer_next_token_is_decl_specifier_ke
+     case RID_TYPENAME:
+       /* Simple type specifiers.  */
+     case RID_CHAR:
++    case RID_CHAR16:
++    case RID_CHAR32:
+     case RID_WCHAR:
+     case RID_BOOL:
+     case RID_SHORT:
+@@ -795,6 +797,8 @@ cp_lexer_print_token (FILE * stream, cp_
+       break;
+ 
+     case CPP_STRING:
++    case CPP_STRING16:
++    case CPP_STRING32:
+     case CPP_WSTRING:
+       fprintf (stream, " \"%s\"", TREE_STRING_POINTER (token->u.value));
+       break;
+@@ -2037,7 +2041,10 @@ cp_parser_parsing_tentatively (cp_parser
+ static bool
+ cp_parser_is_string_literal (cp_token* token)
+ {
+-  return (token->type == CPP_STRING || token->type == CPP_WSTRING);
++  return (token->type == CPP_STRING ||
++	  token->type == CPP_STRING16 ||
++	  token->type == CPP_STRING32 ||
++	  token->type == CPP_WSTRING);
+ }
+ 
+ /* Returns nonzero if TOKEN is the indicated KEYWORD.  */
+@@ -2867,11 +2874,11 @@ static tree
+ cp_parser_string_literal (cp_parser *parser, bool translate, bool wide_ok)
+ {
+   tree value;
+-  bool wide = false;
+   size_t count;
+   struct obstack str_ob;
+   cpp_string str, istr, *strs;
+   cp_token *tok;
++  enum cpp_ttype type;
+ 
+   tok = cp_lexer_peek_token (parser->lexer);
+   if (!cp_parser_is_string_literal (tok))
+@@ -2880,6 +2887,8 @@ cp_parser_string_literal (cp_parser *par
+       return error_mark_node;
+     }
+ 
++  type = tok->type;
++
+   /* Try to avoid the overhead of creating and destroying an obstack
+      for the common case of just one string.  */
+   if (!cp_parser_is_string_literal
+@@ -2890,8 +2899,6 @@ cp_parser_string_literal (cp_parser *par
+       str.text = (const unsigned char *)TREE_STRING_POINTER (tok->u.value);
+       str.len = TREE_STRING_LENGTH (tok->u.value);
+       count = 1;
+-      if (tok->type == CPP_WSTRING)
+-	wide = true;
+ 
+       strs = &str;
+     }
+@@ -2906,8 +2913,14 @@ cp_parser_string_literal (cp_parser *par
+ 	  count++;
+ 	  str.text = (const unsigned char *)TREE_STRING_POINTER (tok->u.value);
+ 	  str.len = TREE_STRING_LENGTH (tok->u.value);
+-	  if (tok->type == CPP_WSTRING)
+-	    wide = true;
++
++	  if (type != tok->type)
++	    {
++	      if (type == CPP_STRING)
++		type = tok->type;
++	      else if (tok->type != CPP_STRING)
++		error ("unsupported non-standard concatenation of string literals");
++	    }
+ 
+ 	  obstack_grow (&str_ob, &str, sizeof (cpp_string));
+ 
+@@ -2918,19 +2931,35 @@ cp_parser_string_literal (cp_parser *par
+       strs = (cpp_string *) obstack_finish (&str_ob);
+     }
+ 
+-  if (wide && !wide_ok)
++  if (type != CPP_STRING && !wide_ok)
+     {
+       cp_parser_error (parser, "a wide string is invalid in this context");
+-      wide = false;
++      type = CPP_STRING;
+     }
+ 
+   if ((translate ? cpp_interpret_string : cpp_interpret_string_notranslate)
+-      (parse_in, strs, count, &istr, wide))
++      (parse_in, strs, count, &istr, type))
+     {
+       value = build_string (istr.len, (const char *)istr.text);
+       free (CONST_CAST (unsigned char *, istr.text));
+ 
+-      TREE_TYPE (value) = wide ? wchar_array_type_node : char_array_type_node;
++      switch (type)
++	{
++	default:
++	case CPP_STRING:
++	  TREE_TYPE (value) = char_array_type_node;
++	  break;
++	case CPP_STRING16:
++	  TREE_TYPE (value) = char16_array_type_node;
++	  break;
++	case CPP_STRING32:
++	  TREE_TYPE (value) = char32_array_type_node;
++	  break;
++	case CPP_WSTRING:
++	  TREE_TYPE (value) = wchar_array_type_node;
++	  break;
++	}
++
+       value = fix_string_type (value);
+     }
+   else
+@@ -3085,6 +3114,8 @@ cp_parser_primary_expression (cp_parser
+ 	   string-literal
+ 	   boolean-literal  */
+     case CPP_CHAR:
++    case CPP_CHAR16:
++    case CPP_CHAR32:
+     case CPP_WCHAR:
+     case CPP_NUMBER:
+       token = cp_lexer_consume_token (parser->lexer);
+@@ -3136,6 +3167,8 @@ cp_parser_primary_expression (cp_parser
+       return token->u.value;
+ 
+     case CPP_STRING:
++    case CPP_STRING16:
++    case CPP_STRING32:
+     case CPP_WSTRING:
+       /* ??? Should wide strings be allowed when parser->translate_strings_p
+ 	 is false (i.e. in attributes)?  If not, we can kill the third
+@@ -10739,6 +10772,8 @@ cp_parser_type_specifier (cp_parser* par
+ 
+    simple-type-specifier:
+      decltype ( expression )   
++     char16_t
++     char32_t
+ 
+    GNU Extension:
+ 
+@@ -10768,6 +10803,12 @@ cp_parser_simple_type_specifier (cp_pars
+ 	decl_specs->explicit_char_p = true;
+       type = char_type_node;
+       break;
++    case RID_CHAR16:
++      type = char16_type_node;
++      break;
++    case RID_CHAR32:
++      type = char32_type_node;
++      break;
+     case RID_WCHAR:
+       type = wchar_type_node;
+       break;
+@@ -17701,13 +17742,16 @@ cp_parser_set_decl_spec_type (cp_decl_sp
+ {
+   decl_specs->any_specifiers_p = true;
+ 
+-  /* If the user tries to redeclare bool or wchar_t (with, for
+-     example, in "typedef int wchar_t;") we remember that this is what
+-     happened.  In system headers, we ignore these declarations so
+-     that G++ can work with system headers that are not C++-safe.  */
++  /* If the user tries to redeclare bool, char16_t, char32_t, or wchar_t
++     (with, for example, in "typedef int wchar_t;") we remember that
++     this is what happened.  In system headers, we ignore these
++     declarations so that G++ can work with system headers that are not
++     C++-safe.  */
+   if (decl_specs->specs[(int) ds_typedef]
+       && !user_defined_p
+       && (type_spec == boolean_type_node
++	  || type_spec == char16_type_node
++	  || type_spec == char32_type_node
+ 	  || type_spec == wchar_type_node)
+       && (decl_specs->type
+ 	  || decl_specs->specs[(int) ds_long]
 Index: gcc/c-common.c
 ===================================================================
-*** gcc/c-common.c	(revision 134437)
---- gcc/c-common.c	(revision 134438)
-*************** cpp_reader *parse_in;		/* Declared in c-
-*** 66,71 ****
---- 66,79 ----
-  #define PID_TYPE "int"
-  #endif
-  
-+ #ifndef CHAR16_TYPE
-+ #define CHAR16_TYPE "short unsigned int"
-+ #endif
-+ 
-+ #ifndef CHAR32_TYPE
-+ #define CHAR32_TYPE "unsigned int"
-+ #endif
-+ 
-  #ifndef WCHAR_TYPE
-  #define WCHAR_TYPE "int"
-  #endif
-*************** cpp_reader *parse_in;		/* Declared in c-
-*** 123,128 ****
---- 131,139 ----
-  	tree signed_wchar_type_node;
-  	tree unsigned_wchar_type_node;
-  
-+ 	tree char16_type_node;
-+ 	tree char32_type_node;
-+ 
-  	tree float_type_node;
-  	tree double_type_node;
-  	tree long_double_type_node;
-*************** cpp_reader *parse_in;		/* Declared in c-
-*** 174,179 ****
---- 185,200 ----
-  
-  	tree wchar_array_type_node;
-  
-+    Type `char16_t[SOMENUMBER]' or something like it.
-+    Used when a UTF-16 string literal is created.
-+ 
-+ 	tree char16_array_type_node;
-+ 
-+    Type `char32_t[SOMENUMBER]' or something like it.
-+    Used when a UTF-32 string literal is created.
-+ 
-+ 	tree char32_array_type_node;
-+ 
-     Type `int ()' -- used for implicit declaration of functions.
-  
-  	tree default_function_type;
-*************** fname_as_string (int pretty_p)
-*** 777,783 ****
-    strname.text = (unsigned char *) namep;
-    strname.len = len - 1;
-  
-!   if (cpp_interpret_string (parse_in, &strname, 1, &cstr, false))
-      {
-        XDELETEVEC (namep);
-        return (const char *) cstr.text;
---- 798,804 ----
-    strname.text = (unsigned char *) namep;
-    strname.len = len - 1;
-  
-!   if (cpp_interpret_string (parse_in, &strname, 1, &cstr, CPP_STRING))
-      {
-        XDELETEVEC (namep);
-        return (const char *) cstr.text;
-*************** fname_decl (unsigned int rid, tree id)
-*** 857,870 ****
-  tree
-  fix_string_type (tree value)
-  {
--   const int wchar_bytes = TYPE_PRECISION (wchar_type_node) / BITS_PER_UNIT;
--   const int wide_flag = TREE_TYPE (value) == wchar_array_type_node;
-    int length = TREE_STRING_LENGTH (value);
-    int nchars;
-    tree e_type, i_type, a_type;
-  
-    /* Compute the number of elements, for the array type.  */
-!   nchars = wide_flag ? length / wchar_bytes : length;
-  
-    /* C89 2.2.4.1, C99 5.2.4.1 (Translation limits).  The analogous
-       limit in C++98 Annex B is very large (65536) and is not normative,
---- 878,908 ----
-  tree
-  fix_string_type (tree value)
-  {
-    int length = TREE_STRING_LENGTH (value);
-    int nchars;
-    tree e_type, i_type, a_type;
-  
-    /* Compute the number of elements, for the array type.  */
-!   if (TREE_TYPE (value) == char_array_type_node || !TREE_TYPE (value))
-!     {
-!       nchars = length;
-!       e_type = char_type_node;
-!     }
-!   else if (TREE_TYPE (value) == char16_array_type_node)
-!     {
-!       nchars = length / (TYPE_PRECISION (char16_type_node) / BITS_PER_UNIT);
-!       e_type = char16_type_node;
-!     }
-!   else if (TREE_TYPE (value) == char32_array_type_node)
-!     {
-!       nchars = length / (TYPE_PRECISION (char32_type_node) / BITS_PER_UNIT);
-!       e_type = char32_type_node;
-!     }
-!   else
-!     {
-!       nchars = length / (TYPE_PRECISION (wchar_type_node) / BITS_PER_UNIT);
-!       e_type = wchar_type_node;
-!     }
-  
-    /* C89 2.2.4.1, C99 5.2.4.1 (Translation limits).  The analogous
-       limit in C++98 Annex B is very large (65536) and is not normative,
-*************** fix_string_type (tree value)
-*** 899,905 ****
-       construct the matching unqualified array type first.  The C front
-       end does not require this, but it does no harm, so we do it
-       unconditionally.  */
--   e_type = wide_flag ? wchar_type_node : char_type_node;
-    i_type = build_index_type (build_int_cst (NULL_TREE, nchars - 1));
-    a_type = build_array_type (e_type, i_type);
-    if (c_dialect_cxx() || warn_write_strings)
---- 937,942 ----
-*************** c_define_builtins (tree va_list_ref_type
-*** 3629,3634 ****
---- 3666,3673 ----
-  void
-  c_common_nodes_and_builtins (void)
-  {
-+   int char16_type_size;
-+   int char32_type_size;
-    int wchar_type_size;
-    tree array_domain_type;
-    tree va_list_ref_type_node;
-*************** c_common_nodes_and_builtins (void)
-*** 3878,3883 ****
---- 3917,3954 ----
-    wchar_array_type_node
-      = build_array_type (wchar_type_node, array_domain_type);
-  
-+   /* Define 'char16_t'.  */
-+   char16_type_node = get_identifier (CHAR16_TYPE);
-+   char16_type_node = TREE_TYPE (identifier_global_value (char16_type_node));
-+   char16_type_size = TYPE_PRECISION (char16_type_node);
-+   if (c_dialect_cxx ())
-+     {
-+       char16_type_node = make_unsigned_type (char16_type_size);
-+ 
-+       if (cxx_dialect == cxx0x)
-+ 	record_builtin_type (RID_CHAR16, "char16_t", char16_type_node);
-+     }
-+ 
-+   /* This is for UTF-16 string constants.  */
-+   char16_array_type_node
-+     = build_array_type (char16_type_node, array_domain_type);
-+ 
-+   /* Define 'char32_t'.  */
-+   char32_type_node = get_identifier (CHAR32_TYPE);
-+   char32_type_node = TREE_TYPE (identifier_global_value (char32_type_node));
-+   char32_type_size = TYPE_PRECISION (char32_type_node);
-+   if (c_dialect_cxx ())
-+     {
-+       char32_type_node = make_unsigned_type (char32_type_size);
-+ 
-+       if (cxx_dialect == cxx0x)
-+ 	record_builtin_type (RID_CHAR32, "char32_t", char32_type_node);
-+     }
-+ 
-+   /* This is for UTF-32 string constants.  */
-+   char32_array_type_node
-+     = build_array_type (char32_type_node, array_domain_type);
-+ 
-    wint_type_node =
-      TREE_TYPE (identifier_global_value (get_identifier (WINT_TYPE)));
-  
-*************** c_parse_error (const char *gmsgid, enum
-*** 6662,6681 ****
-  
-    if (token == CPP_EOF)
-      message = catenate_messages (gmsgid, " at end of input");
-!   else if (token == CPP_CHAR || token == CPP_WCHAR)
-      {
-        unsigned int val = TREE_INT_CST_LOW (value);
-!       const char *const ell = (token == CPP_CHAR) ? "" : "L";
-        if (val <= UCHAR_MAX && ISGRAPH (val))
-  	message = catenate_messages (gmsgid, " before %s'%c'");
-        else
-  	message = catenate_messages (gmsgid, " before %s'\\x%x'");
-  
-!       error (message, ell, val);
-        free (message);
-        message = NULL;
-      }
-!   else if (token == CPP_STRING || token == CPP_WSTRING)
-      message = catenate_messages (gmsgid, " before string constant");
-    else if (token == CPP_NUMBER)
-      message = catenate_messages (gmsgid, " before numeric constant");
---- 6733,6771 ----
-  
-    if (token == CPP_EOF)
-      message = catenate_messages (gmsgid, " at end of input");
-!   else if (token == CPP_CHAR || token == CPP_WCHAR || token == CPP_CHAR16
-! 	   || token == CPP_CHAR32)
-      {
-        unsigned int val = TREE_INT_CST_LOW (value);
-!       const char *prefix;
-! 
-!       switch (token)
-! 	{
-! 	default:
-! 	  prefix = "";
-! 	  break;
-! 	case CPP_WCHAR:
-! 	  prefix = "L";
-! 	  break;
-! 	case CPP_CHAR16:
-! 	  prefix = "u";
-! 	  break;
-! 	case CPP_CHAR32:
-! 	  prefix = "U";
-! 	  break;
-!         }
-! 
-        if (val <= UCHAR_MAX && ISGRAPH (val))
-  	message = catenate_messages (gmsgid, " before %s'%c'");
-        else
-  	message = catenate_messages (gmsgid, " before %s'\\x%x'");
-  
-!       error (message, prefix, val);
-        free (message);
-        message = NULL;
-      }
-!   else if (token == CPP_STRING || token == CPP_WSTRING || token == CPP_STRING16
-! 	   || token == CPP_STRING32)
-      message = catenate_messages (gmsgid, " before string constant");
-    else if (token == CPP_NUMBER)
-      message = catenate_messages (gmsgid, " before numeric constant");
+--- gcc/c-common.c.orig	2009-04-06 11:32:16.000000000 +0200
++++ gcc/c-common.c	2009-09-21 11:51:53.000000000 +0200
+@@ -67,6 +67,14 @@ cpp_reader *parse_in;		/* Declared in c-
+ #define PID_TYPE "int"
+ #endif
+ 
++#ifndef CHAR16_TYPE
++#define CHAR16_TYPE "short unsigned int"
++#endif
++
++#ifndef CHAR32_TYPE
++#define CHAR32_TYPE "unsigned int"
++#endif
++
+ #ifndef WCHAR_TYPE
+ #define WCHAR_TYPE "int"
+ #endif
+@@ -124,6 +132,9 @@ cpp_reader *parse_in;		/* Declared in c-
+ 	tree signed_wchar_type_node;
+ 	tree unsigned_wchar_type_node;
+ 
++	tree char16_type_node;
++	tree char32_type_node;
++
+ 	tree float_type_node;
+ 	tree double_type_node;
+ 	tree long_double_type_node;
+@@ -175,6 +186,16 @@ cpp_reader *parse_in;		/* Declared in c-
+ 
+ 	tree wchar_array_type_node;
+ 
++   Type `char16_t[SOMENUMBER]' or something like it.
++   Used when a UTF-16 string literal is created.
++
++	tree char16_array_type_node;
++
++   Type `char32_t[SOMENUMBER]' or something like it.
++   Used when a UTF-32 string literal is created.
++
++	tree char32_array_type_node;
++
+    Type `int ()' -- used for implicit declaration of functions.
+ 
+ 	tree default_function_type;
+@@ -783,7 +804,7 @@ fname_as_string (int pretty_p)
+   strname.text = (unsigned char *) namep;
+   strname.len = len - 1;
+ 
+-  if (cpp_interpret_string (parse_in, &strname, 1, &cstr, false))
++  if (cpp_interpret_string (parse_in, &strname, 1, &cstr, CPP_STRING))
+     {
+       XDELETEVEC (namep);
+       return (const char *) cstr.text;
+@@ -867,14 +888,31 @@ fname_decl (unsigned int rid, tree id)
+ tree
+ fix_string_type (tree value)
+ {
+-  const int wchar_bytes = TYPE_PRECISION (wchar_type_node) / BITS_PER_UNIT;
+-  const int wide_flag = TREE_TYPE (value) == wchar_array_type_node;
+   int length = TREE_STRING_LENGTH (value);
+   int nchars;
+   tree e_type, i_type, a_type;
+ 
+   /* Compute the number of elements, for the array type.  */
+-  nchars = wide_flag ? length / wchar_bytes : length;
++  if (TREE_TYPE (value) == char_array_type_node || !TREE_TYPE (value))
++    {
++      nchars = length;
++      e_type = char_type_node;
++    }
++  else if (TREE_TYPE (value) == char16_array_type_node)
++    {
++      nchars = length / (TYPE_PRECISION (char16_type_node) / BITS_PER_UNIT);
++      e_type = char16_type_node;
++    }
++  else if (TREE_TYPE (value) == char32_array_type_node)
++    {
++      nchars = length / (TYPE_PRECISION (char32_type_node) / BITS_PER_UNIT);
++      e_type = char32_type_node;
++    }
++  else
++    {
++      nchars = length / (TYPE_PRECISION (wchar_type_node) / BITS_PER_UNIT);
++      e_type = wchar_type_node;
++    }
+ 
+   /* C89 2.2.4.1, C99 5.2.4.1 (Translation limits).  The analogous
+      limit in C++98 Annex B is very large (65536) and is not normative,
+@@ -909,7 +947,6 @@ fix_string_type (tree value)
+      construct the matching unqualified array type first.  The C front
+      end does not require this, but it does no harm, so we do it
+      unconditionally.  */
+-  e_type = wide_flag ? wchar_type_node : char_type_node;
+   i_type = build_index_type (build_int_cst (NULL_TREE, nchars - 1));
+   a_type = build_array_type (e_type, i_type);
+   if (c_dialect_cxx() || warn_write_strings)
+@@ -3645,6 +3682,8 @@ c_define_builtins (tree va_list_ref_type
+ void
+ c_common_nodes_and_builtins (void)
+ {
++  int char16_type_size;
++  int char32_type_size;
+   int wchar_type_size;
+   tree array_domain_type;
+   tree va_list_ref_type_node;
+@@ -3894,6 +3933,38 @@ c_common_nodes_and_builtins (void)
+   wchar_array_type_node
+     = build_array_type (wchar_type_node, array_domain_type);
+ 
++  /* Define 'char16_t'.  */
++  char16_type_node = get_identifier (CHAR16_TYPE);
++  char16_type_node = TREE_TYPE (identifier_global_value (char16_type_node));
++  char16_type_size = TYPE_PRECISION (char16_type_node);
++  if (c_dialect_cxx ())
++    {
++      char16_type_node = make_unsigned_type (char16_type_size);
++
++      if (cxx_dialect == cxx0x)
++	record_builtin_type (RID_CHAR16, "char16_t", char16_type_node);
++    }
++
++  /* This is for UTF-16 string constants.  */
++  char16_array_type_node
++    = build_array_type (char16_type_node, array_domain_type);
++
++  /* Define 'char32_t'.  */
++  char32_type_node = get_identifier (CHAR32_TYPE);
++  char32_type_node = TREE_TYPE (identifier_global_value (char32_type_node));
++  char32_type_size = TYPE_PRECISION (char32_type_node);
++  if (c_dialect_cxx ())
++    {
++      char32_type_node = make_unsigned_type (char32_type_size);
++
++      if (cxx_dialect == cxx0x)
++	record_builtin_type (RID_CHAR32, "char32_t", char32_type_node);
++    }
++
++  /* This is for UTF-32 string constants.  */
++  char32_array_type_node
++    = build_array_type (char32_type_node, array_domain_type);
++
+   wint_type_node =
+     TREE_TYPE (identifier_global_value (get_identifier (WINT_TYPE)));
+ 
+@@ -6667,20 +6738,39 @@ c_parse_error (const char *gmsgid, enum
+ 
+   if (token == CPP_EOF)
+     message = catenate_messages (gmsgid, " at end of input");
+-  else if (token == CPP_CHAR || token == CPP_WCHAR)
++  else if (token == CPP_CHAR || token == CPP_WCHAR || token == CPP_CHAR16
++	   || token == CPP_CHAR32)
+     {
+       unsigned int val = TREE_INT_CST_LOW (value);
+-      const char *const ell = (token == CPP_CHAR) ? "" : "L";
++      const char *prefix;
++
++      switch (token)
++	{
++	default:
++	  prefix = "";
++	  break;
++	case CPP_WCHAR:
++	  prefix = "L";
++	  break;
++	case CPP_CHAR16:
++	  prefix = "u";
++	  break;
++	case CPP_CHAR32:
++	  prefix = "U";
++	  break;
++        }
++
+       if (val <= UCHAR_MAX && ISGRAPH (val))
+ 	message = catenate_messages (gmsgid, " before %s'%c'");
+       else
+ 	message = catenate_messages (gmsgid, " before %s'\\x%x'");
+ 
+-      error (message, ell, val);
++      error (message, prefix, val);
+       free (message);
+       message = NULL;
+     }
+-  else if (token == CPP_STRING || token == CPP_WSTRING)
++  else if (token == CPP_STRING || token == CPP_WSTRING || token == CPP_STRING16
++	   || token == CPP_STRING32)
+     message = catenate_messages (gmsgid, " before string constant");
+   else if (token == CPP_NUMBER)
+     message = catenate_messages (gmsgid, " before numeric constant");
 Index: gcc/c-common.h
 ===================================================================
-*** gcc/c-common.h	(revision 134437)
---- gcc/c-common.h	(revision 134438)
-*************** enum rid
-*** 85,91 ****
-    RID_NEW,      RID_OFFSETOF, RID_OPERATOR,
-    RID_THIS,     RID_THROW,    RID_TRUE,
-    RID_TRY,      RID_TYPENAME, RID_TYPEID,
-!   RID_USING,
-  
-    /* casts */
-    RID_CONSTCAST, RID_DYNCAST, RID_REINTCAST, RID_STATCAST,
---- 85,91 ----
-    RID_NEW,      RID_OFFSETOF, RID_OPERATOR,
-    RID_THIS,     RID_THROW,    RID_TRUE,
-    RID_TRY,      RID_TYPENAME, RID_TYPEID,
-!   RID_USING,    RID_CHAR16,   RID_CHAR32,
-  
-    /* casts */
-    RID_CONSTCAST, RID_DYNCAST, RID_REINTCAST, RID_STATCAST,
-*************** extern GTY ((length ("(int) RID_MAX")))
-*** 143,148 ****
---- 143,150 ----
-  
-  enum c_tree_index
-  {
-+     CTI_CHAR16_TYPE,
-+     CTI_CHAR32_TYPE,
-      CTI_WCHAR_TYPE,
-      CTI_SIGNED_WCHAR_TYPE,
-      CTI_UNSIGNED_WCHAR_TYPE,
-*************** enum c_tree_index
-*** 155,160 ****
---- 157,164 ----
-      CTI_WIDEST_UINT_LIT_TYPE,
-  
-      CTI_CHAR_ARRAY_TYPE,
-+     CTI_CHAR16_ARRAY_TYPE,
-+     CTI_CHAR32_ARRAY_TYPE,
-      CTI_WCHAR_ARRAY_TYPE,
-      CTI_INT_ARRAY_TYPE,
-      CTI_STRING_TYPE,
-*************** struct c_common_identifier GTY(())
-*** 190,195 ****
---- 194,201 ----
-    struct cpp_hashnode node;
-  };
-  
-+ #define char16_type_node		c_global_trees[CTI_CHAR16_TYPE]
-+ #define char32_type_node		c_global_trees[CTI_CHAR32_TYPE]
-  #define wchar_type_node			c_global_trees[CTI_WCHAR_TYPE]
-  #define signed_wchar_type_node		c_global_trees[CTI_SIGNED_WCHAR_TYPE]
-  #define unsigned_wchar_type_node	c_global_trees[CTI_UNSIGNED_WCHAR_TYPE]
-*************** struct c_common_identifier GTY(())
-*** 206,211 ****
---- 212,219 ----
-  #define truthvalue_false_node		c_global_trees[CTI_TRUTHVALUE_FALSE]
-  
-  #define char_array_type_node		c_global_trees[CTI_CHAR_ARRAY_TYPE]
-+ #define char16_array_type_node		c_global_trees[CTI_CHAR16_ARRAY_TYPE]
-+ #define char32_array_type_node		c_global_trees[CTI_CHAR32_ARRAY_TYPE]
-  #define wchar_array_type_node		c_global_trees[CTI_WCHAR_ARRAY_TYPE]
-  #define int_array_type_node		c_global_trees[CTI_INT_ARRAY_TYPE]
-  #define string_type_node		c_global_trees[CTI_STRING_TYPE]
+--- gcc/c-common.h.orig	2009-09-21 11:45:58.000000000 +0200
++++ gcc/c-common.h	2009-09-21 11:51:53.000000000 +0200
+@@ -85,7 +85,7 @@ enum rid
+   RID_NEW,      RID_OFFSETOF, RID_OPERATOR,
+   RID_THIS,     RID_THROW,    RID_TRUE,
+   RID_TRY,      RID_TYPENAME, RID_TYPEID,
+-  RID_USING,
++  RID_USING,    RID_CHAR16,   RID_CHAR32,
+ 
+   /* casts */
+   RID_CONSTCAST, RID_DYNCAST, RID_REINTCAST, RID_STATCAST,
+@@ -143,6 +143,8 @@ extern GTY ((length ("(int) RID_MAX")))
+ 
+ enum c_tree_index
+ {
++    CTI_CHAR16_TYPE,
++    CTI_CHAR32_TYPE,
+     CTI_WCHAR_TYPE,
+     CTI_SIGNED_WCHAR_TYPE,
+     CTI_UNSIGNED_WCHAR_TYPE,
+@@ -155,6 +157,8 @@ enum c_tree_index
+     CTI_WIDEST_UINT_LIT_TYPE,
+ 
+     CTI_CHAR_ARRAY_TYPE,
++    CTI_CHAR16_ARRAY_TYPE,
++    CTI_CHAR32_ARRAY_TYPE,
+     CTI_WCHAR_ARRAY_TYPE,
+     CTI_INT_ARRAY_TYPE,
+     CTI_STRING_TYPE,
+@@ -192,6 +196,8 @@ struct c_common_identifier GTY(())
+   struct cpp_hashnode node;
+ };
+ 
++#define char16_type_node		c_global_trees[CTI_CHAR16_TYPE]
++#define char32_type_node		c_global_trees[CTI_CHAR32_TYPE]
+ #define wchar_type_node			c_global_trees[CTI_WCHAR_TYPE]
+ #define signed_wchar_type_node		c_global_trees[CTI_SIGNED_WCHAR_TYPE]
+ #define unsigned_wchar_type_node	c_global_trees[CTI_UNSIGNED_WCHAR_TYPE]
+@@ -208,6 +214,8 @@ struct c_common_identifier GTY(())
+ #define truthvalue_false_node		c_global_trees[CTI_TRUTHVALUE_FALSE]
+ 
+ #define char_array_type_node		c_global_trees[CTI_CHAR_ARRAY_TYPE]
++#define char16_array_type_node		c_global_trees[CTI_CHAR16_ARRAY_TYPE]
++#define char32_array_type_node		c_global_trees[CTI_CHAR32_ARRAY_TYPE]
+ #define wchar_array_type_node		c_global_trees[CTI_WCHAR_ARRAY_TYPE]
+ #define int_array_type_node		c_global_trees[CTI_INT_ARRAY_TYPE]
+ #define string_type_node		c_global_trees[CTI_STRING_TYPE]
 Index: gcc/c-parser.c
 ===================================================================
-*** gcc/c-parser.c	(revision 134437)
---- gcc/c-parser.c	(revision 134438)
-*************** c_parser_postfix_expression (c_parser *p
-*** 5163,5174 ****
---- 5163,5178 ----
-      {
-      case CPP_NUMBER:
-      case CPP_CHAR:
-+     case CPP_CHAR16:
-+     case CPP_CHAR32:
-      case CPP_WCHAR:
-        expr.value = c_parser_peek_token (parser)->value;
-        expr.original_code = ERROR_MARK;
-        c_parser_consume_token (parser);
-        break;
-      case CPP_STRING:
-+     case CPP_STRING16:
-+     case CPP_STRING32:
-      case CPP_WSTRING:
-        expr.value = c_parser_peek_token (parser)->value;
-        expr.original_code = STRING_CST;
+--- gcc/c-parser.c.orig	2009-06-25 14:26:18.000000000 +0200
++++ gcc/c-parser.c	2009-09-21 11:51:53.000000000 +0200
+@@ -5171,12 +5171,16 @@ c_parser_postfix_expression (c_parser *p
+     {
+     case CPP_NUMBER:
+     case CPP_CHAR:
++    case CPP_CHAR16:
++    case CPP_CHAR32:
+     case CPP_WCHAR:
+       expr.value = c_parser_peek_token (parser)->value;
+       expr.original_code = ERROR_MARK;
+       c_parser_consume_token (parser);
+       break;
+     case CPP_STRING:
++    case CPP_STRING16:
++    case CPP_STRING32:
+     case CPP_WSTRING:
+       expr.value = c_parser_peek_token (parser)->value;
+       expr.original_code = STRING_CST;
 Index: libiberty/testsuite/demangle-expected
 ===================================================================
-*** libiberty/testsuite/demangle-expected	(revision 134437)
---- libiberty/testsuite/demangle-expected	(revision 134438)
-*************** foo(char)
-*** 3399,3404 ****
---- 3399,3424 ----
-  foo
-  #
-  --format=gnu-v3 --no-params
-+ _Z2f0u8char16_t
-+ f0(char16_t)
-+ f0
-+ #
-+ --format=gnu-v3 --no-params
-+ _Z2f0Pu8char16_t
-+ f0(char16_t*)
-+ f0
-+ #
-+ --format=gnu-v3 --no-params
-+ _Z2f0u8char32_t
-+ f0(char32_t)
-+ f0
-+ #
-+ --format=gnu-v3 --no-params
-+ _Z2f0Pu8char32_t
-+ f0(char32_t*)
-+ f0
-+ #
-+ --format=gnu-v3 --no-params
-  2CBIL_Z3foocEE
-  CB<foo(char)>
-  CB<foo(char)>
+--- libiberty/testsuite/demangle-expected.orig	2008-02-19 10:56:53.000000000 +0100
++++ libiberty/testsuite/demangle-expected	2009-09-21 11:51:53.000000000 +0200
+@@ -3399,6 +3399,26 @@ foo(char)
+ foo
+ #
+ --format=gnu-v3 --no-params
++_Z2f0u8char16_t
++f0(char16_t)
++f0
++#
++--format=gnu-v3 --no-params
++_Z2f0Pu8char16_t
++f0(char16_t*)
++f0
++#
++--format=gnu-v3 --no-params
++_Z2f0u8char32_t
++f0(char32_t)
++f0
++#
++--format=gnu-v3 --no-params
++_Z2f0Pu8char32_t
++f0(char32_t*)
++f0
++#
++--format=gnu-v3 --no-params
+ 2CBIL_Z3foocEE
+ CB<foo(char)>
+ CB<foo(char)>
 Index: libcpp/directives.c
 ===================================================================
-*** libcpp/directives.c	(revision 134437)
---- libcpp/directives.c	(revision 134438)
-*************** DIRECTIVE_TABLE
-*** 188,194 ****
-     did use this notation in its preprocessed output.  */
-  static const directive linemarker_dir =
-  {
-!   do_linemarker, U"#", 1, KANDR, IN_I
-  };
-  
-  #define SEEN_EOL() (pfile->cur_token[-1].type == CPP_EOF)
---- 188,194 ----
-     did use this notation in its preprocessed output.  */
-  static const directive linemarker_dir =
-  {
-!   do_linemarker, UC"#", 1, KANDR, IN_I
-  };
-  
-  #define SEEN_EOL() (pfile->cur_token[-1].type == CPP_EOF)
-*************** parse_include (cpp_reader *pfile, int *p
-*** 697,703 ****
-        const unsigned char *dir;
-  
-        if (pfile->directive == &dtable[T_PRAGMA])
-! 	dir = U"pragma dependency";
-        else
-  	dir = pfile->directive->name;
-        cpp_error (pfile, CPP_DL_ERROR, "#%s expects \"FILENAME\" or <FILENAME>",
---- 697,703 ----
-        const unsigned char *dir;
-  
-        if (pfile->directive == &dtable[T_PRAGMA])
-! 	dir = UC"pragma dependency";
-        else
-  	dir = pfile->directive->name;
-        cpp_error (pfile, CPP_DL_ERROR, "#%s expects \"FILENAME\" or <FILENAME>",
-*************** register_pragma_1 (cpp_reader *pfile, co
-*** 1085,1091 ****
-  
-    if (space)
-      {
-!       node = cpp_lookup (pfile, U space, strlen (space));
-        entry = lookup_pragma_entry (*chain, node);
-        if (!entry)
-  	{
---- 1085,1091 ----
-  
-    if (space)
-      {
-!       node = cpp_lookup (pfile, UC space, strlen (space));
-        entry = lookup_pragma_entry (*chain, node);
-        if (!entry)
-  	{
-*************** register_pragma_1 (cpp_reader *pfile, co
-*** 1114,1120 ****
-      }
-  
-    /* Check for duplicates.  */
-!   node = cpp_lookup (pfile, U name, strlen (name));
-    entry = lookup_pragma_entry (*chain, node);
-    if (entry == NULL)
-      {
---- 1114,1120 ----
-      }
-  
-    /* Check for duplicates.  */
-!   node = cpp_lookup (pfile, UC name, strlen (name));
-    entry = lookup_pragma_entry (*chain, node);
-    if (entry == NULL)
-      {
-*************** restore_registered_pragmas (cpp_reader *
-*** 1262,1268 ****
-      {
-        if (pe->is_nspace)
-  	sd = restore_registered_pragmas (pfile, pe->u.space, sd);
-!       pe->pragma = cpp_lookup (pfile, U *sd, strlen (*sd));
-        free (*sd);
-        sd++;
-      }
---- 1262,1268 ----
-      {
-        if (pe->is_nspace)
-  	sd = restore_registered_pragmas (pfile, pe->u.space, sd);
-!       pe->pragma = cpp_lookup (pfile, UC *sd, strlen (*sd));
-        free (*sd);
-        sd++;
-      }
-*************** get__Pragma_string (cpp_reader *pfile)
-*** 1491,1497 ****
-    string = get_token_no_padding (pfile);
-    if (string->type == CPP_EOF)
-      _cpp_backup_tokens (pfile, 1);
-!   if (string->type != CPP_STRING && string->type != CPP_WSTRING)
-      return NULL;
-  
-    paren = get_token_no_padding (pfile);
---- 1491,1498 ----
-    string = get_token_no_padding (pfile);
-    if (string->type == CPP_EOF)
-      _cpp_backup_tokens (pfile, 1);
-!   if (string->type != CPP_STRING && string->type != CPP_WSTRING
-!       && string->type != CPP_STRING32 && string->type != CPP_STRING16)
-      return NULL;
-  
-    paren = get_token_no_padding (pfile);
+--- libcpp/directives.c.orig	2008-02-19 10:59:44.000000000 +0100
++++ libcpp/directives.c	2009-09-21 11:51:53.000000000 +0200
+@@ -188,7 +188,7 @@ DIRECTIVE_TABLE
+    did use this notation in its preprocessed output.  */
+ static const directive linemarker_dir =
+ {
+-  do_linemarker, U"#", 1, KANDR, IN_I
++  do_linemarker, UC"#", 1, KANDR, IN_I
+ };
+ 
+ #define SEEN_EOL() (pfile->cur_token[-1].type == CPP_EOF)
+@@ -689,7 +689,7 @@ parse_include (cpp_reader *pfile, int *p
+       const unsigned char *dir;
+ 
+       if (pfile->directive == &dtable[T_PRAGMA])
+-	dir = U"pragma dependency";
++	dir = UC"pragma dependency";
+       else
+ 	dir = pfile->directive->name;
+       cpp_error (pfile, CPP_DL_ERROR, "#%s expects \"FILENAME\" or <FILENAME>",
+@@ -1077,7 +1077,7 @@ register_pragma_1 (cpp_reader *pfile, co
+ 
+   if (space)
+     {
+-      node = cpp_lookup (pfile, U space, strlen (space));
++      node = cpp_lookup (pfile, UC space, strlen (space));
+       entry = lookup_pragma_entry (*chain, node);
+       if (!entry)
+ 	{
+@@ -1106,7 +1106,7 @@ register_pragma_1 (cpp_reader *pfile, co
+     }
+ 
+   /* Check for duplicates.  */
+-  node = cpp_lookup (pfile, U name, strlen (name));
++  node = cpp_lookup (pfile, UC name, strlen (name));
+   entry = lookup_pragma_entry (*chain, node);
+   if (entry == NULL)
+     {
+@@ -1254,7 +1254,7 @@ restore_registered_pragmas (cpp_reader *
+     {
+       if (pe->is_nspace)
+ 	sd = restore_registered_pragmas (pfile, pe->u.space, sd);
+-      pe->pragma = cpp_lookup (pfile, U *sd, strlen (*sd));
++      pe->pragma = cpp_lookup (pfile, UC *sd, strlen (*sd));
+       free (*sd);
+       sd++;
+     }
+@@ -1483,7 +1483,8 @@ get__Pragma_string (cpp_reader *pfile)
+   string = get_token_no_padding (pfile);
+   if (string->type == CPP_EOF)
+     _cpp_backup_tokens (pfile, 1);
+-  if (string->type != CPP_STRING && string->type != CPP_WSTRING)
++  if (string->type != CPP_STRING && string->type != CPP_WSTRING
++      && string->type != CPP_STRING32 && string->type != CPP_STRING16)
+     return NULL;
+ 
+   paren = get_token_no_padding (pfile);
 Index: libcpp/macro.c
 ===================================================================
-*** libcpp/macro.c	(revision 134437)
---- libcpp/macro.c	(revision 134438)
-*************** _cpp_builtin_macro_text (cpp_reader *pfi
-*** 158,164 ****
-  		  {
-  		    cpp_errno (pfile, CPP_DL_WARNING,
-  			"could not determine file timestamp");
-! 		    pbuffer->timestamp = U"\"??? ??? ?? ??:??:?? ????\"";
-  		  }
-  	      }
-  	  }
---- 158,164 ----
-  		  {
-  		    cpp_errno (pfile, CPP_DL_WARNING,
-  			"could not determine file timestamp");
-! 		    pbuffer->timestamp = UC"\"??? ??? ?? ??:??:?? ????\"";
-  		  }
-  	      }
-  	  }
-*************** _cpp_builtin_macro_text (cpp_reader *pfi
-*** 256,263 ****
-  	      cpp_errno (pfile, CPP_DL_WARNING,
-  			 "could not determine date and time");
-  		
-! 	      pfile->date = U"\"??? ?? ????\"";
-! 	      pfile->time = U"\"??:??:??\"";
-  	    }
-  	}
-  
---- 256,263 ----
-  	      cpp_errno (pfile, CPP_DL_WARNING,
-  			 "could not determine date and time");
-  		
-! 	      pfile->date = UC"\"??? ?? ????\"";
-! 	      pfile->time = UC"\"??:??:??\"";
-  	    }
-  	}
-  
-*************** stringify_arg (cpp_reader *pfile, macro_
-*** 375,382 ****
-  	  continue;
-  	}
-  
-!       escape_it = (token->type == CPP_STRING || token->type == CPP_WSTRING
-! 		   || token->type == CPP_CHAR || token->type == CPP_WCHAR);
-  
-        /* Room for each char being written in octal, initial space and
-  	 final quote and NUL.  */
---- 375,384 ----
-  	  continue;
-  	}
-  
-!       escape_it = (token->type == CPP_STRING || token->type == CPP_CHAR
-! 		   || token->type == CPP_WSTRING || token->type == CPP_STRING
-! 		   || token->type == CPP_STRING32 || token->type == CPP_CHAR32
-! 		   || token->type == CPP_STRING16 || token->type == CPP_CHAR16);
-  
-        /* Room for each char being written in octal, initial space and
-  	 final quote and NUL.  */
+--- libcpp/macro.c.orig	2009-09-21 11:45:58.000000000 +0200
++++ libcpp/macro.c	2009-09-21 11:51:53.000000000 +0200
+@@ -158,7 +158,7 @@ _cpp_builtin_macro_text (cpp_reader *pfi
+ 		  {
+ 		    cpp_errno (pfile, CPP_DL_WARNING,
+ 			"could not determine file timestamp");
+-		    pbuffer->timestamp = U"\"??? ??? ?? ??:??:?? ????\"";
++		    pbuffer->timestamp = UC"\"??? ??? ?? ??:??:?? ????\"";
+ 		  }
+ 	      }
+ 	  }
+@@ -256,8 +256,8 @@ _cpp_builtin_macro_text (cpp_reader *pfi
+ 	      cpp_errno (pfile, CPP_DL_WARNING,
+ 			 "could not determine date and time");
+ 		
+-	      pfile->date = U"\"??? ?? ????\"";
+-	      pfile->time = U"\"??:??:??\"";
++	      pfile->date = UC"\"??? ?? ????\"";
++	      pfile->time = UC"\"??:??:??\"";
+ 	    }
+ 	}
+ 
+@@ -375,8 +375,10 @@ stringify_arg (cpp_reader *pfile, macro_
+ 	  continue;
+ 	}
+ 
+-      escape_it = (token->type == CPP_STRING || token->type == CPP_WSTRING
+-		   || token->type == CPP_CHAR || token->type == CPP_WCHAR);
++      escape_it = (token->type == CPP_STRING || token->type == CPP_CHAR
++		   || token->type == CPP_WSTRING || token->type == CPP_STRING
++		   || token->type == CPP_STRING32 || token->type == CPP_CHAR32
++		   || token->type == CPP_STRING16 || token->type == CPP_CHAR16);
+ 
+       /* Room for each char being written in octal, initial space and
+ 	 final quote and NUL.  */
 Index: libcpp/include/cpplib.h
 ===================================================================
-*** libcpp/include/cpplib.h	(revision 134437)
---- libcpp/include/cpplib.h	(revision 134438)
-*************** struct _cpp_file;
-*** 123,132 ****
---- 123,136 ----
-  									\
-    TK(CHAR,		LITERAL) /* 'char' */				\
-    TK(WCHAR,		LITERAL) /* L'char' */				\
-+   TK(CHAR16,		LITERAL) /* u'char' */				\
-+   TK(CHAR32,		LITERAL) /* U'char' */				\
-    TK(OTHER,		LITERAL) /* stray punctuation */		\
-  									\
-    TK(STRING,		LITERAL) /* "string" */				\
-    TK(WSTRING,		LITERAL) /* L"string" */			\
-+   TK(STRING16,		LITERAL) /* u"string" */			\
-+   TK(STRING32,		LITERAL) /* U"string" */			\
-    TK(OBJC_STRING,	LITERAL) /* @"string" - Objective-C */		\
-    TK(HEADER_NAME,	LITERAL) /* <stdio.h> in #include */		\
-  									\
-*************** struct cpp_options
-*** 291,296 ****
---- 295,303 ----
-    /* Nonzero means to allow hexadecimal floats and LL suffixes.  */
-    unsigned char extended_numbers;
-  
-+   /* Nonzero means process u/U prefix literals (UTF-16/32).  */
-+   unsigned char uliterals;
-+ 
-    /* Nonzero means print names of header files (-H).  */
-    unsigned char print_include_names;
-  
-*************** extern cppchar_t cpp_interpret_charconst
-*** 712,721 ****
-  /* Evaluate a vector of CPP_STRING or CPP_WSTRING tokens.  */
-  extern bool cpp_interpret_string (cpp_reader *,
-  				  const cpp_string *, size_t,
-! 				  cpp_string *, bool);
-  extern bool cpp_interpret_string_notranslate (cpp_reader *,
-  					      const cpp_string *, size_t,
-! 					      cpp_string *, bool);
-  
-  /* Convert a host character constant to the execution character set.  */
-  extern cppchar_t cpp_host_to_exec_charset (cpp_reader *, cppchar_t);
---- 719,728 ----
-  /* Evaluate a vector of CPP_STRING or CPP_WSTRING tokens.  */
-  extern bool cpp_interpret_string (cpp_reader *,
-  				  const cpp_string *, size_t,
-! 				  cpp_string *, enum cpp_ttype);
-  extern bool cpp_interpret_string_notranslate (cpp_reader *,
-  					      const cpp_string *, size_t,
-! 					      cpp_string *, enum cpp_ttype);
-  
-  /* Convert a host character constant to the execution character set.  */
-  extern cppchar_t cpp_host_to_exec_charset (cpp_reader *, cppchar_t);
+--- libcpp/include/cpplib.h.orig	2009-09-21 11:45:58.000000000 +0200
++++ libcpp/include/cpplib.h	2009-09-21 11:51:53.000000000 +0200
+@@ -123,10 +123,14 @@ struct _cpp_file;
+ 									\
+   TK(CHAR,		LITERAL) /* 'char' */				\
+   TK(WCHAR,		LITERAL) /* L'char' */				\
++  TK(CHAR16,		LITERAL) /* u'char' */				\
++  TK(CHAR32,		LITERAL) /* U'char' */				\
+   TK(OTHER,		LITERAL) /* stray punctuation */		\
+ 									\
+   TK(STRING,		LITERAL) /* "string" */				\
+   TK(WSTRING,		LITERAL) /* L"string" */			\
++  TK(STRING16,		LITERAL) /* u"string" */			\
++  TK(STRING32,		LITERAL) /* U"string" */			\
+   TK(OBJC_STRING,	LITERAL) /* @"string" - Objective-C */		\
+   TK(HEADER_NAME,	LITERAL) /* <stdio.h> in #include */		\
+ 									\
+@@ -291,6 +295,9 @@ struct cpp_options
+   /* Nonzero means to allow hexadecimal floats and LL suffixes.  */
+   unsigned char extended_numbers;
+ 
++  /* Nonzero means process u/U prefix literals (UTF-16/32).  */
++  unsigned char uliterals;
++
+   /* Nonzero means print names of header files (-H).  */
+   unsigned char print_include_names;
+ 
+@@ -709,10 +716,10 @@ extern cppchar_t cpp_interpret_charconst
+ /* Evaluate a vector of CPP_STRING or CPP_WSTRING tokens.  */
+ extern bool cpp_interpret_string (cpp_reader *,
+ 				  const cpp_string *, size_t,
+-				  cpp_string *, bool);
++				  cpp_string *, enum cpp_ttype);
+ extern bool cpp_interpret_string_notranslate (cpp_reader *,
+ 					      const cpp_string *, size_t,
+-					      cpp_string *, bool);
++					      cpp_string *, enum cpp_ttype);
+ 
+ /* Convert a host character constant to the execution character set.  */
+ extern cppchar_t cpp_host_to_exec_charset (cpp_reader *, cppchar_t);
 Index: libcpp/include/cpp-id-data.h
 ===================================================================
-*** libcpp/include/cpp-id-data.h	(revision 134437)
---- libcpp/include/cpp-id-data.h	(revision 134438)
-*************** Foundation, 51 Franklin Street, Fifth Fl
-*** 22,28 ****
-  typedef unsigned char uchar;
-  #endif
-  
-! #define U (const unsigned char *)  /* Intended use: U"string" */
-  
-  /* Chained list of answers to an assertion.  */
-  struct answer GTY(())
---- 22,28 ----
-  typedef unsigned char uchar;
-  #endif
-  
-! #define UC (const unsigned char *)  /* Intended use: UC"string" */
-  
-  /* Chained list of answers to an assertion.  */
-  struct answer GTY(())
+--- libcpp/include/cpp-id-data.h.orig	2008-02-19 10:59:42.000000000 +0100
++++ libcpp/include/cpp-id-data.h	2009-09-21 11:51:53.000000000 +0200
+@@ -22,7 +22,7 @@ Foundation, 51 Franklin Street, Fifth Fl
+ typedef unsigned char uchar;
+ #endif
+ 
+-#define U (const unsigned char *)  /* Intended use: U"string" */
++#define UC (const unsigned char *)  /* Intended use: UC"string" */
+ 
+ /* Chained list of answers to an assertion.  */
+ struct answer GTY(())
 Index: libcpp/init.c
 ===================================================================
-*** libcpp/init.c	(revision 134437)
---- libcpp/init.c	(revision 134438)
-*************** struct lang_flags
-*** 76,95 ****
-    char std;
-    char cplusplus_comments;
-    char digraphs;
-  };
-  
-  static const struct lang_flags lang_defaults[] =
-! { /*              c99 c++ xnum xid std  //   digr  */
-!   /* GNUC89   */  { 0,  0,  1,   0,  0,   1,   1     },
-!   /* GNUC99   */  { 1,  0,  1,   0,  0,   1,   1     },
-!   /* STDC89   */  { 0,  0,  0,   0,  1,   0,   0     },
-!   /* STDC94   */  { 0,  0,  0,   0,  1,   0,   1     },
-!   /* STDC99   */  { 1,  0,  1,   0,  1,   1,   1     },
-!   /* GNUCXX   */  { 0,  1,  1,   0,  0,   1,   1     },
-!   /* CXX98    */  { 0,  1,  1,   0,  1,   1,   1     },
-!   /* GNUCXX0X */  { 1,  1,  1,   0,  0,   1,   1     },
-!   /* CXX0X    */  { 1,  1,  1,   0,  1,   1,   1     },
-!   /* ASM      */  { 0,  0,  1,   0,  0,   1,   0     }
-    /* xid should be 1 for GNUC99, STDC99, GNUCXX, CXX98, GNUCXX0X, and
-       CXX0X when no longer experimental (when all uses of identifiers
-       in the compiler have been audited for correct handling of
---- 76,96 ----
-    char std;
-    char cplusplus_comments;
-    char digraphs;
-+   char uliterals;
-  };
-  
-  static const struct lang_flags lang_defaults[] =
-! { /*              c99 c++ xnum xid std  //   digr ulit */
-!   /* GNUC89   */  { 0,  0,  1,   0,  0,   1,   1,   0 },
-!   /* GNUC99   */  { 1,  0,  1,   0,  0,   1,   1,   1 },
-!   /* STDC89   */  { 0,  0,  0,   0,  1,   0,   0,   0 },
-!   /* STDC94   */  { 0,  0,  0,   0,  1,   0,   1,   0 },
-!   /* STDC99   */  { 1,  0,  1,   0,  1,   1,   1,   0 },
-!   /* GNUCXX   */  { 0,  1,  1,   0,  0,   1,   1,   0 },
-!   /* CXX98    */  { 0,  1,  1,   0,  1,   1,   1,   0 },
-!   /* GNUCXX0X */  { 1,  1,  1,   0,  0,   1,   1,   1 },
-!   /* CXX0X    */  { 1,  1,  1,   0,  1,   1,   1,   1 },
-!   /* ASM      */  { 0,  0,  1,   0,  0,   1,   0,   0 }
-    /* xid should be 1 for GNUC99, STDC99, GNUCXX, CXX98, GNUCXX0X, and
-       CXX0X when no longer experimental (when all uses of identifiers
-       in the compiler have been audited for correct handling of
-*************** cpp_set_lang (cpp_reader *pfile, enum c_
-*** 112,117 ****
---- 113,119 ----
-    CPP_OPTION (pfile, trigraphs)			 = l->std;
-    CPP_OPTION (pfile, cplusplus_comments)	 = l->cplusplus_comments;
-    CPP_OPTION (pfile, digraphs)			 = l->digraphs;
-+   CPP_OPTION (pfile, uliterals)			 = l->uliterals;
-  }
-  
-  /* Initialize library global state.  */
+--- libcpp/init.c.orig	2009-09-21 11:44:46.000000000 +0200
++++ libcpp/init.c	2009-09-21 11:51:53.000000000 +0200
+@@ -76,20 +76,21 @@ struct lang_flags
+   char std;
+   char cplusplus_comments;
+   char digraphs;
++  char uliterals;
+ };
+ 
+ static const struct lang_flags lang_defaults[] =
+-{ /*              c99 c++ xnum xid std  //   digr  */
+-  /* GNUC89   */  { 0,  0,  1,   0,  0,   1,   1     },
+-  /* GNUC99   */  { 1,  0,  1,   0,  0,   1,   1     },
+-  /* STDC89   */  { 0,  0,  0,   0,  1,   0,   0     },
+-  /* STDC94   */  { 0,  0,  0,   0,  1,   0,   1     },
+-  /* STDC99   */  { 1,  0,  1,   0,  1,   1,   1     },
+-  /* GNUCXX   */  { 0,  1,  1,   0,  0,   1,   1     },
+-  /* CXX98    */  { 0,  1,  1,   0,  1,   1,   1     },
+-  /* GNUCXX0X */  { 1,  1,  1,   0,  0,   1,   1     },
+-  /* CXX0X    */  { 1,  1,  1,   0,  1,   1,   1     },
+-  /* ASM      */  { 0,  0,  1,   0,  0,   1,   0     }
++{ /*              c99 c++ xnum xid std  //   digr ulit */
++  /* GNUC89   */  { 0,  0,  1,   0,  0,   1,   1,   0 },
++  /* GNUC99   */  { 1,  0,  1,   0,  0,   1,   1,   1 },
++  /* STDC89   */  { 0,  0,  0,   0,  1,   0,   0,   0 },
++  /* STDC94   */  { 0,  0,  0,   0,  1,   0,   1,   0 },
++  /* STDC99   */  { 1,  0,  1,   0,  1,   1,   1,   0 },
++  /* GNUCXX   */  { 0,  1,  1,   0,  0,   1,   1,   0 },
++  /* CXX98    */  { 0,  1,  1,   0,  1,   1,   1,   0 },
++  /* GNUCXX0X */  { 1,  1,  1,   0,  0,   1,   1,   1 },
++  /* CXX0X    */  { 1,  1,  1,   0,  1,   1,   1,   1 },
++  /* ASM      */  { 0,  0,  1,   0,  0,   1,   0,   0 }
+   /* xid should be 1 for GNUC99, STDC99, GNUCXX, CXX98, GNUCXX0X, and
+      CXX0X when no longer experimental (when all uses of identifiers
+      in the compiler have been audited for correct handling of
+@@ -112,6 +113,7 @@ cpp_set_lang (cpp_reader *pfile, enum c_
+   CPP_OPTION (pfile, trigraphs)			 = l->std;
+   CPP_OPTION (pfile, cplusplus_comments)	 = l->cplusplus_comments;
+   CPP_OPTION (pfile, digraphs)			 = l->digraphs;
++  CPP_OPTION (pfile, uliterals)			 = l->uliterals;
+ }
+ 
+ /* Initialize library global state.  */
 Index: libcpp/expr.c
 ===================================================================
-*** libcpp/expr.c	(revision 134437)
---- libcpp/expr.c	(revision 134438)
-*************** eval_token (cpp_reader *pfile, const cpp
-*** 705,710 ****
---- 705,712 ----
-  
-      case CPP_WCHAR:
-      case CPP_CHAR:
-+     case CPP_CHAR16:
-+     case CPP_CHAR32:
-        {
-  	cppchar_t cc = cpp_interpret_charconst (pfile, token,
-  						&temp, &unsignedp);
-*************** _cpp_parse_expr (cpp_reader *pfile)
-*** 863,868 ****
---- 865,872 ----
-  	case CPP_NUMBER:
-  	case CPP_CHAR:
-  	case CPP_WCHAR:
-+ 	case CPP_CHAR16:
-+ 	case CPP_CHAR32:
-  	case CPP_NAME:
-  	case CPP_HASH:
-  	  if (!want_value)
+--- libcpp/expr.c.orig	2008-02-19 10:59:44.000000000 +0100
++++ libcpp/expr.c	2009-09-21 11:51:53.000000000 +0200
+@@ -691,6 +691,8 @@ eval_token (cpp_reader *pfile, const cpp
+ 
+     case CPP_WCHAR:
+     case CPP_CHAR:
++    case CPP_CHAR16:
++    case CPP_CHAR32:
+       {
+ 	cppchar_t cc = cpp_interpret_charconst (pfile, token,
+ 						&temp, &unsignedp);
+@@ -849,6 +851,8 @@ _cpp_parse_expr (cpp_reader *pfile)
+ 	case CPP_NUMBER:
+ 	case CPP_CHAR:
+ 	case CPP_WCHAR:
++	case CPP_CHAR16:
++	case CPP_CHAR32:
+ 	case CPP_NAME:
+ 	case CPP_HASH:
+ 	  if (!want_value)
 Index: libcpp/internal.h
 ===================================================================
-*** libcpp/internal.h	(revision 134437)
---- libcpp/internal.h	(revision 134438)
-*************** struct cset_converter
-*** 48,53 ****
---- 48,54 ----
-  {
-    convert_f func;
-    iconv_t cd;
-+   int width;
-  };
-  
-  #define BITS_PER_CPPCHAR_T (CHAR_BIT * sizeof (cppchar_t))
-*************** struct cpp_reader
-*** 399,404 ****
---- 400,413 ----
-    struct cset_converter narrow_cset_desc;
-  
-    /* Descriptor for converting from the source character set to the
-+      UTF-16 execution character set.  */
-+   struct cset_converter char16_cset_desc;
-+ 
-+   /* Descriptor for converting from the source character set to the
-+      UTF-32 execution character set.  */
-+   struct cset_converter char32_cset_desc;
-+ 
-+   /* Descriptor for converting from the source character set to the
-       wide execution character set.  */
-    struct cset_converter wide_cset_desc;
-  
+--- libcpp/internal.h.orig	2009-09-21 11:45:58.000000000 +0200
++++ libcpp/internal.h	2009-09-21 11:51:53.000000000 +0200
+@@ -48,6 +48,7 @@ struct cset_converter
+ {
+   convert_f func;
+   iconv_t cd;
++  int width;
+ };
+ 
+ #define BITS_PER_CPPCHAR_T (CHAR_BIT * sizeof (cppchar_t))
+@@ -399,6 +400,14 @@ struct cpp_reader
+   struct cset_converter narrow_cset_desc;
+ 
+   /* Descriptor for converting from the source character set to the
++     UTF-16 execution character set.  */
++  struct cset_converter char16_cset_desc;
++
++  /* Descriptor for converting from the source character set to the
++     UTF-32 execution character set.  */
++  struct cset_converter char32_cset_desc;
++
++  /* Descriptor for converting from the source character set to the
+      wide execution character set.  */
+   struct cset_converter wide_cset_desc;
+ 
 Index: libcpp/lex.c
 ===================================================================
-*** libcpp/lex.c	(revision 134437)
---- libcpp/lex.c	(revision 134438)
-*************** struct token_spelling
-*** 39,48 ****
-  };
-  
-  static const unsigned char *const digraph_spellings[] =
-! { U"%:", U"%:%:", U"<:", U":>", U"<%", U"%>" };
-  
-! #define OP(e, s) { SPELL_OPERATOR, U s  },
-! #define TK(e, s) { SPELL_ ## s,    U #e },
-  static const struct token_spelling token_spellings[N_TTYPES] = { TTYPE_TABLE };
-  #undef OP
-  #undef TK
---- 39,48 ----
-  };
-  
-  static const unsigned char *const digraph_spellings[] =
-! { UC"%:", UC"%:%:", UC"<:", UC":>", UC"<%", UC"%>" };
-  
-! #define OP(e, s) { SPELL_OPERATOR, UC s  },
-! #define TK(e, s) { SPELL_ ## s,    UC #e },
-  static const struct token_spelling token_spellings[N_TTYPES] = { TTYPE_TABLE };
-  #undef OP
-  #undef TK
-*************** create_literal (cpp_reader *pfile, cpp_t
-*** 611,618 ****
-  
-  /* Lexes a string, character constant, or angle-bracketed header file
-     name.  The stored string contains the spelling, including opening
-!    quote and leading any leading 'L'.  It returns the type of the
-!    literal, or CPP_OTHER if it was not properly terminated.
-  
-     The spelling is NUL-terminated, but it is not guaranteed that this
-     is the first NUL since embedded NULs are preserved.  */
---- 611,618 ----
-  
-  /* Lexes a string, character constant, or angle-bracketed header file
-     name.  The stored string contains the spelling, including opening
-!    quote and leading any leading 'L', 'u' or 'U'.  It returns the type
-!    of the literal, or CPP_OTHER if it was not properly terminated.
-  
-     The spelling is NUL-terminated, but it is not guaranteed that this
-     is the first NUL since embedded NULs are preserved.  */
-*************** lex_string (cpp_reader *pfile, cpp_token
-*** 626,637 ****
-  
-    cur = base;
-    terminator = *cur++;
-!   if (terminator == 'L')
-      terminator = *cur++;
-    if (terminator == '\"')
-!     type = *base == 'L' ? CPP_WSTRING: CPP_STRING;
-    else if (terminator == '\'')
-!     type = *base == 'L' ? CPP_WCHAR: CPP_CHAR;
-    else
-      terminator = '>', type = CPP_HEADER_NAME;
-  
---- 626,641 ----
-  
-    cur = base;
-    terminator = *cur++;
-!   if (terminator == 'L' || terminator == 'u' || terminator == 'U')
-      terminator = *cur++;
-    if (terminator == '\"')
-!     type = (*base == 'L' ? CPP_WSTRING :
-! 	    *base == 'U' ? CPP_STRING32 :
-! 	    *base == 'u' ? CPP_STRING16 : CPP_STRING);
-    else if (terminator == '\'')
-!     type = (*base == 'L' ? CPP_WCHAR :
-! 	    *base == 'U' ? CPP_CHAR32 :
-! 	    *base == 'u' ? CPP_CHAR16 : CPP_CHAR);
-    else
-      terminator = '>', type = CPP_HEADER_NAME;
-  
-*************** _cpp_lex_direct (cpp_reader *pfile)
-*** 965,975 ****
-        }
-  
-      case 'L':
-!       /* 'L' may introduce wide characters or strings.  */
-!       if (*buffer->cur == '\'' || *buffer->cur == '"')
-  	{
-! 	  lex_string (pfile, result, buffer->cur - 1);
-! 	  break;
-  	}
-        /* Fall through.  */
-  
---- 969,984 ----
-        }
-  
-      case 'L':
-!     case 'u':
-!     case 'U':
-!       /* 'L', 'u' or 'U' may introduce wide characters or strings.  */
-!       if (c == 'L' || CPP_OPTION (pfile, uliterals))
-  	{
-! 	  if (*buffer->cur == '\'' || *buffer->cur == '"')
-! 	    {
-! 	      lex_string (pfile, result, buffer->cur - 1);
-! 	      break;
-! 	    }
-  	}
-        /* Fall through.  */
-  
-*************** _cpp_lex_direct (cpp_reader *pfile)
-*** 977,988 ****
-      case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-      case 'g': case 'h': case 'i': case 'j': case 'k': case 'l':
-      case 'm': case 'n': case 'o': case 'p': case 'q': case 'r':
-!     case 's': case 't': case 'u': case 'v': case 'w': case 'x':
-      case 'y': case 'z':
-      case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-      case 'G': case 'H': case 'I': case 'J': case 'K':
-      case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R':
-!     case 'S': case 'T': case 'U': case 'V': case 'W': case 'X':
-      case 'Y': case 'Z':
-        result->type = CPP_NAME;
-        {
---- 986,997 ----
-      case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
-      case 'g': case 'h': case 'i': case 'j': case 'k': case 'l':
-      case 'm': case 'n': case 'o': case 'p': case 'q': case 'r':
-!     case 's': case 't':           case 'v': case 'w': case 'x':
-      case 'y': case 'z':
-      case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
-      case 'G': case 'H': case 'I': case 'J': case 'K':
-      case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R':
-!     case 'S': case 'T':           case 'V': case 'W': case 'X':
-      case 'Y': case 'Z':
-        result->type = CPP_NAME;
-        {
+--- libcpp/lex.c.orig	2009-09-21 11:45:58.000000000 +0200
++++ libcpp/lex.c	2009-09-21 11:51:53.000000000 +0200
+@@ -39,10 +39,10 @@ struct token_spelling
+ };
+ 
+ static const unsigned char *const digraph_spellings[] =
+-{ U"%:", U"%:%:", U"<:", U":>", U"<%", U"%>" };
++{ UC"%:", UC"%:%:", UC"<:", UC":>", UC"<%", UC"%>" };
+ 
+-#define OP(e, s) { SPELL_OPERATOR, U s  },
+-#define TK(e, s) { SPELL_ ## s,    U #e },
++#define OP(e, s) { SPELL_OPERATOR, UC s  },
++#define TK(e, s) { SPELL_ ## s,    UC #e },
+ static const struct token_spelling token_spellings[N_TTYPES] = { TTYPE_TABLE };
+ #undef OP
+ #undef TK
+@@ -611,8 +611,8 @@ create_literal (cpp_reader *pfile, cpp_t
+ 
+ /* Lexes a string, character constant, or angle-bracketed header file
+    name.  The stored string contains the spelling, including opening
+-   quote and leading any leading 'L'.  It returns the type of the
+-   literal, or CPP_OTHER if it was not properly terminated.
++   quote and leading any leading 'L', 'u' or 'U'.  It returns the type
++   of the literal, or CPP_OTHER if it was not properly terminated.
+ 
+    The spelling is NUL-terminated, but it is not guaranteed that this
+    is the first NUL since embedded NULs are preserved.  */
+@@ -626,12 +626,16 @@ lex_string (cpp_reader *pfile, cpp_token
+ 
+   cur = base;
+   terminator = *cur++;
+-  if (terminator == 'L')
++  if (terminator == 'L' || terminator == 'u' || terminator == 'U')
+     terminator = *cur++;
+   if (terminator == '\"')
+-    type = *base == 'L' ? CPP_WSTRING: CPP_STRING;
++    type = (*base == 'L' ? CPP_WSTRING :
++	    *base == 'U' ? CPP_STRING32 :
++	    *base == 'u' ? CPP_STRING16 : CPP_STRING);
+   else if (terminator == '\'')
+-    type = *base == 'L' ? CPP_WCHAR: CPP_CHAR;
++    type = (*base == 'L' ? CPP_WCHAR :
++	    *base == 'U' ? CPP_CHAR32 :
++	    *base == 'u' ? CPP_CHAR16 : CPP_CHAR);
+   else
+     terminator = '>', type = CPP_HEADER_NAME;
+ 
+@@ -1029,11 +1033,16 @@ _cpp_lex_direct (cpp_reader *pfile)
+       }
+ 
+     case 'L':
+-      /* 'L' may introduce wide characters or strings.  */
+-      if (*buffer->cur == '\'' || *buffer->cur == '"')
++    case 'u':
++    case 'U':
++      /* 'L', 'u' or 'U' may introduce wide characters or strings.  */
++      if (c == 'L' || CPP_OPTION (pfile, uliterals))
+ 	{
+-	  lex_string (pfile, result, buffer->cur - 1);
+-	  break;
++	  if (*buffer->cur == '\'' || *buffer->cur == '"')
++	    {
++	      lex_string (pfile, result, buffer->cur - 1);
++	      break;
++	    }
+ 	}
+       /* Fall through.  */
+ 
+@@ -1041,12 +1050,12 @@ _cpp_lex_direct (cpp_reader *pfile)
+     case 'a': case 'b': case 'c': case 'd': case 'e': case 'f':
+     case 'g': case 'h': case 'i': case 'j': case 'k': case 'l':
+     case 'm': case 'n': case 'o': case 'p': case 'q': case 'r':
+-    case 's': case 't': case 'u': case 'v': case 'w': case 'x':
++    case 's': case 't':           case 'v': case 'w': case 'x':
+     case 'y': case 'z':
+     case 'A': case 'B': case 'C': case 'D': case 'E': case 'F':
+     case 'G': case 'H': case 'I': case 'J': case 'K':
+     case 'M': case 'N': case 'O': case 'P': case 'Q': case 'R':
+-    case 'S': case 'T': case 'U': case 'V': case 'W': case 'X':
++    case 'S': case 'T':           case 'V': case 'W': case 'X':
+     case 'Y': case 'Z':
+       result->type = CPP_NAME;
+       {
 Index: libcpp/charset.c
 ===================================================================
-*** libcpp/charset.c	(revision 134437)
---- libcpp/charset.c	(revision 134438)
-*************** init_iconv_desc (cpp_reader *pfile, cons
-*** 642,647 ****
---- 642,648 ----
-      {
-        ret.func = convert_no_conversion;
-        ret.cd = (iconv_t) -1;
-+       ret.width = -1;
-        return ret;
-      }
-  
-*************** init_iconv_desc (cpp_reader *pfile, cons
-*** 655,660 ****
---- 656,662 ----
-        {
-  	ret.func = conversion_tab[i].func;
-  	ret.cd = conversion_tab[i].fake_cd;
-+ 	ret.width = -1;
-  	return ret;
-        }
-  
-*************** init_iconv_desc (cpp_reader *pfile, cons
-*** 663,668 ****
---- 665,671 ----
-      {
-        ret.func = convert_using_iconv;
-        ret.cd = iconv_open (to, from);
-+       ret.width = -1;
-  
-        if (ret.cd == (iconv_t) -1)
-  	{
-*************** init_iconv_desc (cpp_reader *pfile, cons
-*** 683,688 ****
---- 686,692 ----
-  		 from, to);
-        ret.func = convert_no_conversion;
-        ret.cd = (iconv_t) -1;
-+       ret.width = -1;
-      }
-    return ret;
-  }
-*************** cpp_init_iconv (cpp_reader *pfile)
-*** 716,722 ****
---- 720,736 ----
-      wcset = default_wcset;
-  
-    pfile->narrow_cset_desc = init_iconv_desc (pfile, ncset, SOURCE_CHARSET);
-+   pfile->narrow_cset_desc.width = CPP_OPTION (pfile, char_precision);
-+   pfile->char16_cset_desc = init_iconv_desc (pfile,
-+ 					     be ? "UTF-16BE" : "UTF-16LE",
-+ 					     SOURCE_CHARSET);
-+   pfile->char16_cset_desc.width = 16;
-+   pfile->char32_cset_desc = init_iconv_desc (pfile,
-+ 					     be ? "UTF-32BE" : "UTF-32LE",
-+ 					     SOURCE_CHARSET);
-+   pfile->char32_cset_desc.width = 32;
-    pfile->wide_cset_desc = init_iconv_desc (pfile, wcset, SOURCE_CHARSET);
-+   pfile->wide_cset_desc.width = CPP_OPTION (pfile, wchar_precision);
-  }
-  
-  /* Destroy iconv(3) descriptors set up by cpp_init_iconv, if necessary.  */
-*************** _cpp_valid_ucn (cpp_reader *pfile, const
-*** 1051,1065 ****
-     An advanced pointer is returned.  Issues all relevant diagnostics.  */
-  static const uchar *
-  convert_ucn (cpp_reader *pfile, const uchar *from, const uchar *limit,
-! 	     struct _cpp_strbuf *tbuf, bool wide)
-  {
-    cppchar_t ucn;
-    uchar buf[6];
-    uchar *bufp = buf;
-    size_t bytesleft = 6;
-    int rval;
--   struct cset_converter cvt
--     = wide ? pfile->wide_cset_desc : pfile->narrow_cset_desc;
-    struct normalize_state nst = INITIAL_NORMALIZE_STATE;
-  
-    from++;  /* Skip u/U.  */
---- 1065,1077 ----
-     An advanced pointer is returned.  Issues all relevant diagnostics.  */
-  static const uchar *
-  convert_ucn (cpp_reader *pfile, const uchar *from, const uchar *limit,
-! 	     struct _cpp_strbuf *tbuf, struct cset_converter cvt)
-  {
-    cppchar_t ucn;
-    uchar buf[6];
-    uchar *bufp = buf;
-    size_t bytesleft = 6;
-    int rval;
-    struct normalize_state nst = INITIAL_NORMALIZE_STATE;
-  
-    from++;  /* Skip u/U.  */
-*************** convert_ucn (cpp_reader *pfile, const uc
-*** 1086,1099 ****
-     function issues no diagnostics and never fails.  */
-  static void
-  emit_numeric_escape (cpp_reader *pfile, cppchar_t n,
-! 		     struct _cpp_strbuf *tbuf, bool wide)
-  {
-!   if (wide)
-      {
-        /* We have to render this into the target byte order, which may not
-  	 be our byte order.  */
-        bool bigend = CPP_OPTION (pfile, bytes_big_endian);
--       size_t width = CPP_OPTION (pfile, wchar_precision);
-        size_t cwidth = CPP_OPTION (pfile, char_precision);
-        size_t cmask = width_to_mask (cwidth);
-        size_t nbwc = width / cwidth;
---- 1098,1112 ----
-     function issues no diagnostics and never fails.  */
-  static void
-  emit_numeric_escape (cpp_reader *pfile, cppchar_t n,
-! 		     struct _cpp_strbuf *tbuf, struct cset_converter cvt)
-  {
-!   size_t width = cvt.width;
-! 
-!   if (width != CPP_OPTION (pfile, char_precision))
-      {
-        /* We have to render this into the target byte order, which may not
-  	 be our byte order.  */
-        bool bigend = CPP_OPTION (pfile, bytes_big_endian);
-        size_t cwidth = CPP_OPTION (pfile, char_precision);
-        size_t cmask = width_to_mask (cwidth);
-        size_t nbwc = width / cwidth;
-*************** emit_numeric_escape (cpp_reader *pfile,
-*** 1136,1147 ****
-     number.  You can, e.g. generate surrogate pairs this way.  */
-  static const uchar *
-  convert_hex (cpp_reader *pfile, const uchar *from, const uchar *limit,
-! 	     struct _cpp_strbuf *tbuf, bool wide)
-  {
-    cppchar_t c, n = 0, overflow = 0;
-    int digits_found = 0;
-!   size_t width = (wide ? CPP_OPTION (pfile, wchar_precision)
-! 		  : CPP_OPTION (pfile, char_precision));
-    size_t mask = width_to_mask (width);
-  
-    if (CPP_WTRADITIONAL (pfile))
---- 1149,1159 ----
-     number.  You can, e.g. generate surrogate pairs this way.  */
-  static const uchar *
-  convert_hex (cpp_reader *pfile, const uchar *from, const uchar *limit,
-! 	     struct _cpp_strbuf *tbuf, struct cset_converter cvt)
-  {
-    cppchar_t c, n = 0, overflow = 0;
-    int digits_found = 0;
-!   size_t width = cvt.width;
-    size_t mask = width_to_mask (width);
-  
-    if (CPP_WTRADITIONAL (pfile))
-*************** convert_hex (cpp_reader *pfile, const uc
-*** 1174,1180 ****
-        n &= mask;
-      }
-  
-!   emit_numeric_escape (pfile, n, tbuf, wide);
-  
-    return from;
-  }
---- 1186,1192 ----
-        n &= mask;
-      }
-  
-!   emit_numeric_escape (pfile, n, tbuf, cvt);
-  
-    return from;
-  }
-*************** convert_hex (cpp_reader *pfile, const uc
-*** 1187,1198 ****
-     number.  */
-  static const uchar *
-  convert_oct (cpp_reader *pfile, const uchar *from, const uchar *limit,
-! 	     struct _cpp_strbuf *tbuf, bool wide)
-  {
-    size_t count = 0;
-    cppchar_t c, n = 0;
-!   size_t width = (wide ? CPP_OPTION (pfile, wchar_precision)
-! 		  : CPP_OPTION (pfile, char_precision));
-    size_t mask = width_to_mask (width);
-    bool overflow = false;
-  
---- 1199,1209 ----
-     number.  */
-  static const uchar *
-  convert_oct (cpp_reader *pfile, const uchar *from, const uchar *limit,
-! 	     struct _cpp_strbuf *tbuf, struct cset_converter cvt)
-  {
-    size_t count = 0;
-    cppchar_t c, n = 0;
-!   size_t width = cvt.width;
-    size_t mask = width_to_mask (width);
-    bool overflow = false;
-  
-*************** convert_oct (cpp_reader *pfile, const uc
-*** 1213,1219 ****
-        n &= mask;
-      }
-  
-!   emit_numeric_escape (pfile, n, tbuf, wide);
-  
-    return from;
-  }
---- 1224,1230 ----
-        n &= mask;
-      }
-  
-!   emit_numeric_escape (pfile, n, tbuf, cvt);
-  
-    return from;
-  }
-*************** convert_oct (cpp_reader *pfile, const uc
-*** 1224,1230 ****
-     pointer.  Handles all relevant diagnostics.  */
-  static const uchar *
-  convert_escape (cpp_reader *pfile, const uchar *from, const uchar *limit,
-! 		struct _cpp_strbuf *tbuf, bool wide)
-  {
-    /* Values of \a \b \e \f \n \r \t \v respectively.  */
-  #if HOST_CHARSET == HOST_CHARSET_ASCII
---- 1235,1241 ----
-     pointer.  Handles all relevant diagnostics.  */
-  static const uchar *
-  convert_escape (cpp_reader *pfile, const uchar *from, const uchar *limit,
-! 		struct _cpp_strbuf *tbuf, struct cset_converter cvt)
-  {
-    /* Values of \a \b \e \f \n \r \t \v respectively.  */
-  #if HOST_CHARSET == HOST_CHARSET_ASCII
-*************** convert_escape (cpp_reader *pfile, const
-*** 1236,1258 ****
-  #endif
-  
-    uchar c;
--   struct cset_converter cvt
--     = wide ? pfile->wide_cset_desc : pfile->narrow_cset_desc;
-  
-    c = *from;
-    switch (c)
-      {
-        /* UCNs, hex escapes, and octal escapes are processed separately.  */
-      case 'u': case 'U':
-!       return convert_ucn (pfile, from, limit, tbuf, wide);
-  
-      case 'x':
-!       return convert_hex (pfile, from, limit, tbuf, wide);
-        break;
-  
-      case '0':  case '1':  case '2':  case '3':
-      case '4':  case '5':  case '6':  case '7':
-!       return convert_oct (pfile, from, limit, tbuf, wide);
-  
-        /* Various letter escapes.  Get the appropriate host-charset
-  	 value into C.  */
---- 1247,1267 ----
-  #endif
-  
-    uchar c;
-  
-    c = *from;
-    switch (c)
-      {
-        /* UCNs, hex escapes, and octal escapes are processed separately.  */
-      case 'u': case 'U':
-!       return convert_ucn (pfile, from, limit, tbuf, cvt);
-  
-      case 'x':
-!       return convert_hex (pfile, from, limit, tbuf, cvt);
-        break;
-  
-      case '0':  case '1':  case '2':  case '3':
-      case '4':  case '5':  case '6':  case '7':
-!       return convert_oct (pfile, from, limit, tbuf, cvt);
-  
-        /* Various letter escapes.  Get the appropriate host-charset
-  	 value into C.  */
-*************** convert_escape (cpp_reader *pfile, const
-*** 1312,1317 ****
---- 1321,1347 ----
-    return from + 1;
-  }
-  
-+ /* TYPE is a token type.  The return value is the conversion needed to
-+    convert from source to execution character set for the given type. */
-+ static struct cset_converter
-+ converter_for_type (cpp_reader *pfile, enum cpp_ttype type)
-+ {
-+   switch (type)
-+     {
-+     default:
-+ 	return pfile->narrow_cset_desc;
-+     case CPP_CHAR16:
-+     case CPP_STRING16:
-+ 	return pfile->char16_cset_desc;
-+     case CPP_CHAR32:
-+     case CPP_STRING32:
-+ 	return pfile->char32_cset_desc;
-+     case CPP_WCHAR:
-+     case CPP_WSTRING:
-+ 	return pfile->wide_cset_desc;
-+     }
-+ }
-+ 
-  /* FROM is an array of cpp_string structures of length COUNT.  These
-     are to be converted from the source to the execution character set,
-     escape sequences translated, and finally all are to be
-*************** convert_escape (cpp_reader *pfile, const
-*** 1320,1332 ****
-     false for failure.  */
-  bool
-  cpp_interpret_string (cpp_reader *pfile, const cpp_string *from, size_t count,
-! 		      cpp_string *to, bool wide)
-  {
-    struct _cpp_strbuf tbuf;
-    const uchar *p, *base, *limit;
-    size_t i;
-!   struct cset_converter cvt
-!     = wide ? pfile->wide_cset_desc : pfile->narrow_cset_desc;
-  
-    tbuf.asize = MAX (OUTBUF_BLOCK_SIZE, from->len);
-    tbuf.text = XNEWVEC (uchar, tbuf.asize);
---- 1350,1361 ----
-     false for failure.  */
-  bool
-  cpp_interpret_string (cpp_reader *pfile, const cpp_string *from, size_t count,
-! 		      cpp_string *to,  enum cpp_ttype type)
-  {
-    struct _cpp_strbuf tbuf;
-    const uchar *p, *base, *limit;
-    size_t i;
-!   struct cset_converter cvt = converter_for_type (pfile, type);
-  
-    tbuf.asize = MAX (OUTBUF_BLOCK_SIZE, from->len);
-    tbuf.text = XNEWVEC (uchar, tbuf.asize);
-*************** cpp_interpret_string (cpp_reader *pfile,
-*** 1335,1341 ****
-    for (i = 0; i < count; i++)
-      {
-        p = from[i].text;
-!       if (*p == 'L') p++;
-        p++; /* Skip leading quote.  */
-        limit = from[i].text + from[i].len - 1; /* Skip trailing quote.  */
-  
---- 1364,1370 ----
-    for (i = 0; i < count; i++)
-      {
-        p = from[i].text;
-!       if (*p == 'L' || *p == 'u' || *p == 'U') p++;
-        p++; /* Skip leading quote.  */
-        limit = from[i].text + from[i].len - 1; /* Skip trailing quote.  */
-  
-*************** cpp_interpret_string (cpp_reader *pfile,
-*** 1354,1365 ****
-  	  if (p == limit)
-  	    break;
-  
-! 	  p = convert_escape (pfile, p + 1, limit, &tbuf, wide);
-  	}
-      }
-    /* NUL-terminate the 'to' buffer and translate it to a cpp_string
-       structure.  */
-!   emit_numeric_escape (pfile, 0, &tbuf, wide);
-    tbuf.text = XRESIZEVEC (uchar, tbuf.text, tbuf.len);
-    to->text = tbuf.text;
-    to->len = tbuf.len;
---- 1383,1394 ----
-  	  if (p == limit)
-  	    break;
-  
-! 	  p = convert_escape (pfile, p + 1, limit, &tbuf, cvt);
-  	}
-      }
-    /* NUL-terminate the 'to' buffer and translate it to a cpp_string
-       structure.  */
-!   emit_numeric_escape (pfile, 0, &tbuf, cvt);
-    tbuf.text = XRESIZEVEC (uchar, tbuf.text, tbuf.len);
-    to->text = tbuf.text;
-    to->len = tbuf.len;
-*************** cpp_interpret_string (cpp_reader *pfile,
-*** 1375,1381 ****
-     in a string, but do not perform character set conversion.  */
-  bool
-  cpp_interpret_string_notranslate (cpp_reader *pfile, const cpp_string *from,
-! 				  size_t count,	cpp_string *to, bool wide)
-  {
-    struct cset_converter save_narrow_cset_desc = pfile->narrow_cset_desc;
-    bool retval;
---- 1404,1411 ----
-     in a string, but do not perform character set conversion.  */
-  bool
-  cpp_interpret_string_notranslate (cpp_reader *pfile, const cpp_string *from,
-! 				  size_t count,	cpp_string *to,
-! 				  enum cpp_ttype type ATTRIBUTE_UNUSED)
-  {
-    struct cset_converter save_narrow_cset_desc = pfile->narrow_cset_desc;
-    bool retval;
-*************** cpp_interpret_string_notranslate (cpp_re
-*** 1383,1389 ****
-    pfile->narrow_cset_desc.func = convert_no_conversion;
-    pfile->narrow_cset_desc.cd = (iconv_t) -1;
-  
-!   retval = cpp_interpret_string (pfile, from, count, to, wide);
-  
-    pfile->narrow_cset_desc = save_narrow_cset_desc;
-    return retval;
---- 1413,1419 ----
-    pfile->narrow_cset_desc.func = convert_no_conversion;
-    pfile->narrow_cset_desc.cd = (iconv_t) -1;
-  
-!   retval = cpp_interpret_string (pfile, from, count, to, CPP_STRING);
-  
-    pfile->narrow_cset_desc = save_narrow_cset_desc;
-    return retval;
-*************** narrow_str_to_charconst (cpp_reader *pfi
-*** 1462,1474 ****
-  /* Subroutine of cpp_interpret_charconst which performs the conversion
-     to a number, for wide strings.  STR is the string structure returned
-     by cpp_interpret_string.  PCHARS_SEEN and UNSIGNEDP are as for
-!    cpp_interpret_charconst.  */
-  static cppchar_t
-  wide_str_to_charconst (cpp_reader *pfile, cpp_string str,
-! 		       unsigned int *pchars_seen, int *unsignedp)
-  {
-    bool bigend = CPP_OPTION (pfile, bytes_big_endian);
-!   size_t width = CPP_OPTION (pfile, wchar_precision);
-    size_t cwidth = CPP_OPTION (pfile, char_precision);
-    size_t mask = width_to_mask (width);
-    size_t cmask = width_to_mask (cwidth);
---- 1492,1505 ----
-  /* Subroutine of cpp_interpret_charconst which performs the conversion
-     to a number, for wide strings.  STR is the string structure returned
-     by cpp_interpret_string.  PCHARS_SEEN and UNSIGNEDP are as for
-!    cpp_interpret_charconst.  TYPE is the token type.  */
-  static cppchar_t
-  wide_str_to_charconst (cpp_reader *pfile, cpp_string str,
-! 		       unsigned int *pchars_seen, int *unsignedp,
-! 		       enum cpp_ttype type)
-  {
-    bool bigend = CPP_OPTION (pfile, bytes_big_endian);
-!   size_t width = converter_for_type (pfile, type).width;
-    size_t cwidth = CPP_OPTION (pfile, char_precision);
-    size_t mask = width_to_mask (width);
-    size_t cmask = width_to_mask (cwidth);
-*************** wide_str_to_charconst (cpp_reader *pfile
-*** 1490,1496 ****
-    /* Wide character constants have type wchar_t, and a single
-       character exactly fills a wchar_t, so a multi-character wide
-       character constant is guaranteed to overflow.  */
-!   if (off > 0)
-      cpp_error (pfile, CPP_DL_WARNING,
-  	       "character constant too long for its type");
-  
---- 1521,1527 ----
-    /* Wide character constants have type wchar_t, and a single
-       character exactly fills a wchar_t, so a multi-character wide
-       character constant is guaranteed to overflow.  */
-!   if (str.len > nbwc * 2)
-      cpp_error (pfile, CPP_DL_WARNING,
-  	       "character constant too long for its type");
-  
-*************** wide_str_to_charconst (cpp_reader *pfile
-*** 1498,1510 ****
-       sign- or zero-extend to the full width of cppchar_t.  */
-    if (width < BITS_PER_CPPCHAR_T)
-      {
-!       if (CPP_OPTION (pfile, unsigned_wchar) || !(result & (1 << (width - 1))))
-  	result &= mask;
-        else
-  	result |= ~mask;
-      }
-  
-!   *unsignedp = CPP_OPTION (pfile, unsigned_wchar);
-    *pchars_seen = 1;
-    return result;
-  }
---- 1529,1548 ----
-       sign- or zero-extend to the full width of cppchar_t.  */
-    if (width < BITS_PER_CPPCHAR_T)
-      {
-!       if (type == CPP_CHAR16 || type == CPP_CHAR32
-! 	  || CPP_OPTION (pfile, unsigned_wchar)
-! 	  || !(result & (1 << (width - 1))))
-  	result &= mask;
-        else
-  	result |= ~mask;
-      }
-  
-!   if (type == CPP_CHAR16 || type == CPP_CHAR32
-!       || CPP_OPTION (pfile, unsigned_wchar))
-!     *unsignedp = 1;
-!   else
-!     *unsignedp = 0;
-! 
-    *pchars_seen = 1;
-    return result;
-  }
-*************** cpp_interpret_charconst (cpp_reader *pfi
-*** 1518,1537 ****
-  			 unsigned int *pchars_seen, int *unsignedp)
-  {
-    cpp_string str = { 0, 0 };
-!   bool wide = (token->type == CPP_WCHAR);
-    cppchar_t result;
-  
-!   /* an empty constant will appear as L'' or '' */
-    if (token->val.str.len == (size_t) (2 + wide))
-      {
-        cpp_error (pfile, CPP_DL_ERROR, "empty character constant");
-        return 0;
-      }
-!   else if (!cpp_interpret_string (pfile, &token->val.str, 1, &str, wide))
-      return 0;
-  
-    if (wide)
-!     result = wide_str_to_charconst (pfile, str, pchars_seen, unsignedp);
-    else
-      result = narrow_str_to_charconst (pfile, str, pchars_seen, unsignedp);
-  
---- 1556,1576 ----
-  			 unsigned int *pchars_seen, int *unsignedp)
-  {
-    cpp_string str = { 0, 0 };
-!   bool wide = (token->type != CPP_CHAR);
-    cppchar_t result;
-  
-!   /* an empty constant will appear as L'', u'', U'' or '' */
-    if (token->val.str.len == (size_t) (2 + wide))
-      {
-        cpp_error (pfile, CPP_DL_ERROR, "empty character constant");
-        return 0;
-      }
-!   else if (!cpp_interpret_string (pfile, &token->val.str, 1, &str, token->type))
-      return 0;
-  
-    if (wide)
-!     result = wide_str_to_charconst (pfile, str, pchars_seen, unsignedp,
-! 				    token->type);
-    else
-      result = narrow_str_to_charconst (pfile, str, pchars_seen, unsignedp);
-  
+--- libcpp/charset.c.orig	2008-02-19 10:59:44.000000000 +0100
++++ libcpp/charset.c	2009-09-21 11:51:53.000000000 +0200
+@@ -642,6 +642,7 @@ init_iconv_desc (cpp_reader *pfile, cons
+     {
+       ret.func = convert_no_conversion;
+       ret.cd = (iconv_t) -1;
++      ret.width = -1;
+       return ret;
+     }
+ 
+@@ -655,6 +656,7 @@ init_iconv_desc (cpp_reader *pfile, cons
+       {
+ 	ret.func = conversion_tab[i].func;
+ 	ret.cd = conversion_tab[i].fake_cd;
++	ret.width = -1;
+ 	return ret;
+       }
+ 
+@@ -663,6 +665,7 @@ init_iconv_desc (cpp_reader *pfile, cons
+     {
+       ret.func = convert_using_iconv;
+       ret.cd = iconv_open (to, from);
++      ret.width = -1;
+ 
+       if (ret.cd == (iconv_t) -1)
+ 	{
+@@ -683,6 +686,7 @@ init_iconv_desc (cpp_reader *pfile, cons
+ 		 from, to);
+       ret.func = convert_no_conversion;
+       ret.cd = (iconv_t) -1;
++      ret.width = -1;
+     }
+   return ret;
+ }
+@@ -716,7 +720,17 @@ cpp_init_iconv (cpp_reader *pfile)
+     wcset = default_wcset;
+ 
+   pfile->narrow_cset_desc = init_iconv_desc (pfile, ncset, SOURCE_CHARSET);
++  pfile->narrow_cset_desc.width = CPP_OPTION (pfile, char_precision);
++  pfile->char16_cset_desc = init_iconv_desc (pfile,
++					     be ? "UTF-16BE" : "UTF-16LE",
++					     SOURCE_CHARSET);
++  pfile->char16_cset_desc.width = 16;
++  pfile->char32_cset_desc = init_iconv_desc (pfile,
++					     be ? "UTF-32BE" : "UTF-32LE",
++					     SOURCE_CHARSET);
++  pfile->char32_cset_desc.width = 32;
+   pfile->wide_cset_desc = init_iconv_desc (pfile, wcset, SOURCE_CHARSET);
++  pfile->wide_cset_desc.width = CPP_OPTION (pfile, wchar_precision);
+ }
+ 
+ /* Destroy iconv(3) descriptors set up by cpp_init_iconv, if necessary.  */
+@@ -1051,15 +1065,13 @@ _cpp_valid_ucn (cpp_reader *pfile, const
+    An advanced pointer is returned.  Issues all relevant diagnostics.  */
+ static const uchar *
+ convert_ucn (cpp_reader *pfile, const uchar *from, const uchar *limit,
+-	     struct _cpp_strbuf *tbuf, bool wide)
++	     struct _cpp_strbuf *tbuf, struct cset_converter cvt)
+ {
+   cppchar_t ucn;
+   uchar buf[6];
+   uchar *bufp = buf;
+   size_t bytesleft = 6;
+   int rval;
+-  struct cset_converter cvt
+-    = wide ? pfile->wide_cset_desc : pfile->narrow_cset_desc;
+   struct normalize_state nst = INITIAL_NORMALIZE_STATE;
+ 
+   from++;  /* Skip u/U.  */
+@@ -1086,14 +1098,15 @@ convert_ucn (cpp_reader *pfile, const uc
+    function issues no diagnostics and never fails.  */
+ static void
+ emit_numeric_escape (cpp_reader *pfile, cppchar_t n,
+-		     struct _cpp_strbuf *tbuf, bool wide)
++		     struct _cpp_strbuf *tbuf, struct cset_converter cvt)
+ {
+-  if (wide)
++  size_t width = cvt.width;
++
++  if (width != CPP_OPTION (pfile, char_precision))
+     {
+       /* We have to render this into the target byte order, which may not
+ 	 be our byte order.  */
+       bool bigend = CPP_OPTION (pfile, bytes_big_endian);
+-      size_t width = CPP_OPTION (pfile, wchar_precision);
+       size_t cwidth = CPP_OPTION (pfile, char_precision);
+       size_t cmask = width_to_mask (cwidth);
+       size_t nbwc = width / cwidth;
+@@ -1136,12 +1149,11 @@ emit_numeric_escape (cpp_reader *pfile,
+    number.  You can, e.g. generate surrogate pairs this way.  */
+ static const uchar *
+ convert_hex (cpp_reader *pfile, const uchar *from, const uchar *limit,
+-	     struct _cpp_strbuf *tbuf, bool wide)
++	     struct _cpp_strbuf *tbuf, struct cset_converter cvt)
+ {
+   cppchar_t c, n = 0, overflow = 0;
+   int digits_found = 0;
+-  size_t width = (wide ? CPP_OPTION (pfile, wchar_precision)
+-		  : CPP_OPTION (pfile, char_precision));
++  size_t width = cvt.width;
+   size_t mask = width_to_mask (width);
+ 
+   if (CPP_WTRADITIONAL (pfile))
+@@ -1174,7 +1186,7 @@ convert_hex (cpp_reader *pfile, const uc
+       n &= mask;
+     }
+ 
+-  emit_numeric_escape (pfile, n, tbuf, wide);
++  emit_numeric_escape (pfile, n, tbuf, cvt);
+ 
+   return from;
+ }
+@@ -1187,12 +1199,11 @@ convert_hex (cpp_reader *pfile, const uc
+    number.  */
+ static const uchar *
+ convert_oct (cpp_reader *pfile, const uchar *from, const uchar *limit,
+-	     struct _cpp_strbuf *tbuf, bool wide)
++	     struct _cpp_strbuf *tbuf, struct cset_converter cvt)
+ {
+   size_t count = 0;
+   cppchar_t c, n = 0;
+-  size_t width = (wide ? CPP_OPTION (pfile, wchar_precision)
+-		  : CPP_OPTION (pfile, char_precision));
++  size_t width = cvt.width;
+   size_t mask = width_to_mask (width);
+   bool overflow = false;
+ 
+@@ -1213,7 +1224,7 @@ convert_oct (cpp_reader *pfile, const uc
+       n &= mask;
+     }
+ 
+-  emit_numeric_escape (pfile, n, tbuf, wide);
++  emit_numeric_escape (pfile, n, tbuf, cvt);
+ 
+   return from;
+ }
+@@ -1224,7 +1235,7 @@ convert_oct (cpp_reader *pfile, const uc
+    pointer.  Handles all relevant diagnostics.  */
+ static const uchar *
+ convert_escape (cpp_reader *pfile, const uchar *from, const uchar *limit,
+-		struct _cpp_strbuf *tbuf, bool wide)
++		struct _cpp_strbuf *tbuf, struct cset_converter cvt)
+ {
+   /* Values of \a \b \e \f \n \r \t \v respectively.  */
+ #if HOST_CHARSET == HOST_CHARSET_ASCII
+@@ -1236,23 +1247,21 @@ convert_escape (cpp_reader *pfile, const
+ #endif
+ 
+   uchar c;
+-  struct cset_converter cvt
+-    = wide ? pfile->wide_cset_desc : pfile->narrow_cset_desc;
+ 
+   c = *from;
+   switch (c)
+     {
+       /* UCNs, hex escapes, and octal escapes are processed separately.  */
+     case 'u': case 'U':
+-      return convert_ucn (pfile, from, limit, tbuf, wide);
++      return convert_ucn (pfile, from, limit, tbuf, cvt);
+ 
+     case 'x':
+-      return convert_hex (pfile, from, limit, tbuf, wide);
++      return convert_hex (pfile, from, limit, tbuf, cvt);
+       break;
+ 
+     case '0':  case '1':  case '2':  case '3':
+     case '4':  case '5':  case '6':  case '7':
+-      return convert_oct (pfile, from, limit, tbuf, wide);
++      return convert_oct (pfile, from, limit, tbuf, cvt);
+ 
+       /* Various letter escapes.  Get the appropriate host-charset
+ 	 value into C.  */
+@@ -1312,6 +1321,27 @@ convert_escape (cpp_reader *pfile, const
+   return from + 1;
+ }
+ 
++/* TYPE is a token type.  The return value is the conversion needed to
++   convert from source to execution character set for the given type. */
++static struct cset_converter
++converter_for_type (cpp_reader *pfile, enum cpp_ttype type)
++{
++  switch (type)
++    {
++    default:
++	return pfile->narrow_cset_desc;
++    case CPP_CHAR16:
++    case CPP_STRING16:
++	return pfile->char16_cset_desc;
++    case CPP_CHAR32:
++    case CPP_STRING32:
++	return pfile->char32_cset_desc;
++    case CPP_WCHAR:
++    case CPP_WSTRING:
++	return pfile->wide_cset_desc;
++    }
++}
++
+ /* FROM is an array of cpp_string structures of length COUNT.  These
+    are to be converted from the source to the execution character set,
+    escape sequences translated, and finally all are to be
+@@ -1320,13 +1350,12 @@ convert_escape (cpp_reader *pfile, const
+    false for failure.  */
+ bool
+ cpp_interpret_string (cpp_reader *pfile, const cpp_string *from, size_t count,
+-		      cpp_string *to, bool wide)
++		      cpp_string *to,  enum cpp_ttype type)
+ {
+   struct _cpp_strbuf tbuf;
+   const uchar *p, *base, *limit;
+   size_t i;
+-  struct cset_converter cvt
+-    = wide ? pfile->wide_cset_desc : pfile->narrow_cset_desc;
++  struct cset_converter cvt = converter_for_type (pfile, type);
+ 
+   tbuf.asize = MAX (OUTBUF_BLOCK_SIZE, from->len);
+   tbuf.text = XNEWVEC (uchar, tbuf.asize);
+@@ -1335,7 +1364,7 @@ cpp_interpret_string (cpp_reader *pfile,
+   for (i = 0; i < count; i++)
+     {
+       p = from[i].text;
+-      if (*p == 'L') p++;
++      if (*p == 'L' || *p == 'u' || *p == 'U') p++;
+       p++; /* Skip leading quote.  */
+       limit = from[i].text + from[i].len - 1; /* Skip trailing quote.  */
+ 
+@@ -1354,12 +1383,12 @@ cpp_interpret_string (cpp_reader *pfile,
+ 	  if (p == limit)
+ 	    break;
+ 
+-	  p = convert_escape (pfile, p + 1, limit, &tbuf, wide);
++	  p = convert_escape (pfile, p + 1, limit, &tbuf, cvt);
+ 	}
+     }
+   /* NUL-terminate the 'to' buffer and translate it to a cpp_string
+      structure.  */
+-  emit_numeric_escape (pfile, 0, &tbuf, wide);
++  emit_numeric_escape (pfile, 0, &tbuf, cvt);
+   tbuf.text = XRESIZEVEC (uchar, tbuf.text, tbuf.len);
+   to->text = tbuf.text;
+   to->len = tbuf.len;
+@@ -1375,7 +1404,8 @@ cpp_interpret_string (cpp_reader *pfile,
+    in a string, but do not perform character set conversion.  */
+ bool
+ cpp_interpret_string_notranslate (cpp_reader *pfile, const cpp_string *from,
+-				  size_t count,	cpp_string *to, bool wide)
++				  size_t count,	cpp_string *to,
++				  enum cpp_ttype type ATTRIBUTE_UNUSED)
+ {
+   struct cset_converter save_narrow_cset_desc = pfile->narrow_cset_desc;
+   bool retval;
+@@ -1383,7 +1413,7 @@ cpp_interpret_string_notranslate (cpp_re
+   pfile->narrow_cset_desc.func = convert_no_conversion;
+   pfile->narrow_cset_desc.cd = (iconv_t) -1;
+ 
+-  retval = cpp_interpret_string (pfile, from, count, to, wide);
++  retval = cpp_interpret_string (pfile, from, count, to, CPP_STRING);
+ 
+   pfile->narrow_cset_desc = save_narrow_cset_desc;
+   return retval;
+@@ -1462,13 +1492,14 @@ narrow_str_to_charconst (cpp_reader *pfi
+ /* Subroutine of cpp_interpret_charconst which performs the conversion
+    to a number, for wide strings.  STR is the string structure returned
+    by cpp_interpret_string.  PCHARS_SEEN and UNSIGNEDP are as for
+-   cpp_interpret_charconst.  */
++   cpp_interpret_charconst.  TYPE is the token type.  */
+ static cppchar_t
+ wide_str_to_charconst (cpp_reader *pfile, cpp_string str,
+-		       unsigned int *pchars_seen, int *unsignedp)
++		       unsigned int *pchars_seen, int *unsignedp,
++		       enum cpp_ttype type)
+ {
+   bool bigend = CPP_OPTION (pfile, bytes_big_endian);
+-  size_t width = CPP_OPTION (pfile, wchar_precision);
++  size_t width = converter_for_type (pfile, type).width;
+   size_t cwidth = CPP_OPTION (pfile, char_precision);
+   size_t mask = width_to_mask (width);
+   size_t cmask = width_to_mask (cwidth);
+@@ -1490,7 +1521,7 @@ wide_str_to_charconst (cpp_reader *pfile
+   /* Wide character constants have type wchar_t, and a single
+      character exactly fills a wchar_t, so a multi-character wide
+      character constant is guaranteed to overflow.  */
+-  if (off > 0)
++  if (str.len > nbwc * 2)
+     cpp_error (pfile, CPP_DL_WARNING,
+ 	       "character constant too long for its type");
+ 
+@@ -1498,13 +1529,20 @@ wide_str_to_charconst (cpp_reader *pfile
+      sign- or zero-extend to the full width of cppchar_t.  */
+   if (width < BITS_PER_CPPCHAR_T)
+     {
+-      if (CPP_OPTION (pfile, unsigned_wchar) || !(result & (1 << (width - 1))))
++      if (type == CPP_CHAR16 || type == CPP_CHAR32
++	  || CPP_OPTION (pfile, unsigned_wchar)
++	  || !(result & (1 << (width - 1))))
+ 	result &= mask;
+       else
+ 	result |= ~mask;
+     }
+ 
+-  *unsignedp = CPP_OPTION (pfile, unsigned_wchar);
++  if (type == CPP_CHAR16 || type == CPP_CHAR32
++      || CPP_OPTION (pfile, unsigned_wchar))
++    *unsignedp = 1;
++  else
++    *unsignedp = 0;
++
+   *pchars_seen = 1;
+   return result;
+ }
+@@ -1518,20 +1556,21 @@ cpp_interpret_charconst (cpp_reader *pfi
+ 			 unsigned int *pchars_seen, int *unsignedp)
+ {
+   cpp_string str = { 0, 0 };
+-  bool wide = (token->type == CPP_WCHAR);
++  bool wide = (token->type != CPP_CHAR);
+   cppchar_t result;
+ 
+-  /* an empty constant will appear as L'' or '' */
++  /* an empty constant will appear as L'', u'', U'' or '' */
+   if (token->val.str.len == (size_t) (2 + wide))
+     {
+       cpp_error (pfile, CPP_DL_ERROR, "empty character constant");
+       return 0;
+     }
+-  else if (!cpp_interpret_string (pfile, &token->val.str, 1, &str, wide))
++  else if (!cpp_interpret_string (pfile, &token->val.str, 1, &str, token->type))
+     return 0;
+ 
+   if (wide)
+-    result = wide_str_to_charconst (pfile, str, pchars_seen, unsignedp);
++    result = wide_str_to_charconst (pfile, str, pchars_seen, unsignedp,
++				    token->type);
+   else
+     result = narrow_str_to_charconst (pfile, str, pchars_seen, unsignedp);
+

Places

File project.diff of Package gcc43 (Revision 89d2c3b27114bc980ac4d42c1355aa65)

Places