Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/gpl3/gcc - use /usr/include/gcc-8



details:   https://anonhg.NetBSD.org/src/rev/5c4ed05aeb6c
branches:  trunk
changeset: 464304:5c4ed05aeb6c
user:      mrg <mrg%NetBSD.org@localhost>
date:      Wed Oct 02 02:54:34 2019 +0000

description:
- use /usr/include/gcc-8
- update sanitizer makefiles

also, reduce diffs to upstream:
- remove or1k support
- re-order various lines to match upstream
- move regex map code into file-prefix-map.[ch]

diffstat:

 external/gpl3/gcc/dist/gcc/config.gcc             |  49 +---------------------
 external/gpl3/gcc/dist/gcc/config/i386/i386.c     |  33 ---------------
 external/gpl3/gcc/dist/gcc/config/netbsd-stdint.h |   4 +-
 external/gpl3/gcc/dist/gcc/config/netbsd.h        |   2 +-
 external/gpl3/gcc/dist/gcc/debug.h                |   4 -
 external/gpl3/gcc/dist/gcc/file-prefix-map.h      |   1 +
 external/gpl3/gcc/dist/gcc/gcc.c                  |   1 -
 external/gpl3/gcc/lib/Makefile.sanitizer          |  10 +++-
 external/gpl3/gcc/lib/libasan/Makefile            |   5 +-
 external/gpl3/gcc/lib/libasan/shlib_version       |   2 +-
 external/gpl3/gcc/lib/liblsan/Makefile            |   7 +-
 external/gpl3/gcc/lib/libtsan/Makefile            |   4 +-
 external/gpl3/gcc/lib/libubsan/Makefile           |   6 +-
 external/gpl3/gcc/lib/libubsan/shlib_version      |   2 +-
 14 files changed, 30 insertions(+), 100 deletions(-)

diffs (truncated from 357 to 300 lines):

diff -r f7ef566ffa6e -r 5c4ed05aeb6c external/gpl3/gcc/dist/gcc/config.gcc
--- a/external/gpl3/gcc/dist/gcc/config.gcc     Wed Oct 02 02:50:38 2019 +0000
+++ b/external/gpl3/gcc/dist/gcc/config.gcc     Wed Oct 02 02:54:34 2019 +0000
@@ -465,12 +465,6 @@
 nvptx-*-*)
        cpu_type=nvptx
        ;;
-or1k-*-*)
-        cpu_type=or1k
-        ;;
-or1knd-*-*)
-        cpu_type=or1k
-        ;;
 powerpc*-*-*spe*)
        cpu_type=powerpcspe
        extra_headers="ppc-asm.h altivec.h spe.h ppu_intrinsics.h paired.h spu2vmx.h vec_types.h si2vmx.h htmintrin.h htmxlintrin.h"
@@ -1154,9 +1148,9 @@
        with_tls=${with_tls:-gnu}
        ;;
 arm*-*-netbsdelf*)
-       tmake_file="${tmake_file} arm/t-arm"
        tm_file="dbxelf.h elfos.h ${nbsd_tm_file} arm/elf.h arm/aout.h ${tm_file} arm/netbsd-elf.h"
        extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
+       tmake_file="${tmake_file} arm/t-arm"
        case ${target} in
        arm*eb-*) tm_defines="${tm_defines} TARGET_BIG_ENDIAN_DEFAULT=1" ;;
        esac
@@ -2042,7 +2036,6 @@
        esac
        ;;
 m68010-*-netbsdelf* | m68k-*-netbsdelf* | m5407-*-netbsdelf*)
-       tm_file="${tm_file} dbxelf.h elfos.h ${nbsd_tm_file} m68k/netbsd-elf.h"
        default_m68k_cpu=68020
        case ${target} in
        m5407*)
@@ -2062,6 +2055,7 @@
                ;;
        esac
        default_cf_cpu=5475
+       tm_file="${tm_file} dbxelf.h elfos.h ${nbsd_tm_file} m68k/netbsd-elf.h"
        extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
        tm_defines="${tm_defines} MOTOROLA=1 CHAR_FAST8=1 SHORT_FAST16=1"
        ;;
@@ -2491,42 +2485,6 @@
                tm_file="${tm_file} nvptx/offload.h"
        fi
        ;;
