Module Name:    src
Committed By:   martin
Date:           Thu Dec 20 07:12:27 UTC 2012

Modified Files:
        src/external/gpl3/gcc/dist/gcc: config.gcc
        src/external/gpl3/gcc/dist/gcc/config/ia64: fde-glibc.c

Log Message:
We do not have a native libunwind (yet) - so reuse the Linux stuff on ia64
for now.


To generate a diff of this commit:
cvs rdiff -u -r1.13 -r1.14 src/external/gpl3/gcc/dist/gcc/config.gcc
cvs rdiff -u -r1.1.1.1 -r1.2 \
    src/external/gpl3/gcc/dist/gcc/config/ia64/fde-glibc.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/external/gpl3/gcc/dist/gcc/config.gcc
diff -u src/external/gpl3/gcc/dist/gcc/config.gcc:1.13 src/external/gpl3/gcc/dist/gcc/config.gcc:1.14
--- src/external/gpl3/gcc/dist/gcc/config.gcc:1.13	Tue Sep 18 07:04:41 2012
+++ src/external/gpl3/gcc/dist/gcc/config.gcc	Thu Dec 20 07:12:26 2012
@@ -1503,6 +1503,9 @@ ia64*-*-netbsd*)
 	tm_file="${tm_file} dbxelf.h elfos.h netbsd.h netbsd-elf.h ia64/sysv4.h ia64/netbsd.h"
 	target_cpu_default="MASK_GNU_AS|MASK_GNU_LD"
 	tmake_file="${tmake_file} ia64/t-ia64"
+	if test x$with_system_libunwind != xyes ; then
+		tmake_file="${tmake_file} t-libunwind-elf ia64/t-glibc-libunwind"
+	fi
 	extra_parts="crtbegin.o crtend.o crtbeginS.o crtendS.o crtfastmath.o"
 	;;
 ia64*-*-freebsd*)

Index: src/external/gpl3/gcc/dist/gcc/config/ia64/fde-glibc.c
diff -u src/external/gpl3/gcc/dist/gcc/config/ia64/fde-glibc.c:1.1.1.1 src/external/gpl3/gcc/dist/gcc/config/ia64/fde-glibc.c:1.2
--- src/external/gpl3/gcc/dist/gcc/config/ia64/fde-glibc.c:1.1.1.1	Tue Jun 21 01:22:26 2011
+++ src/external/gpl3/gcc/dist/gcc/config/ia64/fde-glibc.c	Thu Dec 20 07:12:27 2012
@@ -34,10 +34,12 @@
 #include <link.h>
 #include "unwind-ia64.h"
 
+#if !defined(__NetBSD__)
 #if __GLIBC__ < 2 || (__GLIBC__ == 2 && __GLIBC_MINOR__ < 2) \
     || (__GLIBC__ == 2 && __GLIBC_MINOR__ == 2 && !defined(DT_CONFIG))
 # error You need GLIBC 2.2.4 or later on IA-64 Linux
 #endif
+#endif
 
 struct unw_ia64_callback_data
 {

Reply via email to