svn commit: r259563 - in stable/10: contrib/gcc contrib/gcc/config contrib/gcc/config/i386 contrib/gcc/config/rs6000 contrib/gcc/cp contrib/gcc/doc gnu/usr.bin/cc gnu/usr.bin/cc/cc_tools

Pedro F. Giffuni pfg at FreeBSD.org
Wed Dec 18 19:07:32 UTC 2013


Author: pfg
Date: Wed Dec 18 19:07:29 2013
New Revision: 259563
URL: http://svnweb.freebsd.org/changeset/base/259563

Log:
  MFC r258428, r258445
  
  gcc: another round of merges from the gcc pre-43 branch.
  
  Bring The following revisions from the gcc43 branch[1]:
  
  118360, 118361, 118363, 118576, 119820,
  123906, 125246, and 125721.
  
  They all have in common that the were merged long ago
  into Apple's gcc and should help improve the general
  quality of the compiler and make it easier to bring
  new features from Apple's gcc42.
  
  For details please review the additions to the files:
  gcc/ChangeLog.gcc43
  gcc/cp/ChangeLog.gcc43 (new, adds previous revisions)
  
  Fix crosscompilation (r258445 by andreast)
  Reference:
  [1] http://gcc.gnu.org/viewcvs/gcc/trunk/?pathrev=126700
  
  Obtained from:	gcc pre4.3 (GPLv2) branch
  MFC after:	3 weeks

Added:
  stable/10/contrib/gcc/cp/ChangeLog.gcc43
     - copied unchanged from r258428, head/contrib/gcc/cp/ChangeLog.gcc43
Modified:
  stable/10/contrib/gcc/ChangeLog.gcc43
  stable/10/contrib/gcc/Makefile.in
  stable/10/contrib/gcc/builtin-types.def
  stable/10/contrib/gcc/builtins.c
  stable/10/contrib/gcc/builtins.def
  stable/10/contrib/gcc/cgraphunit.c
  stable/10/contrib/gcc/collect2.c
  stable/10/contrib/gcc/config/i386/beos-elf.h
  stable/10/contrib/gcc/config/i386/cygwin.h
  stable/10/contrib/gcc/config/i386/i386.c
  stable/10/contrib/gcc/config/i386/i386.h
  stable/10/contrib/gcc/config/i386/i386.md
  stable/10/contrib/gcc/config/i386/nto.h
  stable/10/contrib/gcc/config/rs6000/aix.h
  stable/10/contrib/gcc/config/rs6000/sysv4.h
  stable/10/contrib/gcc/config/svr4.h
  stable/10/contrib/gcc/configure
  stable/10/contrib/gcc/configure.ac
  stable/10/contrib/gcc/coverage.c
  stable/10/contrib/gcc/cp/decl2.c
  stable/10/contrib/gcc/cp/name-lookup.c
  stable/10/contrib/gcc/cppdefault.c
  stable/10/contrib/gcc/doc/extend.texi
  stable/10/contrib/gcc/doc/libgcc.texi
  stable/10/contrib/gcc/doc/rtl.texi
  stable/10/contrib/gcc/dwarf2out.c
  stable/10/contrib/gcc/expr.c
  stable/10/contrib/gcc/fold-const.c
  stable/10/contrib/gcc/gcc.c
  stable/10/contrib/gcc/genattrtab.c
  stable/10/contrib/gcc/genopinit.c
  stable/10/contrib/gcc/libgcc-std.ver
  stable/10/contrib/gcc/libgcc2.c
  stable/10/contrib/gcc/libgcc2.h
  stable/10/contrib/gcc/mips-tdump.c
  stable/10/contrib/gcc/mips-tfile.c
  stable/10/contrib/gcc/mklibgcc.in
  stable/10/contrib/gcc/optabs.c
  stable/10/contrib/gcc/optabs.h
  stable/10/contrib/gcc/reload1.c
  stable/10/contrib/gcc/rtl.def
  stable/10/contrib/gcc/simplify-rtx.c
  stable/10/contrib/gcc/tree-ssa-propagate.c
  stable/10/contrib/gcc/tree.c
  stable/10/contrib/gcc/tree.h
  stable/10/gnu/usr.bin/cc/Makefile.inc
  stable/10/gnu/usr.bin/cc/cc_tools/freebsd-native.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/gcc/ChangeLog.gcc43
==============================================================================
--- stable/10/contrib/gcc/ChangeLog.gcc43	Wed Dec 18 18:25:27 2013	(r259562)
+++ stable/10/contrib/gcc/ChangeLog.gcc43	Wed Dec 18 19:07:29 2013	(r259563)
@@ -10,6 +10,12 @@
 	* doc/extend.texi: Document the 0b-prefixed binary integer
 	constant extension.
 	
+2007-05-31  Eric Christopher  <echristo at apple.com>
+
+	* expr.c (convert_move): Assert that we don't have a BLKmode
+	operand.
+	(store_expr): Handle BLKmode moves by calling emit_block_move.
+
 2007-05-24  Richard Sandiford  <rsandifo at nildram.co.uk> (r125037)
 
 	* postreload-gcse.c (reg_changed_after_insn_p): New function.
@@ -99,6 +105,12 @@
 	(dwarf2out_imported_module_or_decl): Suppress struct debug
 	information using should_emit_struct_debug when appropriate.
 
+2007-04-16  Ian Lance Taylor  <iant at google.com> (r123906)
+
+	* tree-ssa-propagate.c (cfg_blocks_add): Insert blocks with fewer
+	predecessors at head rather than tail.
+
+
 2007-04-12  Richard Guenther  <rguenther at suse.de> (r123736)
 
 	PR tree-optimization/24689
@@ -333,6 +345,28 @@
 	* doc/invoke.texi (Warning Options): Update -Wparentheses
 	description.
 