-or1k*-*-elf*)
-       tm_file="${tm_file} dbxelf.h elfos.h newlib-stdint.h ${cpu_type}/elf.h"
-       extra_parts="crti.o crtbegin.o crtend.o crtn.o"
-       case ${target} in
-         or1knd-*)
-           tmake_file=or1k/t-or1knd
-           tm_defines="${tm_defines} OR1K_DELAY_DEFAULT=OR1K_DELAY_OFF"
-           ;;
-         *)
-           tmake_file=or1k/t-or1k
-           tm_defines="${tm_defines} OR1K_DELAY_DEFAULT=OR1K_DELAY_ON"
-           ;;
-       esac
-       ;;
-or1k*-*-linux-*)
-       tm_file="${tm_file} dbxelf.h elfos.h or1k/elf.h gnu-user.h linux.h or1k/linux-gas.h or1k/linux-elf.h uclibc-stdint.h"
-       case ${target} in
-         or1knd-*)
-           tmake_file="or1k/t-or1knd or1k/t-linux ${tmake_file}"
-           tm_defines="${tm_defines} OR1K_DELAY_DEFAULT=OR1K_DELAY_OFF"
-           ;;
-         *)
-           tmake_file="or1k/t-or1k or1k/t-linux ${tmake_file}"
-           tm_defines="${tm_defines} OR1K_DELAY_DEFAULT=OR1K_DELAY_ON"
-           ;;
-       esac
-       ;;
-or1k*-*-netbsd*)
-       tm_file="${tm_file} dbxelf.h elfos.h ${nbsd_tm_file} or1k/netbsd.h"
-       extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
-       case ${target} in
-         or1knd-*) tm_defines="${tm_defines} OR1K_DELAY_DEFAULT=OR1K_DELAY_OFF" ;;
-         *) tm_defines="${tm_defines} OR1K_DELAY_DEFAULT=OR1K_DELAY_ON" ;;
-       esac
-       gcc_cv_initfini_array=yes
-       ;;
 pdp11-*-*)
        tm_file="${tm_file} newlib-stdint.h"
        use_gcc_stdint=wrap
@@ -2587,10 +2545,10 @@
                ;;
        esac
        extra_options="${extra_options} netbsd.opt netbsd-elf.opt"
+       extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
        if test x${enable_secureplt} != xno; then
            tm_file="rs6000/secureplt.h ${tm_file}"
        fi
-       extra_options="${extra_options} rs6000/sysv4.opt rs6000/linux64.opt"
        ;;
 powerpc-*-eabispe*)
        tm_file="${tm_file} dbxelf.h elfos.h freebsd-spec.h newlib-stdint.h ${cpu_type}/sysv4.h ${cpu_type}/eabi.h ${cpu_type}/e500.h ${cpu_type}/eabispe.h"
@@ -3243,7 +3201,6 @@
        ;;
 vax-*-netbsdelf*)
        tm_file="${tm_file} elfos.h ${nbsd_tm_file} vax/elf.h vax/netbsd-elf.h"
-       tm_defines="${tm_defines} CHAR_FAST8=1 SHORT_FAST16=1"
        extra_options="${extra_options} netbsd.opt netbsd-elf.opt vax/elf.opt"
        tm_defines="${tm_defines} CHAR_FAST8=1 SHORT_FAST16=1"
        ;;
diff -r f7ef566ffa6e -r 5c4ed05aeb6c external/gpl3/gcc/dist/gcc/config/i386/i386.c
--- a/external/gpl3/gcc/dist/gcc/config/i386/i386.c     Wed Oct 02 02:50:38 2019 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/i386/i386.c     Wed Oct 02 02:54:34 2019 +0000
@@ -11119,39 +11119,6 @@
        ASM_OUTPUT_LABEL (asm_out_file, name);
       }
 
-/* XXXMRG - this was in our original patch against 6.4, not in 6.5 at all. */
-#if 0
-  if (regno == INVALID_REGNUM)
-    {
-      /* Create alias for __x86.return_thunk/__x86.return_thunk_bnd.  */
-      char alias[32];
-
-      indirect_thunk_name (alias, regno, need_bnd_p, true);
-#if TARGET_MACHO
-      if (TARGET_MACHO)
-       {
-         fputs ("\t.weak_definition\t", asm_out_file);
-         assemble_name (asm_out_file, alias);
-         fputs ("\n\t.private_extern\t", asm_out_file);
-         assemble_name (asm_out_file, alias);
-         putc ('\n', asm_out_file);
-         ASM_OUTPUT_LABEL (asm_out_file, alias);
-       }
-#else
-      ASM_OUTPUT_DEF (asm_out_file, alias, name);
-      if (USE_HIDDEN_LINKONCE)
-       {
-         fputs ("\t.globl\t", asm_out_file);
-         assemble_name (asm_out_file, alias);
-         putc ('\n', asm_out_file);
-         fputs ("\t.hidden\t", asm_out_file);
-         assemble_name (asm_out_file, alias);
-         putc ('\n', asm_out_file);
-       }
-#endif
-    }
-#endif
-
   DECL_INITIAL (decl) = make_node (BLOCK);
   current_function_decl = decl;
   allocate_struct_function (decl, false);
