- merged 15.2.0 from PLD

diff --git a/all-library-paths.patch b/all-library-paths.patch
deleted file mode 100644 (file)
index e1c1941..0000000
--- a/all-library-paths.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- gcc-11.2.0/gcc/gcc.cc.orig 2022-04-18 15:40:02.650553155 +0200
-+++ gcc-11.2.0/gcc/gcc.cc      2022-04-19 09:31:21.340818868 +0200
-@@ -7817,17 +7817,6 @@
-   *cp++ = '.';
-   *cp = '\0';
- 
--  /* Exclude directories that the linker is known to search.  */
--  if (linker
--      && IS_DIR_SEPARATOR (path[0])
--      && ((cp - path == 6
--         && filename_ncmp (path + 1, "lib", 3) == 0)
--        || (cp - path == 10
--            && filename_ncmp (path + 1, "usr", 3) == 0
--            && IS_DIR_SEPARATOR (path[4])
--            && filename_ncmp (path + 5, "lib", 3) == 0)))
--    return 0;
--
-   return (stat (path, &st) >= 0 && S_ISDIR (st.st_mode));
- }
- 

diff --git a/branch.sh b/branch.sh
index 60e1040ab472abc5fc288debbbfe60a1d530c254..fb04d96dd39189ee94348f6638fcd3c6ff684148 100755 (executable)
--- a/branch.sh
+++ b/branch.sh
@@ -2,8 +2,8 @@
 set -e
 url=git://gcc.gnu.org/git/gcc.git
 package=gcc
 set -e
 url=git://gcc.gnu.org/git/gcc.git
 package=gcc

-tag=releases/gcc-14.2.0
-branch=releases/gcc-14
+tag=releases/gcc-15.2.0
+branch=releases/gcc-15

 out=$package-branch.diff
 repo=$package.git
 
 out=$package-branch.diff
 repo=$package.git
 

diff --git a/gcc-info.patch b/gcc-info.patch
index c134a1b652379047055497866d17f5dd5e9cedb9..bf0f01df204000aac2ca6757bb11ae26de9da981 100644 (file)
--- a/gcc-info.patch
+++ b/gcc-info.patch
@@ -235,3 +235,31 @@ diff -urNp -x '*.orig' gcc-10.2.0.org/libquadmath/libquadmath.texi gcc-10.2.0/li
  @end direntry
  
  This manual documents the GCC Quad-Precision Math Library API.
  @end direntry
  
  This manual documents the GCC Quad-Precision Math Library API.

+--- gcc-11.5.0/gcc/d/gdc.texi.orig     2024-07-19 07:52:43.845493268 +0200
++++ gcc-11.5.0/gcc/d/gdc.texi  2024-12-12 22:08:23.782172397 +0100
+@@ -34,9 +34,9 @@ man page gfdl(7).
+ 
+ @ifinfo
+ @format
+-@dircategory Software development
++@dircategory Programming Languages:
+ @direntry
+-* gdc: (gdc).               A GCC-based compiler for the D language
++* gdc: (gdc).                         A GCC-based compiler for the D language
+ @end direntry
+ @end format
+ 
+--- gcc-14.2.0/gcc/doc/gm2.texi.orig   2025-04-23 21:49:33.543601226 +0200
++++ gcc-14.2.0/gcc/doc/gm2.texi        2025-04-25 17:09:35.278720741 +0200
+@@ -37,9 +37,9 @@ man page gfdl(7).
+ 
+ @ifinfo
+ @format
+-@dircategory Software development
++@dircategory Programming Languages:
+ @direntry
+-* gm2: (gm2).               A GCC-based compiler for the Modula-2 language
++* gm2: (gm2).                         A GCC-based compiler for the Modula-2 language
+ @end direntry
+ @end format
+ 

diff --git a/gcc.spec b/gcc.spec
index 7c0c9489411a8a38b4fde044ccc20fca7f0d49b3..0a663a56f45396a93fa3a456e3b3743f07edfd2e 100644 (file)
--- a/gcc.spec
+++ b/gcc.spec
@@ -1,5 +1,3 @@
-# TODO: finish D (needs bootstrap from non-TLD gdc binaries)
-#

 # NOTE
 # - when adding new subpackages with external libraries (like libffi)
 #   or having own Version, do not use epoch 6 there, reset them to 0!
 # NOTE
 # - when adding new subpackages with external libraries (like libffi)
 #   or having own Version, do not use epoch 6 there, reset them to 0!


