diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 72d392c967f..b011a5f4254 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,12 @@
+2003-10-27  Kaveh R. Ghazi  <ghazi@caip.rutgers.edu>
+
+	* config/mips/irix6-libc-compat.c (inet_makeaddr): Prototype.
+	* crtstuff.c (__do_global_ctors_1): Move prototype.
+	* unwind-dw2.c (NO_SIZE_OF_ENCODED_VALUE): Define when
+	appropriate.
+	* unwind-sjlj.c (_Unwind_GetCFA, _Unwind_FindEnclosingFunction):
+	Mark parameter with __attribute__((unused)).
+
 2003-10-27  Zack Weinberg  <zack@codesourcery.com>
 
 	* c-decl.c (pushdecl): Clarify comment.
diff --git a/gcc/config/mips/irix6-libc-compat.c b/gcc/config/mips/irix6-libc-compat.c
index 47c72a8ec86..7d4140808a5 100644
--- a/gcc/config/mips/irix6-libc-compat.c
+++ b/gcc/config/mips/irix6-libc-compat.c
@@ -73,6 +73,8 @@ extern machreg_t _inet_makeaddr (machreg_t, machreg_t);
 	struct in_addr inet_makeaddr (int, int);		(IRIX 6.2)
 	struct in_addr inet_makeaddr (in_addr_t, in_addr_t);	(IRIX 6.5)  */
 
+extern machreg_t inet_makeaddr (machreg_t, machreg_t);
+
 machreg_t
 inet_makeaddr (machreg_t net, machreg_t lna)
 {
diff --git a/gcc/crtstuff.c b/gcc/crtstuff.c
index a5c46d602a5..fa3d7652268 100644
--- a/gcc/crtstuff.c
+++ b/gcc/crtstuff.c
@@ -129,6 +129,7 @@ extern void *__deregister_frame_info (void *)
 				     TARGET_ATTRIBUTE_WEAK;
 extern void *__deregister_frame_info_bases (void *)
 				     TARGET_ATTRIBUTE_WEAK;
+extern void __do_global_ctors_1 (void);
 
 /* Likewise for _Jv_RegisterClasses.  */
 extern void _Jv_RegisterClasses (void *) TARGET_ATTRIBUTE_WEAK;
@@ -510,7 +511,6 @@ asm (TEXT_SECTION_ASM_OP);
 /* This case is used by the Irix 6 port, which supports named sections but
    not an SVR4-style .init section.  __do_global_ctors can be non-static
    in this case because we protect it with -hidden_symbol.  */
-extern void __do_global_ctors_1(void);
 void
 __do_global_ctors (void)
 {
diff --git a/gcc/unwind-dw2.c b/gcc/unwind-dw2.c
index c6e242a919a..0b68f11972c 100644
--- a/gcc/unwind-dw2.c
+++ b/gcc/unwind-dw2.c
@@ -34,6 +34,9 @@
 #include "tm.h"
 #include "dwarf2.h"
 #include "unwind.h"
+#ifdef __USING_SJLJ_EXCEPTIONS__
+# define NO_SIZE_OF_ENCODED_VALUE
+#endif
 #include "unwind-pe.h"
 #include "unwind-dw2-fde.h"
 #include "gthr.h"
diff --git a/gcc/unwind-sjlj.c b/gcc/unwind-sjlj.c
index 376135574e0..a02fc325a78 100644
--- a/gcc/unwind-sjlj.c
+++ b/gcc/unwind-sjlj.c
@@ -182,7 +182,7 @@ _Unwind_GetGR (struct _Unwind_Context *context, int index)
 /* Get the value of the CFA as saved in CONTEXT.  */
 
 _Unwind_Word
-_Unwind_GetCFA (struct _Unwind_Context *context)
+_Unwind_GetCFA (struct _Unwind_Context *context __attribute__((unused)))
 {
   /* ??? Ideally __builtin_setjmp places the CFA in the jmpbuf.  */
   return NULL;
@@ -223,7 +223,7 @@ _Unwind_GetRegionStart (struct _Unwind_Context *context __attribute__((unused))
 }
 
 void *
-_Unwind_FindEnclosingFunction (void *pc)
+_Unwind_FindEnclosingFunction (void *pc __attribute__((unused)))
 {
   return NULL;
 }