testing with a native bootstrap, not quite done yet but since there were no conflicts (except for the ChangeLog) it'll be fine.
OK for google/gcc-4_6 assuming tests pass? (Note that the properties changes were generated by svnmerge.py, and TBH I have *no idea* what some of them are about.) thanks, chris ----- [gcc/ChangeLog.google-4_6] 2011-06-09 Chris Demetriou <c...@google.com> Backport from google/main r174890: 2011-06-09 Chris Demetriou <c...@google.com> * doc/install.texi (--with-warn-frame-larger-than-extra-text): New. * configure.ac (--with-warn-frame-larger-than-extra-text): New. (WARN_FRAME_LARGER_THAN_EXTRA_TEXT): Define. * final.c (final_start_function): Use WARN_FRAME_LARGER_THAN_EXTRA_TEXT. * configure: Regenerate. * config.in: Regenerate. Property changes on: . ___________________________________________________________________ Modified: svnmerge-integrated - /branches/google/main:1-174706,174789 /branches/google/integration:1-170988,173923,173959 /branches/gcc-4_6-branch:1-174748 + /branches/google/main:1-174706,174789,174890 /branches/google/integration:1-170988,173923,173959 /branches/gcc-4_6-branch:1-174748 Modified: svn:mergeinfo Merged /branches/google/main:r174890 Property changes on: libjava/classpath ___________________________________________________________________ Modified: svn:mergeinfo Merged /branches/google/main/libjava/classpath:r174890 Index: gcc/doc/install.texi =================================================================== --- gcc/doc/install.texi (revision 174926) +++ gcc/doc/install.texi (working copy) @@ -1717,6 +1717,10 @@ See @option{-canonical-prefixes} or @option{-no-canonical-prefixes} for more details, including how to override this configuration option when compiling. + +@item --with-warn-frame-larger-than-extra-text=@var{text} +Append @samp{@var{text}} to frame size warnings generated by +the @option{-Wframe-larger-than} warning flag. @end table @subheading Cross-Compiler-Specific Options Index: gcc/configure =================================================================== --- gcc/configure (revision 174926) +++ gcc/configure (working copy) @@ -919,6 +919,7 @@ enable_canonical_prefixes enable_plugin enable_libquadmath_support +with_warn_frame_larger_than_extra_text ' ac_precious_vars='build_alias host_alias @@ -1678,6 +1679,8 @@ with the compiler --with-system-zlib use installed libz --with-slibdir=DIR shared libraries in DIR [LIBDIR] + --with-warn-frame-larger-than-extra-text=TEXT + specifies extra text for frame size warnings Some influential environment variables: CC C compiler command @@ -17578,7 +17581,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 17581 "configure" +#line 17584 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -17684,7 +17687,7 @@ lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 lt_status=$lt_dlunknown cat > conftest.$ac_ext <<_LT_EOF -#line 17687 "configure" +#line 17690 "configure" #include "confdefs.h" #if HAVE_DLFCN_H @@ -26510,6 +26513,24 @@ fi +warn_frame_larger_than_extra_text= + +# Check whether --with-warn-frame-larger-than-extra-text was given. +if test "${with_warn_frame_larger_than_extra_text+set}" = set; then : + withval=$with_warn_frame_larger_than_extra_text; case "${withval}" in +yes) as_fn_error "bad value ${withval} given for frame size warning text" "$LINENO" 5 ;; +no) ;; +*) warn_frame_larger_than_extra_text="$withval" ;; +esac +fi + + +cat >>confdefs.h <<_ACEOF +#define WARN_FRAME_LARGER_THAN_EXTRA_TEXT "$warn_frame_larger_than_extra_text" +_ACEOF + + + # Configure the subdirectories # AC_CONFIG_SUBDIRS($subdirs) Index: gcc/final.c =================================================================== --- gcc/final.c (revision 174926) +++ gcc/final.c (working copy) @@ -1576,9 +1576,13 @@ if (warn_frame_larger_than && get_frame_size () > frame_larger_than_size) { - /* Issue a warning */ + /* Issue a warning. (WARN_FRAME_LARGER_THAN_EXTRA_TEXT is + provided by configuration. The way extra text is added + here may prevent localization from working properly. + It's totally broken.) */ warning (OPT_Wframe_larger_than_, - "the frame size of %wd bytes is larger than %wd bytes", + "the frame size of %wd bytes is larger than %wd bytes" + WARN_FRAME_LARGER_THAN_EXTRA_TEXT, get_frame_size (), frame_larger_than_size); } Property changes on: gcc/testsuite/gcc.target/powerpc/ppc-round.c ___________________________________________________________________ Modified: svn:mergeinfo Merged /branches/google/main/gcc/testsuite/gcc.target/powerpc/ppc-round.c:r174890 Index: gcc/config.in =================================================================== --- gcc/config.in (revision 174926) +++ gcc/config.in (working copy) @@ -1787,6 +1787,12 @@ #endif +/* Define to be extra text for frame size warnings. */ +#ifndef USED_FOR_TARGET +#undef WARN_FRAME_LARGER_THAN_EXTRA_TEXT +#endif + + /* Define to be the last component of the Windows registry key under which to look for installation paths. The full key used will be HKEY_LOCAL_MACHINE/SOFTWARE/Free Software Foundation/{WIN32_REGISTRY_KEY}. Index: gcc/configure.ac =================================================================== --- gcc/configure.ac (revision 174926) +++ gcc/configure.ac (working copy) @@ -4951,6 +4951,20 @@ fi +warn_frame_larger_than_extra_text= +AC_ARG_WITH(warn-frame-larger-than-extra-text, +[ --with-warn-frame-larger-than-extra-text=TEXT + specifies extra text for frame size warnings], +[case "${withval}" in +yes) AC_MSG_ERROR(bad value ${withval} given for frame size warning text) ;; +no) ;; +*) warn_frame_larger_than_extra_text="$withval" ;; +esac]) +AC_DEFINE_UNQUOTED(WARN_FRAME_LARGER_THAN_EXTRA_TEXT, + "$warn_frame_larger_than_extra_text", + [Define to be extra text for frame size warnings.]) + + # Configure the subdirectories # AC_CONFIG_SUBDIRS($subdirs) Property changes on: gcc/config/rs6000/rs6000.c ___________________________________________________________________ Modified: svn:mergeinfo Merged /branches/google/main/gcc/config/rs6000/rs6000.c:r174890 Property changes on: gcc/config/rs6000/rs6000.h ___________________________________________________________________ Modified: svn:mergeinfo Merged /branches/google/main/gcc/config/rs6000/rs6000.h:r174890 -- This patch is available for review at http://codereview.appspot.com/4576055