@@ -8,7 +6,7 @@
 # - languages:
 %bcond_without ada             # ADA language support
 %bcond_without cxx             # C++ language support
 # - languages:
 %bcond_without ada             # ADA language support
 %bcond_without cxx             # C++ language support

-%bcond_with    d               # D language support [NFY, buildrequires gdc]
+%bcond_without d               # D language support

 %bcond_without fortran         # Fortran language support
 %bcond_without go              # Go language support
 %bcond_without modula2         # Modula2 language support
 %bcond_without fortran         # Fortran language support
 %bcond_without go              # Go language support
 %bcond_without modula2         # Modula2 language support


@@ -100,7 +98,7 @@
 
 # Stable is: any major_ver and minor_ver >= 1.0
 # For TLD we usually use gcc when minor_ver >= 2.0 (first bugfix release or later)
 
 # Stable is: any major_ver and minor_ver >= 1.0
 # For TLD we usually use gcc when minor_ver >= 2.0 (first bugfix release or later)

-%define                major_ver       14
+%define                major_ver       15

 %define                minor_ver       2.0
 
 Summary:       GNU Compiler Collection: the C compiler and shared files
 %define                minor_ver       2.0
 
 Summary:       GNU Compiler Collection: the C compiler and shared files


@@ -109,21 +107,21 @@ Summary(pl.UTF-8):        Kolekcja kompilatorów GNU: kompilator C i pliki współdziel
 Summary(pt_BR.UTF-8):  Coleção dos compiladores GNU: o compilador C e arquivos compartilhados
 Name:          gcc
 Version:       %{major_ver}.%{minor_ver}
 Summary(pt_BR.UTF-8):  Coleção dos compiladores GNU: o compilador C e arquivos compartilhados
 Name:          gcc
 Version:       %{major_ver}.%{minor_ver}

-Release:       2
+Release:       1

 Epoch:         6
 License:       GPL v3+
 Group:         Development/Languages
 Source0:       https://gcc.gnu.org/pub/gcc/releases/%{name}-%{version}/%{name}-%{version}.tar.xz
 Epoch:         6
 License:       GPL v3+
 Group:         Development/Languages
 Source0:       https://gcc.gnu.org/pub/gcc/releases/%{name}-%{version}/%{name}-%{version}.tar.xz

-# Source0-md5: 2268420ba02dc01821960e274711bde0
+# Source0-md5: b861b092bf1af683c46a8aa2e689a6fd

 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
 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:        17e646e88e3d285211be1c3bdfeb42e9
+# Patch100-md5:        c981de54e8a25c40d5bef99684e74292

 Patch0:                %{name}-info.patch
 Patch0:                %{name}-info.patch

-Patch1:                all-library-paths.patch
+

 Patch2:                %{name}-nodebug.patch
 Patch3:                %{name}-ada-link.patch
 Patch4:                %{name}-ada-x32.patch
 Patch2:                %{name}-nodebug.patch
 Patch3:                %{name}-ada-link.patch
 Patch4:                %{name}-ada-x32.patch


@@ -147,7 +145,8 @@ BuildRequires:      gcc-ada
 BuildRequires: libgnat-static
 %endif
 %if %{with d}
 BuildRequires: libgnat-static
 %endif
 %if %{with d}

-BuildRequires: gcc-d
+BuildRequires: gcc-d >= 6:11
+BuildRequires: libgphobos-static

 %endif
 BuildRequires: gdb
 BuildRequires: gettext-tools >= 0.14.5
 %endif
 BuildRequires: gdb
 BuildRequires: gettext-tools >= 0.14.5


@@ -757,7 +756,7 @@ License:    GPL v3+ with GCC Runtime Library Exception v3.1
 Group:         Libraries
 # >= instead of = to allow keeping older libstdc++ (with different soname)
 Requires:      libgcc >= %{epoch}:%{version}-%{release}
 Group:         Libraries
 # >= instead of = to allow keeping older libstdc++ (with different soname)
 Requires:      libgcc >= %{epoch}:%{version}-%{release}

-Obsoletes:     libg++
+Obsoletes:     libg++ < 2.95

 Obsoletes:     libstdc++3 < 5:3.1
 Obsoletes:     libstdc++4 < 5:3.2
 
 Obsoletes:     libstdc++3 < 5:3.1
 Obsoletes:     libstdc++4 < 5:3.2
 


