diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index eacfe7c2455..a6ac8d53c01 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-08-06  Paolo Bonzini  <bonzini@gnu.org>
+
+	* expr.c (expand_expr_real_1) <ENTRY_VALUE_EXPR>: Remove.
+	* tree-inline.c (estimate_num_insns_1) <ENTRY_VALUE_EXPR>: Remove.
+	* tree-pretty-print.c (dump_generic_node) <ENTRY_VALUE_EXPR>: Remove.
+	* tree.def (ENTRY_VALUE_EXPR): Remove.
+
 2004-08-06  Jakub Jelinek  <jakub@redhat.com>
 
 	* config/i386/i386.c (ix86_expand_clrmem): Move gen_cld down to
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index fda326ff209..3edd2477ab9 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,7 @@
+2004-08-06  Paolo Bonzini  <bonzini@gnu.org>
+
+	* class.c (instantiate_type) <ENTRY_VALUE_EXPR>: Do not handle.
+
 2004-08-05  Mark Mitchell  <mark@codesourcery.com>
 
 	* decl.c (start_preparsed_function): Move determine_visibility
diff --git a/gcc/cp/class.c b/gcc/cp/class.c
index 665fd7abd16..45b11cd2034 100644
--- a/gcc/cp/class.c
+++ b/gcc/cp/class.c
@@ -6125,9 +6125,6 @@ instantiate_type (tree lhstype, tree rhs, tsubst_flags_t flags)
       
       return instantiate_type (lhstype, TREE_OPERAND (rhs, 0), flags);
     }
-    case ENTRY_VALUE_EXPR:
-      abort ();
-      return error_mark_node;
 
     case ERROR_MARK:
       return error_mark_node;
diff --git a/gcc/expr.c b/gcc/expr.c
index ad30901c6b3..3e7eb403d1c 100644
--- a/gcc/expr.c
+++ b/gcc/expr.c
@@ -8424,9 +8424,6 @@ expand_expr_real_1 (tree exp, rtx target, enum machine_mode tmode,
 
       return op0;
 
-    case ENTRY_VALUE_EXPR:
-      abort ();
-
     /* COMPLEX type for Extended Pascal & Fortran  */
     case COMPLEX_EXPR:
       {
diff --git a/gcc/tree-inline.c b/gcc/tree-inline.c
index bb2af8dc2bc..5dacddb7152 100644
--- a/gcc/tree-inline.c
+++ b/gcc/tree-inline.c
@@ -1233,7 +1233,6 @@ estimate_num_insns_1 (tree *tp, int *walk_subtrees, void *data)
     case STATEMENT_LIST:
     case ERROR_MARK:
     case NON_LVALUE_EXPR:
-    case ENTRY_VALUE_EXPR:
     case FDESC_EXPR:
     case VA_ARG_EXPR:
     case TRY_CATCH_EXPR:
diff --git a/gcc/tree-pretty-print.c b/gcc/tree-pretty-print.c
index 1821700635a..a211a8235ca 100644
--- a/gcc/tree-pretty-print.c
+++ b/gcc/tree-pretty-print.c
@@ -1102,10 +1102,6 @@ dump_generic_node (pretty_printer *buffer, tree node, int spc, int flags,
       pp_character (buffer, '>');
       break;
 
-    case ENTRY_VALUE_EXPR:
-      NIY;
-      break;
-
     case COMPLEX_EXPR:
       pp_string (buffer, "COMPLEX_EXPR <");
       dump_generic_node (buffer, TREE_OPERAND (node, 0), spc, flags, false);
diff --git a/gcc/tree.def b/gcc/tree.def
index 49cb8fb4e2e..552be88fc94 100644
--- a/gcc/tree.def
+++ b/gcc/tree.def
@@ -720,10 +720,6 @@ DEFTREECODE (SAVE_EXPR, "save_expr", 'e', 1)
    Operand may have any mode.  Result mode is Pmode.  */
 DEFTREECODE (ADDR_EXPR, "addr_expr", 'e', 1)
 
-/* Operand is a function constant; result is a function variable value
-   of type EPmode.  Used only for languages that need static chains.  */
-DEFTREECODE (ENTRY_VALUE_EXPR, "entry_value_expr", 'e', 1)
-
 /* Operand0 is a function constant; result is part N of a function
    descriptor of type ptr_mode.  */
 DEFTREECODE (FDESC_EXPR, "fdesc_expr", 'e', 2)