Skip to content

Commit bd450bc

Browse files
saidganimsaidganim
committed
Added gcc-10.2.0 patches
1 parent 5171ee8 commit bd450bc

9 files changed

+746
-0
lines changed

‎hashes/gcc-10.2.0.tar.xz.sha1‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
8de0aecd3a52bb92b43082df8a9256356d1f03be gcc-10.2.0.tar.xz

‎patches/gcc-10.2.0/0001-ssp_non_shared.patch‎

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
From bb1f45f53fc26714b30a14bcee55319d7c4cb1f7 Mon Sep 17 00:00:00 2001
2+
From: Said Musaev <[email protected]>
3+
Date: Thu, 1 Oct 2020 14:32:12 +0200
4+
Subject: [PATCH 01/14] ssp_non_shared
5+
6+
---
7+
gcc/gcc.c | 3 ++-
8+
1 file changed, 2 insertions(+), 1 deletion(-)
9+
10+
diff --git a/gcc/gcc.c b/gcc/gcc.c
11+
index 9f790db0daf..e6887590ae2 100644
12+
--- a/gcc/gcc.c
13+
+++ b/gcc/gcc.c
14+
@@ -877,7 +877,8 @@ proper position among the other output files. */
15+
#ifndef LINK_SSP_SPEC
16+
#ifdef TARGET_LIBC_PROVIDES_SSP
17+
#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
18+
- "|fstack-protector-strong|fstack-protector-explicit:}"
19+
+ "|fstack-protector-strong|fstack-protector-explicit" \
20+
+ ":-lssp_nonshared}"
21+
#else
22+
#define LINK_SSP_SPEC "%{fstack-protector|fstack-protector-all" \
23+
"|fstack-protector-strong|fstack-protector-explicit" \
24+
--
25+
2.28.0
26+

‎patches/gcc-10.2.0/0002-posix_memalign.patch‎

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
From 9c14484ac34f8e155b1bec26abe8bd9309e8af59 Mon Sep 17 00:00:00 2001
2+
From: Said Musaev <[email protected]>
3+
Date: Thu, 1 Oct 2020 14:33:52 +0200
4+
Subject: [PATCH 02/14] posix_memalign
5+
6+
---
7+
gcc/config/i386/pmm_malloc.h | 9 +++++----
8+
1 file changed, 5 insertions(+), 4 deletions(-)
9+
10+
diff --git a/gcc/config/i386/pmm_malloc.h b/gcc/config/i386/pmm_malloc.h
11+
index 87344d9383f..ece428df487 100644
12+
--- a/gcc/config/i386/pmm_malloc.h
13+
+++ b/gcc/config/i386/pmm_malloc.h
14+
@@ -27,12 +27,13 @@
15+
#include <stdlib.h>
16+
17+
/* We can't depend on <stdlib.h> since the prototype of posix_memalign
18+
- may not be visible. */
19+
+ may not be visible and we can't pollute the namespace either. */
20+
#ifndef __cplusplus
21+
-extern int posix_memalign (void **, size_t, size_t);
22+
+extern int _mm_posix_memalign (void **, size_t, size_t)
23+
#else
24+
-extern "C" int posix_memalign (void **, size_t, size_t) throw ();
25+
+extern "C" int _mm_posix_memalign (void **, size_t, size_t) throw ()
26+
#endif
27+
+__asm__("posix_memalign");
28+
29+
static __inline void *
30+
_mm_malloc (size_t __size, size_t __alignment)
31+
@@ -42,7 +43,7 @@ _mm_malloc (size_t __size, size_t __alignment)
32+
return malloc (__size);
33+
if (__alignment == 2 || (sizeof (void *) == 8 && __alignment == 4))
34+
__alignment = sizeof (void *);
35+
- if (posix_memalign (&__ptr, __alignment, __size) == 0)
36+
+ if (_mm_posix_memalign (&__ptr, __alignment, __size) == 0)
37+
return __ptr;
38+
else
39+
return NULL;
40+
--
41+
2.28.0
42+

