diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index b6839ada039..b67a02487d0 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+Tue Oct 26 23:29:18 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* c-typeck.c (build_function_call): Check that the built-in
+	function is of class BUILT_IN_NORMAL before trying to recongize
+	it as BUILT_IN_ABS.
+	* calls.c (calls_function_1): Similarly for BUILT_IN_ALLOCA.
+	* stmt.c (expand_end_cae): Similarly for BUILT_IN_CLASSIFY_TYPE.
 
 Wed Oct 27 00:14:13 1999  Robert Lipe  <robertlipe@usa.net>
 
diff --git a/gcc/c-typeck.c b/gcc/c-typeck.c
index 71d8262764f..4e6cadc1ff5 100644
--- a/gcc/c-typeck.c
+++ b/gcc/c-typeck.c
@@ -1461,7 +1461,8 @@ build_function_call (function, params)
 
   if (TREE_CODE (function) == ADDR_EXPR
       && TREE_CODE (TREE_OPERAND (function, 0)) == FUNCTION_DECL
-      && DECL_BUILT_IN (TREE_OPERAND (function, 0)))
+      && DECL_BUILT_IN (TREE_OPERAND (function, 0))
+      && DECL_BUILT_IN_CLASS (TREE_OPERAND (function, 0)) == BUILT_IN_NORMAL)
     switch (DECL_FUNCTION_CODE (TREE_OPERAND (function, 0)))
       {
       case BUILT_IN_ABS:
diff --git a/gcc/calls.c b/gcc/calls.c
index 8113a919d7b..3b4b1b20921 100644
--- a/gcc/calls.c
+++ b/gcc/calls.c
@@ -218,6 +218,7 @@ calls_function_1 (exp, which)
 	  tree fndecl = TREE_OPERAND (TREE_OPERAND (exp, 0), 0);
 
 	  if ((DECL_BUILT_IN (fndecl)
+	       && DECL_BUILT_IN_CLASS (fndecl) == BUILT_IN_NORMAL
 	       && DECL_FUNCTION_CODE (fndecl) == BUILT_IN_ALLOCA)
 	      || (DECL_SAVED_INSNS (fndecl)
 		  && DECL_SAVED_INSNS (fndecl)->calls_alloca))
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 4f383787f41..1971fd27ad8 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+Tue Oct 26 23:29:56 1999  Jeffrey A Law  (law@cygnus.com)
+
+	* call.c (build_over_call):  Check that the built-in function is
+	of class BUILT_IN_NORMAL before trying to recongize it as BUILT_IN_ABS.
+	* typeck.c (build_function_call_real): Similarly. 
+
 1999-10-26  Mark Mitchell  <mark@codesourcery.com>
 
 	* decl.c (poplevel): Don't set BLOCK_TYPE_TAGS.  Don't call
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index b83efd531e5..889f25427ed 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -4150,7 +4150,8 @@ build_over_call (cand, args, flags)
 
   if (TREE_CODE (fn) == ADDR_EXPR
       && TREE_CODE (TREE_OPERAND (fn, 0)) == FUNCTION_DECL
-      && DECL_BUILT_IN (TREE_OPERAND (fn, 0)))
+      && DECL_BUILT_IN (TREE_OPERAND (fn, 0))
+      && DECL_BUILT_IN_CLASS (TREE_OPERAND (fn, 0)) == BUILT_IN_NORMAL)
     switch (DECL_FUNCTION_CODE (TREE_OPERAND (fn, 0)))
       {
       case BUILT_IN_ABS:
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c
index 4bf817858ff..a923b8117bf 100644
--- a/gcc/cp/typeck.c
+++ b/gcc/cp/typeck.c
@@ -3017,7 +3017,8 @@ build_function_call_real (function, params, require_complete, flags)
 
   if (TREE_CODE (function) == ADDR_EXPR
       && TREE_CODE (TREE_OPERAND (function, 0)) == FUNCTION_DECL
-      && DECL_BUILT_IN (TREE_OPERAND (function, 0)))
+      && DECL_BUILT_IN (TREE_OPERAND (function, 0))
+      && DECL_BUILT_IN_CLASS (TREE_OPERAND (function, 0)) == BUILT_IN_NORMAL)
     switch (DECL_FUNCTION_CODE (TREE_OPERAND (function, 0)))
       {
       case BUILT_IN_ABS:
diff --git a/gcc/stmt.c b/gcc/stmt.c
index 53fc1ed09fa..eeab664f6ce 100644
--- a/gcc/stmt.c
+++ b/gcc/stmt.c
@@ -5369,6 +5369,7 @@ expand_end_case (orig_index)
 	       || (TREE_CODE (index_expr) == CALL_EXPR
 		   && TREE_CODE (TREE_OPERAND (index_expr, 0)) == ADDR_EXPR
 		   && TREE_CODE (TREE_OPERAND (TREE_OPERAND (index_expr, 0), 0)) == FUNCTION_DECL
+		   && DECL_BUILT_IN_CLASS (TREE_OPERAND (TREE_OPERAND (index_expr, 0), 0)) == BUILT_IN_NORMAL
 		   && DECL_FUNCTION_CODE (TREE_OPERAND (TREE_OPERAND (index_expr, 0), 0)) == BUILT_IN_CLASSIFY_TYPE)
 	       || (TREE_CODE (index_expr) == COMPOUND_EXPR
 		   && TREE_CODE (TREE_OPERAND (index_expr, 1)) == INTEGER_CST))