Hello community,
here is the log from the commit of package gcc41
checked in at Sun Aug 6 21:17:43 CEST 2006.
--------
--- gcc41/cross-alpha-gcc-icecream-backend.changes 2006-07-20 13:22:05.000000000 +0200
+++ gcc41/cross-alpha-gcc-icecream-backend.changes 2006-08-03 11:37:36.000000000 +0200
@@ -1,0 +2,13 @@
+Thu Aug 3 11:37:24 CEST 2006 - schwab@suse.de
+
+- Fix missing stack notes.
+
+-------------------------------------------------------------------
+Mon Jul 31 15:05:44 CEST 2006 - rguenther@suse.de
+
+- Update to SVN branch head.
+- Bump hppa libgcc so version to 4.
+- Include conditionals for openSUSE::Base.
+- Clean up remaining things in the file lists.
+
+-------------------------------------------------------------------
cross-arm-gcc-icecream-backend.changes: same change
cross-avr-gcc.changes: same change
cross-hppa-gcc-icecream-backend.changes: same change
cross-i386-gcc-icecream-backend.changes: same change
cross-ia64-gcc-icecream-backend.changes: same change
cross-ppc-gcc-icecream-backend.changes: same change
cross-ppc64-gcc-icecream-backend.changes: same change
cross-s390-gcc-icecream-backend.changes: same change
cross-s390x-gcc-icecream-backend.changes: same change
cross-x86_64-gcc-icecream-backend.changes: same change
gcc41.changes: same change
Old:
----
gcc-4.1.2-20060705.tar.bz2
needed_space_in_mb
pr28016.patch
New:
----
gcc-4.1.2-20060731.tar.bz2
note-gnu-stack.diff
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ cross-alpha-gcc-icecream-backend.spec ++++++
--- /var/tmp/diff_new_pack.4DcMfk/_old 2006-08-06 21:16:25.000000000 +0200
+++ /var/tmp/diff_new_pack.4DcMfk/_new 2006-08-06 21:16:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package cross-alpha-gcc-icecream-backend (Version 4.1.2_20060705)
+# spec file for package cross-alpha-gcc-icecream-backend (Version 4.1.2_20060731)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -26,8 +26,8 @@
%define biarch_targets x86_64 s390x ppc64 ppc
URL: http://gcc.gnu.org/
License: GPL, LGPL
-Version: 4.1.2_20060705
-Release: 6
+Version: 4.1.2_20060731
+Release: 1
%define gcc_version %(echo %version | sed 's/_.*//')
%define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/')
%define binsuffix -4.1
@@ -65,13 +65,13 @@
Patch82: pr13212.patch
Patch93: nvl161673.patch
Patch95: pr26399.patch
-Patch96: pr28016.patch
# A set of patches from the RH srpm
Patch51: gcc41-ia64-stack-protector.patch
Patch55: gcc41-java-slow_pthread_self.patch
Patch57: gcc41-ppc32-retaddr.patch
Patch54: gcc41-ldbl-default.patch
Patch50: gcc41-ldbl-default-libstdc++.patch
+Patch52: note-gnu-stack.diff
# general improvement patches
Patch60: pr25626.patch
Patch61: fortran-matmul.patch
@@ -102,7 +102,7 @@
%ifarch ppc
%define GCCDIST powerpc64-suse-linux
%else
-%define GCCDIST %(echo %{_target_cpu}|sed -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
+%define GCCDIST %(echo %{_host_cpu}|sed -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
%endif
%define libsubdir %{_libdir}/gcc/%{GCCDIST}/%{gcc_version}
%define gxxinclude %{_prefix}/include/c++/%{gcc_version}
@@ -131,12 +131,12 @@
%patch82
%patch93
%patch95
-%patch96
%patch51
%patch55
%patch57
%patch54
%patch50
+%patch52
cd libstdc++-v3
%patch60
%patch64
@@ -206,8 +206,8 @@
# we don't want some miscompiles in the testsuite, or some fault in
# the compiler to kill the machine. Hence we limit the amount of memory
# by the physical RAM plus half of swap
-MEM=$(free -m | awk '/^Mem:/ {print $2}')
-SWAP=$(free -m | awk '/^Swap:/ {print $2}')
+#MEM=$(free -m | awk '/^Mem:/ {print $2}')
+#SWAP=$(free -m | awk '/^Swap:/ {print $2}')
#ulimit -v $(((MEM + SWAP/2)*1024))
# In general we want to ship release checking enabled compilers
# and run BETA with checking enabled.
@@ -349,6 +349,13 @@
/usr/share/icecream-envs
%changelog -n cross-alpha-gcc-icecream-backend
+* Thu Aug 03 2006 - schwab@suse.de
+- Fix missing stack notes.
+* Mon Jul 31 2006 - rguenther@suse.de
+- Update to SVN branch head.
+- Bump hppa libgcc so version to 4.
+- Include conditionals for openSUSE::Base.
+- Clean up remaining things in the file lists.
* Thu Jul 20 2006 - rguenther@suse.de
- Rename all packages. Use provides to handle update and
same major .so version libraries from different packages.
cross-arm-gcc-icecream-backend.spec: same change
++++++ cross-avr-gcc.spec ++++++
--- /var/tmp/diff_new_pack.4DcMfk/_old 2006-08-06 21:16:25.000000000 +0200
+++ /var/tmp/diff_new_pack.4DcMfk/_new 2006-08-06 21:16:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package cross-avr-gcc (Version 4.1.2_20060705)
+# spec file for package cross-avr-gcc (Version 4.1.2_20060731)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -24,8 +24,8 @@
%define biarch_targets x86_64 s390x ppc64 ppc
URL: http://gcc.gnu.org/
License: GPL, LGPL
-Version: 4.1.2_20060705
-Release: 6
+Version: 4.1.2_20060731
+Release: 1
%define gcc_version %(echo %version | sed 's/_.*//')
%define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/')
%define binsuffix -4.1
@@ -63,13 +63,13 @@
Patch82: pr13212.patch
Patch93: nvl161673.patch
Patch95: pr26399.patch
-Patch96: pr28016.patch
# A set of patches from the RH srpm
Patch51: gcc41-ia64-stack-protector.patch
Patch55: gcc41-java-slow_pthread_self.patch
Patch57: gcc41-ppc32-retaddr.patch
Patch54: gcc41-ldbl-default.patch
Patch50: gcc41-ldbl-default-libstdc++.patch
+Patch52: note-gnu-stack.diff
# general improvement patches
Patch60: pr25626.patch
Patch61: fortran-matmul.patch
@@ -97,7 +97,7 @@
%ifarch ppc
%define GCCDIST powerpc64-suse-linux
%else
-%define GCCDIST %(echo %{_target_cpu}|sed -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
+%define GCCDIST %(echo %{_host_cpu}|sed -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
%endif
%define libsubdir %{_libdir}/gcc/%{GCCDIST}/%{gcc_version}
%define gxxinclude %{_prefix}/include/c++/%{gcc_version}
@@ -126,12 +126,12 @@
%patch82
%patch93
%patch95
-%patch96
%patch51
%patch55
%patch57
%patch54
%patch50
+%patch52
cd libstdc++-v3
%patch60
%patch64
@@ -201,8 +201,8 @@
# we don't want some miscompiles in the testsuite, or some fault in
# the compiler to kill the machine. Hence we limit the amount of memory
# by the physical RAM plus half of swap
-MEM=$(free -m | awk '/^Mem:/ {print $2}')
-SWAP=$(free -m | awk '/^Swap:/ {print $2}')
+#MEM=$(free -m | awk '/^Mem:/ {print $2}')
+#SWAP=$(free -m | awk '/^Swap:/ {print $2}')
#ulimit -v $(((MEM + SWAP/2)*1024))
# In general we want to ship release checking enabled compilers
# and run BETA with checking enabled.
@@ -311,6 +311,13 @@
%{_prefix}
%changelog -n cross-avr-gcc
+* Thu Aug 03 2006 - schwab@suse.de
+- Fix missing stack notes.
+* Mon Jul 31 2006 - rguenther@suse.de
+- Update to SVN branch head.
+- Bump hppa libgcc so version to 4.
+- Include conditionals for openSUSE::Base.
+- Clean up remaining things in the file lists.
* Thu Jul 20 2006 - rguenther@suse.de
- Rename all packages. Use provides to handle update and
same major .so version libraries from different packages.
++++++ cross-hppa-gcc-icecream-backend.spec ++++++
--- /var/tmp/diff_new_pack.4DcMfk/_old 2006-08-06 21:16:25.000000000 +0200
+++ /var/tmp/diff_new_pack.4DcMfk/_new 2006-08-06 21:16:25.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package cross-hppa-gcc-icecream-backend (Version 4.1.2_20060705)
+# spec file for package cross-hppa-gcc-icecream-backend (Version 4.1.2_20060731)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -26,8 +26,8 @@
%define biarch_targets x86_64 s390x ppc64 ppc
URL: http://gcc.gnu.org/
License: GPL, LGPL
-Version: 4.1.2_20060705
-Release: 6
+Version: 4.1.2_20060731
+Release: 1
%define gcc_version %(echo %version | sed 's/_.*//')
%define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/')
%define binsuffix -4.1
@@ -65,13 +65,13 @@
Patch82: pr13212.patch
Patch93: nvl161673.patch
Patch95: pr26399.patch
-Patch96: pr28016.patch
# A set of patches from the RH srpm
Patch51: gcc41-ia64-stack-protector.patch
Patch55: gcc41-java-slow_pthread_self.patch
Patch57: gcc41-ppc32-retaddr.patch
Patch54: gcc41-ldbl-default.patch
Patch50: gcc41-ldbl-default-libstdc++.patch
+Patch52: note-gnu-stack.diff
# general improvement patches
Patch60: pr25626.patch
Patch61: fortran-matmul.patch
@@ -102,7 +102,7 @@
%ifarch ppc
%define GCCDIST powerpc64-suse-linux
%else
-%define GCCDIST %(echo %{_target_cpu}|sed -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
+%define GCCDIST %(echo %{_host_cpu}|sed -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
%endif
%define libsubdir %{_libdir}/gcc/%{GCCDIST}/%{gcc_version}
%define gxxinclude %{_prefix}/include/c++/%{gcc_version}
@@ -131,12 +131,12 @@
%patch82
%patch93
%patch95
-%patch96
%patch51
%patch55
%patch57
%patch54
%patch50
+%patch52
cd libstdc++-v3
%patch60
%patch64
@@ -206,8 +206,8 @@
# we don't want some miscompiles in the testsuite, or some fault in
# the compiler to kill the machine. Hence we limit the amount of memory
# by the physical RAM plus half of swap
-MEM=$(free -m | awk '/^Mem:/ {print $2}')
-SWAP=$(free -m | awk '/^Swap:/ {print $2}')
+#MEM=$(free -m | awk '/^Mem:/ {print $2}')
+#SWAP=$(free -m | awk '/^Swap:/ {print $2}')
#ulimit -v $(((MEM + SWAP/2)*1024))
# In general we want to ship release checking enabled compilers
# and run BETA with checking enabled.
@@ -349,6 +349,13 @@
/usr/share/icecream-envs
%changelog -n cross-hppa-gcc-icecream-backend
+* Thu Aug 03 2006 - schwab@suse.de
+- Fix missing stack notes.
+* Mon Jul 31 2006 - rguenther@suse.de
+- Update to SVN branch head.
+- Bump hppa libgcc so version to 4.
+- Include conditionals for openSUSE::Base.
+- Clean up remaining things in the file lists.
* Thu Jul 20 2006 - rguenther@suse.de
- Rename all packages. Use provides to handle update and
same major .so version libraries from different packages.
cross-i386-gcc-icecream-backend.spec: same change
cross-ia64-gcc-icecream-backend.spec: same change
cross-ppc-gcc-icecream-backend.spec: same change
cross-ppc64-gcc-icecream-backend.spec: same change
cross-s390-gcc-icecream-backend.spec: same change
cross-s390x-gcc-icecream-backend.spec: same change
cross-x86_64-gcc-icecream-backend.spec: same change
++++++ gcc41.spec ++++++
--- /var/tmp/diff_new_pack.4DcMfk/_old 2006-08-06 21:16:26.000000000 +0200
+++ /var/tmp/diff_new_pack.4DcMfk/_new 2006-08-06 21:16:26.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package gcc41 (Version 4.1.2_20060705)
+# spec file for package gcc41 (Version 4.1.2_20060731)
#
# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany.
# This file and all modifications and additions to the pristine
@@ -30,7 +30,14 @@
%endif
%define build_fortran 1
%define build_objcp 1
-BuildRequires: glibc-devel-32bit
+%if 0%{?build_for_base:1}
+%define build_ada 0
+%define build_java 0
+%define build_fortran 0
+%define build_objcp 0
+%define run_tests 0
+%endif
+BuildRequires: bison flex gettext-devel glibc-devel-32bit
%if %{build_ada}
BuildRequires: gcc-ada
%endif
@@ -56,7 +63,7 @@
%endif
# Define version number of libgcc_s
%ifarch hppa
-%define libgcc_s 2
+%define libgcc_s 4
%else
%define libgcc_s 1
%endif
@@ -98,8 +105,8 @@
%define biarch_targets x86_64 s390x ppc64 ppc
URL: http://gcc.gnu.org/
License: GPL
-Version: 4.1.2_20060705
-Release: 2
+Version: 4.1.2_20060731
+Release: 1
%define gcc_version %(echo %version | sed 's/_.*//')
%define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/')
%define binsuffix -4.1
@@ -140,13 +147,13 @@
Patch82: pr13212.patch
Patch93: nvl161673.patch
Patch95: pr26399.patch
-Patch96: pr28016.patch
# A set of patches from the RH srpm
Patch51: gcc41-ia64-stack-protector.patch
Patch55: gcc41-java-slow_pthread_self.patch
Patch57: gcc41-ppc32-retaddr.patch
Patch54: gcc41-ldbl-default.patch
Patch50: gcc41-ldbl-default-libstdc++.patch
+Patch52: note-gnu-stack.diff
# general improvement patches
Patch60: pr25626.patch
Patch61: fortran-matmul.patch
@@ -855,7 +862,7 @@
%ifarch ppc
%define GCCDIST powerpc64-suse-linux
%else
-%define GCCDIST %(echo %{_target_cpu}|sed -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
+%define GCCDIST %(echo %{_host_cpu}|sed -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
%endif
%define libsubdir %{_libdir}/gcc/%{GCCDIST}/%{gcc_version}
%define gxxinclude %{_prefix}/include/c++/%{gcc_version}
@@ -1017,12 +1024,12 @@
%patch82
%patch93
%patch95
-%patch96
%patch51
%patch55
%patch57
%patch54
%patch50
+%patch52
cd libstdc++-v3
%patch60
%patch64
@@ -1092,8 +1099,8 @@
# we don't want some miscompiles in the testsuite, or some fault in
# the compiler to kill the machine. Hence we limit the amount of memory
# by the physical RAM plus half of swap
-MEM=$(free -m | awk '/^Mem:/ {print $2}')
-SWAP=$(free -m | awk '/^Swap:/ {print $2}')
+#MEM=$(free -m | awk '/^Mem:/ {print $2}')
+#SWAP=$(free -m | awk '/^Swap:/ {print $2}')
#ulimit -v $(((MEM + SWAP/2)*1024))
# In general we want to ship release checking enabled compilers
# and run BETA with checking enabled.
@@ -1255,6 +1262,13 @@
%endif
%endif
done
+%if %{biarch}
+%if %{build_primary_64bit}
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
+%else
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib64
+%endif
+%endif
# Move shared libs around
%if %{versionspecificlibs}
%else
@@ -1280,20 +1294,20 @@
%endif
libobjc libstdc++ libmudflap libmudflapth; do
for lib in `find $RPM_BUILD_ROOT%{versmainlibdir} -maxdepth 1 -name $libname.so.*`; do
- mv $lib $RPM_BUILD_ROOT%{mainlibdir}
+ mv $lib $RPM_BUILD_ROOT%{mainlibdir}/
done
ln -sf %{mainlibdir}/`readlink $RPM_BUILD_ROOT%{versmainlibdir}/$libname.so | sed -e 's/\(.*\.so\.[^\.]*\).*/\1/'` \
$RPM_BUILD_ROOT%{versmainlibdir}/$libname.so
%if %{biarch}
%if %{build_primary_64bit}
for lib in `find $RPM_BUILD_ROOT%{versmainlibdirbi32} -maxdepth 1 -name "$libname.so.*"`; do
- mv $lib $RPM_BUILD_ROOT%{mainlibdirbi32}
+ mv $lib $RPM_BUILD_ROOT%{mainlibdirbi32}/
done
ln -sf %{mainlibdirbi32}/`readlink $RPM_BUILD_ROOT%{versmainlibdirbi32}/$libname.so | sed -e 's/\(.*\.so\.[^\.]*\).*/\1/'` \
$RPM_BUILD_ROOT%{versmainlibdirbi32}/$libname.so
%else
for lib in `find $RPM_BUILD_ROOT%{versmainlibdirbi64} -maxdepth 1 -name "$libname.so.*"`; do
- mv $lib $RPM_BUILD_ROOT%{mainlibdirbi64}
+ mv $lib $RPM_BUILD_ROOT%{mainlibdirbi64}/
done
ln -sf %{mainlibdirbi64}/`readlink $RPM_BUILD_ROOT%{versmainlibdirbi64}/$libname.so | sed -e 's/\(.*\.so\.[^\.]*\).*/\1/'` \
$RPM_BUILD_ROOT%{versmainlibdirbi64}/$libname.so
@@ -1308,14 +1322,12 @@
%if %{biarch}
%if %{build_primary_64bit}
rm -f $RPM_BUILD_ROOT/lib/libgcc_s.so
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
ln -sf /lib/libgcc_s.so.%{libgcc_s} $RPM_BUILD_ROOT%{versmainlibdirbi32}/libgcc_s.so
ln -sf /lib/libgcc_s.so.%{libgcc_s} $RPM_BUILD_ROOT%{versmainlibdirbi32}/libgcc_s_32.so
chmod a+x $RPM_BUILD_ROOT/lib/libgcc_s.so.%{libgcc_s}
%else
# 32-bit biarch systems
rm -f $RPM_BUILD_ROOT/lib64/libgcc_s.so
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib64
ln -sf /lib64/libgcc_s.so.%{libgcc_s} $RPM_BUILD_ROOT%{versmainlibdirbi64}/libgcc_s.so
ln -sf /lib64/libgcc_s.so.%{libgcc_s} $RPM_BUILD_ROOT%{versmainlibdirbi64}/libgcc_s_64.so
chmod a+x $RPM_BUILD_ROOT/lib64/libgcc_s.so.%{libgcc_s}
@@ -1409,7 +1421,7 @@
rm -f $RPM_BUILD_ROOT%{libsubdir}/include/ncurses.h
rm -f $RPM_BUILD_ROOT%{libsubdir}/include/stdio.h
rm -f $RPM_BUILD_ROOT%{libsubdir}/include/zutil.h
-rm -f $RPM_BUILD_ROOT%{libsubdir}/include/X11
+rm -rf $RPM_BUILD_ROOT%{libsubdir}/include/X11
rm -rf $RPM_BUILD_ROOT%{libsubdir}/include/bits
rm -f $RPM_BUILD_ROOT%{libsubdir}/include/obstack.h
rm -f $RPM_BUILD_ROOT%{libsubdir}/include/spe.h
@@ -1505,33 +1517,24 @@
%dir %{_libdir}/gcc/%{GCCDIST}
%dir %{libsubdir}
%dir %{libsubdir}/include
-%if %{versionspecificlibs}
-%if %{biarch}
-%if %{build_primary_64bit}
-%dir %{mainlibdirbi32}
-%else
-%dir %{mainlibdirbi64}
-%endif
-%endif
-%endif
%if %{biarch}
%if %{build_primary_64bit}
# This link is essential for correct execution
%{_libdir}/32
/%{_lib}/32
+%dir %{libsubdir}/32
%else
%{_libdir}/64
+%dir %{libsubdir}/64
+%endif
%endif
+%if %{build_nof}
+%dir %{libsubdir}/nof
%endif
-#%{_prefix}/bin/cc%{binsuffix}
%{_prefix}/bin/gcc%{binsuffix}
%{_prefix}/bin/gccbug%{binsuffix}
%{_prefix}/bin/gcov%{binsuffix}
-#%{_prefix}/bin/protoize%{binsuffix}
-#%{_prefix}/bin/unprotoize%{binsuffix}
%{libsubdir}/collect2
-%{libsubdir}/*crt*.o
-#%{libsubdir}/SYSCALLS.c.X
%{libsubdir}/include/README
%{libsubdir}/include/float.h
%{libsubdir}/include/iso646.h
@@ -1560,53 +1563,23 @@
%{libsubdir}/include/xmmintrin.h
%{libsubdir}/include/mm_malloc.h
%endif
-%{libsubdir}/libgcc.a
-%{libsubdir}/libgcc_eh.a
-%{libsubdir}/libgcov.a
-%if %{biarch}
-%if %{build_primary_64bit}
-%if !%{versionspecificlibs}
-%dir %{libsubdir}/32
-%endif
-%{libsubdir}/32/*crt*
-%{libsubdir}/32/libgcc*a
-%if %{versionspecificlibs}
-#%{libsubdir}/32/libgcc_s*.so
-%endif
-%{libsubdir}/32/libgcov.a
-%else
-%if !%{versionspecificlibs}
-%dir %{libsubdir}/64
-%endif
-%{libsubdir}/64/*crt*
-%{libsubdir}/64/libgcc*.a
-%{libsubdir}/64/libgcov.a
-%endif
-%endif
-%ifarch ppc
-%dir %{libsubdir}/64
-%endif
-%if %{build_nof}
-%ifarch ppc
-%dir %{libsubdir}/nof
-%{libsubdir}/nof/*crt*
-%{libsubdir}/nof/libgcc*.a
-%{libsubdir}/nof/libgcov.a
-%endif
-%ifarch ppc64
-#%{libsubdir}/32/nof
-%endif
-%endif
-%{versmainlibdir}/libgcc_s.so
-%if %{biarch}
-%if %{build_primary_64bit}
-%{versmainlibdirbi32}/libgcc_s.so
-%{versmainlibdirbi32}/libgcc_s_32.so
-%else
-# 32-bit biarch systems
-%{versmainlibdirbi64}/libgcc_s.so
-%{versmainlibdirbi64}/libgcc_s_64.so
-%endif
+
+%versmainlib *crt*.o
+
+%versmainlib libgcc*.a
+
+%versmainlib libgcov.a
+
+%versmainlib libgcc_s*.so
+%if %{separate_biarch}
+
+%versbiarchlib *crt*.o
+
+%versbiarchlib libgcc*.a
+
+%versbiarchlib libgcov.a
+
+%versbiarchlib libgcc_s*.so
%endif
%doc %{_mandir}/man1/gcc%{binsuffix}.1.gz
%doc %{_mandir}/man1/gcov%{binsuffix}.1.gz
@@ -1621,15 +1594,16 @@
%{_prefix}/share/locale/*/LC_MESSAGES/gcc.mo
%{_prefix}/share/locale/*/LC_MESSAGES/cpplib.mo
# FIXME - maybe this should go into a new package libstdc++-locale
+%if 0%{!?build_for_base:1}
%{_prefix}/share/locale/*/LC_MESSAGES/libstdc++.mo
%endif
+%endif
%files c++
%defattr(-,root,root)
%dir %{_libdir}/gcc
%dir %{_libdir}/gcc/%{GCCDIST}
%dir %{libsubdir}
-#%{_prefix}/bin/c++%{binsuffix}
%{_prefix}/bin/g++%{binsuffix}
%doc %{_mandir}/man1/g++%{binsuffix}.1.gz
%{libsubdir}/cc1plus
@@ -1661,20 +1635,8 @@
%files -n libgcc41
%defattr(-,root,root)
%if %{versionspecificlibs}
-%{mainlibdir}/libgcc_s.so.%{libgcc_s}
-%if %{biarch}
-%if %{build_primary_64bit}
-%{mainlibdirbi32}/libgcc_s.so.%{libgcc_s}
-%else
-%if !%{separate_bi64}
-%{mainlibdirbi64}/libgcc_s.so.%{libgcc_s}
-%endif
-%endif
-%endif
-%if %{build_nof}
-%dir %{noflibdir}
-%{noflibdir}/libgcc_s.so.%{libgcc_s}
-%endif
+
+%versmainlib libgcc_s.so.%{libgcc_s}
%else
# not versionspecificlibs
/%{_lib}/libgcc_s.so.%{libgcc_s}
@@ -1697,7 +1659,8 @@
%files -n libgcc41-64bit
%defattr(-,root,root)
%if %{versionspecificlibs}
-%{mainlibdirbi64}/libgcc_s.so.%{libgcc_s}
+
+%versbiarchlib libgcc_s.so.%{libgcc_s}
%else
/lib64/libgcc_s.so.%{libgcc_s}
%endif
@@ -1707,7 +1670,8 @@
%files -n libgcc41-32bit
%defattr(-,root,root)
%if %{versionspecificlibs}
-%{mainlibdirbi32}/libgcc_s.so.%{libgcc_s}
+
+%versbiarchlib libgcc_s.so.%{libgcc_s}
%else
/lib/libgcc_s.so.%{libgcc_s}
%endif
@@ -1832,9 +1796,6 @@
%dir %{_libdir}/gcc
%dir %{_libdir}/gcc/%{GCCDIST}
%dir %{libsubdir}
-#%if !%{gcc_for_opt}
-#/lib/cpp
-#%endif
%{_prefix}/bin/cpp%{binsuffix}
%{libsubdir}/cc1
#%{libsubdir}/specs
@@ -2042,6 +2003,13 @@
%endif
%changelog -n gcc41
+* Thu Aug 03 2006 - schwab@suse.de
+- Fix missing stack notes.
+* Mon Jul 31 2006 - rguenther@suse.de
+- Update to SVN branch head.
+- Bump hppa libgcc so version to 4.
+- Include conditionals for openSUSE::Base.
+- Clean up remaining things in the file lists.
* Thu Jul 20 2006 - rguenther@suse.de
- Rename all packages. Use provides to handle update and
same major .so version libraries from different packages.
++++++ change_spec ++++++
--- gcc41/change_spec 2006-07-17 16:37:22.000000000 +0200
+++ gcc41/change_spec 2006-08-03 11:39:05.000000000 +0200
@@ -87,3 +87,4 @@
test -f gcc.changes && ln -f gcc.changes cross-$arch-gcc.changes
done
fi
+exit 0
++++++ fortran-matmul.patch ++++++
--- /var/tmp/diff_new_pack.4DcMfk/_old 2006-08-06 21:16:26.000000000 +0200
+++ /var/tmp/diff_new_pack.4DcMfk/_new 2006-08-06 21:16:26.000000000 +0200
@@ -1,47 +1,46 @@
gcc/fortran/
- * Make-lang.in (fortran/trans-resolve.o): Depend on
- fortran/dependency.h.
- * gfortran.h (gfc_expr): Add an "inline_noncopying_intrinsic" flag.
- * dependency.h (gfc_get_noncopying_intrinsic_argument): Declare.
- (gfc_check_fncall_dependency): Change prototype.
- * dependency.c (gfc_get_noncopying_intrinsic_argument): New function.
- (gfc_check_argument_var_dependency): New function, split from
- gfc_check_fncall_dependency.
- (gfc_check_argument_dependency): New function.
- (gfc_check_fncall_dependency): Replace the expression parameter with
- separate symbol and argument list parameters. Generalize the function
- to handle dependencies for any type of expression, not just variables.
- Accept a further argument giving the intent of the expression being
- tested. Ignore intent(in) arguments if that expression is also
- intent(in).
- * resolve.c: Include dependency.h.
- (find_noncopying_intrinsics): New function.
- (resolve_function, resolve_call): Call it on success.
- * trans-array.h (gfc_conv_array_transpose): Declare.
- (gfc_check_fncall_dependency): Remove prototype.
- * trans-array.c (gfc_conv_array_transpose): New function.
- * trans-intrinsic.c (gfc_conv_intrinsic_function): Don't use the
- libcall handling if the expression is to be evaluated inline.
- Add a case for handling inline transpose()s.
- * trans-expr.c (gfc_trans_arrayfunc_assign): Adjust for the new
- interface provided by gfc_check_fncall_dependency.
+ * Make-lang.in (fortran/trans-resolve.o): Depend on
+ fortran/dependency.h.
+ * gfortran.h (gfc_expr): Add an "inline_noncopying_intrinsic" flag.
+ * dependency.h (gfc_get_noncopying_intrinsic_argument): Declare.
+ (gfc_check_fncall_dependency): Change prototype.
+ * dependency.c (gfc_get_noncopying_intrinsic_argument): New function.
+ (gfc_check_argument_var_dependency): New function, split from
+ gfc_check_fncall_dependency.
+ (gfc_check_argument_dependency): New function.
+ (gfc_check_fncall_dependency): Replace the expression parameter with
+ separate symbol and argument list parameters. Generalize the function
+ to handle dependencies for any type of expression, not just variables.
+ Accept a further argument giving the intent of the expression being
+ tested. Ignore intent(in) arguments if that expression is also
+ intent(in).
+ * resolve.c: Include dependency.h.
+ (find_noncopying_intrinsics): New function.
+ (resolve_function, resolve_call): Call it on success.
+ * trans-array.h (gfc_conv_array_transpose): Declare.
+ (gfc_check_fncall_dependency): Remove prototype.
+ * trans-array.c (gfc_conv_array_transpose): New function.
+ * trans-intrinsic.c (gfc_conv_intrinsic_function): Don't use the
+ libcall handling if the expression is to be evaluated inline.
+ Add a case for handling inline transpose()s.
+ * trans-expr.c (gfc_trans_arrayfunc_assign): Adjust for the new
+ interface provided by gfc_check_fncall_dependency.
libgfortran/
- * m4/matmul.m4: Use a different order in the special case of a
- transposed first argument.
- * generated/matmul_c4.c, generated/matmul_c8.c, generated/matmul_c10.c,
- * generated/matmul_c16.c, generated/matmul_i4.c, generated/matmul_i8.c,
- * generated/matmul_i10.c, generated/matmul_r4.c, generated/matmul_r8.c
- * generated/matmul_r10.c, generated/matmul_r16.c: Regenerated.
-
+ * m4/matmul.m4: Use a different order in the special case of a
+ transposed first argument.
+ * generated/matmul_c4.c, generated/matmul_c8.c, generated/matmul_c10.c,
+ * generated/matmul_c16.c, generated/matmul_i4.c, generated/matmul_i8.c,
+ * generated/matmul_i10.c, generated/matmul_r4.c, generated/matmul_r8.c
+ * generated/matmul_r10.c, generated/matmul_r16.c: Regenerated.
Index: gcc/fortran/trans-array.c
===================================================================
-*** gcc/fortran/trans-array.c (revision 110114)
+*** gcc/fortran/trans-array.c (revision 115838)
--- gcc/fortran/trans-array.c (working copy)
*************** gfc_trans_allocate_temp_array (stmtblock
-*** 673,678 ****
---- 673,767 ----
+*** 726,731 ****
+--- 726,820 ----
}
@@ -139,10 +138,10 @@
Index: gcc/fortran/trans-expr.c
===================================================================
-*** gcc/fortran/trans-expr.c (revision 110114)
+*** gcc/fortran/trans-expr.c (revision 115838)
--- gcc/fortran/trans-expr.c (working copy)
*************** gfc_trans_arrayfunc_assign (gfc_expr * e
-*** 2686,2692 ****
+*** 3021,3027 ****
}
/* Check for a dependency. */
@@ -150,7 +149,7 @@
return NULL;
/* The frontend doesn't seem to bother filling in expr->symtree for intrinsic
---- 2686,2694 ----
+--- 3021,3029 ----
}
/* Check for a dependency. */
@@ -162,11 +161,11 @@
/* The frontend doesn't seem to bother filling in expr->symtree for intrinsic
Index: gcc/fortran/trans-array.h
===================================================================
-*** gcc/fortran/trans-array.h (revision 110114)
+*** gcc/fortran/trans-array.h (revision 115838)
--- gcc/fortran/trans-array.h (working copy)
*************** void gfc_conv_tmp_ref (gfc_se *);
-*** 94,99 ****
---- 94,101 ----
+*** 95,100 ****
+--- 95,102 ----
void gfc_conv_expr_descriptor (gfc_se *, gfc_expr *, gfc_ss *);
/* Convert an array for passing as an actual function parameter. */
void gfc_conv_array_parameter (gfc_se *, gfc_expr *, gfc_ss *, int);
@@ -176,7 +175,7 @@
/* These work with both descriptors and descriptorless arrays. */
tree gfc_conv_array_data (tree);
*************** tree gfc_conv_descriptor_ubound (tree, t
-*** 115,122 ****
+*** 116,123 ****
/* Dependency checking for WHERE and FORALL. */
int gfc_check_dependency (gfc_expr *, gfc_expr *, gfc_expr **, int);
@@ -185,10 +184,10 @@
/* Add pre-loop scalarization code for intrinsic functions which require
special handling. */
---- 117,122 ----
+--- 118,123 ----
Index: gcc/fortran/resolve.c
===================================================================
-*** gcc/fortran/resolve.c (revision 110114)
+*** gcc/fortran/resolve.c (revision 115838)
--- gcc/fortran/resolve.c (working copy)
*************** Software Foundation, 51 Franklin Street,
*** 25,30 ****
@@ -200,12 +199,12 @@
/* Types used in equivalence statements. */
-*************** resolve_actual_arglist (gfc_actual_argli
-*** 862,867 ****
---- 863,886 ----
+*************** resolve_global_procedure (gfc_symbol *sy
+*** 1072,1077 ****
+--- 1073,1096 ----
+ gsym->used = 1;
}
-
+ /* Go through each actual argument in ACTUAL and see if it can be
+ implemented as an inlined, non-copying intrinsic. FNSYM is the
+ function being called, or NULL if not known. */
@@ -228,8 +227,8 @@
/* Resolve a function call known to be generic.
*************** resolve_function (gfc_expr * expr)
-*** 1266,1271 ****
---- 1285,1294 ----
+*** 1510,1515 ****
+--- 1529,1538 ----
gfc_expr_set_symbols_referenced (expr->ts.cl->length);
}
@@ -241,7 +240,7 @@
}
*************** resolve_call (gfc_code * c)
-*** 1495,1520 ****
+*** 1780,1810 ****
/* Resume assumed_size checking. */
need_full_assumed_size--;
@@ -266,9 +265,14 @@
! gfc_internal_error ("resolve_subroutine(): bad function type");
! }
- if (c->ext.actual != NULL
- && c->symtree->n.sym->attr.elemental)
---- 1518,1543 ----
+ /* Some checks of elemental subroutine actual arguments. */
+ if (resolve_elemental_actual (NULL, c) == FAILURE)
+ return FAILURE;
+
+ return t;
+ }
+
+--- 1803,1835 ----
/* Resume assumed_size checking. */
need_full_assumed_size--;
@@ -293,13 +297,9 @@
! gfc_internal_error ("resolve_subroutine(): bad function type");
! }
- if (c->ext.actual != NULL
- && c->symtree->n.sym->attr.elemental)
-*************** resolve_call (gfc_code * c)
-*** 1531,1536 ****
---- 1554,1561 ----
- }
- }
+ /* Some checks of elemental subroutine actual arguments. */
+ if (resolve_elemental_actual (NULL, c) == FAILURE)
+ return FAILURE;
+ if (t == SUCCESS)
+ find_noncopying_intrinsics (c->resolved_sym, c->ext.actual);
@@ -308,11 +308,11 @@
Index: gcc/fortran/Make-lang.in
===================================================================
-*** gcc/fortran/Make-lang.in (revision 110114)
+*** gcc/fortran/Make-lang.in (revision 115838)
--- gcc/fortran/Make-lang.in (working copy)
*************** fortran/trans-intrinsic.o: $(GFORTRAN_TR
-*** 294,297 ****
---- 294,298 ----
+*** 295,298 ****
+--- 295,299 ----
gt-fortran-trans-intrinsic.h
fortran/dependency.o: $(GFORTRAN_TRANS_DEPS) fortran/dependency.h
fortran/trans-common.o: $(GFORTRAN_TRANS_DEPS)
@@ -320,11 +320,11 @@
Index: gcc/fortran/gfortran.h
===================================================================
-*** gcc/fortran/gfortran.h (revision 110114)
+*** gcc/fortran/gfortran.h (revision 115838)
--- gcc/fortran/gfortran.h (working copy)
*************** typedef struct gfc_expr
-*** 1144,1149 ****
---- 1144,1152 ----
+*** 1164,1169 ****
+--- 1164,1172 ----
/* True if it is converted from Hollerith constant. */
unsigned int from_H : 1;
@@ -336,7 +336,7 @@
{
Index: gcc/fortran/dependency.c
===================================================================
-*** gcc/fortran/dependency.c (revision 110114)
+*** gcc/fortran/dependency.c (revision 115838)
--- gcc/fortran/dependency.c (working copy)
*************** gfc_is_same_range (gfc_array_ref * ar1,
*** 175,180 ****
@@ -523,7 +523,7 @@
return 0;
Index: gcc/fortran/dependency.h
===================================================================
-*** gcc/fortran/dependency.h (revision 110114)
+*** gcc/fortran/dependency.h (revision 115838)
--- gcc/fortran/dependency.h (working copy)
*************** Software Foundation, 51 Franklin Street,
*** 22,28 ****
@@ -533,7 +533,7 @@
! int gfc_check_fncall_dependency (gfc_expr *, gfc_expr *);
int gfc_check_dependency (gfc_expr *, gfc_expr *, gfc_expr **, int);
int gfc_is_same_range (gfc_array_ref *, gfc_array_ref *, int, int);
- int gfc_dep_compare_expr (gfc_expr *, gfc_expr *);
+ int gfc_expr_is_one (gfc_expr *, int);
--- 22,30 ----
@@ -543,13 +543,13 @@
! gfc_actual_arglist *);
int gfc_check_dependency (gfc_expr *, gfc_expr *, gfc_expr **, int);
int gfc_is_same_range (gfc_array_ref *, gfc_array_ref *, int, int);
- int gfc_dep_compare_expr (gfc_expr *, gfc_expr *);
+ int gfc_expr_is_one (gfc_expr *, int);
Index: gcc/fortran/trans-intrinsic.c
===================================================================
-*** gcc/fortran/trans-intrinsic.c (revision 110114)
+*** gcc/fortran/trans-intrinsic.c (revision 115838)
--- gcc/fortran/trans-intrinsic.c (working copy)
*************** gfc_conv_intrinsic_function (gfc_se * se
-*** 2898,2904 ****
+*** 3360,3366 ****
name = &expr->value.function.name[2];
@@ -557,7 +557,7 @@
{
lib = gfc_is_intrinsic_libcall (expr);
if (lib != 0)
---- 2898,2904 ----
+--- 3360,3366 ----
name = &expr->value.function.name[2];
@@ -566,8 +566,8 @@
lib = gfc_is_intrinsic_libcall (expr);
if (lib != 0)
*************** gfc_conv_intrinsic_function (gfc_se * se
-*** 3123,3128 ****
---- 3123,3138 ----
+*** 3589,3594 ****
+--- 3589,3604 ----
gfc_conv_intrinsic_bound (se, expr, 0);
break;
@@ -586,7 +586,7 @@
break;
Index: libgfortran/m4/matmul.m4
===================================================================
-*** libgfortran/m4/matmul.m4 (revision 110114)
+*** libgfortran/m4/matmul.m4 (revision 115838)
--- libgfortran/m4/matmul.m4 (working copy)
*************** include(iparm.m4)dnl
*** 37,52 ****
@@ -706,7 +706,7 @@
#endif
Index: libgfortran/generated/matmul_r8.c
===================================================================
-*** libgfortran/generated/matmul_r8.c (revision 110114)
+*** libgfortran/generated/matmul_r8.c (revision 115838)
--- libgfortran/generated/matmul_r8.c (working copy)
*************** Boston, MA 02110-1301, USA. */
*** 36,51 ****
@@ -826,7 +826,7 @@
#endif
Index: libgfortran/generated/matmul_r16.c
===================================================================
-*** libgfortran/generated/matmul_r16.c (revision 110114)
+*** libgfortran/generated/matmul_r16.c (revision 115838)
--- libgfortran/generated/matmul_r16.c (working copy)
*************** Boston, MA 02110-1301, USA. */
*** 36,51 ****
@@ -946,7 +946,7 @@
#endif
Index: libgfortran/generated/matmul_c8.c
===================================================================
-*** libgfortran/generated/matmul_c8.c (revision 110114)
+*** libgfortran/generated/matmul_c8.c (revision 115838)
--- libgfortran/generated/matmul_c8.c (working copy)
*************** Boston, MA 02110-1301, USA. */
*** 36,51 ****
@@ -1066,7 +1066,7 @@
#endif
Index: libgfortran/generated/matmul_i8.c
===================================================================
-*** libgfortran/generated/matmul_i8.c (revision 110114)
+*** libgfortran/generated/matmul_i8.c (revision 115838)
--- libgfortran/generated/matmul_i8.c (working copy)
*************** Boston, MA 02110-1301, USA. */
*** 36,51 ****
@@ -1186,7 +1186,7 @@
#endif
Index: libgfortran/generated/matmul_c16.c
===================================================================
-*** libgfortran/generated/matmul_c16.c (revision 110114)
+*** libgfortran/generated/matmul_c16.c (revision 115838)
--- libgfortran/generated/matmul_c16.c (working copy)
*************** Boston, MA 02110-1301, USA. */
*** 36,51 ****
@@ -1306,7 +1306,7 @@
#endif
Index: libgfortran/generated/matmul_r10.c
===================================================================
-*** libgfortran/generated/matmul_r10.c (revision 110114)
+*** libgfortran/generated/matmul_r10.c (revision 115838)
--- libgfortran/generated/matmul_r10.c (working copy)
*************** Boston, MA 02110-1301, USA. */
*** 36,51 ****
@@ -1426,7 +1426,7 @@
#endif
Index: libgfortran/generated/matmul_r4.c
===================================================================
-*** libgfortran/generated/matmul_r4.c (revision 110114)
+*** libgfortran/generated/matmul_r4.c (revision 115838)
--- libgfortran/generated/matmul_r4.c (working copy)
*************** Boston, MA 02110-1301, USA. */
*** 36,51 ****
@@ -1546,7 +1546,7 @@
#endif
Index: libgfortran/generated/matmul_c10.c
===================================================================
-*** libgfortran/generated/matmul_c10.c (revision 110114)
+*** libgfortran/generated/matmul_c10.c (revision 115838)
--- libgfortran/generated/matmul_c10.c (working copy)
*************** Boston, MA 02110-1301, USA. */
*** 36,51 ****
@@ -1666,7 +1666,7 @@
#endif
Index: libgfortran/generated/matmul_c4.c
===================================================================
-*** libgfortran/generated/matmul_c4.c (revision 110114)
+*** libgfortran/generated/matmul_c4.c (revision 115838)
--- libgfortran/generated/matmul_c4.c (working copy)
*************** Boston, MA 02110-1301, USA. */
*** 36,51 ****
@@ -1786,7 +1786,7 @@
#endif
Index: libgfortran/generated/matmul_i4.c
===================================================================
-*** libgfortran/generated/matmul_i4.c (revision 110114)
+*** libgfortran/generated/matmul_i4.c (revision 115838)
--- libgfortran/generated/matmul_i4.c (working copy)
*************** Boston, MA 02110-1301, USA. */
*** 36,51 ****
@@ -1906,7 +1906,7 @@
#endif
Index: libgfortran/generated/matmul_i16.c
===================================================================
-*** libgfortran/generated/matmul_i16.c (revision 110114)
+*** libgfortran/generated/matmul_i16.c (revision 115838)
--- libgfortran/generated/matmul_i16.c (working copy)
*************** Boston, MA 02110-1301, USA. */
*** 36,51 ****
++++++ gcc-4.1.2-20060705.tar.bz2 -> gcc-4.1.2-20060731.tar.bz2 ++++++
gcc41/gcc-4.1.2-20060705.tar.bz2 gcc41/gcc-4.1.2-20060731.tar.bz2 differ: char 11, line 1
++++++ gcc.spec.in ++++++
--- gcc41/gcc.spec.in 2006-07-20 12:37:52.000000000 +0200
+++ gcc41/gcc.spec.in 2006-08-05 10:49:15.000000000 +0200
@@ -41,9 +41,17 @@
%define build_fortran 1
%define build_objcp 1
+%if 0%{?build_for_base:1}
+%define build_ada 0
+%define build_java 0
+%define build_fortran 0
+%define build_objcp 0
+%define run_tests 0
+%endif
+
Name: gcc@base_ver@@gcc_suffix@
-BuildRequires: glibc-devel-32bit
+BuildRequires: glibc-devel-32bit flex bison gettext-devel
%if %{build_ada}
BuildRequires: gcc-ada
%endif
@@ -73,7 +81,7 @@
# Define version number of libgcc_s
%ifarch hppa
-%define libgcc_s 2
+%define libgcc_s 4
%else
%define libgcc_s 1
%endif
@@ -121,7 +129,7 @@
URL: http://gcc.gnu.org/
License: GPL
-Version: 4.1.2_20060705
+Version: 4.1.2_20060731
Release: 1
%define gcc_version %(echo %version | sed 's/_.*//')
%define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/')
@@ -166,13 +174,13 @@
Patch82: pr13212.patch
Patch93: nvl161673.patch
Patch95: pr26399.patch
-Patch96: pr28016.patch
# A set of patches from the RH srpm
Patch51: gcc41-ia64-stack-protector.patch
Patch55: gcc41-java-slow_pthread_self.patch
Patch57: gcc41-ppc32-retaddr.patch
Patch54: gcc41-ldbl-default.patch
Patch50: gcc41-ldbl-default-libstdc++.patch
+Patch52: note-gnu-stack.diff
# general improvement patches
Patch60: pr25626.patch
Patch61: fortran-matmul.patch
@@ -472,7 +480,7 @@
%ifarch ppc
%define GCCDIST powerpc64-suse-linux
%else
-%define GCCDIST %(echo %{_target_cpu}|sed -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
+%define GCCDIST %(echo %{_host_cpu}|sed -e "s/i.86/i586/" -e "s/ppc/powerpc/")-suse-linux
%endif
%define libsubdir %{_libdir}/gcc/%{GCCDIST}/%{gcc_version}
@@ -654,12 +662,12 @@
%patch82
%patch93
%patch95
-%patch96
%patch51
%patch55
%patch57
%patch54
%patch50
+%patch52
cd libstdc++-v3
%patch60
%patch64
@@ -734,8 +742,8 @@
# we don't want some miscompiles in the testsuite, or some fault in
# the compiler to kill the machine. Hence we limit the amount of memory
# by the physical RAM plus half of swap
-MEM=$(free -m | awk '/^Mem:/ {print $2}')
-SWAP=$(free -m | awk '/^Swap:/ {print $2}')
+#MEM=$(free -m | awk '/^Mem:/ {print $2}')
+#SWAP=$(free -m | awk '/^Swap:/ {print $2}')
#ulimit -v $(((MEM + SWAP/2)*1024))
# In general we want to ship release checking enabled compilers
@@ -908,6 +916,14 @@
%endif
done
+%if %{biarch}
+%if %{build_primary_64bit}
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
+%else
+mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib64
+%endif
+%endif
+
# Move shared libs around
%if %{versionspecificlibs}
%else
@@ -933,20 +949,20 @@
%endif
libobjc libstdc++ libmudflap libmudflapth; do
for lib in `find $RPM_BUILD_ROOT%{versmainlibdir} -maxdepth 1 -name $libname.so.*`; do
- mv $lib $RPM_BUILD_ROOT%{mainlibdir}
+ mv $lib $RPM_BUILD_ROOT%{mainlibdir}/
done
ln -sf %{mainlibdir}/`readlink $RPM_BUILD_ROOT%{versmainlibdir}/$libname.so | sed -e 's/\(.*\.so\.[^\.]*\).*/\1/'` \
$RPM_BUILD_ROOT%{versmainlibdir}/$libname.so
%if %{biarch}
%if %{build_primary_64bit}
for lib in `find $RPM_BUILD_ROOT%{versmainlibdirbi32} -maxdepth 1 -name "$libname.so.*"`; do
- mv $lib $RPM_BUILD_ROOT%{mainlibdirbi32}
+ mv $lib $RPM_BUILD_ROOT%{mainlibdirbi32}/
done
ln -sf %{mainlibdirbi32}/`readlink $RPM_BUILD_ROOT%{versmainlibdirbi32}/$libname.so | sed -e 's/\(.*\.so\.[^\.]*\).*/\1/'` \
$RPM_BUILD_ROOT%{versmainlibdirbi32}/$libname.so
%else
for lib in `find $RPM_BUILD_ROOT%{versmainlibdirbi64} -maxdepth 1 -name "$libname.so.*"`; do
- mv $lib $RPM_BUILD_ROOT%{mainlibdirbi64}
+ mv $lib $RPM_BUILD_ROOT%{mainlibdirbi64}/
done
ln -sf %{mainlibdirbi64}/`readlink $RPM_BUILD_ROOT%{versmainlibdirbi64}/$libname.so | sed -e 's/\(.*\.so\.[^\.]*\).*/\1/'` \
$RPM_BUILD_ROOT%{versmainlibdirbi64}/$libname.so
@@ -962,14 +978,12 @@
%if %{biarch}
%if %{build_primary_64bit}
rm -f $RPM_BUILD_ROOT/lib/libgcc_s.so
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib
ln -sf /lib/libgcc_s.so.%{libgcc_s} $RPM_BUILD_ROOT%{versmainlibdirbi32}/libgcc_s.so
ln -sf /lib/libgcc_s.so.%{libgcc_s} $RPM_BUILD_ROOT%{versmainlibdirbi32}/libgcc_s_32.so
chmod a+x $RPM_BUILD_ROOT/lib/libgcc_s.so.%{libgcc_s}
%else
# 32-bit biarch systems
rm -f $RPM_BUILD_ROOT/lib64/libgcc_s.so
-mkdir -p $RPM_BUILD_ROOT%{_prefix}/lib64
ln -sf /lib64/libgcc_s.so.%{libgcc_s} $RPM_BUILD_ROOT%{versmainlibdirbi64}/libgcc_s.so
ln -sf /lib64/libgcc_s.so.%{libgcc_s} $RPM_BUILD_ROOT%{versmainlibdirbi64}/libgcc_s_64.so
chmod a+x $RPM_BUILD_ROOT/lib64/libgcc_s.so.%{libgcc_s}
@@ -1068,7 +1082,7 @@
rm -f $RPM_BUILD_ROOT%{libsubdir}/include/ncurses.h
rm -f $RPM_BUILD_ROOT%{libsubdir}/include/stdio.h
rm -f $RPM_BUILD_ROOT%{libsubdir}/include/zutil.h
-rm -f $RPM_BUILD_ROOT%{libsubdir}/include/X11
+rm -rf $RPM_BUILD_ROOT%{libsubdir}/include/X11
rm -rf $RPM_BUILD_ROOT%{libsubdir}/include/bits
rm -f $RPM_BUILD_ROOT%{libsubdir}/include/obstack.h
rm -f $RPM_BUILD_ROOT%{libsubdir}/include/spe.h
@@ -1168,33 +1182,24 @@
%dir %{_libdir}/gcc/%{GCCDIST}
%dir %{libsubdir}
%dir %{libsubdir}/include
-%if %{versionspecificlibs}
-%if %{biarch}
-%if %{build_primary_64bit}
-%dir %{mainlibdirbi32}
-%else
-%dir %{mainlibdirbi64}
-%endif
-%endif
-%endif
%if %{biarch}
%if %{build_primary_64bit}
# This link is essential for correct execution
%{_libdir}/32
/%{_lib}/32
+%dir %{libsubdir}/32
%else
%{_libdir}/64
+%dir %{libsubdir}/64
%endif
%endif
-#%{_prefix}/bin/cc%{binsuffix}
+%if %{build_nof}
+%dir %{libsubdir}/nof
+%endif
%{_prefix}/bin/gcc%{binsuffix}
%{_prefix}/bin/gccbug%{binsuffix}
%{_prefix}/bin/gcov%{binsuffix}
-#%{_prefix}/bin/protoize%{binsuffix}
-#%{_prefix}/bin/unprotoize%{binsuffix}
%{libsubdir}/collect2
-%{libsubdir}/*crt*.o
-#%{libsubdir}/SYSCALLS.c.X
%{libsubdir}/include/README
%{libsubdir}/include/float.h
%{libsubdir}/include/iso646.h
@@ -1223,53 +1228,15 @@
%{libsubdir}/include/xmmintrin.h
%{libsubdir}/include/mm_malloc.h
%endif
-%{libsubdir}/libgcc.a
-%{libsubdir}/libgcc_eh.a
-%{libsubdir}/libgcov.a
-%if %{biarch}
-%if %{build_primary_64bit}
-%if !%{versionspecificlibs}
-%dir %{libsubdir}/32
-%endif
-%{libsubdir}/32/*crt*
-%{libsubdir}/32/libgcc*a
-%if %{versionspecificlibs}
-#%{libsubdir}/32/libgcc_s*.so
-%endif
-%{libsubdir}/32/libgcov.a
-%else
-%if !%{versionspecificlibs}
-%dir %{libsubdir}/64
-%endif
-%{libsubdir}/64/*crt*
-%{libsubdir}/64/libgcc*.a
-%{libsubdir}/64/libgcov.a
-%endif
-%endif
-%ifarch ppc
-%dir %{libsubdir}/64
-%endif
-%if %{build_nof}
-%ifarch ppc
-%dir %{libsubdir}/nof
-%{libsubdir}/nof/*crt*
-%{libsubdir}/nof/libgcc*.a
-%{libsubdir}/nof/libgcov.a
-%endif
-%ifarch ppc64
-#%{libsubdir}/32/nof
-%endif
-%endif
-%{versmainlibdir}/libgcc_s.so
-%if %{biarch}
-%if %{build_primary_64bit}
-%{versmainlibdirbi32}/libgcc_s.so
-%{versmainlibdirbi32}/libgcc_s_32.so
-%else
-# 32-bit biarch systems
-%{versmainlibdirbi64}/libgcc_s.so
-%{versmainlibdirbi64}/libgcc_s_64.so
-%endif
+%versmainlib *crt*.o
+%versmainlib libgcc*.a
+%versmainlib libgcov.a
+%versmainlib libgcc_s*.so
+%if %{separate_biarch}
+%versbiarchlib *crt*.o
+%versbiarchlib libgcc*.a
+%versbiarchlib libgcov.a
+%versbiarchlib libgcc_s*.so
%endif
%doc %{_mandir}/man1/gcc%{binsuffix}.1.gz
%doc %{_mandir}/man1/gcov%{binsuffix}.1.gz
@@ -1284,15 +1251,16 @@
%{_prefix}/share/locale/*/LC_MESSAGES/gcc.mo
%{_prefix}/share/locale/*/LC_MESSAGES/cpplib.mo
# FIXME - maybe this should go into a new package libstdc++-locale
+%if 0%{!?build_for_base:1}
%{_prefix}/share/locale/*/LC_MESSAGES/libstdc++.mo
%endif
+%endif
%files c++
%defattr(-,root,root)
%dir %{_libdir}/gcc
%dir %{_libdir}/gcc/%{GCCDIST}
%dir %{libsubdir}
-#%{_prefix}/bin/c++%{binsuffix}
%{_prefix}/bin/g++%{binsuffix}
%doc %{_mandir}/man1/g++%{binsuffix}.1.gz
%{libsubdir}/cc1plus
@@ -1318,20 +1286,7 @@
%files -n libgcc@base_ver@@gcc_suffix@
%defattr(-,root,root)
%if %{versionspecificlibs}
-%{mainlibdir}/libgcc_s.so.%{libgcc_s}
-%if %{biarch}
-%if %{build_primary_64bit}
-%{mainlibdirbi32}/libgcc_s.so.%{libgcc_s}
-%else
-%if !%{separate_bi64}
-%{mainlibdirbi64}/libgcc_s.so.%{libgcc_s}
-%endif
-%endif
-%endif
-%if %{build_nof}
-%dir %{noflibdir}
-%{noflibdir}/libgcc_s.so.%{libgcc_s}
-%endif
+%versmainlib libgcc_s.so.%{libgcc_s}
%else
# not versionspecificlibs
/%{_lib}/libgcc_s.so.%{libgcc_s}
@@ -1354,7 +1309,7 @@
%files -n libgcc@base_ver@@gcc_suffix@-64bit
%defattr(-,root,root)
%if %{versionspecificlibs}
-%{mainlibdirbi64}/libgcc_s.so.%{libgcc_s}
+%versbiarchlib libgcc_s.so.%{libgcc_s}
%else
/lib64/libgcc_s.so.%{libgcc_s}
%endif
@@ -1364,7 +1319,7 @@
%files -n libgcc@base_ver@@gcc_suffix@-32bit
%defattr(-,root,root)
%if %{versionspecificlibs}
-%{mainlibdirbi32}/libgcc_s.so.%{libgcc_s}
+%versbiarchlib libgcc_s.so.%{libgcc_s}
%else
/lib/libgcc_s.so.%{libgcc_s}
%endif
@@ -1464,9 +1419,6 @@
%dir %{_libdir}/gcc
%dir %{_libdir}/gcc/%{GCCDIST}
%dir %{libsubdir}
-#%if !%{gcc_for_opt}
-#/lib/cpp
-#%endif
%{_prefix}/bin/cpp%{binsuffix}
%{libsubdir}/cc1
#%{libsubdir}/specs
++++++ note-gnu-stack.diff ++++++
http://gcc.gnu.org/viewcvs?view=rev&revision=107432
2005-05-04 Jakub Jelinek