summaryrefslogtreecommitdiff
path: root/debian/patches/kfreebsd-unwind.diff
diff options
context:
space:
mode:
authorIgor Pashev <pashev.igor@gmail.com>2019-11-18 15:53:29 +0300
committerIgor Pashev <pashev.igor@gmail.com>2019-11-18 15:53:29 +0300
commit8f6c4b0033c72f8ac14694c419a99458339dd6a9 (patch)
tree06c106e622a58100aa85a381b9b65d222b076df4 /debian/patches/kfreebsd-unwind.diff
parent42156b5190f4fa150e1fab6777eb81e69d4db8c9 (diff)
downloadgcc-9-debian.tar.gz
Import gcc-9 (9.2.1-19)debian/9.2.1-19debian
Diffstat (limited to 'debian/patches/kfreebsd-unwind.diff')
-rw-r--r--debian/patches/kfreebsd-unwind.diff33
1 files changed, 12 insertions, 21 deletions
diff --git a/debian/patches/kfreebsd-unwind.diff b/debian/patches/kfreebsd-unwind.diff
index 1b6fb9b..76545b1 100644
--- a/debian/patches/kfreebsd-unwind.diff
+++ b/debian/patches/kfreebsd-unwind.diff
@@ -1,39 +1,30 @@
# DP: DWARF2 EH unwinding support for AMD x86-64 and x86 KFreeBSD.
-Index: b/src/libgcc/config.host
-===================================================================
--- a/src/libgcc/config.host
+++ b/src/libgcc/config.host
-@@ -620,7 +620,12 @@ i[34567]86-*-linux*)
+@@ -675,7 +675,13 @@ i[34567]86-*-linux*)
tm_file="${tm_file} i386/elf-lib.h"
md_unwind_header=i386/linux-unwind.h
;;
--i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-knetbsd*-gnu | i[34567]86-*-gnu* | i[34567]86-*-kopensolaris*-gnu)
+-i[34567]86-*-kfreebsd*-gnu | i[34567]86-*-gnu* | i[34567]86-*-kopensolaris*-gnu)
+i[34567]86-*-kfreebsd*-gnu)
+ extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
-+ tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm i386/t-crtstuff t-dfprules"
++ tmake_file="${tmake_file} i386/t-crtpc t-crtfm i386/t-crtstuff t-dfprules"
++ tm_file="${tm_file} i386/elf-lib.h"
+ md_unwind_header=i386/freebsd-unwind.h
+ ;;
-+i[34567]86-*-knetbsd*-gnu | i[34567]86-*-gnu* | i[34567]86-*-kopensolaris*-gnu)
++i[34567]86-*-gnu* | i[34567]86-*-kopensolaris*-gnu)
extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
tmake_file="${tmake_file} i386/t-crtpc t-crtfm i386/t-crtstuff t-dfprules"
tm_file="${tm_file} i386/elf-lib.h"
-@@ -631,7 +636,12 @@ x86_64-*-linux*)
- tm_file="${tm_file} i386/elf-lib.h"
- md_unwind_header=i386/linux-unwind.h
- ;;
--x86_64-*-kfreebsd*-gnu | x86_64-*-knetbsd*-gnu)
-+x86_64-*-kfreebsd*-gnu)
-+ extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
-+ tmake_file="${tmake_file} i386/t-crtpc i386/t-crtfm i386/t-crtstuff t-dfprules"
-+ md_unwind_header=i386/freebsd-unwind.h
-+ ;;
-+x86_64-*-knetbsd*-gnu)
+@@ -690,6 +696,7 @@ x86_64-*-kfreebsd*-gnu)
extra_parts="$extra_parts crtprec32.o crtprec64.o crtprec80.o crtfastmath.o"
tmake_file="${tmake_file} i386/t-crtpc t-crtfm i386/t-crtstuff t-dfprules"
tm_file="${tm_file} i386/elf-lib.h"
-Index: b/src/libgcc/config/i386/freebsd-unwind.h
-===================================================================
++ md_unwind_header=i386/freebsd-unwind.h
+ ;;
+ i[34567]86-pc-msdosdjgpp*)
+ ;;
--- a/src/libgcc/config/i386/freebsd-unwind.h
+++ b/src/libgcc/config/i386/freebsd-unwind.h
@@ -26,6 +26,8 @@ see the files COPYING3 and COPYING.RUNTI
@@ -44,8 +35,8 @@ Index: b/src/libgcc/config/i386/freebsd-unwind.h
+
#include <sys/types.h>
#include <signal.h>
- #include <sys/ucontext.h>
-@@ -171,3 +173,5 @@ x86_freebsd_fallback_frame_state
+ #include <unistd.h>
+@@ -210,3 +212,5 @@ x86_freebsd_fallback_frame_state
return _URC_NO_REASON;
}
#endif /* ifdef __x86_64__ */