CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: mrg Date: Tue Mar 22 05:09:49 UTC 2016 Modified Files: src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb: c++config.h src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb: auto-host.h src/external/gpl3/gcc/usr.bin/libcpp/arch/mipseb: config.h Log Message: mknative-gcc for GCC 5.3 and mipseb. To generate a diff of this commit: cvs rdiff -u -r1.17 -r1.18 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/c++config.h cvs rdiff -u -r1.7 -r1.8 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb/auto-host.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/usr.bin/libcpp/arch/mipseb/config.h 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/lib/libstdc++-v3/arch/mipseb/c++config.h diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/c++config.h:1.17 src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/c++config.h:1.18 --- src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/c++config.h:1.17 Tue Mar 22 05:04:41 2016 +++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/c++config.h Tue Mar 22 05:09:49 2016 @@ -527,31 +527,31 @@ namespace std /* config.h.in. Generated from configure.ac by autoheader. */ /* Define to 1 if you have the `acosf' function. */ -/* #undef _GLIBCXX_HAVE_ACOSF */ +#define _GLIBCXX_HAVE_ACOSF 1 /* Define to 1 if you have the `acosl' function. */ -/* #undef _GLIBCXX_HAVE_ACOSL */ +#define _GLIBCXX_HAVE_ACOSL 1 /* Define to 1 if you have the `asinf' function. */ -/* #undef _GLIBCXX_HAVE_ASINF */ +#define _GLIBCXX_HAVE_ASINF 1 /* Define to 1 if you have the `asinl' function. */ -/* #undef _GLIBCXX_HAVE_ASINL */ +#define _GLIBCXX_HAVE_ASINL 1 /* Define to 1 if the target assembler supports .symver directive. */ #define _GLIBCXX_HAVE_AS_SYMVER_DIRECTIVE 1 /* Define to 1 if you have the `atan2f' function. */ -/* #undef _GLIBCXX_HAVE_ATAN2F */ +#define _GLIBCXX_HAVE_ATAN2F 1 /* Define to 1 if you have the `atan2l' function. */ -/* #undef _GLIBCXX_HAVE_ATAN2L */ +#define _GLIBCXX_HAVE_ATAN2L 1 /* Define to 1 if you have the `atanf' function. */ -/* #undef _GLIBCXX_HAVE_ATANF */ +#define _GLIBCXX_HAVE_ATANF 1 /* Define to 1 if you have the `atanl' function. */ -/* #undef _GLIBCXX_HAVE_ATANL */ +#define _GLIBCXX_HAVE_ATANL 1 /* Define to 1 if you have the `at_quick_exit' function. */ #define _GLIBCXX_HAVE_AT_QUICK_EXIT 1 @@ -560,25 +560,25 @@ namespace std /* #undef _GLIBCXX_HAVE_CC_TLS */ /* Define to 1 if you have the `ceilf' function. */ -/* #undef _GLIBCXX_HAVE_CEILF */ +#define _GLIBCXX_HAVE_CEILF 1 /* Define to 1 if you have the `ceill' function. */ -/* #undef _GLIBCXX_HAVE_CEILL */ +#define _GLIBCXX_HAVE_CEILL 1 /* Define to 1 if you have the header file. */ #define _GLIBCXX_HAVE_COMPLEX_H 1 /* Define to 1 if you have the `cosf' function. */ -/* #undef _GLIBCXX_HAVE_COSF */ +#define _GLIBCXX_HAVE_COSF 1 /* Define to 1 if you have the `coshf' function. */ -/* #undef _GLIBCXX_HAVE_COSHF */ +#define _GLIBCXX_HAVE_COSHF 1 /* Define to 1 if you have the `coshl' function. */ -/* #undef _GLIBCXX_HAVE_COSHL */ +#define _GLIBCXX_HAVE_COSHL 1 /* Define to 1 if you have the `cosl' function. */ -/* #undef _GLIBCXX_HAVE_COSL */ +#define _GLIBCXX_HAVE_COSL 1 /* Define to 1 if you have the header file. */ #define _GLIBCXX_HAVE_DIRENT_H 1 @@ -650,13 +650,13 @@ namespace std #define _GLIBCXX_HAVE_EXECINFO_H 1 /* Define to 1 if you have the `expf' function. */ -/* #undef _GLIBCXX_HAVE_EXPF */ +#define _GLIBCXX_HAVE_EXPF 1 /* Define to 1 if you have the `expl' function. */ -/* #undef _GLIBCXX_HAVE_EXPL */ +#define _GLIBCXX_HAVE_EXPL 1 /* Define to 1 if you have the `fabsf' function. */ -/* #undef _GLIBCXX_HAVE_FABSF */ +#define _GLIBCXX_HAVE_FABSF 1 /* Define to 1 if you have the `fabsl' function. */ /* #undef _GLIBCXX_HAVE_FABSL */ @@ -668,10 +668,10 @@ namespace std #define _GLIBCXX_HAVE_FENV_H 1 /* Define to 1 if you have the `finite' function. */ -/* #undef _GLIBCXX_HAVE_FINITE */ +#define _GLIBCXX_HAVE_FINITE 1 /* Define to 1 if you have the `finitef' function. */ -/* #undef _GLIBCXX_HAVE_FINITEF */ +#define _GLIBCXX_HAVE_FINITEF 1 /* Define to 1 if you have the `finitel' function. */ /* #undef _GLIBCXX_HAVE_FINITEL */ @@ -680,16 +680,16 @@ namespace std #define _GLIBCXX_HAVE_FLOAT_H 1 /* Define to 1 if you have the `floorf' function. */ -/* #undef _GLIBCXX_HAVE_FLOORF */ +#define _GLIBCXX_HAVE_FLOORF 1 /* Define to 1 if you have the `floorl' function. */ -/* #undef _GLIBCXX_HAVE_FLOORL */ +#define _GLIBCXX_HAVE_FLOORL 1 /* Define to 1 if you have the `fmodf' function. */ -/* #undef _GLIBCXX_HAVE_FMODF */ +#define _GLIBCXX_HAVE_FMODF 1 /* Define to 1 if you have the `fmodl' function. */ -/* #undef _GLIBCXX_HAVE_FMODL */ +#define _GLIBCXX_HAVE_FMODL 1 /* Define to 1 if you have the `fpclass' function. */ /* #undef
CVS commit: src/external/gpl3/gcc/usr.bin
Module Name:src
Committed By: mrg
Date: Tue Mar 22 05:08:38 UTC 2016
Modified Files:
src/external/gpl3/gcc/usr.bin/backend: Makefile
src/external/gpl3/gcc/usr.bin/cc1: Makefile
Log Message:
XXXGCC5: add symlinks for SH .cc files.
To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/external/gpl3/gcc/usr.bin/backend/Makefile
cvs rdiff -u -r1.10 -r1.11 src/external/gpl3/gcc/usr.bin/cc1/Makefile
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/usr.bin/backend/Makefile
diff -u src/external/gpl3/gcc/usr.bin/backend/Makefile:1.28 src/external/gpl3/gcc/usr.bin/backend/Makefile:1.29
--- src/external/gpl3/gcc/usr.bin/backend/Makefile:1.28 Wed Mar 16 10:56:20 2016
+++ src/external/gpl3/gcc/usr.bin/backend/Makefile Tue Mar 22 05:08:38 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2016/03/16 10:56:20 mrg Exp $
+# $NetBSD: Makefile,v 1.29 2016/03/22 05:08:38 mrg Exp $
LIBISPRIVATE= yes
@@ -18,10 +18,18 @@ CPPFLAGS.cppdefault.c+= -DPREFIX=\"/usr\
HOSTPROG_CXX= 1
+.include
+
# XXX ${G_OBJS:.o=.c} is invalid in GCC 5.3, but work around for now
BUILDSYMLINKS+= ${GNUHOSTDIST}/gcc/wide-int-print.cc wide-int-print.c
BUILDSYMLINKS+= ${GNUHOSTDIST}/gcc/wide-int.cc wide-int.c
+.if ${MACHINE_CPU} == "sh3"
+BUILDSYMLINKS+= ${GNUHOSTDIST}/gcc/config/sh/sh-mem.cc sh-mem.c
+BUILDSYMLINKS+= ${GNUHOSTDIST}/gcc/config/sh/sh_treg_combine.cc sh_treg_combine.c
+BUILDSYMLINKS+= ${GNUHOSTDIST}/gcc/config/sh/sh_optimize_sett_clrt.cc sh_optimize_sett_clrt.c
+.endif
+
.include
# Force using C++ for this
Index: src/external/gpl3/gcc/usr.bin/cc1/Makefile
diff -u src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.10 src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.11
--- src/external/gpl3/gcc/usr.bin/cc1/Makefile:1.10 Fri Mar 18 17:52:30 2016
+++ src/external/gpl3/gcc/usr.bin/cc1/Makefile Tue Mar 22 05:08:38 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2016/03/18 17:52:30 christos Exp $
+# $NetBSD: Makefile,v 1.11 2016/03/22 05:08:38 mrg Exp $
PROG= cc1
SRCS= ${G_C_OBJS:S,c-family/,,:S,c/,,:Nlibcpp.a:.o=.c} main.c ${PROG}-checksum.c
@@ -47,6 +47,10 @@ COPTS.c-typeck.c= -Wno-stack-protector
CPPFLAGS.default-c.c+= -I${BACKENDOBJ}
+.if ${MACHINE_CPU} == "sh3"
+BUILDSYMLINKS+= ${GNUHOSTDIST}/gcc/config/sh/sh-c.cc sh-c.c
+.endif
+
LDADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} -lintl -lz -lm
DPADD+= ${LIBMPC} ${LIBMPFR} ${LIBGMP} ${LIBINTL} ${LIBZ} ${LIBM}
CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: mrg Date: Tue Mar 22 05:04:41 UTC 2016 Modified Files: src/external/gpl3/gcc/lib/libbacktrace/arch/mipseb: backtrace-supported.h config.h src/external/gpl3/gcc/lib/libgcc/arch/mipseb: defs.mk src/external/gpl3/gcc/lib/libgomp/arch/mipseb: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libiberty/arch/mipseb: config.h src/external/gpl3/gcc/lib/libobjc/arch/mipseb: defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb: c++config.h cxxabi_tweaks.h defs.mk gstdint.h gthr-posix.h gthr-single.h gthr.h src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb: auto-host.h bversion.h configargs.h defs.mk gtyp-input.list plugin-version.h src/external/gpl3/gcc/usr.bin/libcpp/arch/mipseb: config.h Log Message: mknative-gcc for GCC 5.3 and mipseb. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/lib/libbacktrace/arch/mipseb/backtrace-supported.h \ src/external/gpl3/gcc/lib/libbacktrace/arch/mipseb/config.h cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/libgcc/arch/mipseb/defs.mk cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/lib/libgomp/arch/mipseb/config.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libgomp/arch/mipseb/libgomp.spec \ src/external/gpl3/gcc/lib/libgomp/arch/mipseb/libgomp_f.h \ src/external/gpl3/gcc/lib/libgomp/arch/mipseb/omp.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/lib/libiberty/arch/mipseb/config.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libobjc/arch/mipseb/defs.mk cvs rdiff -u -r1.16 -r1.17 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/c++config.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/cxxabi_tweaks.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/gthr-posix.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/gthr-single.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/gthr.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/defs.mk cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/gstdint.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb/auto-host.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb/bversion.h cvs rdiff -u -r1.16 -r1.17 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb/configargs.h cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb/defs.mk cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb/gtyp-input.list cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mipseb/plugin-version.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/libcpp/arch/mipseb/config.h 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/lib/libbacktrace/arch/mipseb/backtrace-supported.h diff -u src/external/gpl3/gcc/lib/libbacktrace/arch/mipseb/backtrace-supported.h:1.3 src/external/gpl3/gcc/lib/libbacktrace/arch/mipseb/backtrace-supported.h:1.4 --- src/external/gpl3/gcc/lib/libbacktrace/arch/mipseb/backtrace-supported.h:1.3 Sat Jan 10 22:59:34 2015 +++ src/external/gpl3/gcc/lib/libbacktrace/arch/mipseb/backtrace-supported.h Tue Mar 22 05:04:41 2016 @@ -1,9 +1,9 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.79 2014/05/29 16:27:50 skrll Exp */ +/* Generated from: NetBSD: mknative-gcc,v 1.87 2016/03/17 23:41:21 mrg Exp */ /* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp */ /* backtrace-supported.h.in -- Whether stack backtrace is supported. - Copyright (C) 2012-2013 Free Software Foundation, Inc. + Copyright (C) 2012-2015 Free Software Foundation, Inc. Written by Ian Lance Taylor, Google. Redistribution and use in source and binary forms, with or without Index: src/external/gpl3/gcc/lib/libbacktrace/arch/mipseb/config.h diff -u src/external/gpl3/gcc/lib/libbacktrace/arch/mipseb/config.h:1.3 src/external/gpl3/gcc/lib/libbacktrace/arch/mipseb/config.h:1.4 --- src/external/gpl3/gcc/lib/libbacktrace/arch/mipseb/config.h:1.3 Sat Jan 10 22:59:34 2015 +++ src/external/gpl3/gcc/lib/libbacktrace/arch/mipseb/config.h Tue Mar 22 05:04:41 2016 @@ -1,5 +1,5 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.79 2014/05/29 16:27:50 skrll Exp */ +/* Generated from: NetBSD: mknative-gcc,v 1.87 2016/03/17 23:41:21 mrg Exp */ /* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp */ /* config.h. Generated from config.h.in by configure. */ @@ -8,6 +8,9 @@ /* ELF size: 32 or 64 */ #define BACKTRACE_ELF_SIZE 32 +/* Define to 1 if you have the __atomic functions */
CVS commit: src/external/gpl3/gcc/lib/libstdc++-v3
Module Name:src Committed By: mrg Date: Tue Mar 22 04:53:17 UTC 2016 Modified Files: src/external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire: defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64: defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000: defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k: defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb: defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el: defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb: defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/or1k: defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64: defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv32: defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64: defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3eb: defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax: defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/include/bits: Makefile Log Message: hand-edit some not-yet-regenerated files that break the libstdc++ includes during mknative. To generate a diff of this commit: cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire/defs.mk cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/ia64/defs.mk cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68000/defs.mk cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/m68k/defs.mk cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64eb/defs.mk cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mips64el/defs.mk cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipseb/defs.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/or1k/defs.mk cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/powerpc64/defs.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv32/defs.mk cvs rdiff -u -r1.1 -r1.2 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/riscv64/defs.mk cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/sh3eb/defs.mk cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/vax/defs.mk cvs rdiff -u -r1.17 -r1.18 \ src/external/gpl3/gcc/lib/libstdc++-v3/include/bits/Makefile 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/lib/libstdc++-v3/arch/coldfire/defs.mk diff -u src/external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire/defs.mk:1.2 src/external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire/defs.mk:1.3 --- src/external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire/defs.mk:1.2 Sat Mar 1 10:00:45 2014 +++ src/external/gpl3/gcc/lib/libstdc++-v3/arch/coldfire/defs.mk Tue Mar 22 04:53:16 2016 @@ -36,7 +36,7 @@ G_pb_headers4=ext/pb_ds/detail/hash_fn/s G_pb_headers5=ext/pb_ds/detail/ov_tree_map_/policy_access_fn_imps.hpp ext/pb_ds/detail/ov_tree_map_/split_join_fn_imps.hpp ext/pb_ds/detail/ov_tree_map_/traits.hpp ext/pb_ds/detail/pairing_heap_/constructors_destructor_fn_imps.hpp ext/pb_ds/detail/pairing_heap_/debug_fn_imps.hpp ext/pb_ds/detail/pairing_heap_/erase_fn_imps.hpp ext/pb_ds/detail/pairing_heap_/find_fn_imps.hpp ext/pb_ds/detail/pairing_heap_/insert_fn_imps.hpp ext/pb_ds/detail/pairing_heap_/pairing_heap_.hpp ext/pb_ds/detail/pairing_heap_/split_join_fn_imps.hpp ext/pb_ds/detail/pat_trie_/constructors_destructor_fn_imps.hpp ext/pb_ds/detail/pat_trie_/debug_fn_imps.hpp ext/pb_ds/detail/pat_trie_/erase_fn_imps.hpp ext/pb_ds/detail/pat_trie_/find_fn_imps.hpp ext/pb_ds/detail/pat_trie_/info_fn_imps.hpp ext/pb_ds/detail/pat_trie_/insert_join_fn_imps.hpp ext/pb_ds/detail/pat_trie_/iterators_fn_imps.hpp ext/pb_ds/detail/pat_trie_/pat_trie_.hpp ext/pb_ds/detail/pat_trie_/pat_trie_base.hpp ext/pb_ds/detail/pat_trie_/policy_access _fn_imps.hpp ext/pb_ds/detail/pat_trie_/r_erase_fn_imps.hpp ext/pb_ds/detail/pat_trie_/rotate_fn_imps.hpp ext/pb_ds/detail/pat_trie_/split_fn_imps.hpp ext/pb_ds/detail/pat_trie_/synth_access_traits.hpp ext/pb_ds/detail/pat_trie_/trace_fn_imps.hpp ext/pb_ds/detail/pat_trie_/traits.hpp ext/pb_ds/detail/pat_trie_/update_fn_imps.hpp ext/pb_ds/detail/priority_queue_base_dispatch.hpp ext/pb_ds/detail/rb_tree_map_/constructors_destructor_fn_imps.hpp ext/pb_ds/detail/rb_tree_map_/debug_fn_imps.hpp G_pb_headers6=ext/pb_ds/detail/rb_tree_map_/erase_fn_imps.hpp ext/pb_ds/detail/rb_tree_map_/find_fn_imps.hpp ext/pb_ds/detail/rb_tree_map_/info_fn_imps.hpp ext/pb_ds/detail/rb_tree_map_/insert_fn_imps.hpp ext/pb_ds/detail/rb_tree_map_/node.hpp ext/pb_ds/detail/rb_tree_map_/rb_tree_.hpp ext/pb_ds/detail/rb_tree_map_/split_join_fn_imps.hpp ext/pb_ds/detail/rb_tree_map_/traits.hpp ext/pb_ds/detail/rc_binomial_heap_/constructors_destructor_fn_imps.hpp
CVS commit: src/external/gpl3/gcc
Module Name:src Committed By: mrg Date: Tue Mar 22 04:50:50 UTC 2016 Modified Files: src/external/gpl3/gcc/lib/libbacktrace/arch/mipsel: backtrace-supported.h config.h src/external/gpl3/gcc/lib/libgcc/arch/mipsel: defs.mk src/external/gpl3/gcc/lib/libgomp/arch/mipsel: config.h libgomp.spec libgomp_f.h omp.h src/external/gpl3/gcc/lib/libiberty/arch/mipsel: config.h src/external/gpl3/gcc/lib/libobjc/arch/mipsel: defs.mk src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel: c++config.h cxxabi_tweaks.h defs.mk gstdint.h gthr-posix.h gthr-single.h gthr.h src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel: auto-host.h bversion.h configargs.h defs.mk gtyp-input.list plugin-version.h src/external/gpl3/gcc/usr.bin/libcpp/arch/mipsel: config.h Log Message: mknative-gcc for GCC 5.3 and mipsel. To generate a diff of this commit: cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/lib/libbacktrace/arch/mipsel/backtrace-supported.h \ src/external/gpl3/gcc/lib/libbacktrace/arch/mipsel/config.h cvs rdiff -u -r1.2 -r1.3 src/external/gpl3/gcc/lib/libgcc/arch/mipsel/defs.mk cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/lib/libgomp/arch/mipsel/config.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libgomp/arch/mipsel/libgomp.spec \ src/external/gpl3/gcc/lib/libgomp/arch/mipsel/libgomp_f.h \ src/external/gpl3/gcc/lib/libgomp/arch/mipsel/omp.h cvs rdiff -u -r1.3 -r1.4 \ src/external/gpl3/gcc/lib/libiberty/arch/mipsel/config.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libobjc/arch/mipsel/defs.mk cvs rdiff -u -r1.15 -r1.16 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/c++config.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/cxxabi_tweaks.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/defs.mk \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/gthr-posix.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/gthr-single.h \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/gthr.h cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gcc/lib/libstdc++-v3/arch/mipsel/gstdint.h cvs rdiff -u -r1.6 -r1.7 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel/auto-host.h cvs rdiff -u -r1.5 -r1.6 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel/bversion.h cvs rdiff -u -r1.17 -r1.18 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel/configargs.h cvs rdiff -u -r1.9 -r1.10 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel/defs.mk cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel/gtyp-input.list cvs rdiff -u -r1.8 -r1.9 \ src/external/gpl3/gcc/usr.bin/gcc/arch/mipsel/plugin-version.h cvs rdiff -u -r1.2 -r1.3 \ src/external/gpl3/gcc/usr.bin/libcpp/arch/mipsel/config.h 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/lib/libbacktrace/arch/mipsel/backtrace-supported.h diff -u src/external/gpl3/gcc/lib/libbacktrace/arch/mipsel/backtrace-supported.h:1.3 src/external/gpl3/gcc/lib/libbacktrace/arch/mipsel/backtrace-supported.h:1.4 --- src/external/gpl3/gcc/lib/libbacktrace/arch/mipsel/backtrace-supported.h:1.3 Sat Jan 10 22:59:34 2015 +++ src/external/gpl3/gcc/lib/libbacktrace/arch/mipsel/backtrace-supported.h Tue Mar 22 04:50:50 2016 @@ -1,9 +1,9 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.79 2014/05/29 16:27:50 skrll Exp */ +/* Generated from: NetBSD: mknative-gcc,v 1.87 2016/03/17 23:41:21 mrg Exp */ /* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp */ /* backtrace-supported.h.in -- Whether stack backtrace is supported. - Copyright (C) 2012-2013 Free Software Foundation, Inc. + Copyright (C) 2012-2015 Free Software Foundation, Inc. Written by Ian Lance Taylor, Google. Redistribution and use in source and binary forms, with or without Index: src/external/gpl3/gcc/lib/libbacktrace/arch/mipsel/config.h diff -u src/external/gpl3/gcc/lib/libbacktrace/arch/mipsel/config.h:1.3 src/external/gpl3/gcc/lib/libbacktrace/arch/mipsel/config.h:1.4 --- src/external/gpl3/gcc/lib/libbacktrace/arch/mipsel/config.h:1.3 Sat Jan 10 22:59:34 2015 +++ src/external/gpl3/gcc/lib/libbacktrace/arch/mipsel/config.h Tue Mar 22 04:50:50 2016 @@ -1,5 +1,5 @@ /* This file is automatically generated. DO NOT EDIT! */ -/* Generated from: NetBSD: mknative-gcc,v 1.79 2014/05/29 16:27:50 skrll Exp */ +/* Generated from: NetBSD: mknative-gcc,v 1.87 2016/03/17 23:41:21 mrg Exp */ /* Generated from: NetBSD: mknative.common,v 1.11 2014/02/17 21:39:43 christos Exp */ /* config.h. Generated from config.h.in by configure. */ @@ -8,6 +8,9 @@ /* ELF size: 32 or 64 */ #define BACKTRACE_ELF_SIZE 32 +/* Define to 1 if you have the __atomic functions */ +#define HAVE_ATOMIC_FUNCTIONS
CVS commit: src/sys/arch/pmax/pmax
Module Name:src
Committed By: mrg
Date: Tue Mar 22 04:48:25 UTC 2016
Modified Files:
src/sys/arch/pmax/pmax: dec_3maxplus.c
Log Message:
revert part of rev 1.66 that converted a tri-state variable into
a bool while leaving a comparision against "< 3".
To generate a diff of this commit:
cvs rdiff -u -r1.70 -r1.71 src/sys/arch/pmax/pmax/dec_3maxplus.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/pmax/pmax/dec_3maxplus.c
diff -u src/sys/arch/pmax/pmax/dec_3maxplus.c:1.70 src/sys/arch/pmax/pmax/dec_3maxplus.c:1.71
--- src/sys/arch/pmax/pmax/dec_3maxplus.c:1.70 Mon Mar 24 19:31:40 2014
+++ src/sys/arch/pmax/pmax/dec_3maxplus.c Tue Mar 22 04:48:25 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: dec_3maxplus.c,v 1.70 2014/03/24 19:31:40 christos Exp $ */
+/* $NetBSD: dec_3maxplus.c,v 1.71 2016/03/22 04:48:25 mrg Exp $ */
/*
* Copyright (c) 1998 Jonathan Stone. All rights reserved.
@@ -70,7 +70,7 @@
#define __INTR_PRIVATE
#include
-__KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.70 2014/03/24 19:31:40 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dec_3maxplus.c,v 1.71 2016/03/22 04:48:25 mrg Exp $");
#include
#include
@@ -289,7 +289,7 @@ dec_3maxplus_intr_establish(device_t dev
static void
dec_3maxplus_ioasic_intr(void)
{
- static bool warned = false;
+ static int warned = 0;
bool ifound;
uint32_t imsk, intr, can_serve, xxxintr;
@@ -309,10 +309,10 @@ dec_3maxplus_ioasic_intr(void)
if (warned && !(can_serve & KN03_INTR_PSWARN)) {
printf("%s\n", "Power supply ok now.");
- warned = false;
+ warned = 0;
}
if ((can_serve & KN03_INTR_PSWARN) && (warned < 3)) {
- warned = true;
+ warned++;
printf("%s\n", "Power supply overheating");
}
CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Tue Mar 22 01:38:17 UTC 2016
Modified Files:
src/lib/libedit: terminal.c
Log Message:
put back NUL check (Ingo Schwarze)
To generate a diff of this commit:
cvs rdiff -u -r1.23 -r1.24 src/lib/libedit/terminal.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/terminal.c
diff -u src/lib/libedit/terminal.c:1.23 src/lib/libedit/terminal.c:1.24
--- src/lib/libedit/terminal.c:1.23 Wed Mar 2 14:24:20 2016
+++ src/lib/libedit/terminal.c Mon Mar 21 21:38:17 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: terminal.c,v 1.23 2016/03/02 19:24:20 christos Exp $ */
+/* $NetBSD: terminal.c,v 1.24 2016/03/22 01:38:17 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)term.c 8.2 (Berkeley) 4/30/95";
#else
-__RCSID("$NetBSD: terminal.c,v 1.23 2016/03/02 19:24:20 christos Exp $");
+__RCSID("$NetBSD: terminal.c,v 1.24 2016/03/22 01:38:17 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -378,7 +378,7 @@ terminal_alloc(EditLine *el, const struc
*/
tlen = 0;
for (tmp = tlist; tmp < [T_str]; tmp++)
- if (*tmp != NULL && *tmp != *str) {
+ if (*tmp != NULL && **tmp != '\0' && *tmp != *str) {
char *ptr;
for (ptr = *tmp; *ptr != '\0'; termbuf[tlen++] = *ptr++)
CVS commit: src/lib/libedit
Module Name:src
Committed By: christos
Date: Tue Mar 22 01:34:32 UTC 2016
Modified Files:
src/lib/libedit: tty.c
Log Message:
Fix reversed condition in tty_end() (Ingo Schwarze)
Also don't succeed if calling setup twice.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.59 src/lib/libedit/tty.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/lib/libedit/tty.c
diff -u src/lib/libedit/tty.c:1.58 src/lib/libedit/tty.c:1.59
--- src/lib/libedit/tty.c:1.58 Sat Feb 27 13:13:21 2016
+++ src/lib/libedit/tty.c Mon Mar 21 21:34:32 2016
@@ -1,4 +1,4 @@
-/* $NetBSD: tty.c,v 1.58 2016/02/27 18:13:21 christos Exp $ */
+/* $NetBSD: tty.c,v 1.59 2016/03/22 01:34:32 christos Exp $ */
/*-
* Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
#if 0
static char sccsid[] = "@(#)tty.c 8.1 (Berkeley) 6/4/93";
#else
-__RCSID("$NetBSD: tty.c,v 1.58 2016/02/27 18:13:21 christos Exp $");
+__RCSID("$NetBSD: tty.c,v 1.59 2016/03/22 01:34:32 christos Exp $");
#endif
#endif /* not lint && not SCCSID */
@@ -498,10 +498,12 @@ tty_setup(EditLine *el)
{
int rst = 1;
- el->el_tty.t_initialized = 0;
if (el->el_flags & EDIT_DISABLED)
return 0;
+ if (el->el_tty.t_initialized)
+ return -1;
+
if (!isatty(el->el_outfd)) {
#ifdef DEBUG_TTY
(void) fprintf(el->el_errfile, "%s: isatty: %s\n", __func__,
@@ -571,6 +573,7 @@ tty_init(EditLine *el)
el->el_tty.t_mode = EX_IO;
el->el_tty.t_vdisable = _POSIX_VDISABLE;
+ el->el_tty.t_initialized = 0;
(void) memcpy(el->el_tty.t_t, ttyperm, sizeof(ttyperm_t));
(void) memcpy(el->el_tty.t_c, ttychar, sizeof(ttychar_t));
return tty_setup(el);
@@ -587,7 +590,7 @@ tty_end(EditLine *el)
if (el->el_flags & EDIT_DISABLED)
return;
- if (el->el_tty.t_initialized)
+ if (!el->el_tty.t_initialized)
return;
if (tty_setty(el, TCSAFLUSH, >el_tty.t_or) == -1) {
CVS commit: src/sys/compat/netbsd32
Module Name:src Committed By: mrg Date: Mon Mar 21 22:42:56 UTC 2016 Modified Files: src/sys/compat/netbsd32: netbsd32_fs.c Log Message: avoid some stupid GCC errors seen only with -Os and -O3. To generate a diff of this commit: cvs rdiff -u -r1.73 -r1.74 src/sys/compat/netbsd32/netbsd32_fs.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/sys/compat/netbsd32/netbsd32_fs.c diff -u src/sys/compat/netbsd32/netbsd32_fs.c:1.73 src/sys/compat/netbsd32/netbsd32_fs.c:1.74 --- src/sys/compat/netbsd32/netbsd32_fs.c:1.73 Fri Oct 23 19:40:10 2015 +++ src/sys/compat/netbsd32/netbsd32_fs.c Mon Mar 21 22:42:56 2016 @@ -1,4 +1,4 @@ -/* $NetBSD: netbsd32_fs.c,v 1.73 2015/10/23 19:40:10 maxv Exp $ */ +/* $NetBSD: netbsd32_fs.c,v 1.74 2016/03/21 22:42:56 mrg Exp $ */ /* * Copyright (c) 1998, 2001 Matthew R. Green @@ -27,7 +27,7 @@ */ #include -__KERNEL_RCSID(0, "$NetBSD: netbsd32_fs.c,v 1.73 2015/10/23 19:40:10 maxv Exp $"); +__KERNEL_RCSID(0, "$NetBSD: netbsd32_fs.c,v 1.74 2016/03/21 22:42:56 mrg Exp $"); #include #include @@ -1236,7 +1236,7 @@ netbsd32_utimensat(struct lwp *l, const syscallarg(netbsd32_timespecp_t) tptr; syscallarg(int) flag; } */ - struct timespec ts[2], *tsp; + struct timespec ts[2], *tsp = NULL /* XXXgcc */; int follow; int error; @@ -1334,7 +1334,7 @@ netbsd32_futimens(struct lwp *l, const s syscallarg(int) fd; syscallarg(netbsd32_timespecp_t) tptr; } */ - struct timespec ts[2], *tsp; + struct timespec ts[2], *tsp = NULL /* XXXgcc */; file_t *fp; int error;
CVS commit: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64
Module Name:src Committed By: christos Date: Mon Mar 21 19:13:15 UTC 2016 Modified Files: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64: sha1-x86_64.S x86_64cpuid.S Log Message: regen with old assembly stubs. To generate a diff of this commit: cvs rdiff -u -r1.9 -r1.10 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S cvs rdiff -u -r1.5 -r1.6 \ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/x86_64cpuid.S Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. Modified files: Index: src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S diff -u src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.9 src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.10 --- src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S:1.9 Sun Mar 20 18:27:44 2016 +++ src/crypto/external/bsd/openssl/lib/libcrypto/arch/x86_64/sha1-x86_64.S Mon Mar 21 15:13:15 2016 @@ -6,37 +6,27 @@ .type sha1_block_data_order,@function .align 16 sha1_block_data_order: - movl OPENSSL_ia32cap_P+0@GOTPCREL(%rip),%r9d - movl OPENSSL_ia32cap_P+4@GOTPCREL(%rip),%r8d - movl OPENSSL_ia32cap_P+8@GOTPCREL(%rip),%r10d - testl $512,%r8d - jz .Lialu - testl $536870912,%r10d - jnz _shaext_shortcut - andl $296,%r10d - cmpl $296,%r10d - je _avx2_shortcut - andl $268435456,%r8d - andl $1073741824,%r9d - orl %r9d,%r8d - cmpl $1342177280,%r8d - je _avx_shortcut + movq OPENSSL_ia32cap_P+0@GOTPCREL(%rip),%r8 + movl 4(%r8),%r8d + btl $9,%r8d + jnc .Lialu + btl $28,%r8d + jc _avx_shortcut jmp _ssse3_shortcut .align 16 .Lialu: - movq %rsp,%rax pushq %rbx pushq %rbp pushq %r12 pushq %r13 - pushq %r14 + movq %rsp,%r11 movq %rdi,%r8 subq $72,%rsp movq %rsi,%r9 andq $-64,%rsp movq %rdx,%r10 - movq %rax,64(%rsp) + movq %r11,64(%rsp) .Lprologue: movl 0(%r8),%esi @@ -50,1168 +40,1230 @@ sha1_block_data_order: .Lloop: movl 0(%r9),%edx bswapl %edx - movl 4(%r9),%ebp - movl %r12d,%eax movl %edx,0(%rsp) + movl %r11d,%eax + movl 4(%r9),%ebp movl %esi,%ecx + xorl %r12d,%eax bswapl %ebp - xorl %r11d,%eax roll $5,%ecx - andl %edi,%eax leal 1518500249(%rdx,%r13,1),%r13d + andl %edi,%eax + movl %ebp,4(%rsp) addl %ecx,%r13d xorl %r12d,%eax roll $30,%edi addl %eax,%r13d - movl 8(%r9),%r14d - movl %r11d,%eax - movl %ebp,4(%rsp) + movl %edi,%eax + movl 8(%r9),%edx movl %r13d,%ecx - bswapl %r14d - xorl %edi,%eax + xorl %r11d,%eax + bswapl %edx roll $5,%ecx - andl %esi,%eax leal 1518500249(%rbp,%r12,1),%r12d + andl %esi,%eax + movl %edx,8(%rsp) addl %ecx,%r12d xorl %r11d,%eax roll $30,%esi addl %eax,%r12d - movl 12(%r9),%edx - movl %edi,%eax - movl %r14d,8(%rsp) + movl %esi,%eax + movl 12(%r9),%ebp movl %r12d,%ecx - bswapl %edx - xorl %esi,%eax + xorl %edi,%eax + bswapl %ebp roll $5,%ecx + leal 1518500249(%rdx,%r11,1),%r11d andl %r13d,%eax - leal 1518500249(%r14,%r11,1),%r11d + movl %ebp,12(%rsp) addl %ecx,%r11d xorl %edi,%eax roll $30,%r13d addl %eax,%r11d - movl 16(%r9),%ebp - movl %esi,%eax - movl %edx,12(%rsp) + movl %r13d,%eax + movl 16(%r9),%edx movl %r11d,%ecx - bswapl %ebp - xorl %r13d,%eax + xorl %esi,%eax + bswapl %edx roll $5,%ecx + leal 1518500249(%rbp,%rdi,1),%edi andl %r12d,%eax - leal 1518500249(%rdx,%rdi,1),%edi + movl %edx,16(%rsp) addl %ecx,%edi xorl %esi,%eax roll $30,%r12d addl %eax,%edi - movl 20(%r9),%r14d - movl %r13d,%eax - movl %ebp,16(%rsp) + movl %r12d,%eax + movl 20(%r9),%ebp movl %edi,%ecx - bswapl %r14d - xorl %r12d,%eax + xorl %r13d,%eax + bswapl %ebp roll $5,%ecx + leal 1518500249(%rdx,%rsi,1),%esi andl %r11d,%eax - leal 1518500249(%rbp,%rsi,1),%esi + movl %ebp,20(%rsp) addl %ecx,%esi xorl %r13d,%eax roll $30,%r11d addl %eax,%esi + movl %r11d,%eax movl 24(%r9),%edx - movl %r12d,%eax - movl %r14d,20(%rsp) movl %esi,%ecx + xorl %r12d,%eax bswapl %edx - xorl %r11d,%eax roll $5,%ecx + leal 1518500249(%rbp,%r13,1),%r13d andl %edi,%eax - leal 1518500249(%r14,%r13,1),%r13d + movl %edx,24(%rsp) addl %ecx,%r13d xorl %r12d,%eax roll $30,%edi addl %eax,%r13d + movl %edi,%eax movl 28(%r9),%ebp - movl %r11d,%eax - movl %edx,24(%rsp) movl %r13d,%ecx + xorl %r11d,%eax bswapl %ebp - xorl %edi,%eax roll $5,%ecx - andl %esi,%eax leal 1518500249(%rdx,%r12,1),%r12d + andl %esi,%eax + movl %ebp,28(%rsp) addl %ecx,%r12d xorl %r11d,%eax roll $30,%esi addl %eax,%r12d - movl 32(%r9),%r14d - movl %edi,%eax - movl %ebp,28(%rsp) + movl %esi,%eax + movl 32(%r9),%edx movl %r12d,%ecx - bswapl %r14d - xorl %esi,%eax + xorl %edi,%eax + bswapl %edx roll $5,%ecx - andl %r13d,%eax leal 1518500249(%rbp,%r11,1),%r11d + andl %r13d,%eax + movl %edx,32(%rsp) addl %ecx,%r11d xorl %edi,%eax roll $30,%r13d addl %eax,%r11d - movl 36(%r9),%edx - movl %esi,%eax - movl %r14d,32(%rsp) + movl %r13d,%eax + movl 36(%r9),%ebp movl
CVS commit: src/crypto/external/bsd/openssl/dist/crypto
Module Name:src
Committed By: christos
Date: Mon Mar 21 19:12:26 UTC 2016
Modified Files:
src/crypto/external/bsd/openssl/dist/crypto: x86_64cpuid.pl
src/crypto/external/bsd/openssl/dist/crypto/sha/asm: sha1-x86_64.pl
Log Message:
revert change from openssl-1.1.0-pre4, breaks gcc-4.8
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/crypto/external/bsd/openssl/dist/crypto/x86_64cpuid.pl
cvs rdiff -u -r1.4 -r1.5 \
src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/crypto/external/bsd/openssl/dist/crypto/x86_64cpuid.pl
diff -u src/crypto/external/bsd/openssl/dist/crypto/x86_64cpuid.pl:1.2 src/crypto/external/bsd/openssl/dist/crypto/x86_64cpuid.pl:1.3
--- src/crypto/external/bsd/openssl/dist/crypto/x86_64cpuid.pl:1.2 Sun Mar 20 18:26:56 2016
+++ src/crypto/external/bsd/openssl/dist/crypto/x86_64cpuid.pl Mon Mar 21 15:12:26 2016
@@ -24,7 +24,7 @@ print<<___;
call OPENSSL_cpuid_setup
.hidden OPENSSL_ia32cap_P
-.comm OPENSSL_ia32cap_P,16,4
+.comm OPENSSL_ia32cap_P,8,4
.text
@@ -53,13 +53,12 @@ OPENSSL_rdtsc:
.size OPENSSL_rdtsc,.-OPENSSL_rdtsc
.globl OPENSSL_ia32_cpuid
-.type OPENSSL_ia32_cpuid,\@function,1
+.type OPENSSL_ia32_cpuid,\@abi-omnipotent
.align 16
OPENSSL_ia32_cpuid:
mov %rbx,%r8 # save %rbx
xor %eax,%eax
- mov %eax,8(%rdi) # clear 3rd word
cpuid
mov %eax,%r11d # max value for standard query level
@@ -127,14 +126,6 @@ OPENSSL_ia32_cpuid:
shr \$14,%r10d
and \$0xfff,%r10d # number of cores -1 per L1D
- cmp \$7,%r11d
- jb .Lnocacheinfo
-
- mov \$7,%eax
- xor %ecx,%ecx
- cpuid
- mov %ebx,8(%rdi)
-
.Lnocacheinfo:
mov \$1,%eax
cpuid
@@ -174,7 +165,6 @@ OPENSSL_ia32_cpuid:
.Lclear_avx:
mov \$0xefffe7ff,%eax # ~(1<<28|1<<12|1<<11)
and %eax,%r9d # clear AVX, FMA and AMD XOP bits
- andl \$0xffdf,8(%rdi) # cleax AVX2, ~(1<<5)
.Ldone:
shl \$32,%r9
mov %r10d,%eax
@@ -273,96 +263,6 @@ OPENSSL_wipe_cpu:
ret
.size OPENSSL_wipe_cpu,.-OPENSSL_wipe_cpu
___
-{
-my $out="%r10";
-my $cnt="%rcx";
-my $max="%r11";
-my $lasttick="%r8d";
-my $lastdiff="%r9d";
-my $redzone=win64?8:-8;
-
-print<<___;
-.globl OPENSSL_instrument_bus
-.type OPENSSL_instrument_bus,\@abi-omnipotent
-.align 16
-OPENSSL_instrument_bus:
- mov $arg1,$out # tribute to Win64
- mov $arg2,$cnt
- mov $arg2,$max
-
- rdtsc # collect 1st tick
- mov %eax,$lasttick # lasttick = tick
- mov \$0,$lastdiff # lastdiff = 0
- clflush ($out)
- .byte 0xf0 # lock
- add $lastdiff,($out)
- jmp .Loop
-.align 16
-.Loop: rdtsc
- mov %eax,%edx
- sub $lasttick,%eax
- mov %edx,$lasttick
- mov %eax,$lastdiff
- clflush ($out)
- .byte 0xf0 # lock
- add %eax,($out)
- lea 4($out),$out
- sub \$1,$cnt
- jnz .Loop
-
- mov $max,%rax
- ret
-.size OPENSSL_instrument_bus,.-OPENSSL_instrument_bus
-
-.globl OPENSSL_instrument_bus2
-.type OPENSSL_instrument_bus2,\@abi-omnipotent
-.align 16
-OPENSSL_instrument_bus2:
- mov $arg1,$out # tribute to Win64
- mov $arg2,$cnt
- mov $arg3,$max
- mov $cnt,$redzone(%rsp)
-
- rdtsc # collect 1st tick
- mov %eax,$lasttick # lasttick = tick
- mov \$0,$lastdiff # lastdiff = 0
-
- clflush ($out)
- .byte 0xf0 # lock
- add $lastdiff,($out)
-
- rdtsc # collect 1st diff
- mov %eax,%edx
- sub $lasttick,%eax # diff
- mov %edx,$lasttick # lasttick = tick
- mov %eax,$lastdiff # lastdiff = diff
-.Loop2:
- clflush ($out)
- .byte 0xf0 # lock
- add %eax,($out) # accumulate diff
-
- sub \$1,$max
- jz .Ldone2
-
- rdtsc
- mov %eax,%edx
- sub $lasttick,%eax # diff
- mov %edx,$lasttick # lasttick = tick
- cmp $lastdiff,%eax
- mov %eax,$lastdiff # lastdiff = diff
- mov \$0,%edx
- setne %dl
- sub %rdx,$cnt # conditional --$cnt
- lea ($out,%rdx,4),$out # conditional ++$out
- jnz .Loop2
-
-.Ldone2:
- mov $redzone(%rsp),%rax
- sub $cnt,%rax
- ret
-.size OPENSSL_instrument_bus2,.-OPENSSL_instrument_bus2
-___
-}
print<<___;
.globl OPENSSL_ia32_rdrand
@@ -379,21 +279,6 @@ OPENSSL_ia32_rdrand:
cmove %rcx,%rax
ret
.size OPENSSL_ia32_rdrand,.-OPENSSL_ia32_rdrand
-
-.globl OPENSSL_ia32_rdseed
-.type OPENSSL_ia32_rdseed,\@abi-omnipotent
-.align 16
-OPENSSL_ia32_rdseed:
- mov \$8,%ecx
-.Loop_rdseed:
- rdseed %rax
- jc .Lbreak_rdseed
- loop .Loop_rdseed
-.Lbreak_rdseed:
- cmp \$0,%rax
- cmove %rcx,%rax
- ret
-.size OPENSSL_ia32_rdseed,.-OPENSSL_ia32_rdseed
___
close STDOUT; # flush
Index: src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl
diff -u src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl:1.4 src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl:1.5
--- src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl:1.4 Sun Mar 20 18:26:56 2016
+++ src/crypto/external/bsd/openssl/dist/crypto/sha/asm/sha1-x86_64.pl Mon Mar 21 15:12:26 2016
@@ -1,7 +1,7 @@
#!/usr/bin/env perl
#
#
