xref: /minix3/external/gpl3/gcc/patches/0003-gcc48-updates.patch (revision 0a6a1f1d05b60e214de2f05a7310ddd1f0e590e7)
1*0a6a1f1dSLionel Sambucdiff -rNU3 dist.org/gcc/config.gcc dist/gcc/config.gcc
2*0a6a1f1dSLionel Sambuc--- dist.org/gcc/config.gcc	2015-12-11 12:26:57.000000000 +0100
3*0a6a1f1dSLionel Sambuc+++ dist/gcc/config.gcc	2015-12-11 12:25:40.000000000 +0100
4*0a6a1f1dSLionel Sambuc@@ -895,10 +895,10 @@
5*0a6a1f1dSLionel Sambuc 	;;
6*0a6a1f1dSLionel Sambuc arm*-*-minix*)
7*0a6a1f1dSLionel Sambuc 	tmake_file="${tmake_file} arm/t-arm arm/t-arm-elf"
8*0a6a1f1dSLionel Sambuc-	tm_file="dbxelf.h elfos.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
9*0a6a1f1dSLionel Sambuc+	tm_file="dbxelf.h elfos.h netbsd-stdint.h arm/unknown-elf.h arm/elf.h arm/aout.h arm/arm.h"
10*0a6a1f1dSLionel Sambuc 	extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
11*0a6a1f1dSLionel Sambuc
12*0a6a1f1dSLionel Sambuc-	    tm_file="$tm_file arm/bpabi.h"
13*0a6a1f1dSLionel Sambuc+	    tm_file="$tm_file arm/bpabi.h minix-spec.h arm/minix.h minix.h"
14*0a6a1f1dSLionel Sambuc 	    tmake_file="$tmake_file arm/t-bpabi t-minix"
15*0a6a1f1dSLionel Sambuc
16*0a6a1f1dSLionel Sambuc 	    # The BPABI long long divmod functions return a 128-bit value in
17*0a6a1f1dSLionel Sambuc@@ -918,8 +918,7 @@
18*0a6a1f1dSLionel Sambuc 	armv6*) with_cpu=${with_cpu:-arm1176jzf-s};;
19*0a6a1f1dSLionel Sambuc 	armv7*) with_cpu=${with_cpu:-cortex-a8};;
20*0a6a1f1dSLionel Sambuc 	esac
21*0a6a1f1dSLionel Sambuc-	tm_file="$tm_file arm/eabi.h newlib-stdint.h minix-spec.h arm/minix.h minix.h"
22*0a6a1f1dSLionel Sambuc-	tmake_file="$tmake_file arm/t-arm-softfp soft-fp/t-softfp"
23*0a6a1f1dSLionel Sambuc+	#tmake_file="$tmake_file arm/t-arm-softfp soft-fp/t-softfp"
24*0a6a1f1dSLionel Sambuc 	;;
25*0a6a1f1dSLionel Sambuc arm*-*-netbsdelf*)
26*0a6a1f1dSLionel Sambuc 	tmake_file="${tmake_file} arm/t-arm"
27*0a6a1f1dSLionel Sambuc@@ -1322,7 +1321,7 @@
28*0a6a1f1dSLionel Sambuc 	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h ${fbsd_tm_file} i386/x86-64.h i386/freebsd.h i386/freebsd64.h"
29*0a6a1f1dSLionel Sambuc 	;;
30*0a6a1f1dSLionel Sambuc i[34567]86-*-minix)
31*0a6a1f1dSLionel Sambuc-	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h minix-spec.h i386/minix.h minix.h"
32*0a6a1f1dSLionel Sambuc+	tm_file="${tm_file} i386/unix.h i386/att.h dbxelf.h elfos.h netbsd-stdint.h minix-spec.h i386/minix.h minix.h"
33*0a6a1f1dSLionel Sambuc 	tmake_file="${tmake_file} i386/t-crtstuff"
34*0a6a1f1dSLionel Sambuc 	extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
35*0a6a1f1dSLionel Sambuc 	;;
36*0a6a1f1dSLionel Sambucdiff -rNU3 dist.org/gcc/tree-ssa-ccp.c dist/gcc/tree-ssa-ccp.c
37*0a6a1f1dSLionel Sambuc--- dist.org/gcc/tree-ssa-ccp.c	2015-12-11 12:26:57.000000000 +0100
38*0a6a1f1dSLionel Sambuc+++ dist/gcc/tree-ssa-ccp.c	2015-12-11 12:24:50.000000000 +0100
39*0a6a1f1dSLionel Sambuc@@ -2530,7 +2530,7 @@
40*0a6a1f1dSLionel Sambuc  }
41*0a6a1f1dSLionel Sambuc };
42*0a6a1f1dSLionel Sambuc
43*0a6a1f1dSLionel Sambuc-#if defined(__NetBSD__) && defined(NETBSD_NATIVE)
44*0a6a1f1dSLionel Sambuc+#if (defined(__NetBSD__) || defined(__minix)) && defined(NETBSD_NATIVE)
45*0a6a1f1dSLionel Sambuc /*
46*0a6a1f1dSLionel Sambuc  * This is a big, ugly, temporary hack:
47*0a6a1f1dSLionel Sambuc  *    http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59958
48*0a6a1f1dSLionel Sambucdiff -rNU3 dist.org/libgcc/config/arm/unwind-arm.h dist/libgcc/config/arm/unwind-arm.h
49*0a6a1f1dSLionel Sambuc--- dist.org/libgcc/config/arm/unwind-arm.h	2013-02-04 20:06:20.000000000 +0100
50*0a6a1f1dSLionel Sambuc+++ dist/libgcc/config/arm/unwind-arm.h	2015-12-11 12:25:05.000000000 +0100
51*0a6a1f1dSLionel Sambuc@@ -48,7 +48,7 @@
52*0a6a1f1dSLionel Sambuc       if (!tmp)
53*0a6a1f1dSLionel Sambuc 	return 0;
54*0a6a1f1dSLionel Sambuc
55*0a6a1f1dSLionel Sambuc-#if (defined(linux) && !defined(__uClinux__)) || defined(__NetBSD__)
56*0a6a1f1dSLionel Sambuc+#if (defined(linux) && !defined(__uClinux__)) || defined(__NetBSD__) || defined(__minix)
57*0a6a1f1dSLionel Sambuc       /* Pc-relative indirect.  */
58*0a6a1f1dSLionel Sambuc #define _GLIBCXX_OVERRIDE_TTYPE_ENCODING (DW_EH_PE_pcrel | DW_EH_PE_indirect)
59*0a6a1f1dSLionel Sambuc       tmp += ptr;
60*0a6a1f1dSLionel Sambucdiff -rNU3 dist.org/libstdc++-v3/libsupc++/atexit_arm.cc dist/libstdc++-v3/libsupc++/atexit_arm.cc
61*0a6a1f1dSLionel Sambuc--- dist.org/libstdc++-v3/libsupc++/atexit_arm.cc	2015-12-11 12:26:57.000000000 +0100
62*0a6a1f1dSLionel Sambuc+++ dist/libstdc++-v3/libsupc++/atexit_arm.cc	2015-12-11 12:25:13.000000000 +0100
63*0a6a1f1dSLionel Sambuc@@ -23,7 +23,7 @@
64*0a6a1f1dSLionel Sambuc
65*0a6a1f1dSLionel Sambuc #include <cxxabi.h>
66*0a6a1f1dSLionel Sambuc
67*0a6a1f1dSLionel Sambuc-#if defined(__arm__) && defined(__ARM_EABI__) && !defined(__NetBSD__)
68*0a6a1f1dSLionel Sambuc+#if defined(__arm__) && defined(__ARM_EABI__) && !defined(__NetBSD__) && !defined(__minix)
69*0a6a1f1dSLionel Sambuc
70*0a6a1f1dSLionel Sambuc namespace __aeabiv1
71*0a6a1f1dSLionel Sambuc {
72