diff -r f7ef566ffa6e -r 5c4ed05aeb6c external/gpl3/gcc/dist/gcc/config/netbsd-stdint.h
--- a/external/gpl3/gcc/dist/gcc/config/netbsd-stdint.h Wed Oct 02 02:50:38 2019 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/netbsd-stdint.h Wed Oct 02 02:54:34 2019 +0000
@@ -67,5 +67,5 @@
 #define UINT_FAST32_TYPE  UINT32_TYPE
 #define UINT_FAST64_TYPE  (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "long long unsigned int")
 
-#define INTPTR_TYPE       (LONG_TYPE_SIZE == 64 ? "long int" : "int")
-#define UINTPTR_TYPE      (LONG_TYPE_SIZE == 64 ? "long unsigned int" : "unsigned int")
+#define INTPTR_TYPE       (LONG_TYPE_SIZE == 64 ?  INT64_TYPE :  INT32_TYPE)
+#define UINTPTR_TYPE      (LONG_TYPE_SIZE == 64 ? UINT64_TYPE : UINT32_TYPE)
diff -r f7ef566ffa6e -r 5c4ed05aeb6c external/gpl3/gcc/dist/gcc/config/netbsd.h
--- a/external/gpl3/gcc/dist/gcc/config/netbsd.h        Wed Oct 02 02:50:38 2019 +0000
+++ b/external/gpl3/gcc/dist/gcc/config/netbsd.h        Wed Oct 02 02:54:34 2019 +0000
@@ -63,7 +63,7 @@
  * XXX figure out a better way to do this
  */
 #undef GCC_INCLUDE_DIR
-#define GCC_INCLUDE_DIR "/usr/include/gcc-7"
+#define GCC_INCLUDE_DIR "/usr/include/gcc-8"
 
 /* Under NetBSD, the normal location of the various *crt*.o files is the
    /usr/lib directory.  */
diff -r f7ef566ffa6e -r 5c4ed05aeb6c external/gpl3/gcc/dist/gcc/debug.h
--- a/external/gpl3/gcc/dist/gcc/debug.h        Wed Oct 02 02:50:38 2019 +0000
+++ b/external/gpl3/gcc/dist/gcc/debug.h        Wed Oct 02 02:54:34 2019 +0000
@@ -251,10 +251,6 @@
 extern bool dwarf2out_default_as_loc_support (void);
 extern bool dwarf2out_default_as_locview_support (void);
 
-const char *remap_debug_filename (const char *);
-void add_debug_prefix_map (const char *);
-void add_debug_regex_map (const char *);
-
 /* For -fdump-go-spec.  */
 
 extern const struct gcc_debug_hooks *
diff -r f7ef566ffa6e -r 5c4ed05aeb6c external/gpl3/gcc/dist/gcc/file-prefix-map.h
--- a/external/gpl3/gcc/dist/gcc/file-prefix-map.h      Wed Oct 02 02:50:38 2019 +0000
+++ b/external/gpl3/gcc/dist/gcc/file-prefix-map.h      Wed Oct 02 02:54:34 2019 +0000
@@ -21,6 +21,7 @@
 void add_macro_prefix_map (const char *);
 void add_debug_prefix_map (const char *);
 void add_file_prefix_map (const char *);
+void add_debug_regex_map (const char *);
 
 const char *remap_macro_filename (const char *);
 const char *remap_debug_filename (const char *);