@@ -807,7 +806,7 @@ Group:              Development/Libraries
 Requires:      %{name}-c++ = %{epoch}:%{version}-%{release}
 Requires:      glibc-devel
 Requires:      libstdc++ = %{epoch}:%{version}-%{release}
 Requires:      %{name}-c++ = %{epoch}:%{version}-%{release}
 Requires:      glibc-devel
 Requires:      libstdc++ = %{epoch}:%{version}-%{release}

-Obsoletes:     libg++-devel
+Obsoletes:     libg++-devel < 2.95

 Obsoletes:     libstdc++3-devel < 5:3.1
 Obsoletes:     libstdc++4-devel < 5:3.2
 
 Obsoletes:     libstdc++3-devel < 5:3.1
 Obsoletes:     libstdc++4-devel < 5:3.2
 


@@ -969,6 +968,125 @@ API and internal documentation for C++ standard library.
 %description -n libstdc++-apidocs -l pl.UTF-8
 Dokumentacja API i wewnętrzna biblioteki standardowej C++.
 
 %description -n libstdc++-apidocs -l pl.UTF-8
 Dokumentacja API i wewnętrzna biblioteki standardowej C++.
 

+%package d
+Summary:       D language support for GCC
+Summary(pl.UTF-8):     Obsługa języka D dla GCC
+Group:         Development/Languages
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      libgphobos = %{epoch}:%{version}-%{release}
+
+%description d
+This package adds support for compiling D programs with the GNU
+compiler.
+
+%description d -l pl.UTF-8
+Ten pakiet dodaje obsługę języka D do kompilatora GCC.
+
+%package d-multilib-32
+Summary:       D language 32-bit binaries support for GCC
+Summary(pl.UTF-8):     Obsługa binariów 32-bitowych w języku D dla GCC
+Group:         Development/Languages
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      libgphobos-multilib-32 = %{epoch}:%{version}-%{release}
+
+%description d-multilib-32
+This package adds support for compiling 32-bit D programs with the GNU
+compiler.
+
+%description d-multilib-32 -l pl.UTF-8
+Ten pakiet dodaje obsługę 32-bitowych programów w języku D do
+kompilatora GCC.
+
+%package d-multilib-%{multilib2}
+Summary:       D language %{m2_desc} binaries support for GCC
+Summary(pl.UTF-8):     Obsługa binariów %{m2_desc} w języku D dla GCC
+Group:         Development/Languages
+Requires:      %{name} = %{epoch}:%{version}-%{release}
+Requires:      libgphobos-multilib-%{multilib2} = %{epoch}:%{version}-%{release}
+
+%description d-multilib-%{multilib2}
+This package adds support for compiling D programs to %{m2_desc}
+binaries with the GNU compiler.
+
+%description d-multilib-%{multilib2} -l pl.UTF-8
+Ten pakiet dodaje obsługę binariów %{m2_desc} w języku D do
+kompilatora GCC.
+
+%package -n libgphobos
+Summary:       D language runtime libraries
+Summary(pl.UTF-8):     Biblioteki uruchomieniowe dla języka D
+License:       Boost v1.0
+Group:         Libraries
+
+%description -n libgphobos
+D language runtime libraries.
+
+%description -n libgphobos -l pl.UTF-8
+Biblioteki uruchomieniowe dla języka D.
+
+%package -n libgphobos-static
+Summary:       Static D language runtime libraries
+Summary(pl.UTF-8):     Statyczne biblioteki uruchomieniowe dla języka D
+License:       Boost v1.0
+Group:         Development/Libraries
+Requires:      %{name}-d = %{epoch}:%{version}-%{release}
+
+%description -n libgphobos-static
+Static D language runtime libraries.
+
+%description -n libgphobos-static -l pl.UTF-8
+Statyczne biblioteki uruchomieniowe dla języka D.
+
+%package -n libgphobos-multilib-32
+Summary:       D language runtime libraries - 32-bit version
+Summary(pl.UTF-8):     Biblioteki uruchomieniowe dla języka D - wersja 32-bitowa
+License:       Boost v1.0
+Group:         Libraries
+
+%description -n libgphobos-multilib-32
+D language runtime libraries - 32-bit version.
+
+%description -n libgphobos-multilib-32 -l pl.UTF-8
+Biblioteki uruchomieniowe dla języka D - wersja 32-bitowa.
+
+%package -n libgphobos-multilib-32-static
+Summary:       Static D language runtime libraries - 32-bit version
+Summary(pl.UTF-8):     Statyczne biblioteki uruchomieniowe dla języka D - wersja 32-bitowa
+Group:         Development/Libraries
+License:       Boost v1.0
+Requires:      %{name}-d-multilib-32 = %{epoch}:%{version}-%{release}
+
+%description -n libgphobos-multilib-32-static
+Static D language runtime libraries - 32-bit version.
+
+%description -n libgphobos-multilib-32-static -l pl.UTF-8
+Statyczne biblioteki uruchomieniowe dla języka D - wersja 32-bitowa.
+
+%package -n libgphobos-multilib-%{multilib2}
+Summary:       D language runtime libraries - %{m2_desc} version
+Summary(pl.UTF-8):     Biblioteki uruchomieniowe dla języka D - wersja %{m2_desc}
+License:       Boost v1.0
+Group:         Libraries
+
+%description -n libgphobos-multilib-%{multilib2}
+D language runtime libraries - %{m2_desc} version.
+
+%description -n libgphobos-multilib-%{multilib2} -l pl.UTF-8
+Biblioteki uruchomieniowe dla języka D - wersja 32-bitowa.
+
+%package -n libgphobos-multilib-%{multilib2}-static
+Summary:       Static D language runtime libraries - %{m2_desc} version
+Summary(pl.UTF-8):     Statyczne biblioteki uruchomieniowe dla języka D - wersja %{m2_desc}
+Group:         Development/Libraries
+License:       Boost v1.0
+Requires:      %{name}-d-multilib-%{multilib2} = %{epoch}:%{version}-%{release}
+
+%description -n libgphobos-multilib-%{multilib2}-static
+Static D language runtime libraries - %{m2_desc} version.
+
+%description -n libgphobos-multilib-%{multilib2}-static -l pl.UTF-8
+Statyczne biblioteki uruchomieniowe dla języka D - wersja %{m2_desc}.
+

 %package fortran
 Summary:       Fortran 95 language support for GCC
 Summary(es.UTF-8):     Soporte de Fortran 95 para GCC
 %package fortran
 Summary:       Fortran 95 language support for GCC
 Summary(es.UTF-8):     Soporte de Fortran 95 para GCC


