Added gcc-10.2.0 patches
This commit is contained in:
Said Musaev
Said Musaev
parent
5171ee8724
commit
bd450bc474
|
|
@ -0,0 +1 @@
|
||||||
|
8de0aecd3a52bb92b43082df8a9256356d1f03be gcc-10.2.0.tar.xz
|
||||||
|
|
@ -0,0 +1,26 @@
|
||||||
|
From bb1f45f53fc26714b30a14bcee55319d7c4cb1f7 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Said Musaev <cpu808694@gmail.com>
|
||||||
|
Date: Thu, 1 Oct 2020 14:32:12 +0200
|
||||||
|
Subject: [PATCH 01/14] ssp_non_shared
|
||||||
|
|
||||||
|
---
|
||||||
|
gcc/gcc.c | 3 ++-
|
||||||
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||||||
|
|
||||||
|
diff --git a/gcc/gcc.c b/gcc/gcc.c
|
||||||
|
index 9f790db0daf..e6887590ae2 100644
|
||||||
|
--- a/gcc/gcc.c
|
||||||
|
+++ b/gcc/gcc.c
|
||||||
|
@@ -877,7 +877,8 @@ proper position among the other output files. */
|
||||||
|
#ifndef LINK_SSP_SPEC
|
||||||
|
#ifdef TARGET_LIBC_PROVIDES_SSP
|
||||||
|
#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
|
||||||
|
- "|fstack-protector-strong|fstack-protector-explicit:}"
|
||||||
|
+ "|fstack-protector-strong|fstack-protector-explicit" \
|
||||||
|
+ ":-lssp_nonshared}"
|
||||||
|
#else
|
||||||
|
#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
|
||||||
|
"|fstack-protector-strong|fstack-protector-explicit" \
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
||||||
|
|
@ -0,0 +1,42 @@
|
||||||
|
From 9c14484ac34f8e155b1bec26abe8bd9309e8af59 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Said Musaev <cpu808694@gmail.com>
|
||||||
|
Date: Thu, 1 Oct 2020 14:33:52 +0200
|
||||||
|
Subject: [PATCH 02/14] posix_memalign
|
||||||
|
|
||||||
|
---
|
||||||
|
gcc/config/i386/pmm_malloc.h | 9 +++++----
|
||||||
|
1 file changed, 5 insertions(+), 4 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
|
||||||
|
index 87344d9383f..ece428df487 100644
|
||||||
|
--- a/gcc/config/i386/pmm_malloc.h
|
||||||
|
+++ b/gcc/config/i386/pmm_malloc.h
|
||||||
|
@@ -27,12 +27,13 @@
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
/* We can't depend on <stdlib.h> since the prototype of posix_memalign
|
||||||
|
- may not be visible. */
|
||||||
|
+ may not be visible and we can't pollute the namespace either. */
|
||||||
|
#ifndef __cplusplus
|
||||||
|
-extern int posix_memalign (void **, size_t, size_t);
|
||||||
|
+extern int _mm_posix_memalign (void **, size_t, size_t)
|
||||||
|
#else
|
||||||
|
-extern "C" int posix_memalign (void **, size_t, size_t) throw ();
|
||||||
|
+extern "C" int _mm_posix_memalign (void **, size_t, size_t) throw ()
|
||||||
|
#endif
|
||||||
|
+__asm__("posix_memalign");
|
||||||
|
|
||||||
|
static __inline void *
|
||||||
|
_mm_malloc (size_t __size, size_t __alignment)
|
||||||
|
@@ -42,7 +43,7 @@ _mm_malloc (size_t __size, size_t __alignment)
|
||||||
|
return malloc (__size);
|
||||||
|
if (__alignment == 2 || (sizeof (void *) == 8 && __alignment == 4))
|
||||||
|
__alignment = sizeof (void *);
|
||||||
|
- if (posix_memalign (&__ptr, __alignment, __size) == 0)
|
||||||
|
+ if (_mm_posix_memalign (&__ptr, __alignment, __size) == 0)
|
||||||
|
return __ptr;
|
||||||
|
else
|
||||||
|
return NULL;
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
||||||
|
|
@ -0,0 +1,72 @@
|
||||||
|
From 0198bee3c490b2beec24a411b7060be273924e1f Mon Sep 17 00:00:00 2001
|
||||||
|
From: Said Musaev <cpu808694@gmail.com>
|
||||||
|
Date: Thu, 1 Oct 2020 14:34:55 +0200
|
||||||
|
Subject: [PATCH 03/14] libitm-test-fix
|
||||||
|
|
||||||
|
---
|
||||||
|
libitm/testsuite/Makefile.am | 6 ++++++
|
||||||
|
libitm/testsuite/Makefile.in | 5 +++++
|
||||||
|
libitm/testsuite/lib/libitm.exp | 3 +++
|
||||||
|
3 files changed, 14 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/libitm/testsuite/Makefile.am b/libitm/testsuite/Makefile.am
|
||||||
|
index 41cfbc46e4b..16f82bdf691 100644
|
||||||
|
--- a/libitm/testsuite/Makefile.am
|
||||||
|
+++ b/libitm/testsuite/Makefile.am
|
||||||
|
@@ -11,3 +11,9 @@ EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \
|
||||||
|
_RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
|
||||||
|
echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
|
||||||
|
RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS)
|
||||||
|
+
|
||||||
|
+EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
|
||||||
|
+
|
||||||
|
+extra.exp:
|
||||||
|
+ echo 'set BUILD_CC "$(CC)"' > $@.tmp
|
||||||
|
+ mv $@.tmp $@
|
||||||
|
diff --git a/libitm/testsuite/Makefile.in b/libitm/testsuite/Makefile.in
|
||||||
|
index 120696d1c25..18633fd748a 100644
|
||||||
|
--- a/libitm/testsuite/Makefile.in
|
||||||
|
+++ b/libitm/testsuite/Makefile.in
|
||||||
|
@@ -286,6 +286,7 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
|
||||||
|
echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
|
||||||
|
|
||||||
|
RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS)
|
||||||
|
+EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
|
||||||
|
all: all-am
|
||||||
|
|
||||||
|
.SUFFIXES:
|
||||||
|
@@ -493,6 +494,10 @@ uninstall-am:
|
||||||
|
.PRECIOUS: Makefile
|
||||||
|
|
||||||
|
|
||||||
|
+extra.exp:
|
||||||
|
+ echo 'set BUILD_CC "$(CC)"' > $@.tmp
|
||||||
|
+ mv $@.tmp $@
|
||||||
|
+
|
||||||
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||||
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||||
|
.NOEXPORT:
|
||||||
|
diff --git a/libitm/testsuite/lib/libitm.exp b/libitm/testsuite/lib/libitm.exp
|
||||||
|
index b3d247b9f98..47c2cd55dac 100644
|
||||||
|
--- a/libitm/testsuite/lib/libitm.exp
|
||||||
|
+++ b/libitm/testsuite/lib/libitm.exp
|
||||||
|
@@ -77,6 +77,7 @@ proc libitm_init { args } {
|
||||||
|
global ALWAYS_CFLAGS
|
||||||
|
global CFLAGS
|
||||||
|
global TOOL_EXECUTABLE TOOL_OPTIONS
|
||||||
|
+ global BUILD_CC
|
||||||
|
global GCC_UNDER_TEST
|
||||||
|
global TESTING_IN_BUILD_TREE
|
||||||
|
global target_triplet
|
||||||
|
@@ -92,6 +93,8 @@ proc libitm_init { args } {
|
||||||
|
if ![info exists GCC_UNDER_TEST] then {
|
||||||
|
if [info exists TOOL_EXECUTABLE] {
|
||||||
|
set GCC_UNDER_TEST $TOOL_EXECUTABLE
|
||||||
|
+ } elseif [info exists BUILD_CC] {
|
||||||
|
+ set GCC_UNDER_TEST $BUILD_CC
|
||||||
|
} else {
|
||||||
|
set GCC_UNDER_TEST "[find_gcc]"
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
||||||
|
|
@ -0,0 +1,72 @@
|
||||||
|
From b31c41313b956fa4bbe0c05792a1483c43eb5fc3 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Said Musaev <cpu808694@gmail.com>
|
||||||
|
Date: Thu, 1 Oct 2020 14:35:11 +0200
|
||||||
|
Subject: [PATCH 04/14] libvtv-test-fix
|
||||||
|
|
||||||
|
---
|
||||||
|
libvtv/testsuite/Makefile.am | 6 ++++++
|
||||||
|
libvtv/testsuite/Makefile.in | 5 +++++
|
||||||
|
libvtv/testsuite/lib/libvtv.exp | 3 +++
|
||||||
|
3 files changed, 14 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/libvtv/testsuite/Makefile.am b/libvtv/testsuite/Makefile.am
|
||||||
|
index 41cfbc46e4b..16f82bdf691 100644
|
||||||
|
--- a/libvtv/testsuite/Makefile.am
|
||||||
|
+++ b/libvtv/testsuite/Makefile.am
|
||||||
|
@@ -11,3 +11,9 @@ EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \
|
||||||
|
_RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
|
||||||
|
echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
|
||||||
|
RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS)
|
||||||
|
+
|
||||||
|
+EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
|
||||||
|
+
|
||||||
|
+extra.exp:
|
||||||
|
+ echo 'set BUILD_CC "$(CC)"' > $@.tmp
|
||||||
|
+ mv $@.tmp $@
|
||||||
|
diff --git a/libvtv/testsuite/Makefile.in b/libvtv/testsuite/Makefile.in
|
||||||
|
index cb804c442d6..6984c568260 100644
|
||||||
|
--- a/libvtv/testsuite/Makefile.in
|
||||||
|
+++ b/libvtv/testsuite/Makefile.in
|
||||||
|
@@ -281,6 +281,7 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
|
||||||
|
echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
|
||||||
|
|
||||||
|
RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS)
|
||||||
|
+EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
|
||||||
|
all: all-am
|
||||||
|
|
||||||
|
.SUFFIXES:
|
||||||
|
@@ -488,6 +489,10 @@ uninstall-am:
|
||||||
|
.PRECIOUS: Makefile
|
||||||
|
|
||||||
|
|
||||||
|
+extra.exp:
|
||||||
|
+ echo 'set BUILD_CC "$(CC)"' > $@.tmp
|
||||||
|
+ mv $@.tmp $@
|
||||||
|
+
|
||||||
|
# Tell versions [3.59,3.63) of GNU make to not export all variables.
|
||||||
|
# Otherwise a system limit (for SysV at least) may be exceeded.
|
||||||
|
.NOEXPORT:
|
||||||
|
diff --git a/libvtv/testsuite/lib/libvtv.exp b/libvtv/testsuite/lib/libvtv.exp
|
||||||
|
index 4b71c9ce7bc..ef06e4a3199 100644
|
||||||
|
--- a/libvtv/testsuite/lib/libvtv.exp
|
||||||
|
+++ b/libvtv/testsuite/lib/libvtv.exp
|
||||||
|
@@ -76,6 +76,7 @@ proc libvtv_init { args } {
|
||||||
|
global ALWAYS_CFLAGS
|
||||||
|
global CFLAGS
|
||||||
|
global TOOL_EXECUTABLE TOOL_OPTIONS
|
||||||
|
+ global BUILD_CC
|
||||||
|
global GCC_UNDER_TEST
|
||||||
|
global TESTING_IN_BUILD_TREE
|
||||||
|
global target_triplet
|
||||||
|
@@ -91,6 +92,8 @@ proc libvtv_init { args } {
|
||||||
|
if ![info exists GCC_UNDER_TEST] then {
|
||||||
|
if [info exists TOOL_EXECUTABLE] {
|
||||||
|
set GCC_UNDER_TEST $TOOL_EXECUTABLE
|
||||||
|
+ } elseif [info exists BUILD_CC] {
|
||||||
|
+ set GCC_UNDER_TEST $BUILD_CC
|
||||||
|
} else {
|
||||||
|
set GCC_UNDER_TEST "[find_gcc]"
|
||||||
|
}
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
||||||
|
|
@ -0,0 +1,363 @@
|
||||||
|
From 96ce04dd42a2cd87eff54c88ee6b4c616e953328 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Said Musaev <cpu808694@gmail.com>
|
||||||
|
Date: Thu, 1 Oct 2020 14:35:25 +0200
|
||||||
|
Subject: [PATCH 05/14] j2
|
||||||
|
|
||||||
|
---
|
||||||
|
gcc/config.gcc | 26 ++++++++++++---------
|
||||||
|
gcc/config/sh/sh.c | 7 ++++++
|
||||||
|
gcc/config/sh/sh.h | 15 +++++++++---
|
||||||
|
gcc/config/sh/sh.opt | 4 ++++
|
||||||
|
gcc/config/sh/sync.md | 54 +++++++++++++++++++++++++++++++++++++++++++
|
||||||
|
gcc/config/sh/t-sh | 10 ++++----
|
||||||
|
6 files changed, 98 insertions(+), 18 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/gcc/config.gcc b/gcc/config.gcc
|
||||||
|
index 6a349965c0a..39859a41e14 100644
|
||||||
|
--- a/gcc/config.gcc
|
||||||
|
+++ b/gcc/config.gcc
|
||||||
|
@@ -547,7 +547,7 @@ s390*-*-*)
|
||||||
|
extra_headers="s390intrin.h htmintrin.h htmxlintrin.h vecintrin.h"
|
||||||
|
;;
|
||||||
|
# Note the 'l'; we need to be able to match e.g. "shle" or "shl".
|
||||||
|
-sh[123456789lbe]*-*-* | sh-*-*)
|
||||||
|
+sh[123456789lbej]*-*-* | sh-*-*)
|
||||||
|
cpu_type=sh
|
||||||
|
extra_options="${extra_options} fused-madd.opt"
|
||||||
|
extra_objs="${extra_objs} sh_treg_combine.o sh-mem.o sh_optimize_sett_clrt.o"
|
||||||
|
@@ -3115,18 +3115,18 @@ s390x-ibm-tpf*)
|
||||||
|
extra_options="${extra_options} s390/tpf.opt"
|
||||||
|
tmake_file="${tmake_file} s390/t-s390"
|
||||||
|
;;
|
||||||
|
-sh-*-elf* | sh[12346l]*-*-elf* | \
|
||||||
|
- sh-*-linux* | sh[2346lbe]*-*-linux* | \
|
||||||
|
+sh-*-elf* | sh[12346lj]*-*-elf* | \
|
||||||
|
+ sh-*-linux* | sh[2346lbej]*-*-linux* | \
|
||||||
|
sh-*-netbsdelf* | shl*-*-netbsdelf*)
|
||||||
|
tmake_file="${tmake_file} sh/t-sh sh/t-elf"
|
||||||
|
if test x${with_endian} = x; then
|
||||||
|
case ${target} in
|
||||||
|
- sh[1234]*be-*-* | sh[1234]*eb-*-*) with_endian=big ;;
|
||||||
|
+ sh[j1234]*be-*-* | sh[j1234]*eb-*-*) with_endian=big ;;
|
||||||
|
shbe-*-* | sheb-*-*) with_endian=big,little ;;
|
||||||
|
sh[1234]l* | sh[34]*-*-linux*) with_endian=little ;;
|
||||||
|
shl* | sh*-*-linux* | \
|
||||||
|
sh-superh-elf) with_endian=little,big ;;
|
||||||
|
- sh[1234]*-*-*) with_endian=big ;;
|
||||||
|
+ sh[j1234]*-*-*) with_endian=big ;;
|
||||||
|
*) with_endian=big,little ;;
|
||||||
|
esac
|
||||||
|
fi
|
||||||
|
@@ -3193,6 +3193,7 @@ sh-*-elf* | sh[12346l]*-*-elf* | \
|
||||||
|
sh2a_nofpu*) sh_cpu_target=sh2a-nofpu ;;
|
||||||
|
sh2a*) sh_cpu_target=sh2a ;;
|
||||||
|
sh2e*) sh_cpu_target=sh2e ;;
|
||||||
|
+ shj2*) sh_cpu_target=shj2;;
|
||||||
|
sh2*) sh_cpu_target=sh2 ;;
|
||||||
|
*) sh_cpu_target=sh1 ;;
|
||||||
|
esac
|
||||||
|
@@ -3214,7 +3215,7 @@ sh-*-elf* | sh[12346l]*-*-elf* | \
|
||||||
|
sh2a-single-only | sh2a-single | sh2a-nofpu | sh2a | \
|
||||||
|
sh4a-single-only | sh4a-single | sh4a-nofpu | sh4a | sh4al | \
|
||||||
|
sh4-single-only | sh4-single | sh4-nofpu | sh4 | sh4-300 | \
|
||||||
|
- sh3e | sh3 | sh2e | sh2 | sh1) ;;
|
||||||
|
+ sh3e | sh3 | sh2e | sh2 | sh1 | shj2) ;;
|
||||||
|
"") sh_cpu_default=${sh_cpu_target} ;;
|
||||||
|
*) echo "with_cpu=$with_cpu not supported"; exit 1 ;;
|
||||||
|
esac
|
||||||
|
@@ -3223,9 +3224,9 @@ sh-*-elf* | sh[12346l]*-*-elf* | \
|
||||||
|
case ${target} in
|
||||||
|
sh[1234]*) sh_multilibs=${sh_cpu_target} ;;
|
||||||
|
sh-superh-*) sh_multilibs=m4,m4-single,m4-single-only,m4-nofpu ;;
|
||||||
|
- sh*-*-linux*) sh_multilibs=m1,m2,m2a,m3e,m4 ;;
|
||||||
|
+ sh*-*-linux*) sh_multilibs=m1,m2,m2a,m3e,m4,mj2 ;;
|
||||||
|
sh*-*-netbsd*) sh_multilibs=m3,m3e,m4 ;;
|
||||||
|
- *) sh_multilibs=m1,m2,m2e,m4,m4-single,m4-single-only,m2a,m2a-single ;;
|
||||||
|
+ *) sh_multilibs=m1,m2,m2e,m4,m4-single,m4-single-only,m2a,m2a-single,mj2 ;;
|
||||||
|
esac
|
||||||
|
if test x$with_fp = xno; then
|
||||||
|
sh_multilibs="`echo $sh_multilibs|sed -e s/m4/sh4-nofpu/ -e s/,m4-[^,]*//g -e s/,m[23]e// -e s/m2a,m2a-single/m2a-nofpu/ -e s/m5-..m....,//g`"
|
||||||
|
@@ -3240,7 +3241,8 @@ sh-*-elf* | sh[12346l]*-*-elf* | \
|
||||||
|
m1 | m2 | m2e | m3 | m3e | \
|
||||||
|
m4 | m4-single | m4-single-only | m4-nofpu | m4-300 |\
|
||||||
|
m4a | m4a-single | m4a-single-only | m4a-nofpu | m4al | \
|
||||||
|
- m2a | m2a-single | m2a-single-only | m2a-nofpu)
|
||||||
|
+ m2a | m2a-single | m2a-single-only | m2a-nofpu | \
|
||||||
|
+ mj2)
|
||||||
|
# TM_MULTILIB_CONFIG is used by t-sh for the non-endian multilib definition
|
||||||
|
# It is passed to MULTIILIB_OPTIONS verbatim.
|
||||||
|
TM_MULTILIB_CONFIG="${TM_MULTILIB_CONFIG}/${sh_multilib}"
|
||||||
|
@@ -3257,7 +3259,7 @@ sh-*-elf* | sh[12346l]*-*-elf* | \
|
||||||
|
done
|
||||||
|
TM_MULTILIB_CONFIG=`echo $TM_MULTILIB_CONFIG | sed 's:^/::'`
|
||||||
|
if test x${enable_incomplete_targets} = xyes ; then
|
||||||
|
- tm_defines="$tm_defines SUPPORT_SH1=1 SUPPORT_SH2E=1 SUPPORT_SH4=1 SUPPORT_SH4_SINGLE=1 SUPPORT_SH2A=1 SUPPORT_SH2A_SINGLE=1"
|
||||||
|
+ tm_defines="$tm_defines SUPPORT_SH1=1 SUPPORT_SH2E=1 SUPPORT_SH4=1 SUPPORT_SH4_SINGLE=1 SUPPORT_SH2A=1 SUPPORT_SH2A_SINGLE=1 SUPPORT_SHJ2=1"
|
||||||
|
fi
|
||||||
|
tm_file="$tm_file ./sysroot-suffix.h"
|
||||||
|
tmake_file="$tmake_file t-sysroot-suffix"
|
||||||
|
@@ -5042,6 +5044,8 @@ case "${target}" in
|
||||||
|
;;
|
||||||
|
m4a | m4a-single | m4a-single-only | m4a-nofpu | m4al)
|
||||||
|
;;
|
||||||
|
+ mj2)
|
||||||
|
+ ;;
|
||||||
|
*)
|
||||||
|
echo "Unknown CPU used in --with-cpu=$with_cpu, known values:" 1>&2
|
||||||
|
echo "m1 m2 m2e m3 m3e m4 m4-single m4-single-only m4-nofpu" 1>&2
|
||||||
|
@@ -5252,7 +5256,7 @@ case ${target} in
|
||||||
|
tmake_file="${cpu_type}/t-${cpu_type} ${tmake_file}"
|
||||||
|
;;
|
||||||
|
|
||||||
|
- sh[123456ble]*-*-* | sh-*-*)
|
||||||
|
+ sh[123456blej]*-*-* | sh-*-*)
|
||||||
|
c_target_objs="${c_target_objs} sh-c.o"
|
||||||
|
cxx_target_objs="${cxx_target_objs} sh-c.o"
|
||||||
|
;;
|
||||||
|
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
|
||||||
|
index 84c0ea025b4..f15552af011 100644
|
||||||
|
--- a/gcc/config/sh/sh.c
|
||||||
|
+++ b/gcc/config/sh/sh.c
|
||||||
|
@@ -686,6 +686,7 @@ parse_validate_atomic_model_option (const char* str)
|
||||||
|
model_names[sh_atomic_model::hard_llcs] = "hard-llcs";
|
||||||
|
model_names[sh_atomic_model::soft_tcb] = "soft-tcb";
|
||||||
|
model_names[sh_atomic_model::soft_imask] = "soft-imask";
|
||||||
|
+ model_names[sh_atomic_model::hard_cas] = "hard-cas";
|
||||||
|
|
||||||
|
const char* model_cdef_names[sh_atomic_model::num_models];
|
||||||
|
model_cdef_names[sh_atomic_model::none] = "NONE";
|
||||||
|
@@ -693,6 +694,7 @@ parse_validate_atomic_model_option (const char* str)
|
||||||
|
model_cdef_names[sh_atomic_model::hard_llcs] = "HARD_LLCS";
|
||||||
|
model_cdef_names[sh_atomic_model::soft_tcb] = "SOFT_TCB";
|
||||||
|
model_cdef_names[sh_atomic_model::soft_imask] = "SOFT_IMASK";
|
||||||
|
+ model_cdef_names[sh_atomic_model::hard_cas] = "HARD_CAS";
|
||||||
|
|
||||||
|
sh_atomic_model ret;
|
||||||
|
ret.type = sh_atomic_model::none;
|
||||||
|
@@ -771,6 +773,9 @@ got_mode_name:;
|
||||||
|
if (ret.type == sh_atomic_model::soft_imask && TARGET_USERMODE)
|
||||||
|
err_ret ("cannot use atomic model %s in user mode", ret.name);
|
||||||
|
|
||||||
|
+ if (ret.type == sh_atomic_model::hard_cas && !TARGET_SHJ2)
|
||||||
|
+ err_ret ("atomic model %s is only available J2 targets", ret.name);
|
||||||
|
+
|
||||||
|
return ret;
|
||||||
|
|
||||||
|
#undef err_ret
|
||||||
|
@@ -827,6 +832,8 @@ sh_option_override (void)
|
||||||
|
sh_cpu = PROCESSOR_SH2E;
|
||||||
|
if (TARGET_SH2A)
|
||||||
|
sh_cpu = PROCESSOR_SH2A;
|
||||||
|
+ if (TARGET_SHJ2)
|
||||||
|
+ sh_cpu = PROCESSOR_SHJ2;
|
||||||
|
if (TARGET_SH3)
|
||||||
|
sh_cpu = PROCESSOR_SH3;
|
||||||
|
if (TARGET_SH3E)
|
||||||
|
diff --git a/gcc/config/sh/sh.h b/gcc/config/sh/sh.h
|
||||||
|
index 8ab5455505c..6ffed6da403 100644
|
||||||
|
--- a/gcc/config/sh/sh.h
|
||||||
|
+++ b/gcc/config/sh/sh.h
|
||||||
|
@@ -85,6 +85,7 @@ extern int code_for_indirect_jump_scratch;
|
||||||
|
#define SUPPORT_SH4_SINGLE 1
|
||||||
|
#define SUPPORT_SH2A 1
|
||||||
|
#define SUPPORT_SH2A_SINGLE 1
|
||||||
|
+#define SUPPORT_SHJ2 1
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define TARGET_DIVIDE_CALL_DIV1 (sh_div_strategy == SH_DIV_CALL_DIV1)
|
||||||
|
@@ -117,6 +118,7 @@ extern int code_for_indirect_jump_scratch;
|
||||||
|
#define SELECT_SH4A_SINGLE_ONLY (MASK_SH4A | SELECT_SH4_SINGLE_ONLY)
|
||||||
|
#define SELECT_SH4A (MASK_SH4A | SELECT_SH4)
|
||||||
|
#define SELECT_SH4A_SINGLE (MASK_SH4A | SELECT_SH4_SINGLE)
|
||||||
|
+#define SELECT_SHJ2 (MASK_SHJ2 | SELECT_SH2)
|
||||||
|
|
||||||
|
#if SUPPORT_SH1
|
||||||
|
#define SUPPORT_SH2 1
|
||||||
|
@@ -124,6 +126,7 @@ extern int code_for_indirect_jump_scratch;
|
||||||
|
#if SUPPORT_SH2
|
||||||
|
#define SUPPORT_SH3 1
|
||||||
|
#define SUPPORT_SH2A_NOFPU 1
|
||||||
|
+#define SUPPORT_SHJ2 1
|
||||||
|
#endif
|
||||||
|
#if SUPPORT_SH3
|
||||||
|
#define SUPPORT_SH4_NOFPU 1
|
||||||
|
@@ -156,7 +159,7 @@ extern int code_for_indirect_jump_scratch;
|
||||||
|
#define MASK_ARCH (MASK_SH1 | MASK_SH2 | MASK_SH3 | MASK_SH_E | MASK_SH4 \
|
||||||
|
| MASK_HARD_SH2A | MASK_HARD_SH2A_DOUBLE | MASK_SH4A \
|
||||||
|
| MASK_HARD_SH4 | MASK_FPU_SINGLE \
|
||||||
|
- | MASK_FPU_SINGLE_ONLY)
|
||||||
|
+ | MASK_FPU_SINGLE_ONLY | MASK_SHJ2)
|
||||||
|
|
||||||
|
/* This defaults us to big-endian. */
|
||||||
|
#ifndef TARGET_ENDIAN_DEFAULT
|
||||||
|
@@ -231,7 +234,8 @@ extern int code_for_indirect_jump_scratch;
|
||||||
|
%{m2a-single:--isa=sh2a} \
|
||||||
|
%{m2a-single-only:--isa=sh2a} \
|
||||||
|
%{m2a-nofpu:--isa=sh2a-nofpu} \
|
||||||
|
-%{m4al:-dsp}"
|
||||||
|
+%{m4al:-dsp} \
|
||||||
|
+%{mj2:-isa=j2}"
|
||||||
|
|
||||||
|
#define ASM_SPEC SH_ASM_SPEC
|
||||||
|
|
||||||
|
@@ -347,6 +351,7 @@ struct sh_atomic_model
|
||||||
|
hard_llcs,
|
||||||
|
soft_tcb,
|
||||||
|
soft_imask,
|
||||||
|
+ hard_cas,
|
||||||
|
|
||||||
|
num_models
|
||||||
|
};
|
||||||
|
@@ -390,6 +395,9 @@ extern const sh_atomic_model& selected_atomic_model (void);
|
||||||
|
#define TARGET_ATOMIC_SOFT_IMASK \
|
||||||
|
(selected_atomic_model ().type == sh_atomic_model::soft_imask)
|
||||||
|
|
||||||
|
+#define TARGET_ATOMIC_HARD_CAS \
|
||||||
|
+ (selected_atomic_model ().type == sh_atomic_model::hard_cas)
|
||||||
|
+
|
||||||
|
#endif // __cplusplus
|
||||||
|
|
||||||
|
#define SUBTARGET_OVERRIDE_OPTIONS (void) 0
|
||||||
|
@@ -1484,7 +1492,7 @@ extern bool current_function_interrupt;
|
||||||
|
|
||||||
|
/* Nonzero if the target supports dynamic shift instructions
|
||||||
|
like shad and shld. */
|
||||||
|
-#define TARGET_DYNSHIFT (TARGET_SH3 || TARGET_SH2A)
|
||||||
|
+#define TARGET_DYNSHIFT (TARGET_SH3 || TARGET_SH2A || TARGET_SHJ2)
|
||||||
|
|
||||||
|
/* The cost of using the dynamic shift insns (shad, shld) are the same
|
||||||
|
if they are available. If they are not available a library function will
|
||||||
|
@@ -1747,6 +1755,7 @@ enum processor_type {
|
||||||
|
PROCESSOR_SH2,
|
||||||
|
PROCESSOR_SH2E,
|
||||||
|
PROCESSOR_SH2A,
|
||||||
|
+ PROCESSOR_SHJ2,
|
||||||
|
PROCESSOR_SH3,
|
||||||
|
PROCESSOR_SH3E,
|
||||||
|
PROCESSOR_SH4,
|
||||||
|
diff --git a/gcc/config/sh/sh.opt b/gcc/config/sh/sh.opt
|
||||||
|
index 908603b92e1..e6108dabbc6 100644
|
||||||
|
--- a/gcc/config/sh/sh.opt
|
||||||
|
+++ b/gcc/config/sh/sh.opt
|
||||||
|
@@ -65,6 +65,10 @@ m2e
|
||||||
|
Target RejectNegative Condition(SUPPORT_SH2E)
|
||||||
|
Generate SH2e code.
|
||||||
|
|
||||||
|
+mj2
|
||||||
|
+Target RejectNegative Mask(SHJ2) Condition(SUPPORT_SHJ2)
|
||||||
|
+Generate J2 code.
|
||||||
|
+
|
||||||
|
m3
|
||||||
|
Target RejectNegative Mask(SH3) Condition(SUPPORT_SH3)
|
||||||
|
Generate SH3 code.
|
||||||
|
diff --git a/gcc/config/sh/sync.md b/gcc/config/sh/sync.md
|
||||||
|
index 25f3b695d2f..55119386a18 100644
|
||||||
|
--- a/gcc/config/sh/sync.md
|
||||||
|
+++ b/gcc/config/sh/sync.md
|
||||||
|
@@ -240,6 +240,9 @@
|
||||||
|
|| (TARGET_SH4A && <MODE>mode == SImode && !TARGET_ATOMIC_STRICT))
|
||||||
|
atomic_insn = gen_atomic_compare_and_swap<mode>_hard (old_val, mem,
|
||||||
|
exp_val, new_val);
|
||||||
|
+ else if (TARGET_ATOMIC_HARD_CAS && <MODE>mode == SImode)
|
||||||
|
+ atomic_insn = gen_atomic_compare_and_swap<mode>_cas (old_val, mem,
|
||||||
|
+ exp_val, new_val);
|
||||||
|
else if (TARGET_ATOMIC_SOFT_GUSA)
|
||||||
|
atomic_insn = gen_atomic_compare_and_swap<mode>_soft_gusa (old_val, mem,
|
||||||
|
exp_val, new_val);
|
||||||
|
@@ -306,6 +309,57 @@
|
||||||
|
}
|
||||||
|
[(set_attr "length" "14")])
|
||||||
|
|
||||||
|
+(define_expand "atomic_compare_and_swapsi_cas"
|
||||||
|
+ [(set (match_operand:SI 0 "register_operand" "=r")
|
||||||
|
+ (unspec_volatile:SI
|
||||||
|
+ [(match_operand:SI 1 "atomic_mem_operand_0" "=Sra")
|
||||||
|
+ (match_operand:SI 2 "register_operand" "r")
|
||||||
|
+ (match_operand:SI 3 "register_operand" "r")]
|
||||||
|
+ UNSPECV_CMPXCHG_1))]
|
||||||
|
+ "TARGET_ATOMIC_HARD_CAS"
|
||||||
|
+{
|
||||||
|
+ rtx mem = gen_rtx_REG (SImode, 0);
|
||||||
|
+ emit_move_insn (mem, force_reg (SImode, XEXP (operands[1], 0)));
|
||||||
|
+ emit_insn (gen_shj2_cas (operands[0], mem, operands[2], operands[3]));
|
||||||
|
+ DONE;
|
||||||
|
+})
|
||||||
|
+
|
||||||
|
+(define_insn "shj2_cas"
|
||||||
|
+ [(set (match_operand:SI 0 "register_operand" "=&r")
|
||||||
|
+ (unspec_volatile:SI
|
||||||
|
+ [(match_operand:SI 1 "register_operand" "=r")
|
||||||
|
+ (match_operand:SI 2 "register_operand" "r")
|
||||||
|
+ (match_operand:SI 3 "register_operand" "0")]
|
||||||
|
+ UNSPECV_CMPXCHG_1))
|
||||||
|
+ (set (reg:SI T_REG)
|
||||||
|
+ (unspec_volatile:SI [(const_int 0)] UNSPECV_CMPXCHG_3))]
|
||||||
|
+ "TARGET_ATOMIC_HARD_CAS"
|
||||||
|
+ "cas.l %2,%0,@%1"
|
||||||
|
+ [(set_attr "length" "2")]
|
||||||
|
+)
|
||||||
|
+
|
||||||
|
+(define_expand "atomic_compare_and_swapqi_cas"
|
||||||
|
+ [(set (match_operand:SI 0 "arith_reg_dest" "=&r")
|
||||||
|
+ (unspec_volatile:SI
|
||||||
|
+ [(match_operand:SI 1 "atomic_mem_operand_0" "=Sra")
|
||||||
|
+ (match_operand:SI 2 "arith_operand" "rI08")
|
||||||
|
+ (match_operand:SI 3 "arith_operand" "rI08")]
|
||||||
|
+ UNSPECV_CMPXCHG_1))]
|
||||||
|
+ "TARGET_ATOMIC_HARD_CAS"
|
||||||
|
+{FAIL;}
|
||||||
|
+)
|
||||||
|
+
|
||||||
|
+(define_expand "atomic_compare_and_swaphi_cas"
|
||||||
|
+ [(set (match_operand:SI 0 "arith_reg_dest" "=&r")
|
||||||
|
+ (unspec_volatile:SI
|
||||||
|
+ [(match_operand:SI 1 "atomic_mem_operand_0" "=Sra")
|
||||||
|
+ (match_operand:SI 2 "arith_operand" "rI08")
|
||||||
|
+ (match_operand:SI 3 "arith_operand" "rI08")]
|
||||||
|
+ UNSPECV_CMPXCHG_1))]
|
||||||
|
+ "TARGET_ATOMIC_HARD_CAS"
|
||||||
|
+{FAIL;}
|
||||||
|
+)
|
||||||
|
+
|
||||||
|
;; The QIHImode llcs patterns modify the address register of the memory
|
||||||
|
;; operand. In order to express that, we have to open code the memory
|
||||||
|
;; operand. Initially the insn is expanded like every other atomic insn
|
||||||
|
diff --git a/gcc/config/sh/t-sh b/gcc/config/sh/t-sh
|
||||||
|
index a402359be72..dbd0bf992bf 100644
|
||||||
|
--- a/gcc/config/sh/t-sh
|
||||||
|
+++ b/gcc/config/sh/t-sh
|
||||||
|
@@ -50,7 +50,8 @@ MULTILIB_MATCHES = $(shell \
|
||||||
|
m2e,m3e,m4-single-only,m4-100-single-only,m4-200-single-only,m4-300-single-only,m4a-single-only \
|
||||||
|
m2a-single,m2a-single-only \
|
||||||
|
m4-single,m4-100-single,m4-200-single,m4-300-single,m4a-single \
|
||||||
|
- m4,m4-100,m4-200,m4-300,m4a; do \
|
||||||
|
+ m4,m4-100,m4-200,m4-300,m4a \
|
||||||
|
+ mj2; do \
|
||||||
|
subst= ; \
|
||||||
|
for lib in `echo $$abi|tr , ' '` ; do \
|
||||||
|
if test "`echo $$multilibs|sed s/$$lib//`" != "$$multilibs"; then \
|
||||||
|
@@ -63,9 +64,9 @@ MULTILIB_MATCHES = $(shell \
|
||||||
|
|
||||||
|
# SH1 and SH2A support big endian only.
|
||||||
|
ifeq ($(DEFAULT_ENDIAN),ml)
|
||||||
|
-MULTILIB_EXCEPTIONS = m1 ml/m1 m2a* ml/m2a* $(TM_MULTILIB_EXCEPTIONS_CONFIG)
|
||||||
|
+MULTILIB_EXCEPTIONS = m1 ml/m1 m2a* ml/m2a* ml/mj2 $(TM_MULTILIB_EXCEPTIONS_CONFIG)
|
||||||
|
else
|
||||||
|
-MULTILIB_EXCEPTIONS = ml/m1 ml/m2a* $(TM_MULTILIB_EXCEPTIONS_CONFIG)
|
||||||
|
+MULTILIB_EXCEPTIONS = ml/m1 ml/m2a* ml/mj2 $(TM_MULTILIB_EXCEPTIONS_CONFIG)
|
||||||
|
endif
|
||||||
|
|
||||||
|
MULTILIB_OSDIRNAMES = \
|
||||||
|
@@ -87,7 +88,8 @@ MULTILIB_OSDIRNAMES = \
|
||||||
|
m4a-single-only=!m4a-single-only $(OTHER_ENDIAN)/m4a-single-only=!$(OTHER_ENDIAN)/m4a-single-only \
|
||||||
|
m4a-single=!m4a-single $(OTHER_ENDIAN)/m4a-single=!$(OTHER_ENDIAN)/m4a-single \
|
||||||
|
m4a=!m4a $(OTHER_ENDIAN)/m4a=!$(OTHER_ENDIAN)/m4a \
|
||||||
|
- m4al=!m4al $(OTHER_ENDIAN)/m4al=!$(OTHER_ENDIAN)/m4al
|
||||||
|
+ m4al=!m4al $(OTHER_ENDIAN)/m4al=!$(OTHER_ENDIAN)/m4al \
|
||||||
|
+ mj2=!j2
|
||||||
|
|
||||||
|
$(out_object_file): gt-sh.h
|
||||||
|
gt-sh.h : s-gtype ; @true
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
||||||
|
|
@ -0,0 +1,106 @@
|
||||||
|
From c7ea8e99b57aa0d704230149b6502785778052ae Mon Sep 17 00:00:00 2001
|
||||||
|
From: Said Musaev <cpu808694@gmail.com>
|
||||||
|
Date: Thu, 1 Oct 2020 20:21:59 +0200
|
||||||
|
Subject: [PATCH 06/14] static-pie
|
||||||
|
|
||||||
|
---
|
||||||
|
gcc/common.opt | 4 ++--
|
||||||
|
gcc/config/gnu-user.h | 17 ++++++++---------
|
||||||
|
gcc/gcc.c | 6 +++---
|
||||||
|
3 files changed, 13 insertions(+), 14 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/gcc/common.opt b/gcc/common.opt
|
||||||
|
index 3ec7743eae8..5972cf3e062 100644
|
||||||
|
--- a/gcc/common.opt
|
||||||
|
+++ b/gcc/common.opt
|
||||||
|
@@ -3395,11 +3395,11 @@ Driver
|
||||||
|
|
||||||
|
no-pie
|
||||||
|
Driver RejectNegative Negative(shared)
|
||||||
|
-Don't create a dynamically linked position independent executable.
|
||||||
|
+Don't create a position independent executable.
|
||||||
|
|
||||||
|
pie
|
||||||
|
Driver RejectNegative Negative(no-pie)
|
||||||
|
-Create a dynamically linked position independent executable.
|
||||||
|
+Create a position independent executable.
|
||||||
|
|
||||||
|
static-pie
|
||||||
|
Driver RejectNegative Negative(pie)
|
||||||
|
diff --git a/gcc/config/gnu-user.h b/gcc/config/gnu-user.h
|
||||||
|
index ff2e880b1fa..bafde149202 100644
|
||||||
|
--- a/gcc/config/gnu-user.h
|
||||||
|
+++ b/gcc/config/gnu-user.h
|
||||||
|
@@ -51,13 +51,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||||
|
#define GNU_USER_TARGET_STARTFILE_SPEC \
|
||||||
|
"%{shared:; \
|
||||||
|
pg|p|profile:%{static-pie:grcrt1.o%s;:gcrt1.o%s}; \
|
||||||
|
- static:crt1.o%s; \
|
||||||
|
- static-pie:rcrt1.o%s; \
|
||||||
|
+ static|static-pie:%{" PIE_SPEC ":rcrt1.o%s;:crt1.o%s}; \
|
||||||
|
" PIE_SPEC ":Scrt1.o%s; \
|
||||||
|
:crt1.o%s} " \
|
||||||
|
GNU_USER_TARGET_CRTI " \
|
||||||
|
- %{static:crtbeginT.o%s; \
|
||||||
|
- shared|static-pie|" PIE_SPEC ":crtbeginS.o%s; \
|
||||||
|
+ %{shared|" PIE_SPEC ":crtbeginS.o%s; \
|
||||||
|
+ static:crtbeginT.o%s; \
|
||||||
|
:crtbegin.o%s} \
|
||||||
|
%{fvtable-verify=none:%s; \
|
||||||
|
fvtable-verify=preinit:vtv_start_preinit.o%s; \
|
||||||
|
@@ -73,11 +72,11 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||||
|
GNU userspace "finalizer" file, `crtn.o'. */
|
||||||
|
|
||||||
|
#define GNU_USER_TARGET_ENDFILE_SPEC \
|
||||||
|
- "%{!static:%{fvtable-verify=none:%s; \
|
||||||
|
+ "%{static|static-pie:; \
|
||||||
|
+ fvtable-verify=none:%s; \
|
||||||
|
fvtable-verify=preinit:vtv_end_preinit.o%s; \
|
||||||
|
- fvtable-verify=std:vtv_end.o%s}} \
|
||||||
|
- %{static:crtend.o%s; \
|
||||||
|
- shared|static-pie|" PIE_SPEC ":crtendS.o%s; \
|
||||||
|
+ fvtable-verify=std:vtv_end.o%s} \
|
||||||
|
+ %{shared|" PIE_SPEC ":crtendS.o%s; \
|
||||||
|
:crtend.o%s} " \
|
||||||
|
GNU_USER_TARGET_CRTN " " \
|
||||||
|
CRTOFFLOADEND
|
||||||
|
@@ -106,7 +105,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see
|
||||||
|
#define LIB_SPEC GNU_USER_TARGET_LIB_SPEC
|
||||||
|
|
||||||
|
#if defined(HAVE_LD_EH_FRAME_HDR)
|
||||||
|
-#define LINK_EH_SPEC "%{!static|static-pie:--eh-frame-hdr} "
|
||||||
|
+#define LINK_EH_SPEC "%{!static|" PIE_SPEC ":--eh-frame-hdr} "
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#define GNU_USER_TARGET_LINK_GCC_C_SEQUENCE_SPEC \
|
||||||
|
diff --git a/gcc/gcc.c b/gcc/gcc.c
|
||||||
|
index e6887590ae2..36bc52c015b 100644
|
||||||
|
--- a/gcc/gcc.c
|
||||||
|
+++ b/gcc/gcc.c
|
||||||
|
@@ -907,7 +907,7 @@ proper position among the other output files. */
|
||||||
|
#define NO_FPIE_AND_FPIC_SPEC NO_FPIE_SPEC "|" NO_FPIC_SPEC
|
||||||
|
#define FPIE_OR_FPIC_SPEC NO_FPIE_AND_FPIC_SPEC ":;"
|
||||||
|
#else
|
||||||
|
-#define PIE_SPEC "pie"
|
||||||
|
+#define PIE_SPEC "pie|static-pie"
|
||||||
|
#define FPIE1_SPEC "fpie"
|
||||||
|
#define NO_FPIE1_SPEC FPIE1_SPEC ":;"
|
||||||
|
#define FPIE2_SPEC "fPIE"
|
||||||
|
@@ -931,12 +931,12 @@ proper position among the other output files. */
|
||||||
|
#ifndef LINK_PIE_SPEC
|
||||||
|
#ifdef HAVE_LD_PIE
|
||||||
|
#ifndef LD_PIE_SPEC
|
||||||
|
-#define LD_PIE_SPEC "-pie"
|
||||||
|
+#define LD_PIE_SPEC "-pie %{static-pie:-static} %{static|static-pie:--no-dynamic-linker -z text -Bsymbolic}"
|
||||||
|
#endif
|
||||||
|
#else
|
||||||
|
#define LD_PIE_SPEC ""
|
||||||
|
#endif
|
||||||
|
-#define LINK_PIE_SPEC "%{static|shared|r:;" PIE_SPEC ":" LD_PIE_SPEC "} "
|
||||||
|
+#define LINK_PIE_SPEC "%{shared|r:;" PIE_SPEC ":" LD_PIE_SPEC "} "
|
||||||
|
#endif
|
||||||
|
|
||||||
|
#ifndef LINK_BUILDID_SPEC
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
||||||
|
|
@ -0,0 +1,32 @@
|
||||||
|
From 86bb9837e03382a6915ccadee6803daf367f2fd0 Mon Sep 17 00:00:00 2001
|
||||||
|
From: Said Musaev <cpu808694@gmail.com>
|
||||||
|
Date: Thu, 1 Oct 2020 20:22:20 +0200
|
||||||
|
Subject: [PATCH 07/14] libstdc++-futex
|
||||||
|
|
||||||
|
---
|
||||||
|
libstdc++-v3/src/c++11/futex.cc | 8 ++++++++
|
||||||
|
1 file changed, 8 insertions(+)
|
||||||
|
|
||||||
|
diff --git a/libstdc++-v3/src/c++11/futex.cc b/libstdc++-v3/src/c++11/futex.cc
|
||||||
|
index c9de11a7ec7..7be702dbeda 100644
|
||||||
|
--- a/libstdc++-v3/src/c++11/futex.cc
|
||||||
|
+++ b/libstdc++-v3/src/c++11/futex.cc
|
||||||
|
@@ -61,7 +61,15 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
|
||||||
|
struct timeval tv;
|
||||||
|
gettimeofday (&tv, NULL);
|
||||||
|
// Convert the absolute timeout value to a relative timeout
|
||||||
|
+#if defined(SYS_futex_time64)
|
||||||
|
+ struct
|
||||||
|
+ {
|
||||||
|
+ long tv_sec;
|
||||||
|
+ long tv_nsec;
|
||||||
|
+ } rt;
|
||||||
|
+#else
|
||||||
|
struct timespec rt;
|
||||||
|
+#endif
|
||||||
|
rt.tv_sec = __s.count() - tv.tv_sec;
|
||||||
|
rt.tv_nsec = __ns.count() - tv.tv_usec * 1000;
|
||||||
|
if (rt.tv_nsec < 0)
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
||||||
|
|
@ -0,0 +1,32 @@
|
||||||
|
From 48687213a92594885837d9b50a22d0776ad744cf Mon Sep 17 00:00:00 2001
|
||||||
|
From: Said Musaev <cpu808694@gmail.com>
|
||||||
|
Date: Thu, 1 Oct 2020 20:22:40 +0200
|
||||||
|
Subject: [PATCH 08/14] m68k-sqrt
|
||||||
|
|
||||||
|
---
|
||||||
|
gcc/config/m68k/m68k.md | 4 ++--
|
||||||
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/gcc/config/m68k/m68k.md b/gcc/config/m68k/m68k.md
|
||||||
|
index 8e35357ea23..65c8b10b3eb 100644
|
||||||
|
--- a/gcc/config/m68k/m68k.md
|
||||||
|
+++ b/gcc/config/m68k/m68k.md
|
||||||
|
@@ -4174,13 +4174,13 @@
|
||||||
|
(define_expand "sqrt<mode>2"
|
||||||
|
[(set (match_operand:FP 0 "nonimmediate_operand" "")
|
||||||
|
(sqrt:FP (match_operand:FP 1 "general_operand" "")))]
|
||||||
|
- "TARGET_HARD_FLOAT"
|
||||||
|
+ "(TARGET_68881 && TARGET_68040) || TARGET_COLDFIRE_FPU"
|
||||||
|
"")
|
||||||
|
|
||||||
|
(define_insn "sqrt<mode>2_68881"
|
||||||
|
[(set (match_operand:FP 0 "nonimmediate_operand" "=f")
|
||||||
|
(sqrt:FP (match_operand:FP 1 "general_operand" "f<FP:dreg>m")))]
|
||||||
|
- "TARGET_68881"
|
||||||
|
+ "TARGET_68881 && TARGET_68040"
|
||||||
|
{
|
||||||
|
if (FP_REG_P (operands[1]))
|
||||||
|
return "f<FP:round>sqrt%.x %1,%0";
|
||||||
|
--
|
||||||
|
2.28.0
|
||||||
|
|
||||||
Loading…
Reference in New Issue