+2006-12-12  Geoffrey Keating  <geoffk at apple.com> (r119820)
+ 
+	* mips-tdump.c: Replace CROSS_COMPILE with
+	CROSS_DIRECTORY_STRUCTURE.
+	* mips-tfile.c: Likewise.
+	* gcc.c: Likewise.
+	* configure.ac: Likewise.
+	* cppdefault.c: Likewise.
+	* Makefile.in: Likewise.
+	* config/alpha/osf.h: Likewise.
+	* config/i386/cygwin.h: Likewise.
+	* config/i386/beos-elf.h: Likewise.
+	* config/i386/nto.h: Likewise.
+	* config/svr4.h: Likewise.
+	* config/rs6000/aix.h: Likewise.
+	* config/rs6000/sysv4.h: Likewise.
+	* collect2.c: Likewise.
+	* configure: Regenerate.
+
+ 	* doc/tm.texi (Alignment Output): Document that ASM_OUTPUT_SKIP
+ 	actually takes an unsigned HOST_WIDE_INT for its second parameter.
+
 2006-12-02  H.J. Lu  <hongjiu.lu at intel.com> (r119454 - partial)
 
 	PR target/30040
@@ -371,6 +405,30 @@
 	(override_options): Add entries for Core2.
 	(ix86_issue_rate): Add case for Core2.
 	
+2006-11-07  Eric Christopher  <echristo at apple.com> (r118576)
+
+	* libgcc2.c (__bswapdi2): Rename from bswapDI2.
+	(__bswapsi2): Ditto.
+	* libgcc2.h: Remove transformation of bswap routines.
+	* config/i386/i386.md (bswapsi2): New.
+	(bswapdi2): Ditto.
+
+2006-10-31  Geoffrey Keating  <geoffk at apple.com> (r118360)
+ 
+	* coverage.c (coverage_checksum_string): Update comment.
+	* dwarf2out.c (switch_to_eh_frame_section): Update for removal
+	of get_file_function_name.
+	* cgraphunit.c (cgraph_build_static_cdtor): Update for rename
+	of get_file_function_name_long.
+	* tree.c (get_file_function_name): Rename from
+	get_file_function_name_long; improve comment; handle 'I' and 'D'
+	specially when the target has ctor/dtor support; remove special
+	handling for 'F'.
+	(get_file_function_name): Remove.
+	* tree.h (get_file_function_name): Rename from
+        get_file_function_name_long.
+	(get_file_function_name): Remove prototype.
+
 2006-10-31  Geoffrey Keating  <geoffk at apple.com> (r118356)
 
 	* c-decl.c (grokdeclarator): Don't set DECL_EXTERNAL on
@@ -521,3 +579,51 @@
 
 	* builtins.c (fold_builtin_classify): Fix typo.
 
+2006-09-07  Eric Christopher  <echristo at apple.com> (r118361)
+	    Falk Hueffner  <falk at debian.org>
+
+	* doc/extend.texi (__builtin_bswap32): Document.
+	(__builtin_bswap64): Ditto.
+	* doc/libgcc.texi (bswapsi2): Document.
+	(bswapdi2): Ditto.
+	* doc/rtl.texi (bswap): Document.
+	* optabs.c (expand_unop): Don't widen a bswap.
+	(init_optabs): Init bswap. Set libfuncs explicitly
+	for bswapsi2 and bswapdi2.
+	* optabs.h (OTI_bswap): New.
+	(bswap_optab): Ditto.
+	* genopinit.c (optabs): Handle bswap_optab.
+	* tree.h (tree_index): Add TI_UINT32_TYPE and
+	TI_UINT64_TYPE.
+	(uint32_type_node): New.
+	(uint64_type_node): Ditto.
+	* tree.c (build_common_tree_nodes_2): Initialize
+	uint32_type_node and uint64_type_node.
+	* builtins.c (expand_builtin_bswap): New.
+	(expand_builtin): Call.
+	(fold_builtin_bswap): New.
+	(fold_builtin_1): Call.
+	* fold-const.c (tree_expr_nonnegative_p): Return true
+	for bswap.
+	* builtin-types.def (BT_UINT32): New.
+	(BT_UINT64): Ditto.
+	(BT_FN_UINT32_UINT32): Ditto.
+	(BT_FN_UINT64_UINT64): Ditto.
+	* builtins.def (BUILT_IN_BSWAP32): New.
+	(BUILT_IN_BSWAP64): Ditto.
+	* rtl.def (BSWAP): New.
+	* genattrtab.c (check_attr_value): New.
+	* libgcc2.c (__bswapSI2): New.
+	(__bswapDI2): Ditto.
+	* libgcc2.h (__bswapSI2): Declare.
+	(__bswapDI2): Ditto.
+	* mklibgcc.in (lib2funcs): Add _bswapsi2 and _bswapdi2.
+	* simplify-rtx.c (simplify_const_unary_operation): Return
+	0 for BSWAP.
+	* libgcc-std.ver (__bwapsi2): Add.
+	(__bswapdi2): Ditto.
+	* reload1.c (eliminate_regs_1): Add bswap.
+	(elimination_effects): Ditto.
+	* config/i386/i386.h (x86_bswap): New.
+	(TARGET_BSWAP): Use.
+	* config/i386/i386.c (x86_bswap): Set.

Modified: stable/10/contrib/gcc/Makefile.in
==============================================================================
--- stable/10/contrib/gcc/Makefile.in	Wed Dec 18 18:25:27 2013	(r259562)
+++ stable/10/contrib/gcc/Makefile.in	Wed Dec 18 19:07:29 2013	(r259563)
@@ -822,7 +822,8 @@ REAL_H = real.h $(MACHMODE_H)
 
 # IN_GCC distinguishes between code compiled into GCC itself and other
 # programs built during a bootstrap.
-# autoconf inserts -DCROSS_COMPILE if we are building a cross compiler.
+# autoconf inserts -DCROSS_DIRECTORY_STRUCTURE if we are building a
+# cross compiler which does not use the native headers and libraries.
 INTERNAL_CFLAGS = -DIN_GCC @CROSS@
 
 # This is the variable actually used when we compile. If you change this,

