This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Re: [PATCH] Function Multiversioning Bug, checking for function versions
- From: Andreas Schwab <schwab at linux-m68k dot org>
- To: Sriraman Tallam <tmsriram at google dot com>
- Cc: GCC Patches <gcc-patches at gcc dot gnu dot org>, "H.J. Lu" <hjl dot tools at gmail dot com>, "Zamyatin\, Igor" <igor dot zamyatin at intel dot com>, David Li <davidxl at google dot com>
- Date: Thu, 27 Dec 2012 11:05:34 +0100
- Subject: Re: [PATCH] Function Multiversioning Bug, checking for function versions
- References: <CAAs8Hmy97t6Pc_RNCvhiW8y3-zU9jr8xFccNZ=69hToQ19wkKg@mail.gmail.com> <CAAs8HmxZb_5ZYuwpPfwJ0DRDOnmRuGVj=h1SBBU9Pv-uF7P1Ng@mail.gmail.com>
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 <schwab@linux-m68k.org>
+
+ * target.def (supports_function_versions): Fix typo.
+
2012-12-26 Sriraman Tallam <tmsriram@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 <steven@gcc.gnu.org>
* cgraph.c (verify_cgraph_node): Don't allocate/free visited_nodes set.
->>>>>>> .r194729
2012-12-25 John David Anglin <dave.anglin@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)
/* Function to determine if one function can inline another function. */
#undef HOOK_PREFIX
--
1.8.0.2
--
Andreas Schwab, schwab@linux-m68k.org
GPG Key fingerprint = 58CA 54C7 6D53 942B 1756 01D3 44D5 214B 8276 4ED5
"And now for something completely different."