@@ -2762,16 +2880,16 @@ więc wtyczki muszą być przebudowywane przy każdej aktualizacji GCC.
 
 %prep
 %setup -q
 
 %prep
 %setup -q

-%patch100 -p1
-%patch0 -p1
-%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
-
-%patch10 -p1
+%patch -P100 -p1
+%patch -P0 -p1
+
+%patch -P2 -p1
+%patch -P3 -p1
+%patch -P4 -p1
+
+%patch -P10 -p1

 %if %{with gcc_libffi}
 %if %{with gcc_libffi}

-%patch11 -p0
+%patch -P11 -p0

 %endif
 
 %{__mv} ChangeLog ChangeLog.general
 %endif
 
 %{__mv} ChangeLog ChangeLog.general


@@ -3191,6 +3309,12 @@ rm -rf $RPM_BUILD_ROOT
 %postun        ada -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %postun        ada -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 

+%post  d -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
+%postun        d -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+

 %post  fortran -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %post  fortran -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 


@@ -3203,6 +3327,12 @@ rm -rf $RPM_BUILD_ROOT
 %postun        go -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %postun        go -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 

+%post  m2 -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+
+%postun        m2 -p /sbin/postshell
+-/usr/sbin/fix-info-dir -c %{_infodir}
+

 %post  -n libquadmath-devel -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 
 %post  -n libquadmath-devel -p /sbin/postshell
 -/usr/sbin/fix-info-dir -c %{_infodir}
 


@@ -3245,6 +3375,8 @@ rm -rf $RPM_BUILD_ROOT
 %postun        -p /sbin/ldconfig -n libstdc++-multilib-32
 %post  -p /sbin/ldconfig -n libstdc++-multilib-%{multilib2}
 %postun        -p /sbin/ldconfig -n libstdc++-multilib-%{multilib2}
 %postun        -p /sbin/ldconfig -n libstdc++-multilib-32
 %post  -p /sbin/ldconfig -n libstdc++-multilib-%{multilib2}
 %postun        -p /sbin/ldconfig -n libstdc++-multilib-%{multilib2}

