diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 13904d954bcd..b3b94eb73b43 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2010-09-29  Jack Howarth <howarth@bromo.med.uc.edu>
+
+	* varasm.c (assemble_alias): Add error message for
+	unsupported ifunc.
+
 2010-09-29  Mike Stump  <mikestump@comcast.net>
 
 	* config/darwin.h (flag_mkernel): Remove.
diff --git a/gcc/varasm.c b/gcc/varasm.c
index 5f9ec9001cb8..43815719693b 100644
--- a/gcc/varasm.c
+++ b/gcc/varasm.c
@@ -5542,8 +5542,12 @@ assemble_alias (tree decl, tree target)
 # else
       if (!DECL_WEAK (decl))
 	{
-	  error_at (DECL_SOURCE_LOCATION (decl),
-		    "only weak aliases are supported in this configuration");
+	  if (lookup_attribute ("ifunc", DECL_ATTRIBUTES (decl)))
+	    error_at (DECL_SOURCE_LOCATION (decl),
+		      "ifunc is not supported in this configuration");
+	  else	
+	    error_at (DECL_SOURCE_LOCATION (decl),
+		      "only weak aliases are supported in this configuration");
 	  return;
 	}
 # endif