libgomp: patch to workaround environ null pointer in initialize_env [release 13.1.1-2mamba;Tue Jun 20 2023]

gcc-13.1.1-libgomp-workaround-null-environ.patch

@@ -0,0 +1,12 @@
+--- gcc-13.1.1/libgomp/env.c.orig	2023-06-20 10:11:45.125868665 +0200
++++ gcc-13.1.1/libgomp/env.c	2023-06-20 10:04:18.089095860 +0200
+@@ -2059,6 +2059,9 @@
+   none = gomp_get_initial_icv_item (GOMP_DEVICE_NUM_FOR_NO_SUFFIX);
+   initialize_icvs (&none->icvs);
+ 
++  if (environ == 0) fprintf(stderr, "FIXME: initialize_env: environ is not initialized\n");
++
++  if (environ != 0)
+   for (env = environ; *env != 0; env++)
+     {
+       if (!startswith (*env, "OMP_"))

gcc-4.3.2-ecj1-wrapper

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-gij --classpath /usr/share/java/ecj.jar \
-   org.eclipse.jdt.internal.compiler.batch.GCCMain \
-   ${1+"$@"}

gcc.spec

@@ -1,4 +1,6 @@
 # openmamba cross platform gcc specfile
+%define git_commit 9a167ee2f8b9a0859fbab6cfdc276cf1f272effe
+%define git_commit_ver 13.1.1
 
 %define target_cpu %(echo %{_target_platform} | cut -d- -f1)
 %if "%{?_target_platform}" != "%{_host}"
@@ -39,17 +41,16 @@
 %define majver %(echo %version | cut -d. -f 1-2)
 
 Name:          gcc
-Version:       11.1.0
-Release:       1mamba
+Version:       13.1.1
+Release:       2mamba
 Summary:       GNU Compiler Collection (C, C++, Fortran, Go, Ada)
 Group:         Applications/Development
 Vendor:        openmamba
 Distribution:  openmamba
 Packager:      Silvan Calarco <silvan.calarco@mambasoft.it>
 URL:           https://gcc.gnu.org/
-Source:        ftp://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}%{?gcc_extraver}.tar.xz
-Source1:       ftp://sourceware.org/pub/java/ecj-latest.jar
-Source2:       gcc-4.3.2-ecj1-wrapper
+Source:        https://sourceware.org/git/gcc.git/master@%{git_commit}/gcc-%{version}.tar.bz2
+#Source:        https://ftp.gnu.org/gnu/gcc/gcc-%{version}/gcc-%{version}.tar.xz
 Patch0:        %{name}-4.5.0-no_fixincludes.patch
 Patch1:        %{name}-4.0.2-zextract.patch
 Patch2:        gcc4-java-nomulti.patch
@@ -68,6 +69,7 @@ Patch15:       gcc-4.9.0-upstream-fixes-1.patch
 Patch16:       gcc-4.9.2-arm-lra-bootstrap.patch
 Patch19:       gcc-7.1.0-cross-ftbfs-ucontet_t.patch
 Patch20:       gcc-10.1.0-arm-provide-futex-atomic-functions.patch
+Patch21:       gcc-13.1.1-libgomp-workaround-null-environ.patch
 License:       GPL
 ## AUTOBUILDREQ-BEGIN
 ## AUTOBUILDREQ-END
@@ -113,7 +115,7 @@ BuildRequires: libisl-devel >= 0.14
 #% else
 #BuildRequires: cross-%{target_cpu}-glibc%{?glibc_require_append} >= 2.5
 %endif
-
+#BuildConflicts: libldc-devel
 Requires(post):%{__install_info}
 Requires:      %{name}-cpp = %{version}-%{release}
 Requires:      libgcc >= %{version}-%{release}
@@ -592,7 +594,15 @@ Cross Platform gcc for %{_target_platform}.
 %debug_package
 %endif
 
+# Don't clean build at the end
+%global __spec_rmbuild_cmd /bin/true
+
 %prep
+%if "%{git_commit_ver}" != "%{version}"
+echo "Needed to update git commit for gcc %{version}"
+exit 1
+%endif
+
 %setup -q -n gcc-%{version}%{?gcc_extraver}
 #-D -T
 #:<< ___EOF
@@ -601,17 +611,26 @@ Cross Platform gcc for %{_target_platform}.
 %define _build_id_links none
 %endif
 
-%if "%{_target_platform}" != "%{_build}"
-%patch9 -p1
-%endif
+#%if "%{_target_platform}" != "%{_build}"
+#%patch 9 -p1
+#%endif
 
-# psignal_fix_bootstrap_build
-%patch11 -p1
+## psignal_fix_bootstrap_build
+#%patch 11 -p1
+
+%patch 21 -p1
 
 %ifarch arm
-%patch20 -p1
+%patch 20 -p1
 ## workaround for gcc-go
 #cp libgo/go/internal/syscall/unix/{getrandom_linux_arm.go,dummy.go}
+cat >> libgo/go/internal/syscall/unix/dummy.go << __EOF
+
+const (
+        getrandomTrap     uintptr = 384
+        copyFileRangeTrap uintptr = 391
+)
+__EOF
 %endif
 
 # Do not run fixincludes
@@ -646,7 +665,7 @@ BUILD_LANGUAGES="${BUILD_LANGUAGES},go"
 
 case %{_target_platform} in
    i386-*|i486-*|i586-*|i686-*|athlon-*)