diff -r f7ef566ffa6e -r 5c4ed05aeb6c external/gpl3/gcc/dist/gcc/gcc.c
--- a/external/gpl3/gcc/dist/gcc/gcc.c  Wed Oct 02 02:50:38 2019 +0000
+++ b/external/gpl3/gcc/dist/gcc/gcc.c  Wed Oct 02 02:54:34 2019 +0000
@@ -7621,7 +7621,6 @@
                              PREFIX_PRIORITY_LAST, 0, 1);
       else if (*cross_compile == '0')
        {
-/* XXXMRG not sure this one is right? */
 #if !defined(NETBSD_NATIVE) && !defined(NETBSD_TOOLS)
          add_prefix (&startfile_prefixes,
                      concat (gcc_exec_prefix
diff -r f7ef566ffa6e -r 5c4ed05aeb6c external/gpl3/gcc/lib/Makefile.sanitizer
--- a/external/gpl3/gcc/lib/Makefile.sanitizer  Wed Oct 02 02:50:38 2019 +0000
+++ b/external/gpl3/gcc/lib/Makefile.sanitizer  Wed Oct 02 02:54:34 2019 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.sanitizer,v 1.7 2019/02/06 04:00:43 mrg Exp $
+#      $NetBSD: Makefile.sanitizer,v 1.8 2019/10/02 02:54:34 mrg Exp $
 
 SANITIZER=${GCCDIST}/libsanitizer
 .PATH: ${SANITIZER}/interception ${SANITIZER}/sanitizer_common
@@ -9,14 +9,18 @@
 interception_type_test.cc \
 interception_win.cc
 
+# XXXmknative
 SANITIZER_SRCS+= \
+       sancov_flags.cc \
        sanitizer_allocator.cc \
+       sanitizer_allocator_checks.cc \
        sanitizer_common.cc \
        sanitizer_common_libcdep.cc \
-       sanitizer_coverage_libcdep.cc \
-       sanitizer_coverage_mapping_libcdep.cc \
+       sanitizer_coverage_libcdep_new.cc \
        sanitizer_deadlock_detector1.cc \
        sanitizer_deadlock_detector2.cc \
+       sanitizer_errno.cc \
+       sanitizer_file.cc \
        sanitizer_flags.cc \
        sanitizer_flag_parser.cc \
        sanitizer_libc.cc \
diff -r f7ef566ffa6e -r 5c4ed05aeb6c external/gpl3/gcc/lib/libasan/Makefile
--- a/external/gpl3/gcc/lib/libasan/Makefile    Wed Oct 02 02:50:38 2019 +0000
+++ b/external/gpl3/gcc/lib/libasan/Makefile    Wed Oct 02 02:54:34 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2019/02/08 22:06:12 mrg Exp $
+# $NetBSD: Makefile,v 1.29 2019/10/02 02:54:34 mrg Exp $
 
 UNSUPPORTED_COMPILER.clang=    # defined
 NOSANITIZER=   # defined
@@ -10,6 +10,7 @@
 
 .PATH: ${SANITIZER}/asan ${SANITIZER}/lsan
 
+# XXXmknative
 ASAN_SRCS= \
        asan_activation.cc \
        asan_allocator.cc \
@@ -20,6 +21,7 @@
        asan_flags.cc \
        asan_globals.cc \
        asan_interceptors.cc \
+       asan_interceptors_memintrinsics.cc \
        asan_linux.cc \
        asan_mac.cc \
        asan_malloc_linux.cc \
@@ -31,6 +33,7 @@
        asan_posix.cc \
        asan_report.cc \
        asan_rtl.cc \
+       asan_shadow_setup.cc \
        asan_stack.cc \
        asan_stats.cc \
        asan_suppressions.cc \
diff -r f7ef566ffa6e -r 5c4ed05aeb6c external/gpl3/gcc/lib/libasan/shlib_version
--- a/external/gpl3/gcc/lib/libasan/shlib_version       Wed Oct 02 02:50:38 2019 +0000
+++ b/external/gpl3/gcc/lib/libasan/shlib_version       Wed Oct 02 02:54:34 2019 +0000
@@ -1,2 +1,2 @@
-major=4
+major=5
 minor=0
diff -r f7ef566ffa6e -r 5c4ed05aeb6c external/gpl3/gcc/lib/liblsan/Makefile
--- a/external/gpl3/gcc/lib/liblsan/Makefile    Wed Oct 02 02:50:38 2019 +0000
+++ b/external/gpl3/gcc/lib/liblsan/Makefile    Wed Oct 02 02:54:34 2019 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2019/02/06 04:00:43 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2019/10/02 02:54:34 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -8,11 +8,12 @@
 .PATH: ${SANITIZER}/lsan ${SANITIZER}/asan
 
 LSAN_SRCS+= \
+       lsan.cc \
+       lsan_allocator.cc \
        lsan_common.cc \
        lsan_common_linux.cc \
-       lsan.cc \
-       lsan_allocator.cc \
        lsan_interceptors.cc \
+       lsan_linux.cc \
        lsan_thread.cc



Home | Main Index | Thread Index | Old Index