/
riscv64.patch
200 lines (182 loc) · 8.3 KB
/
riscv64.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
--- PKGBUILD
+++ PKGBUILD
@@ -7,7 +7,7 @@
# toolchain build order: linux-api-headers->glibc->binutils->gcc->glibc->binutils->gcc
# NOTE: libtool requires rebuilt with each new gcc version
-pkgname=(gcc gcc-libs lib32-gcc-libs gcc-ada gcc-d gcc-fortran gcc-go gcc-m2 gcc-objc gcc-rust lto-dump libgccjit)
+pkgname=(gcc gcc-libs gcc-d gcc-fortran gcc-go gcc-m2 gcc-objc gcc-rust lto-dump libgccjit)
pkgver=14.1.1+r1+g43b730b9134
_commit=43b730b9134af60a8f1c5b107d625f7127ff23c5
pkgrel=1
@@ -18,11 +18,8 @@ url='https://gcc.gnu.org'
makedepends=(
binutils
doxygen
- gcc-ada
gcc-d
git
- lib32-glibc
- lib32-gcc-libs
libisl
libmpc
python
@@ -41,6 +38,7 @@ _libdir=usr/lib/gcc/$CHOST/${pkgver%%+*}
source=(git+https://sourceware.org/git/gcc.git#commit=${_commit}
c89 c99
gcc-ada-repro.patch
+ unfilter-default-library-path.patch
)
validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9 # bpiotrowski@archlinux.org
86CFFCA918CF3AF47147588051E8B148A9999C34 # evangelos@foutrelis.com
@@ -49,7 +47,8 @@ validpgpkeys=(F3691687D867B81B51CE07D9BBE43771487328A9 # bpiotrowski@archlinux.
sha256sums=('51024affcbc17f4ba5528ad9aad112a9b4d367d796a44b0bc59e3403a4c82ddd'
'de48736f6e4153f03d0a5d38ceb6c6fdb7f054e8f47ddd6af0a3dbf14f27b931'
'2513c6d9984dd0a2058557bf00f06d8d5181734e41dcfe07be7ed86f2959622a'
- '1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f')
+ '1773f5137f08ac1f48f0f7297e324d5d868d55201c03068670ee4602babdef2f'
+ '7183fdeea8fd148cf9dd03b0932f9d439b818a5ab3bc9a5e20d8e0b41c9e0efd')
pkgver() {
cd gcc
echo "$(cat gcc/BASE-VER)+$(git describe --tags | sed 's/[^-]*-[^-]*-//;s/[^-]*-/r&/;s/-/+/g;s/_/./')"
@@ -68,6 +67,15 @@ prepare() {
# Reproducible gcc-ada
patch -Np0 < "$srcdir/gcc-ada-repro.patch"
+ # Remove codes filtering default library paths to make mold work correctly
+ patch -Np1 < ../unfilter-default-library-path.patch
+
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=110066
+ git cherry-pick -n bbc1a102735c72e3c5a4dede8ab382813d12b058
+
+ # https://github.com/golang/go/issues/57691
+ git cherry-pick -n 21a07620f4bfe38f12e6d5be8b1eeecc29fa6852
+
mkdir -p "$srcdir/gcc-build"
mkdir -p "$srcdir/libgccjit-build"
}
@@ -95,7 +103,7 @@ build() {
--enable-link-serialization=1
--enable-linker-build-id
--enable-lto
- --enable-multilib
+ --disable-multilib
--enable-plugin
--enable-shared
--enable-threads=posix
@@ -113,7 +121,7 @@ build() {
CXXFLAGS=${CXXFLAGS/-Werror=format-security/}
"$srcdir/gcc/configure" \
- --enable-languages=ada,c,c++,d,fortran,go,lto,m2,objc,obj-c++,rust \
+ --enable-languages=c,c++,d,fortran,go,lto,m2,objc,obj-c++,rust \
--enable-bootstrap \
"${_confflags[@]:?_confflags unset}"
@@ -161,9 +169,9 @@ check() {
package_gcc-libs() {
pkgdesc='Runtime libraries shipped by GCC'
depends=('glibc>=2.27')
- options=(!emptydirs !strip)
+ options=(!emptydirs !strip staticlibs)
provides=($pkgname-multilib libgo.so libgfortran.so libgphobos.so
- libubsan.so libasan.so libtsan.so liblsan.so)
+ libubsan.so libasan.so liblsan.so)
replaces=($pkgname-multilib libgphobos)
cd gcc-build
@@ -176,9 +184,8 @@ package_gcc-libs() {
libgomp \
libitm \
libquadmath \
- libsanitizer/{a,l,ub,t}san \
- libstdc++-v3/src \
- libvtv; do
+ libsanitizer/{a,l,ub}san \
+ libstdc++-v3/src; do
make -C $CHOST/$lib DESTDIR="$pkgdir" install-toolexeclibLTLIBRARIES
done
@@ -195,18 +202,17 @@ package_gcc-libs() {
make -C $CHOST/$lib DESTDIR="$pkgdir" install-info
done
- # remove files provided by lib32-gcc-libs
- rm -rf "$pkgdir"/usr/lib32/
-
# Install Runtime Library Exception
install -Dm644 "$srcdir/gcc/COPYING.RUNTIME" \
"$pkgdir/usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION"
+
+ # Remove static library (.a) files except libatomic.a
+ find "$pkgdir" -name '*.a' ! -name libatomic.a -delete
}
package_gcc() {
pkgdesc="The GNU Compiler Collection - C and C++ frontends"
depends=("gcc-libs=$pkgver-$pkgrel" 'binutils>=2.28' libmpc zstd libisl.so)
- optdepends=('lib32-gcc-libs: for generating code for 32-bit ABI')
provides=($pkgname-multilib)
replaces=($pkgname-multilib)
options=(!emptydirs staticlibs)
@@ -220,22 +226,18 @@ package_gcc() {
install -m755 -t "$pkgdir/${_libdir}/" gcc/{cc1,cc1plus,collect2,lto1}
make -C $CHOST/libgcc DESTDIR="$pkgdir" install
- make -C $CHOST/32/libgcc DESTDIR="$pkgdir" install
- rm -f "$pkgdir"/usr/lib{,32}/libgcc_s.so*
+ rm -f "$pkgdir"/usr/lib/libgcc_s.so*
make -C $CHOST/libstdc++-v3/src DESTDIR="$pkgdir" install
make -C $CHOST/libstdc++-v3/include DESTDIR="$pkgdir" install
make -C $CHOST/libstdc++-v3/libsupc++ DESTDIR="$pkgdir" install
make -C $CHOST/libstdc++-v3/python DESTDIR="$pkgdir" install
- make -C $CHOST/32/libstdc++-v3/src DESTDIR="$pkgdir" install
- make -C $CHOST/32/libstdc++-v3/include DESTDIR="$pkgdir" install
- make -C $CHOST/32/libstdc++-v3/libsupc++ DESTDIR="$pkgdir" install
make DESTDIR="$pkgdir" install-libcc1
install -d "$pkgdir/usr/share/gdb/auto-load/usr/lib"
mv "$pkgdir"/usr/lib/libstdc++.so.6.*-gdb.py \
"$pkgdir/usr/share/gdb/auto-load/usr/lib/"
- rm "$pkgdir"/usr/lib{,32}/libstdc++.so*
+ rm "$pkgdir"/usr/lib/libstdc++.so*
make DESTDIR="$pkgdir" install-fixincludes
make -C gcc DESTDIR="$pkgdir" install-mkheaders
@@ -250,16 +252,11 @@ package_gcc() {
make -C $CHOST/libquadmath DESTDIR="$pkgdir" install-nodist_libsubincludeHEADERS
make -C $CHOST/libsanitizer DESTDIR="$pkgdir" install-nodist_{saninclude,toolexeclib}HEADERS
make -C $CHOST/libsanitizer/asan DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
- make -C $CHOST/libsanitizer/tsan DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
make -C $CHOST/libsanitizer/lsan DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
- make -C $CHOST/32/libgomp DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
- make -C $CHOST/32/libitm DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
- make -C $CHOST/32/libsanitizer DESTDIR="$pkgdir" install-nodist_{saninclude,toolexeclib}HEADERS
- make -C $CHOST/32/libsanitizer/asan DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
make -C gcc DESTDIR="$pkgdir" install-man install-info
rm "$pkgdir"/usr/share/man/man1/{gccgo,gfortran,lto-dump,gdc,gm2}.1
- rm "$pkgdir"/usr/share/info/{gccgo,gfortran,gnat-style,gnat_rm,gnat_ugn,gdc,m2}.info
+ rm "$pkgdir"/usr/share/info/{gccgo,gfortran,gdc,m2}.info
make -C libcpp DESTDIR="$pkgdir" install
make -C gcc DESTDIR="$pkgdir" install-po
@@ -270,7 +267,7 @@ package_gcc() {
# create cc-rs compatible symlinks
# https://github.com/rust-lang/cc-rs/blob/1.0.73/src/lib.rs#L2578-L2581
for binary in {c++,g++,gcc,gcc-ar,gcc-nm,gcc-ranlib}; do
- ln -s /usr/bin/${binary} "${pkgdir}"/usr/bin/x86_64-linux-gnu-${binary}
+ ln -s /usr/bin/${binary} "${pkgdir}"/usr/bin/riscv64-linux-gnu-${binary}
done
# POSIX conformance launcher scripts for c89 and c99
@@ -280,9 +277,6 @@ package_gcc() {
# install the libstdc++ man pages
make -C $CHOST/libstdc++-v3/doc DESTDIR="$pkgdir" doc-install-man
- # remove files provided by lib32-gcc-libs
- rm -f "$pkgdir"/usr/lib32/lib{stdc++,gcc_s}.so
-
# byte-compile python libraries
python -m compileall "$pkgdir/usr/share/gcc-${pkgver%%+*}/"
python -O -m compileall "$pkgdir/usr/share/gcc-${pkgver%%+*}/"
@@ -302,8 +296,6 @@ package_gcc-fortran() {
cd gcc-build
make -C $CHOST/libgfortran DESTDIR="$pkgdir" install-cafexeclibLTLIBRARIES \
install-{toolexeclibDATA,nodist_fincludeHEADERS,gfor_cHEADERS}
- make -C $CHOST/32/libgfortran DESTDIR="$pkgdir" install-cafexeclibLTLIBRARIES \
- install-{toolexeclibDATA,nodist_fincludeHEADERS,gfor_cHEADERS}
make -C $CHOST/libgomp DESTDIR="$pkgdir" install-nodist_fincludeHEADERS
make -C gcc DESTDIR="$pkgdir" fortran.install-{common,man,info}
install -Dm755 gcc/f951 "$pkgdir/${_libdir}/f951"
@@ -381,7 +373,6 @@ package_gcc-go() {
cd gcc-build
make -C $CHOST/libgo DESTDIR="$pkgdir" install-exec-am
- make -C $CHOST/32/libgo DESTDIR="$pkgdir" install-exec-am
make DESTDIR="$pkgdir" install-gotools
make -C gcc DESTDIR="$pkgdir" go.install-{common,man,info}