Merge in trunk.
authormrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 13 Jan 2014 19:14:33 +0000 (19:14 +0000)
committermrs <mrs@138bc75d-0d04-0410-961f-82ee72b054a4>
Mon, 13 Jan 2014 19:14:33 +0000 (19:14 +0000)
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/wide-int@206584 138bc75d-0d04-0410-961f-82ee72b054a4

36 files changed:
1  2 
gcc/Makefile.in
gcc/ada/gcc-interface/cuintp.c
gcc/builtins.c
gcc/c/c-decl.c
gcc/c/c-parser.c
gcc/config/aarch64/aarch64.c
gcc/config/arm/arm.c
gcc/config/darwin.c
gcc/config/i386/i386.c
gcc/config/rs6000/rs6000-c.c
gcc/config/rs6000/rs6000.c
gcc/config/rs6000/rs6000.h
gcc/config/rs6000/rs6000.md
gcc/cp/class.c
gcc/cp/cvt.c
gcc/cp/mangle.c
gcc/expr.c
gcc/gimple-fold.c
gcc/gimple.c
gcc/ipa-devirt.c
gcc/ipa-prop.c
gcc/lto/lto.c
gcc/omp-low.c
gcc/optabs.c
gcc/stor-layout.c
gcc/tree-cfg.c
gcc/tree-core.h
gcc/tree-predcom.c
gcc/tree-ssa-loop-ivopts.c
gcc/tree-ssa-loop-niter.c
gcc/tree-ssa-pre.c
gcc/tree-vect-data-refs.c
gcc/tree-vect-loop-manip.c
gcc/tree.c
gcc/tree.h
gcc/var-tracking.c

diff --cc gcc/Makefile.in
@@@ -929,11 -929,10 +929,10 @@@ CPP_ID_DATA_H = $(CPPLIB_H) $(srcdir)/.
  CPP_INTERNAL_H = $(srcdir)/../libcpp/internal.h $(CPP_ID_DATA_H)
  TREE_DUMP_H = tree-dump.h $(SPLAY_TREE_H) $(DUMPFILE_H)
  TREE_PASS_H = tree-pass.h $(TIMEVAR_H) $(DUMPFILE_H)
- TREE_FLOW_H = tree-flow.h tree-flow-inline.h tree-ssa-operands.h \
+ TREE_SSA_H = tree-ssa.h tree-ssa-operands.h \
                $(BITMAP_H) sbitmap.h $(BASIC_BLOCK_H) $(GIMPLE_H) \
                $(HASHTAB_H) $(CGRAPH_H) $(IPA_REFERENCE_H) \
 -              tree-ssa-alias.h
 +              tree-ssa-alias.h wide-int.h
- TREE_SSA_H = tree-ssa.h $(TREE_FLOW_H)
  PRETTY_PRINT_H = pretty-print.h $(INPUT_H) $(OBSTACK_H)
  TREE_PRETTY_PRINT_H = tree-pretty-print.h $(PRETTY_PRINT_H)
  GIMPLE_PRETTY_PRINT_H = gimple-pretty-print.h $(TREE_PRETTY_PRINT_H)
Simple merge
diff --cc gcc/builtins.c
Simple merge
diff --cc gcc/c/c-decl.c
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
@@@ -78,9 -78,9 +78,10 @@@ along with GCC; see the file COPYING3
  #include "diagnostic.h"
  #include "dumpfile.h"
  #include "tree-pass.h"
 +#include "wide-int.h"
  #include "context.h"
  #include "pass_manager.h"
+ #include "target-globals.h"
  
  static rtx legitimize_dllimport_symbol (rtx, bool);
  static rtx legitimize_pe_coff_extern_decl (rtx, bool);
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc gcc/cp/class.c
Simple merge
diff --cc gcc/cp/cvt.c
Simple merge
diff --cc gcc/cp/mangle.c
Simple merge
diff --cc gcc/expr.c
Simple merge
Simple merge
diff --cc gcc/gimple.c
Simple merge
Simple merge
diff --cc gcc/ipa-prop.c
Simple merge
diff --cc gcc/lto/lto.c
Simple merge
diff --cc gcc/omp-low.c
Simple merge
diff --cc gcc/optabs.c
Simple merge
Simple merge
diff --cc gcc/tree-cfg.c
Simple merge
diff --cc gcc/tree-core.h
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
diff --cc gcc/tree.c
Simple merge
diff --cc gcc/tree.h
Simple merge
Simple merge