From: Jakub Bogusz Date: Mon, 26 Sep 2022 04:30:41 +0000 (+0200) Subject: - up to 9.5.0 X-Git-Url: http://git.pld-linux.org/gitweb.cgi?a=commitdiff_plain;h=d96f80281049f3947a7ab42b8f781172910a2bf9;p=packages%2Fgcc.git - up to 9.5.0 - updated info,nodebug,ada-link patches - added linux-mount patch --- diff --git a/gcc-ada-link.patch b/gcc-ada-link.patch index 240790a..b5f945a 100644 --- a/gcc-ada-link.patch +++ b/gcc-ada-link.patch @@ -1,14 +1,15 @@ ---- a/gcc/ada/link.c 2004-09-13 12:18:40.000000000 +0200 -+++ b/gcc/ada/link.c 2004-09-26 12:24:29.079704096 +0200 -@@ -157,10 +157,10 @@ +--- gcc-9.5.0/gcc/ada/link.c.orig 2022-09-24 15:37:06.801813536 +0200 ++++ gcc-9.5.0/gcc/ada/link.c 2022-09-24 15:42:19.873450815 +0200 +@@ -129,10 +129,10 @@ const char *__gnat_default_libgcc_subdir - #elif defined (linux) || defined(__GLIBC__) + #elif defined (__linux__) || defined (__GLIBC__) const char *__gnat_object_file_option = "-Wl,@"; -const char *__gnat_run_path_option = "-Wl,-rpath,"; -+const char *__gnat_run_path_option = ""; - char __gnat_shared_libgnat_default = STATIC; +-char __gnat_shared_libgnat_default = STATIC; -char __gnat_shared_libgcc_default = STATIC; -int __gnat_link_max = 8192; ++const char *__gnat_run_path_option = ""; ++char __gnat_shared_libgnat_default = SHARED; +char __gnat_shared_libgcc_default = SHARED; +int __gnat_link_max = 131072; unsigned char __gnat_objlist_file_supported = 1; diff --git a/gcc-info.patch b/gcc-info.patch index 1536e1c..0b59520 100644 --- a/gcc-info.patch +++ b/gcc-info.patch @@ -12,10 +12,10 @@ @end direntry @end ifinfo ---- a/gcc/doc/cppinternals.texi 2004-07-03 01:57:11.000000000 +0200 -+++ b/gcc/doc/cppinternals.texi 2004-09-26 10:58:58.208715048 +0200 -@@ -3,9 +3,9 @@ - @settitle The GNU C Preprocessor Internals +--- gcc-9.5.0/gcc/doc/cppinternals.texi.orig 2022-09-23 21:34:02.237198474 +0200 ++++ gcc-9.5.0/gcc/doc/cppinternals.texi 2022-09-23 21:54:16.340621111 +0200 +@@ -5,9 +5,9 @@ + @include gcc-common.texi @ifinfo -@dircategory Software development @@ -62,11 +62,11 @@ @end direntry This file documents the internals of the GNU compilers. @sp 1 ---- a/gcc/ada/gnat-style.texi 2004-09-01 13:51:52.000000000 +0200 -+++ b/gcc/ada/gnat-style.texi 2004-09-26 10:58:58.342694680 +0200 -@@ -28,9 +28,9 @@ - @setchapternewpage odd +--- gcc-9.5.0/gcc/ada/gnat-style.texi.orig 2022-09-23 21:34:02.250531735 +0200 ++++ gcc-9.5.0/gcc/ada/gnat-style.texi 2022-09-23 21:54:43.833805501 +0200 +@@ -29,9 +29,9 @@ Texts. A copy of the license is include + @include gcc-common.texi -@dircategory Software development +@dircategory Programming Languages: @@ -146,9 +146,9 @@ @end direntry @end format ---- gcc-4.8.2/libgomp/libgomp.texi.orig 2013-01-14 19:18:49.000000000 +0100 -+++ gcc-4.8.2/libgomp/libgomp.texi 2014-04-21 08:06:10.259411139 +0200 -@@ -29,9 +29,9 @@ +--- gcc-9.5.0/libgomp/libgomp.texi.orig 2022-09-23 21:34:03.680523988 +0200 ++++ gcc-9.5.0/libgomp/libgomp.texi 2022-09-23 21:55:09.700332037 +0200 +@@ -29,9 +29,9 @@ texts being (a) (see below), and with th @end copying @ifinfo @@ -159,7 +159,7 @@ +* libgomp: (libgomp). GNU Offloading and Multi Processing Runtime Library @end direntry - This manual documents the GNU implementation of the OpenMP API for + This manual documents libgomp, the GNU Offloading and Multi Processing --- gcc-4.8.2/libitm/libitm.texi.orig 2013-02-03 18:46:11.000000000 +0100 +++ gcc-4.8.2/libitm/libitm.texi 2014-04-21 08:06:38.919410542 +0200 @@ -18,9 +18,9 @@ diff --git a/gcc-linux-mount.patch b/gcc-linux-mount.patch new file mode 100644 index 0000000..920de7e --- /dev/null +++ b/gcc-linux-mount.patch @@ -0,0 +1,31 @@ +--- gcc-9.5.0/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc.orig 2022-05-27 09:21:13.287390967 +0200 ++++ gcc-9.5.0/libsanitizer/sanitizer_common/sanitizer_platform_limits_posix.cc 2022-09-25 15:24:41.297783298 +0200 +@@ -58,6 +58,7 @@ + #endif + + #if SANITIZER_LINUX ++#define _LINUX_MOUNT_H 1 /* rely on sys/mount.h */ + #include + #include + #include +--- gcc-9.5.0/libgo/sysinfo.c.orig 2022-05-27 09:21:13.143390262 +0200 ++++ gcc-9.5.0/libgo/sysinfo.c 2022-09-25 20:58:40.739220326 +0200 +@@ -131,6 +131,8 @@ + #endif + #if defined(HAVE_SYS_MOUNT_H) + #include ++#elif defined(HAVE_LINUX_FS_H) ++#include + #endif + #if defined(HAVE_SYS_VFS_H) + #include +@@ -150,9 +152,6 @@ + #if defined(HAVE_LINUX_ETHER_H) + #include + #endif +-#if defined(HAVE_LINUX_FS_H) +-#include +-#endif + #if defined(HAVE_LINUX_REBOOT_H) + #include + #endif diff --git a/gcc-moresparcs.patch b/gcc-moresparcs.patch index 0a243b5..591d38d 100644 --- a/gcc-moresparcs.patch +++ b/gcc-moresparcs.patch @@ -1,15 +1,15 @@ --- gcc-4.7.1/gcc/config.gcc.orig 2012-07-10 17:33:40.596463050 +0200 +++ gcc-4.7.1/gcc/config.gcc 2012-07-12 18:39:03.475713361 +0200 -@@ -2401,7 +2401,7 @@ +@@ -3026,7 +3026,7 @@ sparc-*-rtems*) tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h sparc/sp-elf.h sparc/rtemself.h rtems.h newlib-stdint.h" - tmake_file="sparc/t-sparc sparc/t-elf t-rtems" + tmake_file="${tmake_file} sparc/t-sparc sparc/t-rtems" ;; -sparc-*-linux*) +sparc-*-linux* | sparcv[789]*-*-linux*) tm_file="${tm_file} dbxelf.h elfos.h sparc/sysv4.h gnu-user.h linux.h glibc-stdint.h sparc/tso.h" extra_options="${extra_options} sparc/long-double-switch.opt" case ${target} in -@@ -2878,7 +2878,7 @@ sparc64-*-rtems*) +@@ -3080,7 +3080,7 @@ sparc64-*-rtems*) extra_options="${extra_options}" tmake_file="${tmake_file} sparc/t-sparc sparc/t-rtems-64" ;; diff --git a/gcc-nodebug.patch b/gcc-nodebug.patch index 2ecd3b2..f6d3619 100644 --- a/gcc-nodebug.patch +++ b/gcc-nodebug.patch @@ -25,8 +25,8 @@ # Pretend that _Unwind_GetIPInfo is available for the target by default. This # should be autodetected during the configuration of libada and passed down to # here, but we need something for --disable-libada and hope for the best. ---- gcc-4.7.1/libada/Makefile.in.orig 2012-06-12 17:12:37.000000000 +0200 -+++ gcc-4.7.1/libada/Makefile.in 2012-07-12 18:27:53.482408144 +0200 +--- gcc-9.5.0/libada/Makefile.in.orig 2022-09-23 21:58:10.762684472 +0200 ++++ gcc-9.5.0/libada/Makefile.in 2022-09-24 15:32:44.406568386 +0200 @@ -59,7 +59,7 @@ LDFLAGS= CFLAGS=-g PICFLAG = @PICFLAG@ @@ -34,7 +34,7 @@ -GNATLIBCFLAGS= -g -O2 +GNATLIBCFLAGS= -O2 GNATLIBCFLAGS_FOR_C = -W -Wall $(GNATLIBCFLAGS) $(CFLAGS_FOR_TARGET) \ - -fexceptions -DIN_RTS @have_getipinfo@ + -fexceptions -DIN_RTS @have_getipinfo@ @have_capability@ --- gcc-4.7.1/libffi/Makefile.am.orig 2012-02-27 11:00:12.000000000 +0100 +++ gcc-4.7.1/libffi/Makefile.am 2012-07-12 18:28:20.115740360 +0200 @@ -127,16 +127,16 @@ # For robustness sake (in light of junk files or in-source # configuration), copy from the build or source tree to the install ---- gcc-4.7.1/Makefile.in.orig 2012-05-16 17:54:24.000000000 +0200 -+++ gcc-4.7.1/Makefile.in 2012-07-12 18:32:07.075730835 +0200 -@@ -364,7 +364,7 @@ +--- gcc-9.5.0/Makefile.in.orig 2022-05-27 09:21:10.431376979 +0200 ++++ gcc-9.5.0/Makefile.in 2022-09-24 15:33:00.146483116 +0200 +@@ -372,7 +372,7 @@ BUILD_PREFIX_1 = @BUILD_PREFIX_1@ # Flags to pass to stage2 and later makes. They are defined # here so that they can be overridden by Makefile fragments. -BOOT_CFLAGS= -g -O2 +BOOT_CFLAGS= -O2 BOOT_LDFLAGS= - BOOT_ADAFLAGS=-gnatpg -gnata + BOOT_ADAFLAGS= -gnatpg @@ -618,8 +618,8 @@ CXXFLAGS_FOR_TARGET = @CXXFLAGS_FOR_TARG LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET) diff --git a/gcc.spec b/gcc.spec index b5d662a..c6f44fe 100644 --- a/gcc.spec +++ b/gcc.spec @@ -96,7 +96,7 @@ # Stable is: any major_ver and minor_ver >= 1.0 # For PLD we usually use gcc when minor_ver >= 2.0 (first bugfix release or later) %define major_ver 9 -%define minor_ver 3.0 +%define minor_ver 5.0 Summary: GNU Compiler Collection: the C compiler and shared files Summary(es.UTF-8): Colección de compiladores GNU: el compilador C y ficheros compartidos @@ -109,18 +109,19 @@ Epoch: 6 License: GPL v3+ Group: Development/Languages Source0: https://ftp.gnu.org/pub/gnu/gcc/gcc-%{version}/%{name}-%{version}.tar.xz -# Source0-md5: d00a144b771ddeb021b61aa205b7e345 +# Source0-md5: 34cd76facb562835ff5faca81fead17e Source1: %{name}-optimize-la.pl # check libffi version with libffi/configure.ac Source3: libffi.pc.in Source4: branch.sh # use branch.sh to update gcc-branch.diff -Patch100: %{name}-branch.diff -# Patch100-md5: 0f41c1f7245b318399c8dcd7b8fa0bfc +#Patch100: %{name}-branch.diff +## Patch100-md5: 0f41c1f7245b318399c8dcd7b8fa0bfc Patch0: %{name}-info.patch Patch2: %{name}-nodebug.patch Patch3: %{name}-ada-link.patch Patch4: %{name}-ada-x32.patch +Patch5: %{name}-linux-mount.patch Patch10: %{name}-moresparcs.patch Patch11: %{name}-install-libffi.patch @@ -2524,11 +2525,12 @@ więc wtyczki muszą być przebudowywane przy każdej aktualizacji GCC. %prep %setup -q -%patch100 -p1 +#patch100 -p1 %patch0 -p1 %patch2 -p1 %patch3 -p1 %patch4 -p1 +%patch5 -p1 %patch10 -p1 %if %{with gcc_libffi}