diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c91c336378b768b3bd938106cbce2fabf08852c4..f3788a936753335a92c46855affea2ac7f257729 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2001-04-04  Richard Henderson  <rth@redhat.com>
+
+	* config/ia64/ia64.h (IA64_UNWIND_INFO): Disable.
+	* config/ia64/t-glibc (LIB2ADDEH): Disable.
+	* config/ia64/t-ia64 (LIB2ADDEH): Disable.
+
 2001-04-04  Richard Henderson  <rth@redhat.com>
 
 	* configure.in (gcc_cv_as_leb128): Escape "." in regexp.
diff --git a/gcc/config/ia64/ia64.h b/gcc/config/ia64/ia64.h
index a90c9fa490b4f47dd1c3e9bc32c89927184bd865..8acbef13127ad041f7ee5280c5eac919e8ad4ff9 100644
--- a/gcc/config/ia64/ia64.h
+++ b/gcc/config/ia64/ia64.h
@@ -2841,7 +2841,10 @@ do {									\
 
 extern int ia64_final_schedule;
 
+/* ??? Hack until frame-ia64.c is updated.
 #define IA64_UNWIND_INFO	1
+*/
+
 #define HANDLER_SECTION fprintf (asm_out_file, "\t.personality\t__ia64_personality_v1\n\t.handlerdata\n");
 #define IA64_UNWIND_EMIT(f,i)	process_for_unwind_directive (f,i)
 
diff --git a/gcc/config/ia64/t-glibc b/gcc/config/ia64/t-glibc
index a1056628b501443b7310beeca41cdd7f76458fd7..5336209a9e81d646c41482bf3ba26b9fa99cbb83 100644
--- a/gcc/config/ia64/t-glibc
+++ b/gcc/config/ia64/t-glibc
@@ -1 +1 @@
-LIB2ADDEH += $(srcdir)/config/ia64/fde-glibc.c
+# LIB2ADDEH += $(srcdir)/config/ia64/fde-glibc.c
diff --git a/gcc/config/ia64/t-ia64 b/gcc/config/ia64/t-ia64
index f27c72957d0d8cea4df6b411dd9b929358c6f51e..b8f053c8fc5afb555640e62df775be6d8bfc6271 100644
--- a/gcc/config/ia64/t-ia64
+++ b/gcc/config/ia64/t-ia64
@@ -41,5 +41,4 @@ crtendS.o: $(srcdir)/config/ia64/crtend.asm $(GCC_PASSES)
 	$(GCC_FOR_TARGET) -DSHARED -c -o crtendS.o -x assembler-with-cpp $(srcdir)/config/ia64/crtend.asm
 
 EXTRA_HEADERS = $(srcdir)/config/ia64/ia64intrin.h
-LIB2ADDEH = $(srcdir)/config/ia64/frame-ia64.c
-
+# LIB2ADDEH = $(srcdir)/config/ia64/frame-ia64.c