diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 631441488db..1d515afb8d8 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-19  Lee Millward  <lee.millward@codesourcery.com>
+
+	* config/ia64/ia64.c (ia64_expand_builtin): Use the
+	new CALL_EXPR_FN macro for retrieving the function 
+	declaration of the input expression.
+	
 2007-02-19  Manuel Lopez-Ibanez  <manu@gcc.gnu.org>
 
 	* c.opt (Waddress): New.
diff --git a/gcc/config/ia64/ia64.c b/gcc/config/ia64/ia64.c
index ead7f665265..f1dbfc35a73 100644
--- a/gcc/config/ia64/ia64.c
+++ b/gcc/config/ia64/ia64.c
@@ -9191,7 +9191,7 @@ ia64_expand_builtin (tree exp, rtx target, rtx subtarget ATTRIBUTE_UNUSED,
 		     enum machine_mode mode ATTRIBUTE_UNUSED,
 		     int ignore ATTRIBUTE_UNUSED)
 {
-  tree fndecl = TREE_OPERAND (TREE_OPERAND (exp, 0), 0);
+  tree fndecl = TREE_OPERAND (CALL_EXPR_FN (exp), 0);
   unsigned int fcode = DECL_FUNCTION_CODE (fndecl);
 
   switch (fcode)