aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorAndreas Schwab <schwab@linux-m68k.org>2012-12-27 10:04:51 +0000
committerAndreas Schwab <schwab@gcc.gnu.org>2012-12-27 10:04:51 +0000
commit9e1883a2da28dc1fcc20783fbb318b9e64059a2e (patch)
tree6450ba9f824b07d5fcd041d3fbdf5540db819bb3 /gcc
parenteb745e40fe60490ce7f0cf1c1bf3b0084d340923 (diff)
downloadgcc-9e1883a2da28dc1fcc20783fbb318b9e64059a2e.zip
gcc-9e1883a2da28dc1fcc20783fbb318b9e64059a2e.tar.gz
gcc-9e1883a2da28dc1fcc20783fbb318b9e64059a2e.tar.bz2
* target.def (supports_function_versions): Fix typo.
From-SVN: r194731
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog7
-rw-r--r--gcc/target.def2
2 files changed, 5 insertions, 4 deletions
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