File tree Expand file tree Collapse file tree 3 files changed +28
-13
lines changed Expand file tree Collapse file tree 3 files changed +28
-13
lines changed Original file line number Diff line number Diff line change @@ -62,6 +62,17 @@ function sources_crosscomp() {
62
62
[mpc]=1.2.0
63
63
)
64
64
;;
65
+ bookworm)
66
+ pkgs=(
67
+ [binutils]=2.40
68
+ [gcc]=12.2.0
69
+ [glibc]=2.36
70
+ [gmp]=6.2.1
71
+ [kernel]=6.1
72
+ [mpfr]=4.2.0
73
+ [mpc]=1.3.1
74
+ )
75
+ ;;
65
76
* )
66
77
md_ret_errors+=(" Unsupported distribution $dist " )
67
78
return 1
@@ -86,10 +97,14 @@ function sources_crosscomp() {
86
97
87
98
# apply glibc patch required when compiling with GCC 10+
88
99
# see https://sourceware.org/git/gitweb.cgi?p=glibc.git;h=49348beafe9ba150c9bd48595b3f372299bddbb0
89
- # as well as a fix for an incorrect header include.
90
100
if [[ " $dist " == " bullseye" ]]; then
91
101
applyPatch " $md_data /bullseye.diff"
92
102
fi
103
+ # fix incorrect limits.h include.
104
+ if compareVersions " ${pkgs[gcc]} " ge 10; then
105
+ applyPatch " $md_data /asan_limits.diff"
106
+ fi
107
+
93
108
}
94
109
95
110
function build_crosscomp() {
Original file line number Diff line number Diff line change
1
+ # fixes gcc/libsanitizer/asan/asan_linux.cpp:217:21: error: ‘PATH_MAX’ was not declared in this scope
2
+ --- a/gcc/libsanitizer/asan/asan_linux.cpp
3
+ +++ b/gcc/libsanitizer/asan/asan_linux.cpp
4
+ @@ -31,7 +31,7 @@
5
+ #include <sys/types.h>
6
+ #include <dlfcn.h>
7
+ #include <fcntl.h>
8
+ - #include <limits.h>
9
+ + #include <linux/limits.h>
10
+ #include <pthread.h>
11
+ #include <stdio.h>
12
+ #include <unistd.h>
Original file line number Diff line number Diff line change @@ -134,15 +134,3 @@ index 84a8b94c74..0a5a40430e 100644
134
134
135
135
# These files quiet sNaNs in a way that is optimized away without
136
136
137
- # fixes gcc/libsanitizer/asan/asan_linux.cpp:217:21: error: ‘PATH_MAX’ was not declared in this scope
138
- --- a/gcc/libsanitizer/asan/asan_linux.cpp
139
- +++ b/gcc/libsanitizer/asan/asan_linux.cpp
140
- @@ -31,7 +31,7 @@
141
- #include <sys/types.h>
142
- #include <dlfcn.h>
143
- #include <fcntl.h>
144
- - #include <limits.h>
145
- + #include <linux/limits.h>
146
- #include <pthread.h>
147
- #include <stdio.h>
148
- #include <unistd.h>
You can’t perform that action at this time.
0 commit comments