Merge remote-tracking branch 'gnu/gcc-4_7-branch' into rework

author Masaki Muranaka <monaka@monami-ya.jp>

Thu, 15 May 2014 06:08:55 +0000 (15:08 +0900)

committer Masaki Muranaka <monaka@monami-ya.jp>

Thu, 15 May 2014 06:08:55 +0000 (15:08 +0900)
author Masaki Muranaka <monaka@monami-ya.jp>
Thu, 15 May 2014 06:08:55 +0000 (15:08 +0900)
committer Masaki Muranaka <monaka@monami-ya.jp>
Thu, 15 May 2014 06:08:55 +0000 (15:08 +0900)
diff --cc boehm-gc/include/Makefile.in
Simple merge
diff --cc gcc/config/avr/avr.h

index efe782d,79a669d..cec00c1
--- 1/gcc/config/avr/avr.h
--- 2/gcc/config/avr/avr.h
+++ b/gcc/config/avr/avr.h
@@@ -771,39 -660,17 +660,24 @@@ mmcu=*:-mmcu=%*} 
   #define TEST_HARD_REG_CLASS(CLASS, REGNO) \
     TEST_HARD_REG_BIT (reg_class_contents[ (int) (CLASS)], REGNO)
   
- /* Note that the other files fail to use these
-    in some of the places where they should.  */
- 
- #if defined(__STDC__) || defined(ALMOST_STDC)
- #define AS2(a,b,c) #a " " #b "," #c
- #define AS2C(b,c) " " #b "," #c
- #define AS3(a,b,c,d) #a " " #b "," #c "," #d
- #define AS1(a,b) #a " " #b
- #else
- #define AS1(a,b) "a   b"
- #define AS2(a,b,c) "a b,c"
- #define AS2C(b,c) " b,c"
- #define AS3(a,b,c,d) "a       b,c,d"
- #endif
- #define OUT_AS1(a,b) output_asm_insn (AS1(a,b), operands)
- #define OUT_AS2(a,b,c) output_asm_insn (AS2(a,b,c), operands)
   #define CR_TAB "\n\t"
   
- #define PREFERRED_DEBUGGING_TYPE DBX_DEBUG
- 
- #define DWARF2_DEBUGGING_INFO 1
- 
   #define DWARF2_ADDR_SIZE 4
   
- #define OBJECT_FORMAT_ELF
+ #define INCOMING_RETURN_ADDR_RTX   avr_incoming_return_addr_rtx ()
+ #define INCOMING_FRAME_SP_OFFSET   (AVR_3_BYTE_PC ? 3 : 2)
+ 
+ /* The caller's stack pointer value immediately before the call
+    is one byte below the first argument.  */
+ #define ARG_POINTER_CFA_OFFSET(FNDECL)  -1
   
+ +#define INCOMING_RETURN_ADDR_RTX   avr_incoming_return_addr_rtx ()
+ +#define INCOMING_FRAME_SP_OFFSET   (AVR_3_BYTE_PC ? 3 : 2)
+ +
+ +/* The caller's stack pointer value immediately before the call
+ +   is one byte below the first argument.  */
+ +#define ARG_POINTER_CFA_OFFSET(FNDECL)  -1
+ +
   #define HARD_REGNO_RENAME_OK(OLD_REG, NEW_REG) \
     avr_hard_regno_rename_ok (OLD_REG, NEW_REG)
   
diff --cc gcc/config/m68k/t-linux

index d61f73b,aa64dfc..669a356
--- 1/gcc/config/m68k/t-linux
--- 2/gcc/config/m68k/t-linux
+++ b/gcc/config/m68k/t-linux
@@@ -16,15 -16,13 +16,17 @@@
   # along with GCC; see the file COPYING3.  If not see
   # <http://www.gnu.org/licenses/>.
   
- EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o crtbeginS.o crtendS.o crtbeginT.o
+ # Only include multilibs for 680x0 and ColdFire CPUs with an MMU.
+ M68K_MLIB_CPU += && ((CPU ~ "^m680") || (CPU ~ "^mcf")) && (FLAGS ~ "FL_MMU")
   
- # Only include multilibs for 680x0 CPUs with an MMU.
- M68K_MLIB_CPU += && (CPU ~ "^m680") && (FLAGS ~ "FL_MMU")
+ ifeq ($(M68K_ARCH),m68k)
+ MULTIARCH_DIRNAME = $(call if_multiarch,m68k-linux-gnu)
+ endif
   
+ +ifeq ($(M68K_ARCH),m68k)
+ +MULTIARCH_DIRNAME = $(call if_multiarch,m68k-linux-gnu)
+ +endif
+ +
   # This rule uses MULTILIB_MATCHES to generate a definition of
   # SYSROOT_SUFFIX_SPEC.
   sysroot-suffix.h: $(srcdir)/config/m68k/print-sysroot-suffix.sh
diff --cc gcc/config/mn10300/mn10300.c
Simple merge
diff --cc gcc/config/picochip/picochip.c

index dd4e34e,b878a1f..d7f9aeb
--- 1/gcc/config/picochip/picochip.c
--- 2/gcc/config/picochip/picochip.c
+++ b/gcc/config/picochip/picochip.c
@@@ -330,23 -321,17 +321,28 @@@ static char picochip_get_vliw_alu_id (v
   #undef TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE
   #define TARGET_OVERRIDE_OPTIONS_AFTER_CHANGE picochip_option_override
   
- #undef TARGET_OPTION_OPTIMIZATION_TABLE
- #define TARGET_OPTION_OPTIMIZATION_TABLE picochip_option_optimization_table
+ /* The 2nd scheduling pass option is switched off, and a machine
+    dependent reorganisation ensures that it is run later on, after the
+    second jump optimisation.  */
+ #undef TARGET_DELAY_SCHED2
+ #define TARGET_DELAY_SCHED2 true
   
- #undef TARGET_EXCEPT_UNWIND_INFO
- #define TARGET_EXCEPT_UNWIND_INFO sjlj_except_unwind_info
+ /* Variable tracking should be run after all optimizations which
+    change order of insns.  It also needs a valid CFG.  */
+ #undef TARGET_DELAY_VARTRACK
+ #define TARGET_DELAY_VARTRACK true
   
+ +/* The 2nd scheduling pass option is switched off, and a machine
+ +   dependent reorganisation ensures that it is run later on, after the
+ +   second jump optimisation.  */
+ +#undef TARGET_DELAY_SCHED2
+ +#define TARGET_DELAY_SCHED2 true
+ +
+ +/* Variable tracking should be run after all optimizations which
+ +   change order of insns.  It also needs a valid CFG.  */
+ +#undef TARGET_DELAY_VARTRACK
+ +#define TARGET_DELAY_VARTRACK true
+ +
   struct gcc_target targetm = TARGET_INITIALIZER;
   \f
   
diff --cc gcc/config/rx/predicates.md
Simple merge
diff --cc gcc/df-problems.c
Simple merge
diff --cc gcc/final.c
Simple merge
diff --cc gcc/predict.c
Simple merge
diff --cc gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog-2005
Simple merge
diff --cc gcc/testsuite/gcc.c-torture/compile/pr41679.c

index aa10cb6,aa10cb6..0000000

deleted file mode 100644,100644
--- 1/gcc/testsuite/gcc.c-torture/compile/pr41679.c
--- 2/gcc/testsuite/gcc.c-torture/compile/pr41679.c
+++ /dev/null
@@@ -1,15 -1,15 +1,0 @@@
--/* { dg-options "-g" } */
--
--extern int a;
--extern char b;
--extern int foo (void);
--
--void
--test (void)
--{
--  int c;
--  b = foo () ? '~' : '\0';
--  while ((c = foo ()))
--    if (c == '7')
--      a = 0;
--}
diff --cc gcc/testsuite/gcc.c-torture/compile/pr46883.c

index db8527d,db8527d..0000000

deleted file mode 100644,100644
--- 1/gcc/testsuite/gcc.c-torture/compile/pr46883.c
--- 2/gcc/testsuite/gcc.c-torture/compile/pr46883.c
+++ /dev/null
@@@ -1,13 -1,13 +1,0 @@@
--void bar (unsigned char *q, unsigned short *data16s, int len)
--{
--  int i;
--
--  for (i = 0; i < len; i++)
--    {
--      q[2 * i] =
--        (((data16s[i] & 0xFF) << 8) | ((data16s[i] >> 8) & 0xFF)) & 0xFF;
--      q[2 * i + 1] =
--        ((unsigned short)
--         (((data16s[i] & 0xFF) << 8) | ((data16s[i] >> 8) & 0xFF))) >> 8;
--    }
--}
diff --cc gcc/testsuite/gfortran.dg/proc_ptr_comp_20.f90
Simple merge
diff --cc gcc/testsuite/lib/prune.exp

index 093d4f7,09d2581..16ac667
--- 1/gcc/testsuite/lib/prune.exp
--- 2/gcc/testsuite/lib/prune.exp
+++ b/gcc/testsuite/lib/prune.exp
@@@ -29,10 -29,11 +29,14 @@@ proc prune_gcc_output { text } 
       regsub -all "(^|\n)collect: re(compiling|linking)\[^\n\]*" $text "" text
       regsub -all "(^|\n)Please submit.*instructions\[^\n\]*" $text "" text
       regsub -all "(^|\n)\[0-9\]\[0-9\]* errors\." $text "" text
+     regsub -all "(^|\n)(In file included|\[ \]+from)\[^\n\]*" $text "" text
+ 
+     # Ignore informational notes.
+     regsub -all "(^|\n)\[^\n\]*: note: \[^\n\]*" $text "" text
   
+ +    # Ignore informational notes.
+ +    regsub -all "(^|\n)\[^\n\]*: note: \[^\n\]*" $text "" text
+ +
       # Ignore harmless -fpic warnings.
       regsub -all "(^|\n)\[^\n\]*: warning: -f(pic|PIC) ignored for target\[^\n\]*" $text "" text
       regsub -all "(^|\n)\[^\n\]*: warning: -f(pic|PIC)( and -fpic are| is)? not supported\[^\n\]*" $text "" text
diff --cc gcc/tree-eh.c

index fab4a3a,26724dc..5d7d970
--- 1/gcc/tree-eh.c
--- 2/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@@ -2455,17 -2513,44 +2513,51 @@@ tree_could_trap_p (tree expr
       case CALL_EXPR:
         t = get_callee_fndecl (expr);
         /* Assume that calls to weak functions may trap.  */
-       if (!t || !DECL_P (t) || DECL_WEAK (t))
+       if (!t || !DECL_P (t))
         return true;
+       if (DECL_WEAK (t))
+       return tree_could_trap_p (t);
+       return false;
+ 
+     case FUNCTION_DECL:
+       /* Assume that accesses to weak functions may trap, unless we know
+        they are certainly defined in current TU or in some other
+        LTO partition.  */
+       if (DECL_WEAK (expr))
+       {
+         struct cgraph_node *node;
+         if (!DECL_EXTERNAL (expr))
+           return false;
+         node = cgraph_function_node (cgraph_get_node (expr), NULL);
+         if (node && node->in_other_partition)
+           return false;
+         return true;
+       }
+       return false;
+ 
+     case VAR_DECL:
+       /* Assume that accesses to weak vars may trap, unless we know
+        they are certainly defined in current TU or in some other
+        LTO partition.  */
+       if (DECL_WEAK (expr))
+       {
+         struct varpool_node *node;
+         if (!DECL_EXTERNAL (expr))
+           return false;
+         node = varpool_variable_node (varpool_get_node (expr), NULL);
+         if (node && node->in_other_partition)
+           return false;
+         return true;
+       }
         return false;
   
+ +    case VAR_DECL:
+ +    case FUNCTION_DECL:
+ +      /* Assume that accesses to weak vars or functions may trap.  */
+ +      if (DECL_WEAK (expr))
+ +        return true;
+ +      return false;
+ +
       default:
         return false;
       }
diff --cc libgcc/config/ia64/t-linux
Simple merge
diff --cc libgfortran/generated/eoshift3_16.c
Simple merge
diff --cc libgfortran/generated/eoshift3_4.c
Simple merge
diff --cc libgfortran/generated/eoshift3_8.c
Simple merge
diff --cc libgfortran/io/file_pos.c
Simple merge
diff --cc libgfortran/io/intrinsics.c
Simple merge
diff --cc libgfortran/io/unix.c
Simple merge
diff --cc libgfortran/io/unix.h
Simple merge
diff --cc libgfortran/m4/eoshift3.m4
Simple merge
diff --cc libstdc++-v3/config.h.in

index 2a8afaf,4dea92b..4633d96
--- 1/libstdc++-v3/config.h.in
--- 2/libstdc++-v3/config.h.in
+++ b/libstdc++-v3/config.h.in
@@@ -689,12 -698,10 +698,13 @@@
   /* Define to use concept checking code from the boost libraries. */
   #undef _GLIBCXX_CONCEPT_CHECKS
   
- /* Define if a fully dynamic basic_string is wanted. */
+ /* Define to 1 if a fully dynamic basic_string is wanted, 0 to disable,
+    undefined for platform defaults */
   #undef _GLIBCXX_FULLY_DYNAMIC_STRING
   
+ +/* Define if gthreads types cannot be copy-assigned in C++11. */
+ +#undef _GLIBCXX_GTHREADS_NO_COPY_ASSIGN_IN_CXX11
+ +
   /* Define if gthreads library is available. */
   #undef _GLIBCXX_HAS_GTHREADS
   
diff --cc libstdc++-v3/include/bits/stl_algo.h
Simple merge
diff --cc libstdc++-v3/libsupc++/Makefile.am

index 701c2d9,7c72f58..d257c4c
--- 1/libstdc++-v3/libsupc++/Makefile.am
--- 2/libstdc++-v3/libsupc++/Makefile.am
+++ b/libstdc++-v3/libsupc++/Makefile.am
@@@ -123,30 -152,13 +152,18 @@@ C_COMPILE = 
   
   # LTCOMPILE is copied from LTCXXCOMPILE below.
   LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared $(LIBTOOLFLAGS) --mode=compile \
-           $(CC) $(DEFS) $(C_INCLUDES) $(LIBSUPCXX_PICFLAGS) \
-             $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
- 
- cp-demangle.c:
-       rm -f $@
-       $(LN_S) $(toplevel_srcdir)/libiberty/cp-demangle.c $@
- cp-demangle.lo: cp-demangle.c
-       $(LTCOMPILE) -DIN_GLIBCPP_V3 -Wno-error -c $<
- cp-demangle.o: cp-demangle.c
-       $(C_COMPILE) -DIN_GLIBCPP_V3 -Wno-error -c $<
- 
+           $(CC) $(DEFS) $(C_INCLUDES) \
+           $(glibcxx_lt_pic_flag) $(glibcxx_compiler_shared_flag) \
+           $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
   
+ +nested_exception.lo: nested_exception.cc
+ +      $(LTCXXCOMPILE) -std=gnu++0x -c $<
+ +nested_exception.o: nested_exception.cc
+ +      $(CXXCOMPILE) -std=gnu++0x -c $<
+ +
   # Libtool notes
   
- # 1) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is
- # last. (That way, things like -O2 passed down from the toplevel can
- # be overridden by --enable-debug.)
- 
- # 2) In general, libtool expects an argument such as `--tag=CXX' when
+ # 1) In general, libtool expects an argument such as `--tag=CXX' when
   # using the C++ compiler, because that will enable the settings
   # detected when C++ support was being configured.  However, when no
   # such flag is given in the command line, libtool attempts to figure
diff --cc libstdc++-v3/testsuite/ext/type_traits/add_unsigned_integer_neg.cc
Simple merge
diff --cc libstdc++-v3/testsuite/ext/type_traits/remove_unsigned_integer_neg.cc
Simple merge
author	Masaki Muranaka <monaka@monami-ya.jp>
	Thu, 15 May 2014 06:08:55 +0000 (15:08 +0900)
committer	Masaki Muranaka <monaka@monami-ya.jp>
	Thu, 15 May 2014 06:08:55 +0000 (15:08 +0900)
		1	2
boehm-gc/include/Makefile.in	patch \|	diff1 \|	diff2 \|	blob \| history
gcc/config/avr/avr.h	patch \|	diff1 \|	diff2 \|	blob \| history
gcc/config/m68k/t-linux	patch \|	diff1 \|	diff2 \|	blob \| history
gcc/config/mn10300/mn10300.c	patch \|	diff1 \|	diff2 \|	blob \| history
gcc/config/picochip/picochip.c	patch \|	diff1 \|	diff2 \|	blob \| history
gcc/config/rx/predicates.md	patch \|	diff1 \|	diff2 \|	blob \| history
gcc/df-problems.c	patch \|	diff1 \|	diff2 \|	blob \| history
gcc/final.c	patch \|	diff1 \|	diff2 \|	blob \| history
gcc/predict.c	patch \|	diff1 \|	diff2 \|	blob \| history
gcc/testsuite/g++.old-deja/g++.oliva/ChangeLog-2005	patch \|	diff1 \|	diff2 \|	blob \| history
gcc/testsuite/gcc.c-torture/compile/pr41679.c	patch \|	blob1 \|	blob2 \|	history
gcc/testsuite/gcc.c-torture/compile/pr46883.c	patch \|	blob1 \|	blob2 \|	history
gcc/testsuite/gfortran.dg/proc_ptr_comp_20.f90	patch \|	diff1 \|	diff2 \|	blob \| history
gcc/testsuite/lib/prune.exp	patch \|	diff1 \|	diff2 \|	blob \| history
gcc/tree-eh.c	patch \|	diff1 \|	diff2 \|	blob \| history
libgcc/config/ia64/t-linux	patch \|	diff1 \|	diff2 \|	blob \| history
libgfortran/generated/eoshift3_16.c	patch \|	diff1 \|	diff2 \|	blob \| history
libgfortran/generated/eoshift3_4.c	patch \|	diff1 \|	diff2 \|	blob \| history
libgfortran/generated/eoshift3_8.c	patch \|	diff1 \|	diff2 \|	blob \| history
libgfortran/io/file_pos.c	patch \|	diff1 \|	diff2 \|	blob \| history
libgfortran/io/intrinsics.c	patch \|	diff1 \|	diff2 \|	blob \| history
libgfortran/io/unix.c	patch \|	diff1 \|	diff2 \|	blob \| history
libgfortran/io/unix.h	patch \|	diff1 \|	diff2 \|	blob \| history
libgfortran/m4/eoshift3.m4	patch \|	diff1 \|	diff2 \|	blob \| history
libstdc++-v3/config.h.in	patch \|	diff1 \|	diff2 \|	blob \| history
libstdc++-v3/include/bits/stl_algo.h	patch \|	diff1 \|	diff2 \|	blob \| history
libstdc++-v3/libsupc++/Makefile.am	patch \|	diff1 \|	diff2 \|	blob \| history
libstdc++-v3/testsuite/ext/type_traits/add_unsigned_integer_neg.cc	patch \|	diff1 \|	diff2 \|	blob \| history
libstdc++-v3/testsuite/ext/type_traits/remove_unsigned_integer_neg.cc	patch \|	diff1 \|	diff2 \|	blob \| history