[Libunwind-devel] [PATCH] Make C++ ABI related code for exceptions optional

[Arun Sharma]

It's on by default on ia64, but disabled on other platforms.
This allows users to link in libunwind, without having to use it
for C++ exception handling.

Signed-off-by: Arun Sharma <address@hidden>

diff --git a/configure.in b/configure.in
index c2374c5..66ab133 100644
--- a/configure.in
+++ b/configure.in
@@ -99,6 +99,7 @@ AM_CONDITIONAL(ARCH_PPC32, test x$target_arch = xppc32)
 AM_CONDITIONAL(ARCH_PPC64, test x$target_arch = xppc64)
 AM_CONDITIONAL(OS_LINUX, expr x$target_os : xlinux >/dev/null)
 AM_CONDITIONAL(OS_HPUX, expr x$target_os : xhpux >/dev/null)
+AM_CONDITIONAL(SUPPORT_CXX_EXCEPTIONS, test x$target_arch = xia64)
 
 if test x$target_arch = xppc64; then
         libdir='${exec_prefix}/lib64'
diff --git a/src/Makefile.am b/src/Makefile.am
index ae113f4..7de3026 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -61,6 +61,7 @@ libunwind_la_SOURCES_generic =                                
                \
        mi/Gget_fpreg.c mi/Gset_fpreg.c                                 \
        mi/Gset_caching_policy.c
 
+if SUPPORT_CXX_EXCEPTIONS
 libunwind_la_SOURCES_local_unwind =                                    \
        unwind/Backtrace.c unwind/DeleteException.c                     \
        unwind/FindEnclosingFunction.c unwind/ForcedUnwind.c            \
@@ -69,6 +70,7 @@ libunwind_la_SOURCES_local_unwind =                           
        \
        unwind/GetRegionStart.c unwind/GetTextRelBase.c                 \
        unwind/RaiseException.c unwind/Resume.c                         \
        unwind/Resume_or_Rethrow.c unwind/SetGR.c unwind/SetIP.c
+endif
 
 # List of arch-independent files needed by local-only library (libunwind):
 libunwind_la_SOURCES_local_nounwind =                                  \