diff options
Diffstat (limited to 'main/gcc/ada-musl.patch')
| -rw-r--r-- | main/gcc/ada-musl.patch | 71 |
1 files changed, 39 insertions, 32 deletions
diff --git a/main/gcc/ada-musl.patch b/main/gcc/ada-musl.patch index 8255e3b36e..ebbe852225 100644 --- a/main/gcc/ada-musl.patch +++ b/main/gcc/ada-musl.patch @@ -1,5 +1,6 @@ ---- gcc-4.8.1/gcc/ada/adaint.c.orig -+++ gcc-4.8.1/gcc/ada/adaint.c +diff -ru gcc-4.9.2/gcc/ada/adaint.c gcc-4.9.2/gcc/ada/adaint.c +--- gcc-4.9.2/gcc/ada/adaint.c 2014-02-24 18:51:58.000000000 -0200 ++++ gcc-4.9.2/gcc/ada/adaint.c 2014-12-10 12:05:44.621173474 -0200 @@ -67,6 +67,11 @@ #include <sys/pstat.h> #endif @@ -12,7 +13,7 @@ #ifdef VMS #define _POSIX_EXIT 1 #define HOST_EXECUTABLE_SUFFIX ".exe" -@@ -3782,8 +3787,6 @@ +@@ -3891,8 +3896,6 @@ return (void *) syscall (__NR_gettid); } @@ -21,35 +22,37 @@ /* glibc versions earlier than 2.7 do not define the routines to handle dynamically allocated CPU sets. For these targets, we use the static versions. */ -@@ -3792,7 +3795,7 @@ +@@ -3901,7 +3904,7 @@ /* Dynamic cpu sets */ --cpu_set_t *__gnat_cpu_alloc (size_t count) -+void *__gnat_cpu_alloc (size_t count) +-cpu_set_t * ++void * + __gnat_cpu_alloc (size_t count) { return CPU_ALLOC (count); - } -@@ -3802,30 +3805,30 @@ - return CPU_ALLOC_SIZE (count); +@@ -3914,33 +3917,33 @@ } --void __gnat_cpu_free (cpu_set_t *set) -+void __gnat_cpu_free (void *set) + void +-__gnat_cpu_free (cpu_set_t *set) ++__gnat_cpu_free (void *set) { - CPU_FREE (set); + CPU_FREE ((cpu_set_t *) set); } --void __gnat_cpu_zero (size_t count, cpu_set_t *set) -+void __gnat_cpu_zero (size_t count, void *set) + void +-__gnat_cpu_zero (size_t count, cpu_set_t *set) ++__gnat_cpu_zero (size_t count, void *set) { - CPU_ZERO_S (count, set); + CPU_ZERO_S (count, (cpu_set_t *) set); } --void __gnat_cpu_set (int cpu, size_t count, cpu_set_t *set) -+void __gnat_cpu_set (int cpu, size_t count, void *set) + void +-__gnat_cpu_set (int cpu, size_t count, cpu_set_t *set) ++__gnat_cpu_set (int cpu, size_t count, void *set) { /* Ada handles CPU numbers starting from 1, while C identifies the first CPU by a 0, so we need to adjust. */ @@ -57,48 +60,52 @@ + CPU_SET_S (cpu - 1, count, (cpu_set_t *) set); } - #else + #else /* !CPU_ALLOC */ /* Static cpu sets */ --cpu_set_t *__gnat_cpu_alloc (size_t count ATTRIBUTE_UNUSED) -+void *__gnat_cpu_alloc (size_t count ATTRIBUTE_UNUSED) +-cpu_set_t * ++void * + __gnat_cpu_alloc (size_t count ATTRIBUTE_UNUSED) { - return (cpu_set_t *) xmalloc (sizeof (cpu_set_t)); + return xmalloc (sizeof (cpu_set_t)); } - size_t __gnat_cpu_alloc_size (size_t count ATTRIBUTE_UNUSED) -@@ -3833,21 +3836,21 @@ - return sizeof (cpu_set_t); + size_t +@@ -3950,23 +3953,23 @@ } --void __gnat_cpu_free (cpu_set_t *set) -+void __gnat_cpu_free (void *set) + void +-__gnat_cpu_free (cpu_set_t *set) ++__gnat_cpu_free (void *set) { free (set); } --void __gnat_cpu_zero (size_t count ATTRIBUTE_UNUSED, cpu_set_t *set) -+void __gnat_cpu_zero (size_t count ATTRIBUTE_UNUSED, void *set) + void +-__gnat_cpu_zero (size_t count ATTRIBUTE_UNUSED, cpu_set_t *set) ++__gnat_cpu_zero (size_t count ATTRIBUTE_UNUSED, void *set) { - CPU_ZERO (set); + CPU_ZERO ((cpu_set_t *) set); } --void __gnat_cpu_set (int cpu, size_t count ATTRIBUTE_UNUSED, cpu_set_t *set) -+void __gnat_cpu_set (int cpu, size_t count ATTRIBUTE_UNUSED, void *set) + void +-__gnat_cpu_set (int cpu, size_t count ATTRIBUTE_UNUSED, cpu_set_t *set) ++__gnat_cpu_set (int cpu, size_t count ATTRIBUTE_UNUSED, void *set) { /* Ada handles CPU numbers starting from 1, while C identifies the first CPU by a 0, so we need to adjust. */ - CPU_SET (cpu - 1, set); + CPU_SET (cpu - 1, (cpu_set_t *) set); } - #endif - #endif ---- gcc-4.8.1/gcc/ada/adaint.h.orig -+++ gcc-4.8.1/gcc/ada/adaint.h -@@ -259,13 +259,11 @@ + #endif /* !CPU_ALLOC */ + #endif /* linux */ +diff -ru gcc-4.9.2/gcc/ada/adaint.h gcc-4.9.2/gcc/ada/adaint.h +--- gcc-4.9.2/gcc/ada/adaint.h 2014-02-24 18:51:58.000000000 -0200 ++++ gcc-4.9.2/gcc/ada/adaint.h 2014-12-10 12:03:48.377834174 -0200 +@@ -266,13 +266,11 @@ /* Routines for interface to required CPU set primitives */ |