Modified: stable/10/contrib/gcc/builtin-types.def
==============================================================================
--- stable/10/contrib/gcc/builtin-types.def	Wed Dec 18 18:25:27 2013	(r259562)
+++ stable/10/contrib/gcc/builtin-types.def	Wed Dec 18 19:07:29 2013	(r259563)
@@ -75,6 +75,8 @@ DEF_PRIMITIVE_TYPE (BT_LONGLONG, long_lo
 DEF_PRIMITIVE_TYPE (BT_ULONGLONG, long_long_unsigned_type_node)
 DEF_PRIMITIVE_TYPE (BT_INTMAX, intmax_type_node)
 DEF_PRIMITIVE_TYPE (BT_UINTMAX, uintmax_type_node)
+DEF_PRIMITIVE_TYPE (BT_UINT32, uint32_type_node)
+DEF_PRIMITIVE_TYPE (BT_UINT64, uint64_type_node)
 DEF_PRIMITIVE_TYPE (BT_WORD, (*lang_hooks.types.type_for_mode) (word_mode, 0))
 DEF_PRIMITIVE_TYPE (BT_FLOAT, float_type_node)
 DEF_PRIMITIVE_TYPE (BT_DOUBLE, double_type_node)
@@ -204,6 +206,10 @@ DEF_FUNCTION_TYPE_1 (BT_FN_DFLOAT128_DFL
 DEF_FUNCTION_TYPE_1 (BT_FN_VOID_VPTR, BT_VOID, BT_VOLATILE_PTR)
 DEF_FUNCTION_TYPE_1 (BT_FN_VOID_PTRPTR, BT_VOID, BT_PTR_PTR)
 DEF_FUNCTION_TYPE_1 (BT_FN_UINT_UINT, BT_UINT, BT_UINT)
+DEF_FUNCTION_TYPE_1 (BT_FN_ULONG_ULONG, BT_ULONG, BT_ULONG)
+DEF_FUNCTION_TYPE_1 (BT_FN_ULONGLONG_ULONGLONG, BT_ULONGLONG, BT_ULONGLONG)
+DEF_FUNCTION_TYPE_1 (BT_FN_UINT32_UINT32, BT_UINT32, BT_UINT32)
+DEF_FUNCTION_TYPE_1 (BT_FN_UINT64_UINT64, BT_UINT64, BT_UINT64)
 
 DEF_POINTER_TYPE (BT_PTR_FN_VOID_PTR, BT_FN_VOID_PTR)
 
@@ -435,4 +441,3 @@ DEF_FUNCTION_TYPE_VAR_5 (BT_FN_INT_STRIN
 DEF_POINTER_TYPE (BT_PTR_FN_VOID_VAR, BT_FN_VOID_VAR)
 DEF_FUNCTION_TYPE_3 (BT_FN_PTR_PTR_FN_VOID_VAR_PTR_SIZE,
 		     BT_PTR, BT_PTR_FN_VOID_VAR, BT_PTR, BT_SIZE)
-

Modified: stable/10/contrib/gcc/builtins.c
==============================================================================
--- stable/10/contrib/gcc/builtins.c	Wed Dec 18 18:25:27 2013	(r259562)
+++ stable/10/contrib/gcc/builtins.c	Wed Dec 18 19:07:29 2013	(r259563)
@@ -4589,6 +4589,30 @@ expand_builtin_alloca (tree arglist, rtx
   return result;
 }
 
+/* Expand a call to a bswap builtin.  The arguments are in ARGLIST.  MODE
+   is the mode to expand with.  */
+
+static rtx
+expand_builtin_bswap (tree arglist, rtx target, rtx subtarget)
+{
+  enum machine_mode mode;
+  tree arg;
+  rtx op0;
+
+  if (!validate_arglist (arglist, INTEGER_TYPE, VOID_TYPE))
+    return 0;
+
+  arg = TREE_VALUE (arglist);
+  mode = TYPE_MODE (TREE_TYPE (arg));
+  op0 = expand_expr (arg, subtarget, VOIDmode, 0);
+
+  target = expand_unop (mode, bswap_optab, op0, target, 1);
+
+  gcc_assert (target);
+
+  return convert_to_mode (mode, target, 0);
+}
+
 /* Expand a call to a unary builtin.  The arguments are in ARGLIST.
    Return 0 if a normal call should be emitted rather than expanding the
    function in-line.  If convenient, the result should be placed in TARGET.
@@ -5877,6 +5901,14 @@ expand_builtin (tree exp, rtx target, rt
       expand_stack_restore (TREE_VALUE (arglist));
       return const0_rtx;
 
+    case BUILT_IN_BSWAP32:
+    case BUILT_IN_BSWAP64:
+      target = expand_builtin_bswap (arglist, target, subtarget);
+
+      if (target)
+	return target;
+      break;
+
     CASE_INT_FN (BUILT_IN_FFS):
     case BUILT_IN_FFSIMAX:
       target = expand_builtin_unop (target_mode, arglist, target,
@@ -7539,6 +7571,67 @@ fold_builtin_bitop (tree fndecl, tree ar
   return NULL_TREE;
 }
 
+/* Fold function call to builtin_bswap and the long and long long
+   variants.  Return NULL_TREE if no simplification can be made.  */
+static tree
+fold_builtin_bswap (tree fndecl, tree arglist)
+{
+  tree arg;
+
+  if (! validate_arglist (arglist, INTEGER_TYPE, VOID_TYPE))
+    return 0;
+
+  /* Optimize constant value.  */
+  arg = TREE_VALUE (arglist);
+  if (TREE_CODE (arg) == INTEGER_CST && ! TREE_CONSTANT_OVERFLOW (arg))
+    {
+      HOST_WIDE_INT hi, width, r_hi = 0;
+      unsigned HOST_WIDE_INT lo, r_lo = 0;
+      tree type;
+
+      type = TREE_TYPE (arg);
+      width = TYPE_PRECISION (type);
+      lo = TREE_INT_CST_LOW (arg);
+      hi = TREE_INT_CST_HIGH (arg);
+
+      switch (DECL_FUNCTION_CODE (fndecl))
+	{
+	  case BUILT_IN_BSWAP32:
+	  case BUILT_IN_BSWAP64:
+	    {
+	      int s;
+
+	      for (s = 0; s < width; s += 8)
+		{
+		  int d = width - s - 8;
+		  unsigned HOST_WIDE_INT byte;
+
+		  if (s < HOST_BITS_PER_WIDE_INT)
+		    byte = (lo >> s) & 0xff;
+		  else
+		    byte = (hi >> (s - HOST_BITS_PER_WIDE_INT)) & 0xff;
+
+		  if (d < HOST_BITS_PER_WIDE_INT)
+		    r_lo |= byte << d;
+		  else
+		    r_hi |= byte << (d - HOST_BITS_PER_WIDE_INT);
+		}
+	    }
+
+	    break;
+
+	default:
+	  gcc_unreachable ();
+	}
+
+      if (width < HOST_BITS_PER_WIDE_INT)
+	return build_int_cst (TREE_TYPE (TREE_TYPE (fndecl)), r_lo);
+      else
+	return build_int_cst_wide (TREE_TYPE (TREE_TYPE (fndecl)), r_lo, r_hi);
+    }
+
+  return NULL_TREE;
+}
 /* Return true if EXPR is the real constant contained in VALUE.  */
 
 static bool
@@ -9053,6 +9146,10 @@ fold_builtin_1 (tree fndecl, tree arglis
     CASE_FLT_FN (BUILT_IN_LLRINT):
       return fold_fixed_mathfn (fndecl, arglist);
 
+    case BUILT_IN_BSWAP32:
+    case BUILT_IN_BSWAP64:
+      return fold_builtin_bswap (fndecl, arglist);
+
     CASE_INT_FN (BUILT_IN_FFS):
     CASE_INT_FN (BUILT_IN_CLZ):
     CASE_INT_FN (BUILT_IN_CTZ):

Modified: stable/10/contrib/gcc/builtins.def
==============================================================================
--- stable/10/contrib/gcc/builtins.def	Wed Dec 18 18:25:27 2013	(r259562)
+++ stable/10/contrib/gcc/builtins.def	Wed Dec 18 19:07:29 2013	(r259563)
@@ -594,6 +594,8 @@ DEF_EXT_LIB_BUILTIN    (BUILT_IN_ALLOCA,
 DEF_GCC_BUILTIN        (BUILT_IN_APPLY, "apply", BT_FN_PTR_PTR_FN_VOID_VAR_PTR_SIZE, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_APPLY_ARGS, "apply_args", BT_FN_PTR_VAR, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_ARGS_INFO, "args_info", BT_FN_INT_INT, ATTR_NULL)
+DEF_GCC_BUILTIN        (BUILT_IN_BSWAP32, "bswap32", BT_FN_UINT32_UINT32, ATTR_CONST_NOTHROW_LIST)
+DEF_GCC_BUILTIN        (BUILT_IN_BSWAP64, "bswap64", BT_FN_UINT64_UINT64, ATTR_CONST_NOTHROW_LIST)
 DEF_LIB_BUILTIN        (BUILT_IN_CALLOC, "calloc", BT_FN_PTR_SIZE_SIZE, ATTR_MALLOC_NOTHROW_LIST)
 DEF_GCC_BUILTIN        (BUILT_IN_CLASSIFY_TYPE, "classify_type", BT_FN_INT_VAR, ATTR_NULL)
 DEF_GCC_BUILTIN        (BUILT_IN_CLZ, "clz", BT_FN_INT_UINT, ATTR_CONST_NOTHROW_LIST)

Modified: stable/10/contrib/gcc/cgraphunit.c
==============================================================================
--- stable/10/contrib/gcc/cgraphunit.c	Wed Dec 18 18:25:27 2013	(r259562)
+++ stable/10/contrib/gcc/cgraphunit.c	Wed Dec 18 19:07:29 2013	(r259563)
@@ -1676,7 +1676,7 @@ cgraph_build_static_cdtor (char which, t
   tree decl, name, resdecl;
 
   sprintf (which_buf, "%c_%d", which, counter++);
-  name = get_file_function_name_long (which_buf);
+  name = get_file_function_name (which_buf);
 
   decl = build_decl (FUNCTION_DECL, name,
 		     build_function_type (void_type_node, void_list_node));

Modified: stable/10/contrib/gcc/collect2.c
==============================================================================
--- stable/10/contrib/gcc/collect2.c	Wed Dec 18 18:25:27 2013	(r259562)
+++ stable/10/contrib/gcc/collect2.c	Wed Dec 18 19:07:29 2013	(r259563)
@@ -53,7 +53,7 @@ Software Foundation, 51 Franklin Street,
    the utilities are not correct for a cross-compiler; we have to hope that
    cross-versions are in the proper directories.  */
 
-#ifdef CROSS_COMPILE
+#ifdef CROSS_DIRECTORY_STRUCTURE
 #undef OBJECT_FORMAT_COFF
 #undef MD_EXEC_PREFIX
 #undef REAL_LD_FILE_NAME
@@ -553,7 +553,7 @@ is_ctor_dtor (const char *s)
 
 static struct path_prefix cpath, path;
 
-#ifdef CROSS_COMPILE
+#ifdef CROSS_DIRECTORY_STRUCTURE
 /* This is the name of the target machine.  We use it to form the name
    of the files to execute.  */
 
@@ -746,7 +746,7 @@ main (int argc, char **argv)
   static const char *const strip_suffix = "strip";
   static const char *const gstrip_suffix = "gstrip";
 
-#ifdef CROSS_COMPILE
+#ifdef CROSS_DIRECTORY_STRUCTURE
   /* If we look for a program in the compiler directories, we just use
      the short name, since these directories are already system-specific.
      But it we look for a program in the system directories, we need to
@@ -775,7 +775,7 @@ main (int argc, char **argv)
 #endif
   const char *const full_strip_suffix	= strip_suffix;
   const char *const full_gstrip_suffix	= gstrip_suffix;
-#endif /* CROSS_COMPILE */
+#endif /* CROSS_DIRECTORY_STRUCTURE */
 
   const char *arg;
   FILE *outf;
@@ -957,7 +957,7 @@ main (int argc, char **argv)
   c_file_name = getenv ("COLLECT_GCC");
   if (c_file_name == 0)
     {
-#ifdef CROSS_COMPILE
+#ifdef CROSS_DIRECTORY_STRUCTURE
       c_file_name = concat (target_machine, "-gcc", NULL);
 #else
       c_file_name = "gcc";

Modified: stable/10/contrib/gcc/config/i386/beos-elf.h
==============================================================================
--- stable/10/contrib/gcc/config/i386/beos-elf.h	Wed Dec 18 18:25:27 2013	(r259562)
+++ stable/10/contrib/gcc/config/i386/beos-elf.h	Wed Dec 18 19:07:29 2013	(r259563)
@@ -135,7 +135,7 @@ Boston, MA 02110-1301, USA.  */
    for the BeOS include files relative to TOOL_INCLUDE_DIR.  Yes, we
    use ANSI string concatenation here (FIXME) */
 
-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #undef INCLUDE_DEFAULTS
 #define INCLUDE_DEFAULTS \
     { \
@@ -177,7 +177,7 @@ Boston, MA 02110-1301, USA.  */
     { "/boot/develop/headers", 0, 0, 0 }, \
     { 0, 0, 0, 0 } \
     }
-#else /* CROSS_COMPILE */
+#else /* CROSS_DIRECTORY_STRUCTURE */
 #undef	INCLUDE_DEFAULTS
 #define INCLUDE_DEFAULTS				\
     { \

Modified: stable/10/contrib/gcc/config/i386/cygwin.h
==============================================================================
--- stable/10/contrib/gcc/config/i386/cygwin.h	Wed Dec 18 18:25:27 2013	(r259562)
+++ stable/10/contrib/gcc/config/i386/cygwin.h	Wed Dec 18 19:07:29 2013	(r259563)
@@ -146,7 +146,7 @@ char cygwin_tool_include_dir[sizeof (TOO
 #undef TOOL_INCLUDE_DIR
 #define TOOL_INCLUDE_DIR ((const char *) cygwin_tool_include_dir)
 
-#ifndef CROSS_COMPILE
+#ifndef CROSS_DIRECTORY_STRUCTURE
 #undef STANDARD_INCLUDE_DIR
 #define STANDARD_INCLUDE_DIR "/usr/include"
 char cygwin_standard_include_dir[sizeof (STANDARD_INCLUDE_DIR) + 1

Modified: stable/10/contrib/gcc/config/i386/i386.c
==============================================================================
--- stable/10/contrib/gcc/config/i386/i386.c	Wed Dec 18 18:25:27 2013	(r259562)
+++ stable/10/contrib/gcc/config/i386/i386.c	Wed Dec 18 19:07:29 2013	(r259563)
@@ -1089,6 +1089,8 @@ const int x86_cmpxchg = ~m_386;
 const int x86_cmpxchg8b = ~(m_386 | m_486);
 /* Exchange and add was added for 80486.  */
 const int x86_xadd = ~m_386;
+/* Byteswap was added for 80486.  */
+const int x86_bswap = ~m_386;
 const int x86_pad_returns = m_ATHLON_K8_AMDFAM10 | m_CORE2 | m_GENERIC;
 
 /* In case the average insn count for single function invocation is

Modified: stable/10/contrib/gcc/config/i386/i386.h
==============================================================================
--- stable/10/contrib/gcc/config/i386/i386.h	Wed Dec 18 18:25:27 2013	(r259562)
+++ stable/10/contrib/gcc/config/i386/i386.h	Wed Dec 18 19:07:29 2013	(r259563)
@@ -168,6 +168,7 @@ extern const int x86_use_bt;
 extern const int x86_cmpxchg, x86_cmpxchg8b, x86_xadd;
 extern const int x86_use_incdec;
 extern const int x86_pad_returns;
+extern const int x86_bswap;
 extern const int x86_partial_flag_reg_stall;
 extern int x86_prefetch_sse, x86_cmpxchg16b;
 
@@ -243,6 +244,7 @@ extern int x86_prefetch_sse, x86_cmpxchg
 #define TARGET_CMPXCHG8B (x86_cmpxchg8b & (1 << ix86_arch))
 #define TARGET_CMPXCHG16B (x86_cmpxchg16b)
 #define TARGET_XADD (x86_xadd & (1 << ix86_arch))
+#define TARGET_BSWAP (x86_bswap & (1 << ix86_arch))
 
 #ifndef TARGET_64BIT_DEFAULT
 #define TARGET_64BIT_DEFAULT 0

Modified: stable/10/contrib/gcc/config/i386/i386.md
==============================================================================
--- stable/10/contrib/gcc/config/i386/i386.md	Wed Dec 18 18:25:27 2013	(r259562)
+++ stable/10/contrib/gcc/config/i386/i386.md	Wed Dec 18 19:07:29 2013	(r259563)
@@ -284,14 +284,14 @@
     (const_int 0)))
 
 ;; Set when string REP prefix is used.
-(define_attr "prefix_rep" "" 
+(define_attr "prefix_rep" ""
   (if_then_else (and (eq_attr "unit" "sse") (eq_attr "mode" "SF,DF"))
     (const_int 1)
     (const_int 0)))
 
 ;; Set when 0f opcode prefix is used.
 (define_attr "prefix_0f" ""
-  (if_then_else 
+  (if_then_else
     (ior (eq_attr "type" "imovx,setcc,icmov,bitmanip")
 	 (eq_attr "unit" "sse,mmx"))
     (const_int 1)
@@ -466,7 +466,7 @@
 
 ;; All x87 floating point modes
 (define_mode_macro X87MODEF [SF DF XF])
- 
+
 ;; All integer modes handled by x87 fisttp operator.
 (define_mode_macro X87MODEI [HI SI DI])
 
@@ -475,7 +475,7 @@
 
 ;; All SSE floating point modes
 (define_mode_macro SSEMODEF [SF DF])
- 
+
 ;; All integer modes handled by SSE cvtts?2si* operators.
 (define_mode_macro SSEMODEI24 [SI DI])
 
@@ -1098,7 +1098,7 @@
 ;; Push/pop instructions.  They are separate since autoinc/dec is not a
 ;; general_operand.
 ;;
-;; %%% We don't use a post-inc memory reference because x86 is not a 
+;; %%% We don't use a post-inc memory reference because x86 is not a
 ;; general AUTO_INC_DEC host, which impacts how it is treated in flow.
 ;; Changing this impacts compiler performance on other non-AUTO_INC_DEC
 ;; targets without our curiosities, and it is just as easy to represent
@@ -1160,7 +1160,7 @@
   [(set_attr "type" "alu1")
    (set_attr "mode" "SI")
    (set_attr "length_immediate" "0")])
- 
+
 (define_insn "*movsi_or"
   [(set (match_operand:SI 0 "register_operand" "=r")
 	(match_operand:SI 1 "immediate_operand" "i"))
@@ -2308,7 +2308,7 @@
    && (reload_in_progress || reload_completed
        || (ix86_cmodel == CM_MEDIUM || ix86_cmodel == CM_LARGE)
        || GET_CODE (operands[1]) != CONST_DOUBLE
-       || memory_operand (operands[0], SFmode))" 
+       || memory_operand (operands[0], SFmode))"
 {
   switch (which_alternative)
     {
@@ -2368,7 +2368,7 @@
 		   (const_string "V4SF"))
 	       /* For architectures resolving dependencies on
 		  whole SSE registers use APS move to break dependency
-		  chains, otherwise use short move to avoid extra work. 
+		  chains, otherwise use short move to avoid extra work.
 
 		  Do the same for architectures resolving dependencies on
 		  the parts.  While in DF mode it is better to always handle
@@ -2476,7 +2476,7 @@
    && (reload_in_progress || reload_completed
        || (ix86_cmodel == CM_MEDIUM || ix86_cmodel == CM_LARGE)
        || GET_CODE (operands[1]) != CONST_DOUBLE
-       || memory_operand (operands[0], DFmode))" 
+       || memory_operand (operands[0], DFmode))"
 {
   switch (which_alternative)
     {
@@ -2596,7 +2596,7 @@
    && (reload_in_progress || reload_completed
        || (ix86_cmodel == CM_MEDIUM || ix86_cmodel == CM_LARGE)
        || GET_CODE (operands[1]) != CONST_DOUBLE
-       || memory_operand (operands[0], DFmode))" 
+       || memory_operand (operands[0], DFmode))"
 {
   switch (which_alternative)
     {
@@ -2712,10 +2712,10 @@
 	(match_operand:DF 1 "general_operand" ""))]
   "reload_completed
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)
-   && ! (ANY_FP_REG_P (operands[0]) || 
+   && ! (ANY_FP_REG_P (operands[0]) ||
 	 (GET_CODE (operands[0]) == SUBREG
 	  && ANY_FP_REG_P (SUBREG_REG (operands[0]))))
-   && ! (ANY_FP_REG_P (operands[1]) || 
+   && ! (ANY_FP_REG_P (operands[1]) ||
 	 (GET_CODE (operands[1]) == SUBREG
 	  && ANY_FP_REG_P (SUBREG_REG (operands[1]))))"
   [(const_int 0)]
@@ -2807,7 +2807,7 @@
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)
    && (reload_in_progress || reload_completed
        || GET_CODE (operands[1]) != CONST_DOUBLE
-       || memory_operand (operands[0], XFmode))" 
+       || memory_operand (operands[0], XFmode))"
 {
   switch (which_alternative)
     {
@@ -2841,7 +2841,7 @@
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)
    && (reload_in_progress || reload_completed
        || GET_CODE (operands[1]) != CONST_DOUBLE
-       || memory_operand (operands[0], XFmode))" 
+       || memory_operand (operands[0], XFmode))"
 {
   switch (which_alternative)
     {
@@ -2875,10 +2875,10 @@
   "reload_completed
    && (GET_CODE (operands[0]) != MEM || GET_CODE (operands[1]) != MEM)
    && GET_MODE (operands[0]) == XFmode
-   && ! (ANY_FP_REG_P (operands[0]) || 
+   && ! (ANY_FP_REG_P (operands[0]) ||
 	 (GET_CODE (operands[0]) == SUBREG
 	  && ANY_FP_REG_P (SUBREG_REG (operands[0]))))
-   && ! (ANY_FP_REG_P (operands[1]) || 
+   && ! (ANY_FP_REG_P (operands[1]) ||
 	 (GET_CODE (operands[1]) == SUBREG
 	  && ANY_FP_REG_P (SUBREG_REG (operands[1]))))"
   [(const_int 0)]
@@ -3073,7 +3073,7 @@
   [(set (match_operand:HI 0 "register_operand" "")
 	(zero_extend:HI (match_operand:QI 1 "nonimmediate_operand" "")))
    (clobber (reg:CC FLAGS_REG))]
-  "reload_completed 
+  "reload_completed
    && (!TARGET_ZERO_EXTEND_WITH_AND || optimize_size)
    && (!REG_P (operands[1]) || ANY_QI_REG_P (operands[1]))"
   [(set (match_operand:HI 0 "register_operand" "")
@@ -3143,7 +3143,7 @@
   [(set (match_operand:SI 0 "register_operand" "")
 	(zero_extend:SI (match_operand:QI 1 "nonimmediate_operand" "")))
    (clobber (reg:CC FLAGS_REG))]
-  "reload_completed 
+  "reload_completed
    && (!TARGET_ZERO_EXTEND_WITH_AND || optimize_size)
    && (!REG_P (operands[1]) || ANY_QI_REG_P (operands[1]))"
   [(set (match_dup 0)
@@ -3220,7 +3220,7 @@
   [(set (match_dup 4) (const_int 0))]
   "split_di (&operands[0], 1, &operands[3], &operands[4]);")
 
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "register_operand" "")
 	(zero_extend:DI (match_operand:SI 1 "register_operand" "")))
    (clobber (reg:CC FLAGS_REG))]
@@ -3229,7 +3229,7 @@
   [(set (match_dup 4) (const_int 0))]
   "split_di (&operands[0], 1, &operands[3], &operands[4]);")
 
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "nonimmediate_operand" "")
 	(zero_extend:DI (match_operand:SI 1 "general_operand" "")))
    (clobber (reg:CC FLAGS_REG))]
@@ -3308,7 +3308,7 @@
     (set_attr "mode" "DI")])
 
 ;; Extend to memory case when source register does die.
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "memory_operand" "")
 	(sign_extend:DI (match_operand:SI 1 "register_operand" "")))
    (clobber (reg:CC FLAGS_REG))
@@ -3323,7 +3323,7 @@
   "split_di (&operands[0], 1, &operands[3], &operands[4]);")
 
 ;; Extend to memory case when source register does not die.
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "memory_operand" "")
 	(sign_extend:DI (match_operand:SI 1 "register_operand" "")))
    (clobber (reg:CC FLAGS_REG))
@@ -3353,7 +3353,7 @@
 
 ;; Extend to register case.  Optimize case where source and destination
 ;; registers match and cases where we can use cltd.
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "register_operand" "")
 	(sign_extend:DI (match_operand:SI 1 "register_operand" "")))
    (clobber (reg:CC FLAGS_REG))
@@ -3482,7 +3482,7 @@
 ;; These are all no-ops in the model used for the 80387.  So just
 ;; emit moves.
 
-;; %%% Kill these when call knows how to work out a DFmode push earlier. 
+;; %%% Kill these when call knows how to work out a DFmode push earlier.
 (define_insn "*dummy_extendsfdf2"
   [(set (match_operand:DF 0 "push_operand" "=<")
 	(float_extend:DF (match_operand:SF 1 "nonimmediate_operand" "fY")))]
@@ -4365,7 +4365,7 @@
    (set_attr "i387_cw" "trunc")
    (set_attr "mode" "DI")])
 
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "register_operand" "")
 	(fix:DI (match_operand 1 "register_operand" "")))
    (use (match_operand:HI 2 "memory_operand" ""))
@@ -4380,7 +4380,7 @@
    (set (match_dup 0) (match_dup 4))]
   "")
 
-(define_split 
+(define_split
   [(set (match_operand:DI 0 "memory_operand" "")
 	(fix:DI (match_operand 1 "register_operand" "")))
    (use (match_operand:HI 2 "memory_operand" ""))
@@ -4421,7 +4421,7 @@
    (set_attr "i387_cw" "trunc")
    (set_attr "mode" "<MODE>")])
 
-(define_split 
+(define_split
   [(set (match_operand:X87MODEI12 0 "register_operand" "")
 	(fix:X87MODEI12 (match_operand 1 "register_operand" "")))
    (use (match_operand:HI 2 "memory_operand" ""))
@@ -4434,7 +4434,7 @@
    (set (match_dup 0) (match_dup 4))]
   "")
 
-(define_split 
+(define_split
   [(set (match_operand:X87MODEI12 0 "memory_operand" "")
 	(fix:X87MODEI12 (match_operand 1 "register_operand" "")))
    (use (match_operand:HI 2 "memory_operand" ""))
@@ -4913,7 +4913,7 @@
 
 (define_insn "*addsi3_carry_zext"
   [(set (match_operand:DI 0 "register_operand" "=r")
-	  (zero_extend:DI 
+	  (zero_extend:DI
 	    (plus:SI (plus:SI (match_operand:SI 3 "ix86_carry_flag_operator" "")
 			      (match_operand:SI 1 "nonimmediate_operand" "%0"))
 		     (match_operand:SI 2 "general_operand" "rim"))))
@@ -5222,7 +5222,7 @@
 	(compare
 	  (plus:DI (match_operand:DI 1 "nonimmediate_operand" "%0,0")
 		   (match_operand:DI 2 "x86_64_general_operand" "rme,re"))
-	  (const_int 0)))			
+	  (const_int 0)))
    (set (match_operand:DI 0 "nonimmediate_operand" "=r,rm")
 	(plus:DI (match_dup 1) (match_dup 2)))]
   "TARGET_64BIT && ix86_match_ccmode (insn, CCGOCmode)
@@ -5369,7 +5369,7 @@
 	(compare
 	  (plus:DI (match_operand:DI 1 "nonimmediate_operand" "%0")
 		   (match_operand:DI 2 "x86_64_general_operand" "rme"))
-	  (const_int 0)))			
+	  (const_int 0)))
    (clobber (match_scratch:DI 0 "=r"))]
   "TARGET_64BIT
    && ix86_match_ccmode (insn, CCGOCmode)
@@ -5568,7 +5568,7 @@
 	(compare
 	  (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0,0")
 		   (match_operand:SI 2 "general_operand" "rmni,rni"))
-	  (const_int 0)))			
+	  (const_int 0)))
    (set (match_operand:SI 0 "nonimmediate_operand" "=r,rm")
 	(plus:SI (match_dup 1) (match_dup 2)))]
   "ix86_match_ccmode (insn, CCGOCmode)
@@ -5616,7 +5616,7 @@
 	(compare
 	  (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
 		   (match_operand:SI 2 "general_operand" "rmni"))
-	  (const_int 0)))			
+	  (const_int 0)))
    (set (match_operand:DI 0 "register_operand" "=r")
 	(zero_extend:DI (plus:SI (match_dup 1) (match_dup 2))))]
   "TARGET_64BIT && ix86_match_ccmode (insn, CCGOCmode)
@@ -5794,7 +5794,7 @@
 	(compare
 	  (plus:SI (match_operand:SI 1 "nonimmediate_operand" "%0")
 		   (match_operand:SI 2 "general_operand" "rmni"))
-	  (const_int 0)))			
+	  (const_int 0)))
    (clobber (match_scratch:SI 0 "=r"))]
   "ix86_match_ccmode (insn, CCGOCmode)
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)
@@ -5934,7 +5934,7 @@
 	(compare
 	  (plus:HI (match_operand:HI 1 "nonimmediate_operand" "%0,0")
 		   (match_operand:HI 2 "general_operand" "rmni,rni"))
-	  (const_int 0)))			
+	  (const_int 0)))
    (set (match_operand:HI 0 "nonimmediate_operand" "=r,rm")
 	(plus:HI (match_dup 1) (match_dup 2)))]
   "ix86_match_ccmode (insn, CCGOCmode)
@@ -6054,7 +6054,7 @@
 	(compare
 	  (plus:HI (match_operand:HI 1 "nonimmediate_operand" "%0")
 		   (match_operand:HI 2 "general_operand" "rmni"))
-	  (const_int 0)))			
+	  (const_int 0)))
    (clobber (match_scratch:HI 0 "=r"))]
   "ix86_match_ccmode (insn, CCGOCmode)
    && (GET_CODE (operands[1]) != MEM || GET_CODE (operands[2]) != MEM)"
@@ -7483,7 +7483,7 @@
  		(match_operand:DF 2 "nonimmediate_operand" "")))]
    "TARGET_80387 || (TARGET_SSE2 && TARGET_SSE_MATH)"
    "")
- 
+
 (define_expand "divsf3"
   [(set (match_operand:SF 0 "register_operand" "")
 	(div:SF (match_operand:SF 1 "register_operand" "")
@@ -8161,7 +8161,7 @@
 	    gcc_assert (INTVAL (operands[2]) == 0xffff);
 	    mode = HImode;
 	  }
-	
+
 	operands[1] = gen_lowpart (mode, operands[1]);
 	if (mode == QImode)
 	  return "movz{bq|x}\t{%1,%0|%0, %1}";
@@ -8226,7 +8226,7 @@
 	    gcc_assert (INTVAL (operands[2]) == 0xffff);
 	    mode = HImode;
 	  }
-	
+
 	operands[1] = gen_lowpart (mode, operands[1]);
 	if (mode == QImode)
 	  return "movz{bl|x}\t{%1,%0|%0, %1}";
@@ -8270,7 +8270,7 @@
   [(parallel [(set (zero_extract:SI (match_dup 0)
 				    (const_int 8)
 				    (const_int 8))
-		   (xor:SI 
+		   (xor:SI
 		     (zero_extract:SI (match_dup 0)
 				      (const_int 8)
 				      (const_int 8))
@@ -8458,7 +8458,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(and:SI 
+	(and:SI
 	  (zero_extract:SI
 	    (match_operand 1 "ext_register_operand" "0")
 	    (const_int 8)
@@ -8487,7 +8487,7 @@
    (set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(and:SI 
+	(and:SI
 	  (zero_extract:SI
 	    (match_dup 1)
 	    (const_int 8)
@@ -8503,7 +8503,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(and:SI 
+	(and:SI
 	  (zero_extract:SI
 	    (match_operand 1 "ext_register_operand" "0")
 	    (const_int 8)
@@ -8521,7 +8521,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(and:SI 
+	(and:SI
 	  (zero_extract:SI
 	    (match_operand 1 "ext_register_operand" "0")
 	    (const_int 8)
@@ -8864,7 +8864,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(ior:SI 
+	(ior:SI
 	  (zero_extract:SI
 	    (match_operand 1 "ext_register_operand" "0")
 	    (const_int 8)
@@ -8881,7 +8881,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(ior:SI 
+	(ior:SI
 	  (zero_extract:SI
 	    (match_operand 1 "ext_register_operand" "0")
 	    (const_int 8)
@@ -8900,7 +8900,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(ior:SI 
+	(ior:SI
 	  (zero_extract:SI
 	    (match_operand 1 "ext_register_operand" "0")
 	    (const_int 8)
@@ -8919,7 +8919,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(ior:SI 
+	(ior:SI
 	  (zero_extract:SI (match_operand 1 "ext_register_operand" "0")
 	  		   (const_int 8)
 			   (const_int 8))
@@ -9202,7 +9202,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(xor:SI 
+	(xor:SI
 	  (zero_extract:SI
 	    (match_operand 1 "ext_register_operand" "0")
 	    (const_int 8)
@@ -9219,7 +9219,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(xor:SI 
+	(xor:SI
 	  (zero_extract:SI
 	    (match_operand 1 "ext_register_operand" "0")
 	    (const_int 8)
@@ -9238,7 +9238,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(xor:SI 
+	(xor:SI
 	  (zero_extract:SI
 	    (match_operand 1 "ext_register_operand" "0")
 	    (const_int 8)
@@ -9257,7 +9257,7 @@
   [(set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(xor:SI 
+	(xor:SI
 	  (zero_extract:SI (match_operand 1 "ext_register_operand" "0")
 	  		   (const_int 8)
 			   (const_int 8))
@@ -9325,7 +9325,7 @@
    (set (zero_extract:SI (match_operand 0 "ext_register_operand" "=q")
 			 (const_int 8)
 			 (const_int 8))
-	(xor:SI 
+	(xor:SI
 	  (zero_extract:SI (match_dup 1) (const_int 8) (const_int 8))
 	  (match_dup 2)))]
   "!TARGET_64BIT && ix86_match_ccmode (insn, CCNOmode)"
@@ -9346,7 +9346,7 @@
    (set (zero_extract:SI (match_operand 0 "ext_register_operand" "=Q")
 			 (const_int 8)
 			 (const_int 8))
-	(xor:SI 
+	(xor:SI
 	  (zero_extract:SI (match_dup 1) (const_int 8) (const_int 8))
 	  (match_dup 2)))]
   "TARGET_64BIT && ix86_match_ccmode (insn, CCNOmode)"
@@ -9368,7 +9368,7 @@
      (set (zero_extract:SI (match_operand 0 "ext_register_operand" "")
 			   (const_int 8)
 			   (const_int 8))
-	  (xor:SI 
+	  (xor:SI
 	    (zero_extract:SI (match_dup 1) (const_int 8) (const_int 8))
 	    (match_dup 2)))])]
   ""
@@ -9867,7 +9867,7 @@
   enum machine_mode mode = GET_MODE (operands[0]);
   enum machine_mode vmode = GET_MODE (operands[2]);
   rtx tmp;
-  
+
   operands[0] = simplify_gen_subreg (vmode, operands[0], mode, 0);
   operands[1] = simplify_gen_subreg (vmode, operands[1], mode, 0);
   if (operands_match_p (operands[0], operands[2]))
@@ -9891,7 +9891,7 @@
   "reload_completed"
   [(parallel [(set (match_dup 0) (match_dup 1))
 	      (clobber (reg:CC FLAGS_REG))])]
-{ 
+{
   rtx tmp;
   operands[0] = gen_lowpart (SImode, operands[0]);
   if (GET_CODE (operands[1]) == ABS)
@@ -9998,7 +9998,7 @@
   operands[1] = tmp;
 })
 
-;; Conditionalize these after reload. If they match before reload, we 
+;; Conditionalize these after reload. If they match before reload, we
 ;; lose the clobber and ability to use integer instructions.
 
 (define_insn "*negsf2_1"
@@ -11415,8 +11415,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "sar{q}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand:DI 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand:DI 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -11448,8 +11448,8 @@
    && ix86_binary_operator_ok (ASHIFTRT, DImode, operands)"
   "sar{q}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand:DI 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand:DI 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -11628,8 +11628,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "sar{l}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand:SI 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand:SI 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -11684,8 +11684,8 @@
    && ix86_binary_operator_ok (ASHIFTRT, SImode, operands)"
   "sar{l}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand:SI 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand:SI 0 "register_operand" "")
 	(const_string "2")
 	(const_string "*")))])
 
@@ -11785,8 +11785,8 @@
    && (TARGET_SHIFT1 || optimize_size)"
   "sar{w}\t%0"
   [(set_attr "type" "ishift")
-   (set (attr "length") 
-     (if_then_else (match_operand 0 "register_operand" "") 
+   (set (attr "length")
+     (if_then_else (match_operand 0 "register_operand" "")

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***


More information about the svn-src-stable-10 mailing list