On Thu, Dec 27, 2012 at 2:05 AM, Andreas Schwab <sch...@linux-m68k.org> wrote: > diff --git a/gcc/ChangeLog b/gcc/ChangeLog > index 148388d..575e03a 100644 > --- a/gcc/ChangeLog > +++ b/gcc/ChangeLog > @@ -1,4 +1,7 @@ > -<<<<<<< .mine > +2012-12-27 Andreas Schwab <sch...@linux-m68k.org> > + > + * target.def (supports_function_versions): Fix typo. > +
> 2012-12-26 Sriraman Tallam <tmsri...@google.com> > > * doc/tm.texi.in (TARGET_OPTION_SUPPORTS_FUNCTION_VERSIONS): Document > @@ -15,12 +18,10 @@ > * (is_function_default_version): Check target string. > * TARGET_OPTION_SUPPORTS_FUNCTION_VERSIONS: New macro. > > -======= > 2012-12-27 Steven Bosscher <ste...@gcc.gnu.org> > > * cgraph.c (verify_cgraph_node): Don't allocate/free visited_nodes > set. > > ->>>>>>> .r194729 > 2012-12-25 John David Anglin <dave.ang...@nrc-cnrc.gc.ca> > > PR target/53789 > diff --git a/gcc/target.def b/gcc/target.def > index 79bb955..d0547be 100644 > --- a/gcc/target.def > +++ b/gcc/target.def > @@ -2839,7 +2839,7 @@ DEFHOOK > (supports_function_versions, > "", > bool, (void), > - hool_bool_void_false) > + hook_bool_void_false) Thanks for the fix. -Sri. > > /* Function to determine if one function can inline another function. */ > #undef HOOK_PREFIX > -- > 1.8.0.2 > > > -- > Andreas Schwab, sch...@linux-m68k.org > GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5 > "And now for something completely different."
