Index: head/lang/gcc5/files/patch-libgcc-config-arm-unwind-arm =================================================================== --- head/lang/gcc5/files/patch-libgcc-config-arm-unwind-arm (nonexistent) +++ head/lang/gcc5/files/patch-libgcc-config-arm-unwind-arm (revision 441426) @@ -0,0 +1,51 @@ +--- UTC +--- libgcc/config/arm/unwind-arm.h.orig 2017-05-20 23:16:46.089160000 +0200 ++++ libgcc/config/arm/unwind-arm.h 2017-05-20 23:17:17.447204000 +0200 +@@ -72,12 +72,19 @@ + { + return _URC_FAILURE; + } ++#ifndef __FreeBSD__ + /* Return the address of the instruction, not the actual IP value. */ + #define _Unwind_GetIP(context) \ + (_Unwind_GetGR (context, 15) & ~(_Unwind_Word)1) + + #define _Unwind_SetIP(context, val) \ + _Unwind_SetGR (context, 15, val | (_Unwind_GetGR (context, 15) & 1)) ++#else ++ #undef _Unwind_GetIPInfo ++ _Unwind_Ptr _Unwind_GetIP (struct _Unwind_Context *); ++ _Unwind_Ptr _Unwind_GetIPInfo (struct _Unwind_Context *, int *); ++ void _Unwind_SetIP (struct _Unwind_Context *, _Unwind_Ptr); ++#endif + + #ifdef __cplusplus + } /* extern "C" */ +--- libgcc/config/arm/unwind-arm.c.orig 2017-05-20 23:16:46.089435000 +0200 ++++ libgcc/config/arm/unwind-arm.c 2017-05-20 23:17:17.447479000 +0200 +@@ -509,3 +509,25 @@ + { + return __gnu_unwind_pr_common (state, ucbp, context, 2); + } ++ ++#ifdef __FreeBSD__ ++/* FreeBSD expects these to be functions */ ++inline _Unwind_Ptr ++_Unwind_GetIP (struct _Unwind_Context *context) ++{ ++ return _Unwind_GetGR (context, 15) & ~(_Unwind_Word)1; ++} ++ ++inline _Unwind_Ptr ++_Unwind_GetIPInfo (struct _Unwind_Context *context, int *ip_before_insn) ++{ ++ *ip_before_insn = 0; ++ return _Unwind_GetIP (context); ++} ++ ++inline void ++_Unwind_SetIP (struct _Unwind_Context *context, _Unwind_Ptr val) ++{ ++ _Unwind_SetGR (context, 15, val | (_Unwind_GetGR (context, 15) & 1)); ++} ++#endif Property changes on: head/lang/gcc5/files/patch-libgcc-config-arm-unwind-arm ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/lang/gcc6/files/patch-libgcc-config-arm-unwind-arm =================================================================== --- head/lang/gcc6/files/patch-libgcc-config-arm-unwind-arm (nonexistent) +++ head/lang/gcc6/files/patch-libgcc-config-arm-unwind-arm (revision 441426) @@ -0,0 +1,51 @@ +--- UTC +--- libgcc/config/arm/unwind-arm.h.orig 2017-05-20 23:16:46.089160000 +0200 ++++ libgcc/config/arm/unwind-arm.h 2017-05-20 23:17:17.447204000 +0200 +@@ -72,12 +72,19 @@ + { + return _URC_FAILURE; + } ++#ifndef __FreeBSD__ + /* Return the address of the instruction, not the actual IP value. */ + #define _Unwind_GetIP(context) \ + (_Unwind_GetGR (context, 15) & ~(_Unwind_Word)1) + + #define _Unwind_SetIP(context, val) \ + _Unwind_SetGR (context, 15, val | (_Unwind_GetGR (context, 15) & 1)) ++#else ++ #undef _Unwind_GetIPInfo ++ _Unwind_Ptr _Unwind_GetIP (struct _Unwind_Context *); ++ _Unwind_Ptr _Unwind_GetIPInfo (struct _Unwind_Context *, int *); ++ void _Unwind_SetIP (struct _Unwind_Context *, _Unwind_Ptr); ++#endif + + #ifdef __cplusplus + } /* extern "C" */ +--- libgcc/config/arm/unwind-arm.c.orig 2017-05-20 23:16:46.089435000 +0200 ++++ libgcc/config/arm/unwind-arm.c 2017-05-20 23:17:17.447479000 +0200 +@@ -509,3 +509,25 @@ + { + return __gnu_unwind_pr_common (state, ucbp, context, 2); + } ++ ++#ifdef __FreeBSD__ ++/* FreeBSD expects these to be functions */ ++inline _Unwind_Ptr ++_Unwind_GetIP (struct _Unwind_Context *context) ++{ ++ return _Unwind_GetGR (context, 15) & ~(_Unwind_Word)1; ++} ++ ++inline _Unwind_Ptr ++_Unwind_GetIPInfo (struct _Unwind_Context *context, int *ip_before_insn) ++{ ++ *ip_before_insn = 0; ++ return _Unwind_GetIP (context); ++} ++ ++inline void ++_Unwind_SetIP (struct _Unwind_Context *context, _Unwind_Ptr val) ++{ ++ _Unwind_SetGR (context, 15, val | (_Unwind_GetGR (context, 15) & 1)); ++} ++#endif Property changes on: head/lang/gcc6/files/patch-libgcc-config-arm-unwind-arm ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property