+%post  -p /sbin/ldconfig -n libgphobos
+%postun        -p /sbin/ldconfig -n libgphobos

 %post  -p /sbin/ldconfig -n libgfortran
 %postun        -p /sbin/ldconfig -n libgfortran
 %post  -p /sbin/ldconfig -n libgfortran-multilib-32
 %post  -p /sbin/ldconfig -n libgfortran
 %postun        -p /sbin/ldconfig -n libgfortran
 %post  -p /sbin/ldconfig -n libgfortran-multilib-32


@@ -3397,14 +3529,28 @@ rm -rf $RPM_BUILD_ROOT
 %ifarch %{ix86} %{x8664} x32
 %{gcclibdir}/include/adxintrin.h
 %{gcclibdir}/include/ammintrin.h
 %ifarch %{ix86} %{x8664} x32
 %{gcclibdir}/include/adxintrin.h
 %{gcclibdir}/include/ammintrin.h

+%{gcclibdir}/include/amxavx512intrin.h

 %{gcclibdir}/include/amxbf16intrin.h
 %{gcclibdir}/include/amxcomplexintrin.h
 %{gcclibdir}/include/amxfp16intrin.h
 %{gcclibdir}/include/amxbf16intrin.h
 %{gcclibdir}/include/amxcomplexintrin.h
 %{gcclibdir}/include/amxfp16intrin.h

+%{gcclibdir}/include/amxfp8intrin.h

 %{gcclibdir}/include/amxint8intrin.h
 %{gcclibdir}/include/amxint8intrin.h

+%{gcclibdir}/include/amxmovrsintrin.h
+%{gcclibdir}/include/amxtf32intrin.h

 %{gcclibdir}/include/amxtileintrin.h
 %{gcclibdir}/include/amxtileintrin.h

+%{gcclibdir}/include/amxtransposeintrin.h
+%{gcclibdir}/include/avx10_2-512bf16intrin.h
+%{gcclibdir}/include/avx10_2-512convertintrin.h
+%{gcclibdir}/include/avx10_2-512mediaintrin.h
+%{gcclibdir}/include/avx10_2-512minmaxintrin.h
+%{gcclibdir}/include/avx10_2-512satcvtintrin.h
+%{gcclibdir}/include/avx10_2bf16intrin.h
+%{gcclibdir}/include/avx10_2convertintrin.h
+%{gcclibdir}/include/avx10_2copyintrin.h
+%{gcclibdir}/include/avx10_2mediaintrin.h
+%{gcclibdir}/include/avx10_2minmaxintrin.h
+%{gcclibdir}/include/avx10_2satcvtintrin.h

 %{gcclibdir}/include/avx2intrin.h
 %{gcclibdir}/include/avx2intrin.h

-%{gcclibdir}/include/avx5124fmapsintrin.h
-%{gcclibdir}/include/avx5124vnniwintrin.h

 %{gcclibdir}/include/avx512bf16intrin.h
 %{gcclibdir}/include/avx512bf16vlintrin.h
 %{gcclibdir}/include/avx512bitalgintrin.h
 %{gcclibdir}/include/avx512bf16intrin.h
 %{gcclibdir}/include/avx512bf16vlintrin.h
 %{gcclibdir}/include/avx512bitalgintrin.h


@@ -3412,13 +3558,11 @@ rm -rf $RPM_BUILD_ROOT
 %{gcclibdir}/include/avx512bwintrin.h
 %{gcclibdir}/include/avx512cdintrin.h
 %{gcclibdir}/include/avx512dqintrin.h
 %{gcclibdir}/include/avx512bwintrin.h
 %{gcclibdir}/include/avx512cdintrin.h
 %{gcclibdir}/include/avx512dqintrin.h

-%{gcclibdir}/include/avx512erintrin.h

 %{gcclibdir}/include/avx512fintrin.h
 %{gcclibdir}/include/avx512fp16intrin.h
 %{gcclibdir}/include/avx512fp16vlintrin.h
 %{gcclibdir}/include/avx512ifmaintrin.h
 %{gcclibdir}/include/avx512ifmavlintrin.h
 %{gcclibdir}/include/avx512fintrin.h
 %{gcclibdir}/include/avx512fp16intrin.h
 %{gcclibdir}/include/avx512fp16vlintrin.h
 %{gcclibdir}/include/avx512ifmaintrin.h
 %{gcclibdir}/include/avx512ifmavlintrin.h

