external/gpl3/gcc/patches/0003-gcc48-updates.patch

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