Skip to content

Commit 7f33e53

Browse files
committed
updpatch: gcc, ver=15.1.1+r7+gf36ec88aa85a-1
* remove already merge patches. * remove unsupported language cobol.
1 parent f9a5722 commit 7f33e53

3 files changed

Lines changed: 16 additions & 256 deletions

File tree

gcc/0001-LoongArch-Fix-incorrect-reorder-of-__lsx_vldx-and-__.patch

Lines changed: 0 additions & 158 deletions
This file was deleted.

gcc/LoongArch-Support-Q-suffix-for-__float128.patch

Lines changed: 0 additions & 71 deletions
This file was deleted.

gcc/loong.patch

Lines changed: 16 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
diff --git a/PKGBUILD b/PKGBUILD
2-
index 1be6613..2fba603 100644
31
--- a/PKGBUILD
42
+++ b/PKGBUILD
53
@@ -21,8 +21,6 @@ makedepends=(
@@ -11,22 +9,18 @@ index 1be6613..2fba603 100644
119
libisl
1210
libmpc
1311
python
14-
@@ -68,6 +66,14 @@ prepare() {
12+
@@ -68,6 +66,10 @@ prepare() {
1513
# Reproducible gcc-ada
1614
patch -Np0 < "$srcdir/gcc-ada-repro.patch"
1715

1816
+ # Patches for loong64
1917
+ # Fix libdir
2018
+ patch -Np1 -i "$srcdir/gcc-lib64-lib.patch"
21-
+ # Back port fix for __builtin_lsx_vldx
22-
+ patch -Np1 -i "$srcdir/0001-LoongArch-Fix-incorrect-reorder-of-__lsx_vldx-and-__.patch"
23-
+ # Back port Q suffix for __float128
24-
+ patch -Np1 -i "$srcdir/LoongArch-Support-Q-suffix-for-__float128.patch"
2519
+
2620
mkdir -p "$srcdir/gcc-build"
2721
mkdir -p "$srcdir/libgccjit-build"
2822
}
29-
@@ -95,7 +101,8 @@ build() {
23+
@@ -95,7 +97,8 @@ build() {
3024
--enable-link-serialization=1
3125
--enable-linker-build-id
3226
--enable-lto
@@ -36,16 +30,16 @@ index 1be6613..2fba603 100644
3630
--enable-plugin
3731
--enable-shared
3832
--enable-threads=posix
39-
@@ -113,7 +120,7 @@ build() {
33+
@@ -113,7 +116,7 @@ build() {
4034
CXXFLAGS=${CXXFLAGS/-Werror=format-security/}
4135

4236
"$srcdir/gcc/configure" \
43-
- --enable-languages=ada,c,c++,d,fortran,go,lto,m2,objc,obj-c++,rust \
37+
- --enable-languages=ada,c,c++,d,fortran,go,lto,m2,objc,obj-c++,rust,cobol \
4438
+ --enable-languages=ada,c,c++,d,fortran,lto,m2,objc,obj-c++,rust \
4539
--enable-bootstrap \
4640
"${_confflags[@]:?_confflags unset}"
4741

48-
@@ -162,7 +169,7 @@ package_gcc-libs() {
42+
@@ -162,7 +165,7 @@ package_gcc-libs() {
4943
pkgdesc='Runtime libraries shipped by GCC'
5044
depends=('glibc>=2.27')
5145
options=(!emptydirs !strip)
@@ -54,15 +48,15 @@ index 1be6613..2fba603 100644
5448
libubsan.so libasan.so libtsan.so liblsan.so)
5549
replaces=($pkgname-multilib libgphobos)
5650

57-
@@ -172,7 +179,6 @@ package_gcc-libs() {
51+
@@ -172,7 +175,6 @@ package_gcc-libs() {
5852

5953
for lib in libatomic \
6054
libgfortran \
6155
- libgo \
6256
libgomp \
6357
libitm \
6458
libquadmath \
65-
@@ -220,22 +226,18 @@ package_gcc() {
59+
@@ -220,22 +222,18 @@ package_gcc() {
6660
install -m755 -t "$pkgdir/${_libdir}/" gcc/{cc1,cc1plus,collect2,lto1}
6761

6862
make -C $CHOST/libgcc DESTDIR="$pkgdir" install
@@ -86,7 +80,7 @@ index 1be6613..2fba603 100644
8680

8781
make DESTDIR="$pkgdir" install-fixincludes
8882
make -C gcc DESTDIR="$pkgdir" install-mkheaders
89-
@@ -252,14 +254,10 @@ package_gcc() {
83+
@@ -252,14 +250,10 @@ package_gcc() {
9084
make -C $CHOST/libsanitizer/asan DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
9185
make -C $CHOST/libsanitizer/tsan DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
9286
make -C $CHOST/libsanitizer/lsan DESTDIR="$pkgdir" install-nodist_toolexeclibHEADERS
@@ -103,7 +97,7 @@ index 1be6613..2fba603 100644
10397

10498
make -C libcpp DESTDIR="$pkgdir" install
10599
make -C gcc DESTDIR="$pkgdir" install-po
106-
@@ -270,7 +268,7 @@ package_gcc() {
100+
@@ -270,7 +264,7 @@ package_gcc() {
107101
# create cc-rs compatible symlinks
108102
# https://github.com/rust-lang/cc-rs/blob/1.0.73/src/lib.rs#L2578-L2581
109103
for binary in {c++,g++,gcc,gcc-ar,gcc-nm,gcc-ranlib}; do
@@ -112,7 +106,7 @@ index 1be6613..2fba603 100644
112106
done
113107

114108
# POSIX conformance launcher scripts for c89 and c99
115-
@@ -302,8 +300,6 @@ package_gcc-fortran() {
109+
@@ -302,8 +296,6 @@ package_gcc-fortran() {
116110
cd gcc-build
117111
make -C $CHOST/libgfortran DESTDIR="$pkgdir" install-cafexeclibLTLIBRARIES \
118112
install-{toolexeclibDATA,nodist_fincludeHEADERS,gfor_cHEADERS}
@@ -121,7 +115,7 @@ index 1be6613..2fba603 100644
121115
make -C $CHOST/libgomp DESTDIR="$pkgdir" install-nodist_fincludeHEADERS
122116
make -C gcc DESTDIR="$pkgdir" fortran.install-{common,man,info}
123117
install -Dm755 gcc/f951 "$pkgdir/${_libdir}/f951"
124-
@@ -348,10 +344,6 @@ package_gcc-ada() {
118+
@@ -348,10 +340,6 @@ package_gcc-ada() {
125119
make DESTDIR="${pkgdir}" INSTALL="install" \
126120
INSTALL_DATA="install -m644" install-libada
127121

@@ -132,7 +126,7 @@ index 1be6613..2fba603 100644
132126
ln -s gcc "$pkgdir/usr/bin/gnatgcc"
133127

134128
# insist on dynamic linking, but keep static libraries because gnatmake complains
135-
@@ -360,12 +352,6 @@ package_gcc-ada() {
129+
@@ -360,12 +348,6 @@ package_gcc-ada() {
136130
ln -s libgnat-${pkgver%%.*}.so "$pkgdir/usr/lib/libgnat.so"
137131
rm -f "$pkgdir"/${_libdir}/adalib/libgna{rl,t}.so
138132

@@ -145,18 +139,13 @@ index 1be6613..2fba603 100644
145139
# Install Runtime Library Exception
146140
install -d "$pkgdir/usr/share/licenses/$pkgname/"
147141
ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
148-
@@ -512,3 +498,14 @@ package_libgccjit() {
142+
@@ -527,3 +509,9 @@ package_libgccjit() {
149143
ln -s /usr/share/licenses/gcc-libs/RUNTIME.LIBRARY.EXCEPTION \
150144
"$pkgdir/usr/share/licenses/$pkgname/"
151145
}
152146
+
153-
+source+=("gcc-lib64-lib.patch"
154-
+ # https://gcc.gnu.org/bugzilla/show_bug.cgi?id=119084
155-
+ # Fix https://github.com/cisco/openh264/issues/3857
156-
+ "0001-LoongArch-Fix-incorrect-reorder-of-__lsx_vldx-and-__.patch"
157-
+ "LoongArch-Support-Q-suffix-for-__float128.patch")
158-
+sha256sums+=('d09cbb949364442a78e886b8f55593f07ad17f1e5369ecc83d6c6826015ba22e'
159-
+ '8a4fec2937e22fda73ce549b3f11a70c2bcc343c2dfca2de29217b2708148552'
160-
+ 'fabf067e4e5a17480dde6e05af3bdfc5e38e46837538e172d9251b50ec9cc015')
147+
+source+=("gcc-lib64-lib.patch")
148+
+sha256sums+=('d09cbb949364442a78e886b8f55593f07ad17f1e5369ecc83d6c6826015ba22e')
161149
+pkgname=(${pkgname[@]/lib32-gcc-libs})
162150
+pkgname=(${pkgname[@]/gcc-go})
151+
+pkgname=(${pkgname[@]/gcc-gcobol})

0 commit comments

Comments
 (0)