Skip to content

Commit 2dc7942

Browse files
isagefrangarcj
authored andcommitted
signed chars by default.
update patch offsets for gcc10
1 parent a43fb19 commit 2dc7942

2 files changed

Lines changed: 34 additions & 25 deletions

File tree

CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -462,7 +462,7 @@ ExternalProject_add(gcc-base
462462
URL http://ftp.gnu.org/gnu/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.xz
463463
URL_HASH ${GCC_HASH}
464464
DOWNLOAD_DIR ${DOWNLOAD_DIR}
465-
PATCH_COMMAND patch -d <SOURCE_DIR> -p1 -t -N < ${PROJECT_SOURCE_DIR}/patches/gcc/0001-gcc-8.patch
465+
PATCH_COMMAND patch -d <SOURCE_DIR> -p1 -t -N < ${PROJECT_SOURCE_DIR}/patches/gcc/0001-gcc-10.patch
466466
CONFIGURE_COMMAND ${compiler_flags} ${wrapper_command} <SOURCE_DIR>/configure
467467
--build=${build_native}
468468
# compile a native compiler so keep host == build
@@ -554,7 +554,7 @@ if(CMAKE_TOOLCHAIN_FILE)
554554
URL http://ftp.gnu.org/gnu/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.xz
555555
URL_HASH ${GCC_HASH}
556556
DOWNLOAD_DIR ${DOWNLOAD_DIR}
557-
PATCH_COMMAND patch -d <SOURCE_DIR> -p1 -t -N < ${PROJECT_SOURCE_DIR}/patches/gcc/0001-gcc-8.patch
557+
PATCH_COMMAND patch -d <SOURCE_DIR> -p1 -t -N < ${PROJECT_SOURCE_DIR}/patches/gcc/0001-gcc-10.patch
558558
CONFIGURE_COMMAND ${compiler_flags} ${toolchain_tools}
559559
${wrapper_command} <SOURCE_DIR>/configure
560560
--build=${build_native}
@@ -610,7 +610,7 @@ ExternalProject_add(gcc-final
610610
URL http://ftp.gnu.org/gnu/gcc/gcc-${GCC_VERSION}/gcc-${GCC_VERSION}.tar.xz
611611
URL_HASH ${GCC_HASH}
612612
DOWNLOAD_DIR ${DOWNLOAD_DIR}
613-
PATCH_COMMAND patch -d <SOURCE_DIR> -p1 -t -N < ${PROJECT_SOURCE_DIR}/patches/gcc/0001-gcc-8.patch
613+
PATCH_COMMAND patch -d <SOURCE_DIR> -p1 -t -N < ${PROJECT_SOURCE_DIR}/patches/gcc/0001-gcc-10.patch
614614
CONFIGURE_COMMAND ${compiler_flags} ${toolchain_tools} ${compiler_target_tools}
615615
${wrapper_command} <SOURCE_DIR>/configure
616616
--build=${build_native}
Lines changed: 31 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
diff --git a/gcc/config/arm/arm-c.c b/gcc/config/arm/arm-c.c
2-
index 6e256ee0a..54e390c38 100644
2+
index 7468a20bd..3496590c4 100644
33
--- a/gcc/config/arm/arm-c.c
44
+++ b/gcc/config/arm/arm-c.c
5-
@@ -230,6 +230,8 @@ arm_cpu_cpp_builtins (struct cpp_reader * pfile)
5+
@@ -372,6 +372,8 @@ arm_cpu_cpp_builtins (struct cpp_reader * pfile)
66
builtin_assert ("cpu=arm");
77
builtin_assert ("machine=arm");
88

@@ -12,10 +12,10 @@ index 6e256ee0a..54e390c38 100644
1212
}
1313

1414
diff --git a/gcc/config/arm/arm.h b/gcc/config/arm/arm.h
15-
index 9ee6a4eb5..b89f85655 100644
15+
index 30e1d6dc9..bd5f7b19c 100644
1616
--- a/gcc/config/arm/arm.h
1717
+++ b/gcc/config/arm/arm.h
18-
@@ -669,6 +670,10 @@ extern int arm_arch_cmse;
18+
@@ -731,6 +731,10 @@ extern const int arm_arch_cde_coproc_bits[];
1919
#define WCHAR_TYPE_SIZE BITS_PER_WORD
2020
#endif
2121

@@ -26,11 +26,34 @@ index 9ee6a4eb5..b89f85655 100644
2626
/* Sized for fixed-point types. */
2727

2828
#define SHORT_FRACT_TYPE_SIZE 8
29+
@@ -1996,7 +2000,7 @@ enum arm_auto_incmodes
30+
/* signed 'char' is most compatible, but RISC OS wants it unsigned.
31+
unsigned is probably best, but may break some code. */
32+
#ifndef DEFAULT_SIGNED_CHAR
33+
-#define DEFAULT_SIGNED_CHAR 0
34+
+#define DEFAULT_SIGNED_CHAR 1
35+
#endif
36+
37+
/* Max number of bytes we can move from memory to memory
38+
diff --git a/gcc/config/arm/arm.opt b/gcc/config/arm/arm.opt
39+
index cd3d8e1be..523b92aa1 100644
40+
--- a/gcc/config/arm/arm.opt
41+
+++ 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
45+
46+
+pthread
47+
+Driver
48+
+
49+
Enum
50+
Name(tls_type) Type(enum arm_tls_type)
51+
TLS dialect to use:
2952
diff --git a/gcc/gcc.c b/gcc/gcc.c
30-
index 4f57765b0..a4d5ffb14 100644
53+
index 9f790db0d..27a38bb02 100644
3154
--- a/gcc/gcc.c
3255
+++ b/gcc/gcc.c
33-
@@ -674,8 +674,9 @@ proper position among the other output files. */
56+
@@ -673,8 +673,9 @@ proper position among the other output files. */
3457
#endif
3558

3659
/* config.h can define LIB_SPEC to override the default libraries. */
@@ -41,25 +64,11 @@ index 4f57765b0..a4d5ffb14 100644
4164
#endif
4265

4366
/* When using -fsplit-stack we need to wrap pthread_create, in order
44-
diff --git a/gcc/config/arm/arm.opt b/gcc/config/arm/arm.opt
45-
index af478a946b2..31d0ff7fd18 100644
46-
--- a/gcc/config/arm/arm.opt
47-
+++ b/gcc/config/arm/arm.opt
48-
@@ -21,6 +21,9 @@
49-
HeaderInclude
50-
config/arm/arm-opts.h
51-
52-
+pthread
53-
+Driver
54-
+
55-
Enum
56-
Name(tls_type) Type(enum arm_tls_type)
57-
TLS dialect to use:
5867
diff --git a/libgomp/configure b/libgomp/configure
59-
index 6161da579c0..68c31eaad2b 100755
68+
index 5240f7e9d..de5dc96e4 100755
6069
--- a/libgomp/configure
6170
+++ b/libgomp/configure
62-
@@ -15720,29 +15720,6 @@ $as_echo "#define HAVE_UNAME 1" >>confdefs.h
71+
@@ -15768,29 +15768,6 @@ $as_echo "#define HAVE_UNAME 1" >>confdefs.h
6372
fi
6473
rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
6574

0 commit comments

Comments
 (0)