diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 9855c592fa8a872a4793d6c3b1bea0313d6e5039..ec31de74f99a674e2ffa7abc5f20d28bf341dc5a 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2001-04-04  Zack Weinberg  <zackw@stanford.edu>
+
+	* expr.h: Remove #ifdef FUNCTION_CONVERSION_BUG logic.
+	* config/romp/xm-romp.h: Delete.
+
 2001-04-04  Bernd Schmidt  <bernds@redhat.com>
 
 	* sched-deps.c (sched_analyze_insn): Partially revert March 27
diff --git a/gcc/config/romp/xm-romp.h b/gcc/config/romp/xm-romp.h
deleted file mode 100644
index 1109e983f6ba49280801cdf9198c18e3cf47d017..0000000000000000000000000000000000000000
--- a/gcc/config/romp/xm-romp.h
+++ /dev/null
@@ -1,24 +0,0 @@
-/* Configuration for GNU C-compiler for IBM RT PC.
-   Copyright (C) 1989, 1991, 1993, 2001 Free Software Foundation, Inc.
-
-This file is part of GNU CC.
-
-GNU CC is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
-any later version.
-
-GNU CC is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with GNU CC; see the file COPYING.  If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
-
-/* hc has a bug converting functions to pointers in arguments.  */
-#ifdef __HIGHC__
-#define FUNCTION_CONVERSION_BUG
-#endif
diff --git a/gcc/expr.h b/gcc/expr.h
index 8d883017eb1848a7061e6f353dd784fa48718002..1f107d93012f7fc6c14d4d92f769f1533807d50b 100644
--- a/gcc/expr.h
+++ b/gcc/expr.h
@@ -279,16 +279,7 @@ typedef struct optab
 
 /* Given an enum insn_code, access the function to construct
    the body of that kind of insn.  */
-#ifdef FUNCTION_CONVERSION_BUG
-/* Some compilers fail to convert a function properly to a
-   pointer-to-function when used as an argument.
-   So produce the pointer-to-function directly.
-   Luckily, these compilers seem to work properly when you
-   call the pointer-to-function.  */
-#define GEN_FCN(CODE) (insn_data[(int) (CODE)].genfun)
-#else
 #define GEN_FCN(CODE) (*insn_data[(int) (CODE)].genfun)
-#endif
 
 /* Enumeration of valid indexes into optab_table.  */
 enum optab_index
diff --git a/gcc/po/ChangeLog b/gcc/po/ChangeLog
index 2a4773adb3c4a63e7c79721a328ece4e3987a3a8..21d52ad6c57c4aeaa5576e263881bef9b69e8887 100644
--- a/gcc/po/ChangeLog
+++ b/gcc/po/ChangeLog
@@ -1,3 +1,7 @@
+2001-04-04  Zack Weinberg  <zackw@stanford.edu>
+
+	* POTFILES.in: Remove config/romp/xm-romp.h.
+
 2001-04-03  Zack Weinberg  <zackw@stanford.edu>
 
 	* POTFILES.in: Remove all the files deleted by the xm-host.h
diff --git a/gcc/po/POTFILES.in b/gcc/po/POTFILES.in
index 6b4659084b8112d8f91f8ef79194ac844cc03bf0..8bfdcef7c1b00c3624cf87122423d2907dd885d6 100644
--- a/gcc/po/POTFILES.in
+++ b/gcc/po/POTFILES.in
@@ -389,7 +389,6 @@ config/psos.h
 config/ptx4.h
 config/romp/romp.c
 config/romp/romp.h
-config/romp/xm-romp.h
 config/rs6000/aix.h
 config/rs6000/aix31.h
 config/rs6000/aix3newas.h