diff options
| author | ian <ian@FreeBSD.org> | 2014-08-25 18:45:15 +0000 |
|---|---|---|
| committer | ian <ian@FreeBSD.org> | 2014-08-25 18:45:15 +0000 |
| commit | 056154207bec2358ab9c949ba7db0b25066c3a69 (patch) | |
| tree | de6bd4c4b0f5485b453207e79ac2c32f4aaf8ed6 | |
| parent | e0de69b3b8f8fe7d80ce7e95b20c12fd2d93c608 (diff) | |
| download | FreeBSD-src-056154207bec2358ab9c949ba7db0b25066c3a69.zip FreeBSD-src-056154207bec2358ab9c949ba7db0b25066c3a69.tar.gz | |
MFC r268994: C++ exception/unwind handling fix
Add FreeBSD to the list of environments that needs to handle R_ARM_TARGET2
relocations in unwind data as pc-relative indirect references.
Note that the commit log for r269792 incorrectly claims that it includes
this change, but I apparently fumbled it somehow, so this is the real MFC.
| -rw-r--r-- | contrib/gcc/config/arm/unwind-arm.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/contrib/gcc/config/arm/unwind-arm.h b/contrib/gcc/config/arm/unwind-arm.h index 8a5c5ce..ab8531d 100644 --- a/contrib/gcc/config/arm/unwind-arm.h +++ b/contrib/gcc/config/arm/unwind-arm.h @@ -232,7 +232,7 @@ extern "C" { if (!tmp) return 0; -#if defined(linux) || defined(__NetBSD__) +#if defined(linux) || defined(__NetBSD__) || defined(__FreeBSD__) /* Pc-relative indirect. */ tmp += ptr; tmp = *(_Unwind_Word *) tmp; |
