Index: gcc/unwind-dw2-fde-darwin.c
===================================================================
--- gcc/unwind-dw2-fde-darwin.c	(revision 163268)
+++ gcc/unwind-dw2-fde-darwin.c	(working copy)
@@ -276,13 +276,14 @@ _Unwind_Find_FDE (void *pc, struct dwarf_eh_bases
  }

  void *
-_darwin10_Unwind_FindEnclosingFunction (void *pc)
+_darwin10_Unwind_FindEnclosingFunction (void *pc ATTRIBUTE_UNUSED)
  {
+#if __MACH__ && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060)
    struct dwarf_eh_bases bases;
    const struct dwarf_fde *fde = _Unwind_Find_FDE (pc-1, &bases);
    if (fde)
      return bases.func;
-  else
-    return NULL;
+#endif
+  return NULL;
  }

Index: libjava/include/posix.h
===================================================================
--- libjava/include/posix.h	(revision 163268)
+++ libjava/include/posix.h	(working copy)
@@ -56,9 +56,9 @@ details.  */
  #define _Jv_platform_solib_suffix ".so"
  #endif

-#if defined(__APPLE__) && defined(__MACH__)
-#undef _Unwind_FindEnclosingFunction
-#define _Unwind_FindEnclosingFunction(PC)  
_darwin10_Unwind_FindEnclosingFunction(PC)
+#if __MACH__ && (__ENVIRONMENT_MAC_OS_X_VERSION_MIN_REQUIRED__ >= 1060)
+#  undef _Unwind_FindEnclosingFunction
+#  define _Unwind_FindEnclosingFunction(PC)  
_darwin10_Unwind_FindEnclosingFunction(PC)
  #endif