gcc: Update to 11.3.0
* rebase some patches * drop __in/__out patch, conflict long fixed in mingw-w64 * remove install files which are handled by hooks now
This commit is contained in:
parent
059aec4ed8
commit
d547b001e8
@ -115,11 +115,9 @@ index 155be74efdb..b750114185c 100644
|
|||||||
endif
|
endif
|
||||||
|
|
||||||
c++.uninstall:
|
c++.uninstall:
|
||||||
diff --git a/gcc/jit/Make-lang.in b/gcc/jit/Make-lang.in
|
--- gcc-11.3.0/gcc/jit/Make-lang.in.orig 2022-04-21 09:58:53.343586600 +0200
|
||||||
index 663772aba63..98c4d521b1c 100644
|
+++ gcc-11.3.0/gcc/jit/Make-lang.in 2022-05-13 19:47:18.555238500 +0200
|
||||||
--- a/gcc/jit/Make-lang.in
|
@@ -44,8 +44,13 @@
|
||||||
+++ b/gcc/jit/Make-lang.in
|
|
||||||
@@ -44,8 +44,13 @@ LIBGCCJIT_VERSION_NUM = 0
|
|
||||||
LIBGCCJIT_MINOR_NUM = 0
|
LIBGCCJIT_MINOR_NUM = 0
|
||||||
LIBGCCJIT_RELEASE_NUM = 1
|
LIBGCCJIT_RELEASE_NUM = 1
|
||||||
|
|
||||||
@ -135,7 +133,7 @@ index 663772aba63..98c4d521b1c 100644
|
|||||||
LIBGCCJIT_IMPORT_LIB = libgccjit.dll.a
|
LIBGCCJIT_IMPORT_LIB = libgccjit.dll.a
|
||||||
|
|
||||||
jit: $(LIBGCCJIT_FILENAME) \
|
jit: $(LIBGCCJIT_FILENAME) \
|
||||||
@@ -105,7 +110,7 @@ endif
|
@@ -139,7 +144,7 @@
|
||||||
# Use strict warnings for this front end.
|
# Use strict warnings for this front end.
|
||||||
jit-warn = $(STRICT_WARN)
|
jit-warn = $(STRICT_WARN)
|
||||||
|
|
||||||
@ -144,16 +142,16 @@ index 663772aba63..98c4d521b1c 100644
|
|||||||
# Create import library
|
# Create import library
|
||||||
LIBGCCJIT_EXTRA_OPTS = -Wl,--out-implib,$(LIBGCCJIT_IMPORT_LIB)
|
LIBGCCJIT_EXTRA_OPTS = -Wl,--out-implib,$(LIBGCCJIT_IMPORT_LIB)
|
||||||
else
|
else
|
||||||
@@ -129,7 +134,7 @@ $(LIBGCCJIT_FILENAME): $(jit_OBJS) \
|
@@ -173,7 +178,7 @@
|
||||||
@$(call LINK_PROGRESS,$(INDEX.jit),end)
|
@$(call LINK_PROGRESS,$(INDEX.jit),end)
|
||||||
|
|
||||||
# Create symlinks when not building for Windows
|
# Create symlinks when not building for Windows
|
||||||
-ifeq (,$(findstring mingw,$(target)))
|
-ifeq (,$(findstring mingw,$(target)))
|
||||||
+ifeq (,$(filter %-mingw% %-cygwin,$(target)))
|
+ifeq (,$(filter %-mingw% %-cygwin,$(target)))
|
||||||
$(LIBGCCJIT_SONAME_SYMLINK): $(LIBGCCJIT_FILENAME)
|
|
||||||
ln -sf $(LIBGCCJIT_FILENAME) $(LIBGCCJIT_SONAME_SYMLINK)
|
|
||||||
|
|
||||||
@@ -311,7 +316,7 @@ jit.install-headers: installdirs
|
ifeq (,$(findstring darwin,$(host)))
|
||||||
|
# but only one level for Darwin, version info is embedded.
|
||||||
|
@@ -359,7 +364,7 @@
|
||||||
$(INSTALL_DATA) $(srcdir)/jit/libgccjit++.h \
|
$(INSTALL_DATA) $(srcdir)/jit/libgccjit++.h \
|
||||||
$(DESTDIR)$(includedir)/libgccjit++.h
|
$(DESTDIR)$(includedir)/libgccjit++.h
|
||||||
|
|
||||||
|
|||||||
@ -63,15 +63,6 @@ index 9af87f9c6ad..f261a25d2f5 100644
|
|||||||
verbose " test_executable: ${test_executable}"
|
verbose " test_executable: ${test_executable}"
|
||||||
|
|
||||||
# Invoke the driver to build the test executable
|
# Invoke the driver to build the test executable
|
||||||
@@ -916,7 +916,7 @@ proc jit-verify-executable { args } {
|
|
||||||
|
|
||||||
# We need to link with --export-dynamic for test-calling-external-function.c
|
|
||||||
# so that the JIT-built code can call into functions from the main program.
|
|
||||||
-set DEFAULT_CFLAGS "-I$srcdir/../jit -lgccjit -g -Wall -Werror -Wl,--export-dynamic"
|
|
||||||
+set DEFAULT_CFLAGS "-I$srcdir/../jit -lgccjit -g -Wall -Werror"
|
|
||||||
|
|
||||||
# Main loop. This will invoke jig-dg-test on each test-*.c file.
|
|
||||||
dg-runtest $tests "" $DEFAULT_CFLAGS
|
|
||||||
diff --git a/gcc/testsuite/jit.dg/test-compile-to-assembler.c b/gcc/testsuite/jit.dg/test-compile-to-assembler.c
|
diff --git a/gcc/testsuite/jit.dg/test-compile-to-assembler.c b/gcc/testsuite/jit.dg/test-compile-to-assembler.c
|
||||||
index e3a6d2edd20..6321402e20e 100644
|
index e3a6d2edd20..6321402e20e 100644
|
||||||
--- a/gcc/testsuite/jit.dg/test-compile-to-assembler.c
|
--- a/gcc/testsuite/jit.dg/test-compile-to-assembler.c
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
@ -789,9 +789,8 @@ diff -Naur gcc-11.2.0-orig/gcc/configure.ac gcc-11.2.0/gcc/configure.ac
|
|||||||
AC_MSG_CHECKING(broken PE linker dwarf5 support)
|
AC_MSG_CHECKING(broken PE linker dwarf5 support)
|
||||||
gcc_cv_ld_broken_pe_dwarf5=yes
|
gcc_cv_ld_broken_pe_dwarf5=yes
|
||||||
if test $in_tree_ld = yes ; then
|
if test $in_tree_ld = yes ; then
|
||||||
diff -Naur gcc-11.2.0-orig/gcc/jit/Make-lang.in gcc-11.2.0/gcc/jit/Make-lang.in
|
--- gcc-11.3.0/gcc/jit/Make-lang.in.orig 2022-05-13 19:57:10.989703900 +0200
|
||||||
--- gcc-11.2.0-orig/gcc/jit/Make-lang.in 2021-11-29 18:43:59.170198900 +0100
|
+++ gcc-11.3.0/gcc/jit/Make-lang.in 2022-05-13 20:01:59.656616200 +0200
|
||||||
+++ gcc-11.2.0/gcc/jit/Make-lang.in 2021-11-30 06:11:18.717125800 +0100
|
|
||||||
@@ -48,8 +48,11 @@
|
@@ -48,8 +48,11 @@
|
||||||
ifneq (,$(filter %cygwin,$(target)))
|
ifneq (,$(filter %cygwin,$(target)))
|
||||||
SHARED_PFX=cyg
|
SHARED_PFX=cyg
|
||||||
@ -805,7 +804,7 @@ diff -Naur gcc-11.2.0-orig/gcc/jit/Make-lang.in gcc-11.2.0/gcc/jit/Make-lang.in
|
|||||||
LIBGCCJIT_FILENAME = $(SHARED_PFX)gccjit-$(LIBGCCJIT_VERSION_NUM).dll
|
LIBGCCJIT_FILENAME = $(SHARED_PFX)gccjit-$(LIBGCCJIT_VERSION_NUM).dll
|
||||||
LIBGCCJIT_IMPORT_LIB = libgccjit.dll.a
|
LIBGCCJIT_IMPORT_LIB = libgccjit.dll.a
|
||||||
|
|
||||||
@@ -110,7 +113,7 @@
|
@@ -144,7 +147,7 @@
|
||||||
# Use strict warnings for this front end.
|
# Use strict warnings for this front end.
|
||||||
jit-warn = $(STRICT_WARN)
|
jit-warn = $(STRICT_WARN)
|
||||||
|
|
||||||
@ -814,16 +813,16 @@ diff -Naur gcc-11.2.0-orig/gcc/jit/Make-lang.in gcc-11.2.0/gcc/jit/Make-lang.in
|
|||||||
# Create import library
|
# Create import library
|
||||||
LIBGCCJIT_EXTRA_OPTS = -Wl,--out-implib,$(LIBGCCJIT_IMPORT_LIB)
|
LIBGCCJIT_EXTRA_OPTS = -Wl,--out-implib,$(LIBGCCJIT_IMPORT_LIB)
|
||||||
else
|
else
|
||||||
@@ -134,7 +137,7 @@
|
@@ -178,7 +181,7 @@
|
||||||
@$(call LINK_PROGRESS,$(INDEX.jit),end)
|
@$(call LINK_PROGRESS,$(INDEX.jit),end)
|
||||||
|
|
||||||
# Create symlinks when not building for Windows
|
# Create symlinks when not building for Windows
|
||||||
-ifeq (,$(filter %-mingw% %-cygwin,$(target)))
|
-ifeq (,$(filter %-mingw% %-cygwin,$(target)))
|
||||||
+ifeq (,$(filter %-mingw% %-cygwin %-msys,$(target)))
|
+ifeq (,$(filter %-mingw% %-cygwin %-msys,$(target)))
|
||||||
$(LIBGCCJIT_SONAME_SYMLINK): $(LIBGCCJIT_FILENAME)
|
|
||||||
ln -sf $(LIBGCCJIT_FILENAME) $(LIBGCCJIT_SONAME_SYMLINK)
|
|
||||||
|
|
||||||
@@ -316,7 +319,7 @@
|
ifeq (,$(findstring darwin,$(host)))
|
||||||
|
# but only one level for Darwin, version info is embedded.
|
||||||
|
@@ -364,7 +367,7 @@
|
||||||
$(INSTALL_DATA) $(srcdir)/jit/libgccjit++.h \
|
$(INSTALL_DATA) $(srcdir)/jit/libgccjit++.h \
|
||||||
$(DESTDIR)$(includedir)/libgccjit++.h
|
$(DESTDIR)$(includedir)/libgccjit++.h
|
||||||
|
|
||||||
|
|||||||
20
gcc/PKGBUILD
20
gcc/PKGBUILD
@ -7,8 +7,8 @@
|
|||||||
|
|
||||||
pkgbase=gcc
|
pkgbase=gcc
|
||||||
pkgname=('gcc' 'gcc-libs' 'gcc-fortran')
|
pkgname=('gcc' 'gcc-libs' 'gcc-fortran')
|
||||||
pkgver=11.2.0
|
pkgver=11.3.0
|
||||||
pkgrel=3
|
pkgrel=1
|
||||||
pkgdesc="The GNU Compiler Collection"
|
pkgdesc="The GNU Compiler Collection"
|
||||||
arch=('i686' 'x86_64')
|
arch=('i686' 'x86_64')
|
||||||
license=('GPL' 'LGPL' 'FDL' 'custom')
|
license=('GPL' 'LGPL' 'FDL' 'custom')
|
||||||
@ -35,11 +35,10 @@ source=(https://ftp.gnu.org/gnu/gcc/gcc-${pkgver}/gcc-${pkgver}.tar.xz
|
|||||||
0011-Cygwin-define-STD_UNIX.patch
|
0011-Cygwin-define-STD_UNIX.patch
|
||||||
0101-Cygwin-enable-libgccjit-not-just-for-MingW.patch
|
0101-Cygwin-enable-libgccjit-not-just-for-MingW.patch
|
||||||
0102-Cygwin-testsuite-fixes-for-libgccjit.patch
|
0102-Cygwin-testsuite-fixes-for-libgccjit.patch
|
||||||
0130-libstdc++-in-out.patch
|
|
||||||
0950-11.2.0-configure-msys2.patch
|
0950-11.2.0-configure-msys2.patch
|
||||||
0951-11.2.0-msys2-spec.patch
|
0951-11.2.0-msys2-spec.patch
|
||||||
0953-11.2.0-testsuite-msys2.patch)
|
0953-11.2.0-testsuite-msys2.patch)
|
||||||
sha256sums=('d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b'
|
sha256sums=('b47cf2818691f5b1e21df2bb38c795fac2cfbd640ede2d0a5e1c89e338a3ac39'
|
||||||
'b6b141864e1ad82779e809608c6eed61addb09c6ff7249d1a4a5db807cc5b9be'
|
'b6b141864e1ad82779e809608c6eed61addb09c6ff7249d1a4a5db807cc5b9be'
|
||||||
'cfc44c9747980ef8a5dc87a654340ccf25cf4ebb4103e544fb4fc1e5a26e6120'
|
'cfc44c9747980ef8a5dc87a654340ccf25cf4ebb4103e544fb4fc1e5a26e6120'
|
||||||
'9475f8b4b92d5fe2af9538c2b036a5d7528b23ae07e4c684cf84be2e7f8482cf'
|
'9475f8b4b92d5fe2af9538c2b036a5d7528b23ae07e4c684cf84be2e7f8482cf'
|
||||||
@ -51,10 +50,9 @@ sha256sums=('d08edc536b54c372a1010ff6619dd274c0f1603aa49212ba20f7aa2cda36fa8b'
|
|||||||
'89c239285de06224a6bf056a620b0a0defae788d194893cd39eadc06ee171e62'
|
'89c239285de06224a6bf056a620b0a0defae788d194893cd39eadc06ee171e62'
|
||||||
'7839d88eb3cea821f51b9778c62e63bf5cc831c810ab2cc12f15e7a1633c3cb3'
|
'7839d88eb3cea821f51b9778c62e63bf5cc831c810ab2cc12f15e7a1633c3cb3'
|
||||||
'2269e9c2438e21b082ca0d136519a08a0853b896dd559a3946bd9b9e6b94fc5e'
|
'2269e9c2438e21b082ca0d136519a08a0853b896dd559a3946bd9b9e6b94fc5e'
|
||||||
'd92ed176f950b2588292384bed0c2cf6dcc4fb58147cf341f6d40ba26d4f85fb'
|
'cfcd07c86ac35aaa41c6f60e2089a8ee9552f9e705de3aba3c7cfa7223f66cb0'
|
||||||
'282fd27bed2295c09768d9819d8c1f4bdfc4472e7a654cc51b45f8a2733aa07d'
|
'84efaa23be80c0ccf5e0f5da0a34b17c26948bfb7c2cc89b17b455df6df5c1e4'
|
||||||
'cf2a9deb7ea1bd63a9ddb8db9274251be92cee0e49d62488dfa37a567ee7064b'
|
'2d294f4467b5afa1c3f250243ca64953d237c9826414600b26894b0f1d5aef5c'
|
||||||
'7011c9e66fcb2d6ffc970763f4a15794babb62e275823c770f3cf0f4fbe7d2fb'
|
|
||||||
'c949d1a10231c5f9cecf3f09319afb290f66fe012e545fd70cd7bdfadddfcf56'
|
'c949d1a10231c5f9cecf3f09319afb290f66fe012e545fd70cd7bdfadddfcf56'
|
||||||
'593f41e1f1265171ecc5377226dc76a3a4d92d7c3cc4f0b0afe6c4a6578cc5e3')
|
'593f41e1f1265171ecc5377226dc76a3a4d92d7c3cc4f0b0afe6c4a6578cc5e3')
|
||||||
|
|
||||||
@ -105,9 +103,6 @@ prepare() {
|
|||||||
0101-Cygwin-enable-libgccjit-not-just-for-MingW.patch \
|
0101-Cygwin-enable-libgccjit-not-just-for-MingW.patch \
|
||||||
0102-Cygwin-testsuite-fixes-for-libgccjit.patch
|
0102-Cygwin-testsuite-fixes-for-libgccjit.patch
|
||||||
|
|
||||||
# MINGW Patches
|
|
||||||
apply_patch_with_msg 0130-libstdc++-in-out.patch
|
|
||||||
|
|
||||||
# MSYS2 Patches
|
# MSYS2 Patches
|
||||||
apply_patch_with_msg \
|
apply_patch_with_msg \
|
||||||
0950-11.2.0-configure-msys2.patch \
|
0950-11.2.0-configure-msys2.patch \
|
||||||
@ -209,7 +204,6 @@ build() {
|
|||||||
package_gcc-libs()
|
package_gcc-libs()
|
||||||
{
|
{
|
||||||
pkgdesc="Runtime libraries shipped by GCC"
|
pkgdesc="Runtime libraries shipped by GCC"
|
||||||
install=gcc-libs.install
|
|
||||||
|
|
||||||
cd ${srcdir}/build-$(arch)
|
cd ${srcdir}/build-$(arch)
|
||||||
make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
|
make -j1 -C $CHOST/libgcc DESTDIR=${pkgdir} install-shared
|
||||||
@ -246,7 +240,6 @@ package_gcc()
|
|||||||
depends=("gcc-libs=${pkgver}-${pkgrel}" 'binutils' 'gmp' 'isl' 'mpc' 'mpfr' 'msys2-runtime-devel' 'msys2-w32api-headers' 'msys2-w32api-runtime' 'windows-default-manifest')
|
depends=("gcc-libs=${pkgver}-${pkgrel}" 'binutils' 'gmp' 'isl' 'mpc' 'mpfr' 'msys2-runtime-devel' 'msys2-w32api-headers' 'msys2-w32api-runtime' 'windows-default-manifest')
|
||||||
options=('staticlibs' "$STRIP_OPTION" "$DEBUG_OPTION")
|
options=('staticlibs' "$STRIP_OPTION" "$DEBUG_OPTION")
|
||||||
provides=('msys2-devel')
|
provides=('msys2-devel')
|
||||||
install=gcc.install
|
|
||||||
|
|
||||||
cd ${srcdir}/build-$(arch)
|
cd ${srcdir}/build-$(arch)
|
||||||
|
|
||||||
@ -330,7 +323,6 @@ package_gcc-fortran()
|
|||||||
pkgdesc="Fortran front-end for GCC"
|
pkgdesc="Fortran front-end for GCC"
|
||||||
depends=("gcc=$pkgver-$pkgrel")
|
depends=("gcc=$pkgver-$pkgrel")
|
||||||
options=('staticlibs' '!emptydirs' "$STRIP_OPTION" "$DEBUG_OPTION")
|
options=('staticlibs' '!emptydirs' "$STRIP_OPTION" "$DEBUG_OPTION")
|
||||||
install=gcc-fortran.install
|
|
||||||
|
|
||||||
cd ${srcdir}/build-$(arch)
|
cd ${srcdir}/build-$(arch)
|
||||||
|
|
||||||
|
|||||||
@ -1,20 +0,0 @@
|
|||||||
infodir=usr/share/info
|
|
||||||
filelist="gnat-style.info gnat_rm.info gnat_ugn.info"
|
|
||||||
|
|
||||||
post_install() {
|
|
||||||
[ -x usr/bin/install-info ] || return 0
|
|
||||||
for file in ${filelist}; do
|
|
||||||
install-info $infodir/$file.gz $infodir/dir 2> /dev/null
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
post_upgrade() {
|
|
||||||
post_install $1
|
|
||||||
}
|
|
||||||
|
|
||||||
pre_remove() {
|
|
||||||
[ -x usr/bin/install-info ] || return 0
|
|
||||||
for file in ${filelist}; do
|
|
||||||
install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
|
|
||||||
done
|
|
||||||
}
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
infodir=usr/share/info
|
|
||||||
file="gfortran.info"
|
|
||||||
|
|
||||||
post_install() {
|
|
||||||
[ -x usr/bin/install-info ] || return 0
|
|
||||||
install-info $infodir/$file.gz $infodir/dir 2> /dev/null
|
|
||||||
}
|
|
||||||
|
|
||||||
post_upgrade() {
|
|
||||||
post_install $1
|
|
||||||
}
|
|
||||||
|
|
||||||
pre_remove() {
|
|
||||||
[ -x usr/bin/install-info ] || return 0
|
|
||||||
install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
infodir=usr/share/info
|
|
||||||
filelist=gccgo.info
|
|
||||||
|
|
||||||
post_install() {
|
|
||||||
[ -x usr/bin/install-info ] || return 0
|
|
||||||
for file in ${filelist}; do
|
|
||||||
install-info $infodir/$file.gz $infodir/dir 2> /dev/null
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
post_upgrade() {
|
|
||||||
post_install $1
|
|
||||||
}
|
|
||||||
|
|
||||||
pre_remove() {
|
|
||||||
[ -x usr/bin/install-info ] || return 0
|
|
||||||
for file in ${filelist}; do
|
|
||||||
install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
|
|
||||||
done
|
|
||||||
}
|
|
||||||
@ -1,16 +0,0 @@
|
|||||||
infodir=usr/share/info
|
|
||||||
filelist="libgomp.info libquadmath.info"
|
|
||||||
|
|
||||||
post_upgrade() {
|
|
||||||
[ -x usr/bin/install-info ] || return 0
|
|
||||||
for file in ${filelist}; do
|
|
||||||
install-info $infodir/$file.gz $infodir/dir 2> /dev/null
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
pre_remove() {
|
|
||||||
[ -x usr/bin/install-info ] || return 0
|
|
||||||
for file in ${filelist}; do
|
|
||||||
install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
|
|
||||||
done
|
|
||||||
}
|
|
||||||
@ -1,20 +0,0 @@
|
|||||||
infodir=usr/share/info
|
|
||||||
filelist="cpp.info cppinternals.info gcc.info gccinstall.info gccint.info"
|
|
||||||
|
|
||||||
post_install() {
|
|
||||||
[ -x usr/bin/install-info ] || return 0
|
|
||||||
for file in ${filelist}; do
|
|
||||||
install-info $infodir/$file.gz $infodir/dir 2> /dev/null
|
|
||||||
done
|
|
||||||
}
|
|
||||||
|
|
||||||
post_upgrade() {
|
|
||||||
post_install $1
|
|
||||||
}
|
|
||||||
|
|
||||||
pre_remove() {
|
|
||||||
[ -x usr/bin/install-info ] || return 0
|
|
||||||
for file in ${filelist}; do
|
|
||||||
install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null
|
|
||||||
done
|
|
||||||
}
|
|
||||||
Loading…
x
Reference in New Issue
Block a user