diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2dd587a5af5d..c78ff25a9a5f 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2001-08-01  Mark Kettenis  <kettenis@gnu.org>
+
+	* unwind-pe.h (base_of_encoded_value, read_encoded_value): Define
+	only if NO_BASE_OF_ENCODED_VALUE isn't defined.
+	* unwind-dw2-fde.c (NO_BASE_OF_ENCODED_VALUE): Define before
+	including "unwind-pe.h".
+
 Wed Aug  1 20:01:42 CEST 2001  Jan Hubicka  <jh@suse.cz>
 
 	* rs6000.md (define_splits): Kill unused constraints.
diff --git a/gcc/unwind-dw2-fde.c b/gcc/unwind-dw2-fde.c
index 8370e7a77dea..333daecd4515 100644
--- a/gcc/unwind-dw2-fde.c
+++ b/gcc/unwind-dw2-fde.c
@@ -32,6 +32,7 @@ Boston, MA 02111-1307, USA.  */
 #include "tsystem.h"
 #include "dwarf2.h"
 #include "unwind.h"
+#define NO_BASE_OF_ENCODED_VALUE
 #include "unwind-pe.h"
 #include "unwind-dw2-fde.h"
 #include "gthr.h"
diff --git a/gcc/unwind-pe.h b/gcc/unwind-pe.h
index d6f368f779c0..9a98f4571ff4 100644
--- a/gcc/unwind-pe.h
+++ b/gcc/unwind-pe.h
@@ -76,6 +76,8 @@ size_of_encoded_value (unsigned char encoding)
   __gxx_abort ();
 }
 
+#ifndef NO_BASE_OF_ENCODED_VALUE
+
 /* Given an encoding and an _Unwind_Context, return the base to which
    the encoding is relative.  This base may then be passed to
    read_encoded_value_with_base for use when the _Unwind_Context is
@@ -104,6 +106,8 @@ base_of_encoded_value (unsigned char encoding, struct _Unwind_Context *context)
   __gxx_abort ();
 }
 
+#endif
+
 /* Load an encoded value from memory at P.  The value is returned in VAL;
    The function returns P incremented past the value.  BASE is as given
    by base_of_encoded_value for this encoding in the appropriate context.  */
@@ -220,6 +224,8 @@ read_encoded_value_with_base (unsigned char encoding, _Unwind_Ptr base,
   return p;
 }
 
+#ifndef NO_BASE_OF_ENCODED_VALUE
+
 /* Like read_encoded_value_with_base, but get the base from the context
    rather than providing it directly.  */
 
@@ -232,6 +238,8 @@ read_encoded_value (struct _Unwind_Context *context, unsigned char encoding,
 		p, val);
 }
 
+#endif
+
 /* Read an unsigned leb128 value from P, store the value in VAL, return
    P incremented past the value.  */