-%{gcclibdir}/include/avx512pfintrin.h

 %{gcclibdir}/include/avx512vbmi2intrin.h
 %{gcclibdir}/include/avx512vbmi2vlintrin.h
 %{gcclibdir}/include/avx512vbmiintrin.h
 %{gcclibdir}/include/avx512vbmi2intrin.h
 %{gcclibdir}/include/avx512vbmi2vlintrin.h
 %{gcclibdir}/include/avx512vbmiintrin.h


@@ -3446,6 +3590,7 @@ rm -rf $RPM_BUILD_ROOT
 %{gcclibdir}/include/cldemoteintrin.h
 %{gcclibdir}/include/clflushoptintrin.h
 %{gcclibdir}/include/clwbintrin.h
 %{gcclibdir}/include/cldemoteintrin.h
 %{gcclibdir}/include/clflushoptintrin.h
 %{gcclibdir}/include/clwbintrin.h

+%{gcclibdir}/include/movrsintrin.h

 %{gcclibdir}/include/clzerointrin.h
 %{gcclibdir}/include/cmpccxaddintrin.h
 %{gcclibdir}/include/cpuid.h
 %{gcclibdir}/include/clzerointrin.h
 %{gcclibdir}/include/cmpccxaddintrin.h
 %{gcclibdir}/include/cpuid.h


@@ -3842,6 +3987,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libstdc++-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libstdc++.so
 %files -n libstdc++-devel
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libstdc++.so

+%{_libdir}/libstdc++.modules.json

 %{_libdir}/libstdc++.la
 %{_libdir}/libstdc++exp.a
 %{_libdir}/libstdc++exp.la
 %{_libdir}/libstdc++.la
 %{_libdir}/libstdc++exp.a
 %{_libdir}/libstdc++exp.la


@@ -3922,6 +4068,83 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 %endif
 
 %endif
 %endif
 