-      ADDITIONAL_OPTS="--with-arch=i686"
+      ADDITIONAL_OPTS="--with-arch=pentium4"
       ;;
    ppc-* | powerpc-*)
       ADDITIONAL_OPTS=""
@@ -847,6 +866,11 @@ mv %{buildroot}%{_libdir}/libstdc++.so.*-gdb.py %{buildroot}%{_datadir}/gdb/auto
 # fix for 32bit multilib build
 mkdir -p %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/lib32
 mv %{buildroot}%{_prefix}/lib32/libstdc++.so.*-gdb.py %{buildroot}%{_datadir}/gdb/auto-load/%{_prefix}/lib32/
+# set /usr/lib32 for ldconfig
+install -d -m0755 %{buildroot}%{_sysconfdir}/ld.so.conf.d
+cat > %{buildroot}%{_sysconfdir}/ld.so.conf.d/lib32-gcc.conf << EOF
+/usr/lib32
+EOF
 %endif
 
 (cd ../gcc-%{version}%{?gcc_extraver}
@@ -1007,7 +1031,6 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 
 %files -n libcc1-devel
 %defattr(-,root,root)
-%{_libdir}/libcc1.la
 %{_libdir}/libcc1.so
 
 %files -n libitm
@@ -1017,7 +1040,6 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 %files -n libitm-devel
 %defattr(-,root,root)
 %{_libdir}/libitm.a
-%{_libdir}/libitm.la
 %{_libdir}/libitm.so
 %{_libdir}/libitm.spec
 %{_infodir}/libitm.info.gz
@@ -1033,14 +1055,11 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 %files -n libgomp-devel
 %defattr(-,root,root)
 %{_libdir}/libgomp.a
-%{_libdir}/libgomp.la
 %{_libdir}/libgomp.so
-#%{_libdir}/libgomp-plugin-host_nonshm.la
 #%{_libdir}/libgomp-plugin-host_nonshm.so
 %{_libdir}/libgomp.spec
 %ifarch ppc
 %{_libdir}/nof/libgomp.a
-%{_libdir}/nof/libgomp.la
 %{_libdir}/nof/libgomp.so
 %{_libdir}/nof/libgomp.spec
 %endif
@@ -1056,11 +1075,9 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 %files -n libobjc-devel
 %defattr(-,root,root)
 %{_libdir}/libobjc.a
-%{_libdir}/libobjc.la
 %{_libdir}/libobjc.so
 %ifarch ppc
 %{_libdir}/nof/libobjc.a
-%{_libdir}/nof/libobjc.la
 %{_libdir}/nof/libobjc.so
 %endif
 %dir %{_libdir}/gcc/%{_target_platform}/%{version}/include/objc
@@ -1076,16 +1093,12 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 %files -n libssp-devel
 %defattr(-,root,root)
 %{_libdir}/libssp.a
-%{_libdir}/libssp.la
 %{_libdir}/libssp.so
 %{_libdir}/libssp_nonshared.a
-%{_libdir}/libssp_nonshared.la
 %ifarch ppc
 %{_libdir}/nof/libssp.a
-%{_libdir}/nof/libssp.la
 %{_libdir}/nof/libssp.so
 %{_libdir}/nof/libssp_nonshared.a
-%{_libdir}/nof/libssp_nonshared.la
 %endif
 %dir %{_libdir}/gcc/%{_target_platform}/%{version}/include/ssp
 %{_libdir}/gcc/%{_target_platform}/%{version}/include/ssp/*
@@ -1100,17 +1113,15 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 %files -n libasan-devel
 %defattr(-,root,root)
 %{_libdir}/libasan.a
-%{_libdir}/libasan.la
 %{_libdir}/libasan.so
 %{_libdir}/libasan_preinit.o
 %ifarch x86_64 aarch64
 %{_libdir}/libtsan.a
-%{_libdir}/libtsan.la
 %{_libdir}/libtsan.so
 %{_libdir}/libtsan_preinit.o
 %endif
 
-%ifarch aarch64
+%ifarch aarch64 x86_64
 %files -n libhwasan
 %defattr(-,root,root)
 %{_libdir}/libhwasan.so.*
@@ -1118,11 +1129,9 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 %files -n libhwasan-devel
 %defattr(-,root,root)
 %{_libdir}/libhwasan.a
-%{_libdir}/libhwasan.la
 %{_libdir}/libhwasan.so
-%endif
+%{_libdir}/libhwasan_preinit.o
 
-%ifarch x86_64 aarch64
 %files -n liblsan
 %defattr(-,root,root)
 %{_libdir}/liblsan.so.*
@@ -1130,7 +1139,6 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 %files -n liblsan-devel
 %defattr(-,root,root)
 %{_libdir}/liblsan.a
-%{_libdir}/liblsan.la
 %{_libdir}/liblsan.so
 %{_libdir}/liblsan_preinit.o
 %endif
@@ -1142,7 +1150,6 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 %files -n libatomic-devel
 %defattr(-,root,root)
 %{_libdir}/libatomic.a
-%{_libdir}/libatomic.la
 %{_libdir}/libatomic.so
 
 #%files -n libcilkrts
@@ -1152,7 +1159,6 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 #%files -n libcilkrts-devel
 #%defattr(-,root,root)
 #%{_libdir}/libcilkrts.a
-#%{_libdir}/libcilkrts.la
 #%{_libdir}/libcilkrts.so
 #%{_libdir}/libcilkrts.spec
 
@@ -1165,11 +1171,9 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 #%files -n libmpx-devel
 #%defattr(-,root,root)
 #%{_libdir}/libmpx.a
-#%{_libdir}/libmpx.la
 #%{_libdir}/libmpx.so
 #%{_libdir}/libmpx.spec
 #%{_libdir}/libmpxwrappers.a
-#%{_libdir}/libmpxwrappers.la
 #%{_libdir}/libmpxwrappers.so
 #%endif
 
@@ -1180,7 +1184,6 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 %files -n libubsan-devel
 %defattr(-,root,root)
 %{_libdir}/libubsan.a
-%{_libdir}/libubsan.la
 %{_libdir}/libubsan.so
 %{_libdir}/libsanitizer.spec
 
@@ -1191,14 +1194,14 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 #%files -n libvtv-devel
 #%defattr(-,root,root)
 #%{_libdir}/libvtv.a
-#%{_libdir}/libvtv.la
 #%{_libdir}/libvtv.so
 
 %if "%{disable_cpp}" != "1"
 #
 # C++ language
 #
-%files c++
+# NOTE: libstdc++.lang moved here to prevent x86 biarch conflict of libstdc++6
+%files c++ -f libstdc++.lang
 %defattr(-,root,root)
 %{_bindir}/c++
 %{_bindir}/g++
@@ -1208,7 +1211,7 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 %{_mandir}/man1/g++.1.*
 #%doc gcc/cp/ChangeLog*
 
-%files -n %{libstdcxx_name} -f libstdc++.lang
+%files -n %{libstdcxx_name}
 %defattr(-,root,root)
 %{_libdir}/libstdc++.so.*
 %ifarch ppc
@@ -1221,14 +1224,15 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 
 %files -n %{libstdcxx_name}-devel
 %defattr(-,root,root)
-%{_libdir}/libstdc++.*a
+%{_libdir}/libstdc++.a
+%{_libdir}/libstdc++exp.a
 %{_libdir}/libstdc++.so
-%{_libdir}/libsupc++.*a
-%{_libdir}/libstdc++fs.*a
+%{_libdir}/libsupc++.a
+%{_libdir}/libstdc++fs.a
 %ifarch ppc
-%{_libdir}/nof/libstdc++.*a
+%{_libdir}/nof/libstdc++.a
 %{_libdir}/nof/libstdc++.so
-%{_libdir}/nof/libsupc++.*a
+%{_libdir}/nof/libsupc++.a
 %endif
 %dir %{_includedir}/c++
 %{_includedir}/c++/*
@@ -1243,10 +1247,8 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 %{_bindir}/gdc
 %{_bindir}/%{_target_platform}-gdc
 %{_libdir}/libgdruntime.a
-%{_libdir}/libgdruntime.la
 %{_libdir}/libgdruntime.so
 %{_libdir}/libgphobos.a
-%{_libdir}/libgphobos.la
 %{_libdir}/libgphobos.so
 %{_libdir}/libgphobos.spec
 %{_infodir}/gdc.info*
@@ -1266,12 +1268,10 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 %{_bindir}/gfortran
 %{_bindir}/%{_target_platform}-gfortran
 %{_libdir}/libgfortran.a
-%{_libdir}/libgfortran.la
 %{_libdir}/libgfortran.so
 %{_libdir}/libgfortran.spec
 %ifarch ppc
 %{_libdir}/nof/libgfortran.a
-%{_libdir}/nof/libgfortran.la
 %{_libdir}/nof/libgfortran.so
 %endif
 %{_mandir}/man1/gfortran.1.*
@@ -1293,7 +1293,6 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 %files -n libquadmath-devel
 %defattr(-,root,root)
 %{_libdir}/libquadmath.a
-%{_libdir}/libquadmath.la
 %{_libdir}/libquadmath.so
 %endif
 
@@ -1321,7 +1320,6 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 %files -n libgo-devel
 %defattr(-,root,root)
 %{_libdir}/libgo.a
-%{_libdir}/libgo.la
 %{_libdir}/libgo.so
 %{_libdir}/libgobegin.a
 %{_libdir}/libgolibbegin.a
@@ -1341,7 +1339,9 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 #%doc gcc/doc/gfortran.pdf
 %endif
 %endif
+%ifnarch arm aarch64
 %{_infodir}/libquadmath.info.*
+%endif
 %if "%{disable_doc}" != "1"
 #%doc gcc/doc/cpp.pdf
 #%doc gcc/doc/cppinternals.pdf
@@ -1356,30 +1356,29 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 %ifarch x86_64
 %files -n gcc-multilib
 %defattr(-,root,root)
+%{_sysconfdir}/ld.so.conf.d/lib32-gcc.conf
 %dir %{_libdir}/gcc/%{_target_platform}/%{version}/32
 %{_libdir}/gcc/%{_target_platform}/%{version}/32/*
 %{_prefix}/lib32/libgcc_s.so
 %{_prefix}/lib32/libgcc_s.so.1
 #
 %{_prefix}/lib32/libstdc++.*a
+%{_prefix}/lib32/libstdc++exp.a
 %{_prefix}/lib32/libstdc++.so
 %{_prefix}/lib32/libstdc++.so.*
 %{_prefix}/lib32/libstdc++fs.*a
 #
 %{_prefix}/lib32/libasan.a
-%{_prefix}/lib32/libasan.la
 %{_prefix}/lib32/libasan.so
 %{_prefix}/lib32/libasan.so.*
 %{_prefix}/lib32/libasan_preinit.o
 %{_prefix}/lib32/libatomic.a
-%{_prefix}/lib32/libatomic.la
 %{_prefix}/lib32/libatomic.so
 %{_prefix}/lib32/libatomic.so.*
 #
 # gfortran
 #
 %{_prefix}/lib32/libgfortran.a
-%{_prefix}/lib32/libgfortran.la
 %{_prefix}/lib32/libgfortran.so
 %{_prefix}/lib32/libgfortran.so.*
 %{_prefix}/lib32/libgfortran.spec
@@ -1391,7 +1390,6 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 %dir %{_prefix}/lib32/go/%{version}/%{_target_platform}
 %{_prefix}/lib32/go/%{version}/%{_target_platform}/*
 %{_prefix}/lib32/libgo.a
-%{_prefix}/lib32/libgo.la
 %{_prefix}/lib32/libgo.so
 %{_prefix}/lib32/libgo.so.*
 %{_prefix}/lib32/libgobegin.a
@@ -1401,7 +1399,6 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 #
 #
 %{_prefix}/lib32/libgomp.a
-%{_prefix}/lib32/libgomp.la
 %{_prefix}/lib32/libgomp.so
 %{_prefix}/lib32/libgomp.so.*
 %{_prefix}/lib32/libgomp.spec
@@ -1409,51 +1406,39 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 #%{_prefix}/lib/libgomp-plugin-host_nonshm.so
 #%{_prefix}/lib/libgomp-plugin-host_nonshm.so.*
 /usr/lib32/libitm.a
-/usr/lib32/libitm.la
 /usr/lib32/libitm.so
 /usr/lib32/libitm.so.*
 /usr/lib32/libitm.spec
 #/usr/lib/libmpx*.a
-#/usr/lib/libmpx*.la
 #/usr/lib/libmpx*.so
 #/usr/lib/libmpx*.so.*
 #/usr/lib/libmpx.spec
 /usr/lib32/libobjc.a
-/usr/lib32/libobjc.la
 /usr/lib32/libobjc.so
 /usr/lib32/libobjc.so.*
 /usr/lib32/libssp.a
-/usr/lib32/libssp.la
 /usr/lib32/libssp.so
 /usr/lib32/libssp.so.*
 /usr/lib32/libssp_nonshared.a
-/usr/lib32/libssp_nonshared.la
 /usr/lib32/libsupc++.a
-/usr/lib32/libsupc++.la
 #/usr/lib/libcilkrts.a
-#/usr/lib/libcilkrts.la
 #/usr/lib/libcilkrts.so
 #/usr/lib/libcilkrts.so.*
 #/usr/lib/libcilkrts.spec
 /usr/lib32/libquadmath.a
-/usr/lib32/libquadmath.la
 /usr/lib32/libquadmath.so
 /usr/lib32/libquadmath.so.*
 /usr/lib32/libsanitizer.spec
 /usr/lib32/libubsan.a
-/usr/lib32/libubsan.la
 /usr/lib32/libubsan.so
 /usr/lib32/libubsan.so.*
 #/usr/lib/libvtv.a
-#/usr/lib/libvtv.la
 #/usr/lib/libvtv.so
 #/usr/lib/libvtv.so.*
 %{_prefix}/lib32/libgdruntime.a
-%{_prefix}/lib32/libgdruntime.la
 %{_prefix}/lib32/libgdruntime.so
 %{_prefix}/lib32/libgdruntime.so.*
 %{_prefix}/lib32/libgphobos.a
-%{_prefix}/lib32/libgphobos.la
 %{_prefix}/lib32/libgphobos.so
 %{_prefix}/lib32/libgphobos.so.*
 %{_prefix}/lib32/libgphobos.spec
@@ -1477,14 +1462,10 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 %endif
 %endif
 #%{_prefix}/%{_target_platform}/%{_lib}/libgfortran.a
-#%{_prefix}/%{_target_platform}/%{_lib}/libgfortran.la
 #%{_prefix}/%{_target_platform}/%{_lib}/libobjc.a
-#%{_prefix}/%{_target_platform}/%{_lib}/libobjc.la
 %if "%{target_cpu}" == "ppc"
 %{_prefix}/%{_target_platform}/%{_lib}/nof/libgfortran.a
-%{_prefix}/%{_target_platform}/%{_lib}/nof/libgfortran.la
 %{_prefix}/%{_target_platform}/%{_lib}/nof/libobjc.a
-%{_prefix}/%{_target_platform}/%{_lib}/nof/libobjc.la
 %endif
 %endif
 %{_libdir}/gcc/%{_target_platform}/%{version}/*
@@ -1497,6 +1478,27 @@ rm -f %{buildroot}%{_infodir}/libffi.info*
 %endif
 
 %changelog
+* Tue Jun 20 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 13.1.1-2mamba
+- libgomp: patch to workaround environ null pointer in initialize_env
+
+* Sat Jun 17 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 13.1.1-1mamba
+- update to 13.1.1
+
+* Sat Jun 10 2023 Silvan Calarco <silvan.calarco@mambasoft.it> 13.1.0-1mamba
+- update to 13.1.0
+
+* Thu Sep 29 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 12.2.0-2mamba
+- gcc-multilib: add /usr/lib32 to ldconfig paths
+
+* Sun Aug 21 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 12.2.0-1mamba
+- update to 12.2.0
+
+* Thu Apr 28 2022 Silvan Calarco <silvan.calarco@mambasoft.it> 11.3.0-1mamba
+- update to 11.3.0
+
+* Wed Jul 28 2021 Automatic Build System <autodist@mambasoft.it> 11.2.0-1mamba
+- automatic version update by autodist
+
 * Thu Apr 29 2021 Automatic Build System <autodist@mambasoft.it> 11.1.0-1mamba
 - automatic version update by autodist