svn commit: r270606 - stable/10/contrib/gcc/config/arm

Ian Lepore ian at FreeBSD.org
Mon Aug 25 18:45:16 UTC 2014


Author: ian
Date: Mon Aug 25 18:45:15 2014
New Revision: 270606
URL: http://svnweb.freebsd.org/changeset/base/270606

Log:
  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.

Modified:
  stable/10/contrib/gcc/config/arm/unwind-arm.h
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/contrib/gcc/config/arm/unwind-arm.h
==============================================================================
--- stable/10/contrib/gcc/config/arm/unwind-arm.h	Mon Aug 25 18:34:23 2014	(r270605)
+++ stable/10/contrib/gcc/config/arm/unwind-arm.h	Mon Aug 25 18:45:15 2014	(r270606)
@@ -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;


More information about the svn-src-stable mailing list