|
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 |
2 | 2 | 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 |
5 | 5 | @@ -372,6 +372,8 @@ arm_cpu_cpp_builtins (struct cpp_reader * pfile) |
6 | 6 | builtin_assert ("cpu=arm"); |
7 | 7 | builtin_assert ("machine=arm"); |
@@ -36,23 +36,23 @@ index 30e1d6dc9..bd5f7b19c 100644 |
36 | 36 |
|
37 | 37 | /* Max number of bytes we can move from memory to memory |
38 | 38 | diff --git a/gcc/config/arm/arm.opt b/gcc/config/arm/arm.opt |
39 | | -index cd3d8e1be..523b92aa1 100644 |
| 39 | +index 3a49b51ec..840b2b3c4 100644 |
40 | 40 | --- a/gcc/config/arm/arm.opt |
41 | 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 |
| 42 | +@@ -33,6 +33,9 @@ unsigned aarch_enable_bti = 0 |
| 43 | + TargetVariable |
| 44 | + enum aarch_key_type aarch_ra_sign_key = AARCH_KEY_A |
45 | 45 |
|
46 | 46 | +pthread |
47 | 47 | +Driver |
48 | 48 | + |
49 | 49 | Enum |
50 | 50 | Name(tls_type) Type(enum arm_tls_type) |
51 | 51 | 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 |
53 | 53 | index 9f790db0d..27a38bb02 100644 |
54 | | ---- a/gcc/gcc.c |
55 | | -+++ b/gcc/gcc.c |
| 54 | +--- a/gcc/gcc.cc |
| 55 | ++++ b/gcc/gcc.cc |
56 | 56 | @@ -673,8 +673,9 @@ proper position among the other output files. */ |
57 | 57 | #endif |
58 | 58 |
|
@@ -98,3 +98,16 @@ index 5240f7e9d..de5dc96e4 100755 |
98 | 98 | # Check for getpid. |
99 | 99 | cat confdefs.h - <<_ACEOF >conftest.$ac_ext |
100 | 100 | /* 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