+%if %{with d}
+%files d
+%defattr(644,root,root,755)
+%doc gcc/d/{ChangeLog,README.gcc}
+%attr(755,root,root) %{_bindir}/gdc
+%attr(755,root,root) %{_bindir}/*-gdc
+%attr(755,root,root) %{gcclibdir}/d21
+%attr(755,root,root) %{_libdir}/libgdruntime.so
+%attr(755,root,root) %{_libdir}/libgphobos.so
+%{_libdir}/libgdruntime.la
+%{_libdir}/libgphobos.la
+%{_libdir}/libgphobos.spec
+%{gcclibdir}/include/d
+%{_mandir}/man1/gdc.1*
+%{_infodir}/gdc.info*
+
+%if %{with multilib}
+%files d-multilib-32
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir32}/libgdruntime.so
+%attr(755,root,root) %{_libdir32}/libgphobos.so
+%{_libdir32}/libgdruntime.la
+%{_libdir32}/libgphobos.la
+%{_libdir32}/libgphobos.spec
+%endif
+
+%if %{with multilib2}
+%files d-multilib-%{multilib2}
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdirm2}/libgdruntime.so
+%attr(755,root,root) %{_libdirm2}/libgphobos.so
+%{_libdirm2}/libgdruntime.la
+%{_libdirm2}/libgphobos.la
+%{_libdirm2}/libgphobos.spec
+%endif
+
+%files -n libgphobos
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir}/libgdruntime.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgdruntime.so.6
+%attr(755,root,root) %{_libdir}/libgphobos.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libgphobos.so.6
+
+%files -n libgphobos-static
+%defattr(644,root,root,755)
+%{_libdir}/libgdruntime.a
+%{_libdir}/libgphobos.a
+
+%if %{with multilib}
+%files -n libgphobos-multilib-32
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdir32}/libgdruntime.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir32}/libgdruntime.so.6
+%attr(755,root,root) %{_libdir32}/libgphobos.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir32}/libgphobos.so.6
+
+%files -n libgphobos-multilib-32-static
+%defattr(644,root,root,755)
+%{_libdir32}/libgdruntime.a
+%{_libdir32}/libgphobos.a
+%endif
+
+%if %{with multilib2}
+%files -n libgphobos-multilib-%{multilib2}
+%defattr(644,root,root,755)
+%attr(755,root,root) %{_libdirm2}/libgdruntime.so.*.*.*
+%attr(755,root,root) %ghost %{_libdirm2}/libgdruntime.so.6
+%attr(755,root,root) %{_libdirm2}/libgphobos.so.*.*.*
+%attr(755,root,root) %ghost %{_libdirm2}/libgphobos.so.6
+
+%files -n libgphobos-multilib-%{multilib2}-static
+%defattr(644,root,root,755)
+%{_libdirm2}/libgdruntime.a
+%{_libdirm2}/libgphobos.a
+%endif
+%endif
+

 %if %{with fortran}
 %files fortran
 %defattr(644,root,root,755)
 %if %{with fortran}
 %files fortran
 %defattr(644,root,root,755)


@@ -4120,6 +4343,7 @@ rm -rf $RPM_BUILD_ROOT
 %{_libdir}/libm2pim.la
 %{gcclibdir}/m2
 %{_mandir}/man1/gm2.1*
 %{_libdir}/libm2pim.la
 %{gcclibdir}/m2
 %{_mandir}/man1/gm2.1*

+%{_infodir}/m2.info*

 
 %if %{with multilib}
 %files m2-multilib-32
 
 %if %{with multilib}
 %files m2-multilib-32


@@ -4156,15 +4380,15 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libgm2
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libm2cor.so.*.*.*
 %files -n libgm2
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir}/libm2cor.so.*.*.*

-%attr(755,root,root) %ghost %{_libdir}/libm2cor.so.19
+%attr(755,root,root) %ghost %{_libdir}/libm2cor.so.20

 %attr(755,root,root) %{_libdir}/libm2iso.so.*.*.*
 %attr(755,root,root) %{_libdir}/libm2iso.so.*.*.*

-%attr(755,root,root) %ghost %{_libdir}/libm2iso.so.19
+%attr(755,root,root) %ghost %{_libdir}/libm2iso.so.20

 %attr(755,root,root) %{_libdir}/libm2log.so.*.*.*
 %attr(755,root,root) %{_libdir}/libm2log.so.*.*.*

-%attr(755,root,root) %ghost %{_libdir}/libm2log.so.19
+%attr(755,root,root) %ghost %{_libdir}/libm2log.so.20

 %attr(755,root,root) %{_libdir}/libm2min.so.*.*.*
 %attr(755,root,root) %{_libdir}/libm2min.so.*.*.*

-%attr(755,root,root) %ghost %{_libdir}/libm2min.so.19
+%attr(755,root,root) %ghost %{_libdir}/libm2min.so.20

 %attr(755,root,root) %{_libdir}/libm2pim.so.*.*.*
 %attr(755,root,root) %{_libdir}/libm2pim.so.*.*.*

-%attr(755,root,root) %ghost %{_libdir}/libm2pim.so.19
+%attr(755,root,root) %ghost %{_libdir}/libm2pim.so.20

 
 %files -n libgm2-static
 %defattr(644,root,root,755)
 
 %files -n libgm2-static
 %defattr(644,root,root,755)


@@ -4178,15 +4402,15 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libgm2-multilib-32
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir32}/libm2cor.so.*.*.*
 %files -n libgm2-multilib-32
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir32}/libm2cor.so.*.*.*

-%attr(755,root,root) %ghost %{_libdir32}/libm2cor.so.19
+%attr(755,root,root) %ghost %{_libdir32}/libm2cor.so.20

 %attr(755,root,root) %{_libdir32}/libm2iso.so.*.*.*
 %attr(755,root,root) %{_libdir32}/libm2iso.so.*.*.*

-%attr(755,root,root) %ghost %{_libdir32}/libm2iso.so.19
+%attr(755,root,root) %ghost %{_libdir32}/libm2iso.so.20

 %attr(755,root,root) %{_libdir32}/libm2log.so.*.*.*
 %attr(755,root,root) %{_libdir32}/libm2log.so.*.*.*

-%attr(755,root,root) %ghost %{_libdir32}/libm2log.so.19
+%attr(755,root,root) %ghost %{_libdir32}/libm2log.so.20

 %attr(755,root,root) %{_libdir32}/libm2min.so.*.*.*
 %attr(755,root,root) %{_libdir32}/libm2min.so.*.*.*

-%attr(755,root,root) %ghost %{_libdir32}/libm2min.so.19
+%attr(755,root,root) %ghost %{_libdir32}/libm2min.so.20

 %attr(755,root,root) %{_libdir32}/libm2pim.so.*.*.*
 %attr(755,root,root) %{_libdir32}/libm2pim.so.*.*.*

-%attr(755,root,root) %ghost %{_libdir32}/libm2pim.so.19
+%attr(755,root,root) %ghost %{_libdir32}/libm2pim.so.20

 
 %files -n libgm2-multilib-32-static
 %defattr(644,root,root,755)
 
 %files -n libgm2-multilib-32-static
 %defattr(644,root,root,755)


@@ -4201,15 +4425,15 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libgm2-multilib-%{multilib2}
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdirm2}/libm2cor.so.*.*.*
 %files -n libgm2-multilib-%{multilib2}
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdirm2}/libm2cor.so.*.*.*

-%attr(755,root,root) %ghost %{_libdirm2}/libm2cor.so.19
+%attr(755,root,root) %ghost %{_libdirm2}/libm2cor.so.20

 %attr(755,root,root) %{_libdirm2}/libm2iso.so.*.*.*
 %attr(755,root,root) %{_libdirm2}/libm2iso.so.*.*.*

-%attr(755,root,root) %ghost %{_libdirm2}/libm2iso.so.19
+%attr(755,root,root) %ghost %{_libdirm2}/libm2iso.so.20

 %attr(755,root,root) %{_libdirm2}/libm2log.so.*.*.*
 %attr(755,root,root) %{_libdirm2}/libm2log.so.*.*.*

-%attr(755,root,root) %ghost %{_libdirm2}/libm2log.so.19
+%attr(755,root,root) %ghost %{_libdirm2}/libm2log.so.20

 %attr(755,root,root) %{_libdirm2}/libm2min.so.*.*.*
 %attr(755,root,root) %{_libdirm2}/libm2min.so.*.*.*

-%attr(755,root,root) %ghost %{_libdirm2}/libm2min.so.19
+%attr(755,root,root) %ghost %{_libdirm2}/libm2min.so.20

 %attr(755,root,root) %{_libdirm2}/libm2pim.so.*.*.*
 %attr(755,root,root) %{_libdirm2}/libm2pim.so.*.*.*

-%attr(755,root,root) %ghost %{_libdirm2}/libm2pim.so.19
+%attr(755,root,root) %ghost %{_libdirm2}/libm2pim.so.20

 
 %files -n libgm2-multilib-%{multilib2}-static
 %defattr(644,root,root,755)
 
 %files -n libgm2-multilib-%{multilib2}-static
 %defattr(644,root,root,755)


@@ -4321,7 +4545,7 @@ rm -rf $RPM_BUILD_ROOT
 %defattr(644,root,root,755)
 %doc libgo/{LICENSE,PATENTS,README}
 %attr(755,root,root) %{_libdir}/libgo.so.*.*.*
 %defattr(644,root,root,755)
 %doc libgo/{LICENSE,PATENTS,README}
 %attr(755,root,root) %{_libdir}/libgo.so.*.*.*

-%attr(755,root,root) %ghost %{_libdir}/libgo.so.23
+%attr(755,root,root) %ghost %{_libdir}/libgo.so.24

 
 %files -n libgo-devel
 %defattr(644,root,root,755)
 
 %files -n libgo-devel
 %defattr(644,root,root,755)


@@ -4338,7 +4562,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libgo-multilib-32
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir32}/libgo.so.*.*.*
 %files -n libgo-multilib-32
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdir32}/libgo.so.*.*.*

-%attr(755,root,root) %ghost %{_libdir32}/libgo.so.23
+%attr(755,root,root) %ghost %{_libdir32}/libgo.so.24

 
 %files -n libgo-multilib-32-devel
 %defattr(644,root,root,755)
 
 %files -n libgo-multilib-32-devel
 %defattr(644,root,root,755)


@@ -4356,7 +4580,7 @@ rm -rf $RPM_BUILD_ROOT
 %files -n libgo-multilib-%{multilib2}
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdirm2}/libgo.so.*.*.*
 %files -n libgo-multilib-%{multilib2}
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_libdirm2}/libgo.so.*.*.*

-%attr(755,root,root) %ghost %{_libdirm2}/libgo.so.23
+%attr(755,root,root) %ghost %{_libdirm2}/libgo.so.24

 
 %files -n libgo-multilib-%{multilib2}-devel
 %defattr(644,root,root,755)
 
 %files -n libgo-multilib-%{multilib2}-devel
 %defattr(644,root,root,755)