Skip to content

Commit 4b92df2

Browse files
nikarhfrangarcj
authored andcommitted
Upgraded gcc and binutils
1 parent 197e79b commit 4b92df2

3 files changed

Lines changed: 28 additions & 15 deletions

File tree

CMakeLists.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ cmake_minimum_required(VERSION 3.2.0)
88
project(vitasdk)
99

1010
# Use the following gcc version
11-
set(GCC_VERSION 10.3.0)
12-
set(GCC_HASH SHA256=64f404c1a650f27fc33da242e1f2df54952e3963a49e06e73f6940f3223ac344)
11+
set(GCC_VERSION 13.1.0)
12+
set(GCC_HASH SHA256=61d684f0aa5e76ac6585ad8898a2427aade8979ed5e7f85492286c4dfc13ee86)
1313

1414
set(ZLIB_VERSION 1.2.13)
1515
set(ZLIB_HASH SHA256=d14c38e313afc35a9a8760dadf26042f51ea0f5d154b0630a31da0540107fb98)
@@ -34,8 +34,8 @@ set(ISL_VERSION 0.21)
3434
set(EXPAT_VERSION 2.3.0)
3535
set(EXPAT_HASH SHA256=f122a20eada303f904d5e0513326c5b821248f2d4d2afbf5c6f1339e511c0586)
3636

37-
set(BINUTILS_VERSION 2.34)
38-
set(BINUTILS_HASH SHA256=f00b0e8803dc9bab1e2165bd568528135be734df3fabf8d0161828cd56028952)
37+
set(BINUTILS_VERSION 2.40)
38+
set(BINUTILS_HASH SHA256=0f8a4c272d7f17f369ded10a4aca28b8e304828e95526da482b0ccc4dfc9d8e1)
3939

4040
set(GDB_VERSION 9.2)
4141
set(GDB_HASH SHA256=360cd7ae79b776988e89d8f9a01c985d0b1fa21c767a4295e5f88cb49175c555)

patches/binutils/0002-fix-broken-reloc.patch

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ diff -urN binutils-2.31.1.orig/bfd/elf32-arm.c binutils-2.31.1/bfd/elf32-arm.c
44
@@ -13517,6 +13517,7 @@
55
else
66
unwind_type = 2;
7-
7+
88
+ elide = 0;
99
if (elide && !bfd_link_relocatable (info))
1010
{

patches/gcc/0001-gcc-10.patch

Lines changed: 23 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
diff --git a/gcc/config/arm/arm-c.c b/gcc/config/arm/arm-c.c
1+
diff --git a/gcc/config/arm/arm-c.cc b/gcc/config/arm/arm-c.cc
22
index 7468a20bd..3496590c4 100644
3-
--- a/gcc/config/arm/arm-c.c
4-
+++ b/gcc/config/arm/arm-c.c
3+
--- a/gcc/config/arm/arm-c.cc
4+
+++ b/gcc/config/arm/arm-c.cc
55
@@ -372,6 +372,8 @@ arm_cpu_cpp_builtins (struct cpp_reader * pfile)
66
builtin_assert ("cpu=arm");
77
builtin_assert ("machine=arm");
@@ -36,23 +36,23 @@ index 30e1d6dc9..bd5f7b19c 100644
3636

3737
/* Max number of bytes we can move from memory to memory
3838
diff --git a/gcc/config/arm/arm.opt b/gcc/config/arm/arm.opt
39-
index cd3d8e1be..523b92aa1 100644
39+
index 3a49b51ec..840b2b3c4 100644
4040
--- a/gcc/config/arm/arm.opt
4141
+++ b/gcc/config/arm/arm.opt
42-
@@ -30,6 +30,9 @@ const char *x_arm_cpu_string
43-
TargetSave
44-
const char *x_arm_tune_string
42+
@@ -33,6 +33,9 @@ unsigned aarch_enable_bti = 0
43+
TargetVariable
44+
enum aarch_key_type aarch_ra_sign_key = AARCH_KEY_A
4545

4646
+pthread
4747
+Driver
4848
+
4949
Enum
5050
Name(tls_type) Type(enum arm_tls_type)
5151
TLS dialect to use:
52-
diff --git a/gcc/gcc.c b/gcc/gcc.c
52+
diff --git a/gcc/gcc.cc b/gcc/gcc.cc
5353
index 9f790db0d..27a38bb02 100644
54-
--- a/gcc/gcc.c
55-
+++ b/gcc/gcc.c
54+
--- a/gcc/gcc.cc
55+
+++ b/gcc/gcc.cc
5656
@@ -673,8 +673,9 @@ proper position among the other output files. */
5757
#endif
5858

@@ -98,3 +98,16 @@ index 5240f7e9d..de5dc96e4 100755
9898
# Check for getpid.
9999
cat confdefs.h - <<_ACEOF >conftest.$ac_ext
100100
/* end confdefs.h. */
101+
diff --git a/libgomp/libgomp_f.h.in b/libgomp/libgomp_f.h.in
102+
index d8e61c8b6..9d120f62c 100644
103+
--- a/libgomp/libgomp_f.h.in
104+
+++ b/libgomp/libgomp_f.h.in
105+
@@ -81,7 +81,7 @@ omp_check_defines (void)
106+
|| @OMP_LOCK_KIND@ != sizeof (*(omp_lock_arg_t) 0)
107+
|| @OMP_NEST_LOCK_KIND@ != sizeof (*(omp_nest_lock_arg_t) 0)
108+
|| @INTPTR_T_KIND@ != sizeof (omp_allocator_handle_t)
109+
- || 4 != sizeof (omp_alloctrait_key_t)
110+
+ || 1 != sizeof (omp_alloctrait_key_t)
111+
|| @INTPTR_T_KIND@ != sizeof (omp_alloctrait_value_t)
112+
|| @INTPTR_T_KIND@ != sizeof (omp_memspace_handle_t)
113+
|| @OMP_DEPEND_KIND@ != sizeof (omp_depend_t))

0 commit comments

Comments
 (0)