‎patches/gcc-10.2.0/0003-libitm-test-fix.patch‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
From 0198bee3c490b2beec24a411b7060be273924e1f Mon Sep 17 00:00:00 2001
2+
From: Said Musaev <[email protected]>
3+
Date: Thu, 1 Oct 2020 14:34:55 +0200
4+
Subject: [PATCH 03/14] libitm-test-fix
5+
6+
---
7+
libitm/testsuite/Makefile.am | 6 ++++++
8+
libitm/testsuite/Makefile.in | 5 +++++
9+
libitm/testsuite/lib/libitm.exp | 3 +++
10+
3 files changed, 14 insertions(+)
11+
12+
diff --git a/libitm/testsuite/Makefile.am b/libitm/testsuite/Makefile.am
13+
index 41cfbc46e4b..16f82bdf691 100644
14+
--- a/libitm/testsuite/Makefile.am
15+
+++ b/libitm/testsuite/Makefile.am
16+
@@ -11,3 +11,9 @@ EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \
17+
_RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
18+
echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
19+
RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS)
20+
+
21+
+EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
22+
+
23+
+extra.exp:
24+
+ echo 'set BUILD_CC "$(CC)"' > [email protected]
25+
+ mv [email protected] $@
26+
diff --git a/libitm/testsuite/Makefile.in b/libitm/testsuite/Makefile.in
27+
index 120696d1c25..18633fd748a 100644
28+
--- a/libitm/testsuite/Makefile.in
29+
+++ b/libitm/testsuite/Makefile.in
30+
@@ -286,6 +286,7 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
31+
echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
32+
33+
RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS)
34+
+EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
35+
all: all-am
36+
37+
.SUFFIXES:
38+
@@ -493,6 +494,10 @@ uninstall-am:
39+
.PRECIOUS: Makefile
40+
41+
42+
+extra.exp:
43+
+ echo 'set BUILD_CC "$(CC)"' > [email protected]
44+
+ mv [email protected] $@
45+
+
46+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
47+
# Otherwise a system limit (for SysV at least) may be exceeded.
48+
.NOEXPORT:
49+
diff --git a/libitm/testsuite/lib/libitm.exp b/libitm/testsuite/lib/libitm.exp
50+
index b3d247b9f98..47c2cd55dac 100644
51+
--- a/libitm/testsuite/lib/libitm.exp
52+
+++ b/libitm/testsuite/lib/libitm.exp
53+
@@ -77,6 +77,7 @@ proc libitm_init { args } {
54+
global ALWAYS_CFLAGS
55+
global CFLAGS
56+
global TOOL_EXECUTABLE TOOL_OPTIONS
57+
+ global BUILD_CC
58+
global GCC_UNDER_TEST
59+
global TESTING_IN_BUILD_TREE
60+
global target_triplet
61+
@@ -92,6 +93,8 @@ proc libitm_init { args } {
62+
if ![info exists GCC_UNDER_TEST] then {
63+
if [info exists TOOL_EXECUTABLE] {
64+
set GCC_UNDER_TEST $TOOL_EXECUTABLE
65+
+ } elseif [info exists BUILD_CC] {
66+
+ set GCC_UNDER_TEST $BUILD_CC
67+
} else {
68+
set GCC_UNDER_TEST "[find_gcc]"
69+
}
70+
--
71+
2.28.0
72+

‎patches/gcc-10.2.0/0004-libvtv-test-fix.patch‎

Lines changed: 72 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,72 @@
1+
From b31c41313b956fa4bbe0c05792a1483c43eb5fc3 Mon Sep 17 00:00:00 2001
2+
From: Said Musaev <[email protected]>
3+
Date: Thu, 1 Oct 2020 14:35:11 +0200
4+
Subject: [PATCH 04/14] libvtv-test-fix
5+
6+
---
7+
libvtv/testsuite/Makefile.am | 6 ++++++
8+
libvtv/testsuite/Makefile.in | 5 +++++
9+
libvtv/testsuite/lib/libvtv.exp | 3 +++
10+
3 files changed, 14 insertions(+)
11+
12+
diff --git a/libvtv/testsuite/Makefile.am b/libvtv/testsuite/Makefile.am
13+
index 41cfbc46e4b..16f82bdf691 100644
14+
--- a/libvtv/testsuite/Makefile.am
15+
+++ b/libvtv/testsuite/Makefile.am
16+
@@ -11,3 +11,9 @@ EXPECT = $(shell if test -f $(top_builddir)/../expect/expect; then \
17+
_RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
18+
echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
19+
RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS)
20+
+
21+
+EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
22+
+
23+
+extra.exp:
24+
+ echo 'set BUILD_CC "$(CC)"' > [email protected]
25+
+ mv [email protected] $@
26+
diff --git a/libvtv/testsuite/Makefile.in b/libvtv/testsuite/Makefile.in
27+
index cb804c442d6..6984c568260 100644
28+
--- a/libvtv/testsuite/Makefile.in
29+
+++ b/libvtv/testsuite/Makefile.in
30+
@@ -281,6 +281,7 @@ _RUNTEST = $(shell if test -f $(top_srcdir)/../dejagnu/runtest; then \
31+
echo $(top_srcdir)/../dejagnu/runtest; else echo runtest; fi)
32+
33+
RUNTEST = $(_RUNTEST) $(AM_RUNTESTFLAGS)
34+
+EXTRA_DEJAGNU_SITE_CONFIG = extra.exp
35+
all: all-am
36+
37+
.SUFFIXES:
38+
@@ -488,6 +489,10 @@ uninstall-am:
39+
.PRECIOUS: Makefile
40+
41+
42+
+extra.exp:
43+
+ echo 'set BUILD_CC "$(CC)"' > [email protected]
44+
+ mv [email protected] $@
45+
+
46+
# Tell versions [3.59,3.63) of GNU make to not export all variables.
47+
# Otherwise a system limit (for SysV at least) may be exceeded.
48+
.NOEXPORT:
49+
diff --git a/libvtv/testsuite/lib/libvtv.exp b/libvtv/testsuite/lib/libvtv.exp
50+
index 4b71c9ce7bc..ef06e4a3199 100644
51+
--- a/libvtv/testsuite/lib/libvtv.exp
52+
+++ b/libvtv/testsuite/lib/libvtv.exp
53+
@@ -76,6 +76,7 @@ proc libvtv_init { args } {
54+
global ALWAYS_CFLAGS
55+
global CFLAGS
56+
global TOOL_EXECUTABLE TOOL_OPTIONS
57+
+ global BUILD_CC
58+
global GCC_UNDER_TEST
59+
global TESTING_IN_BUILD_TREE
60+
global target_triplet
61+
@@ -91,6 +92,8 @@ proc libvtv_init { args } {
62+
if ![info exists GCC_UNDER_TEST] then {
63+
if [info exists TOOL_EXECUTABLE] {
64+
set GCC_UNDER_TEST $TOOL_EXECUTABLE
65+
+ } elseif [info exists BUILD_CC] {
66+
+ set GCC_UNDER_TEST $BUILD_CC
67+
} else {
68+
set GCC_UNDER_TEST "[find_gcc]"
69+
}
70+
--
71+
2.28.0
72+

0 commit comments

Comments
 (0)