[meego-packaging] 4909: Changes to devel:base/gcc
Austin Zhang
austin.zhang at intel.com
Fri Jun 25 10:55:57 PDT 2010
Hi,
I have made the following changes to gcc in project devel:base. Please review and accept ASAP.
Thank You,
Austin Zhang
[This message was auto-generated]
---
Request #4909:
submit: home:austin:branches:devel:base/gcc(r3)(cleanup) -> devel:base/gcc
Message:
Update to 4.5.0 and removed obsoleted stuffs.
State: new 2010-06-25T05:51:33 austin
Comment: None
changes files:
--------------
--- gcc.changes
+++ gcc.changes
@@ -0,0 +1,11 @@
+* Mon May 24 2010 Austin Zhang <austin.zhang at intel.com> - 4.5.0
+- Added rpmlintrc to suppress wanring/error.
+- Added multilib support explicitly
+
+* Mon Apr 19 2010 Austin Zhang <austin.zhang at intel.com> - 4.5.0
+- Gcc-4.5.0, the first official version with atom support inside
+- Added MPC support
+- Enable LTO
+- Remove protoize feature
+- Removed obsoleted stuffs
+
old:
----
gcc-4.4.2-20091027.tar.bz2
gcc-rpmlintrc
gcc44-pr38757.patch
gcc44-pr41762.patch
gcc44-rh330771.patch
gcc44-unwind-debug-hook.patch
gcc44-use-atom.patch
new:
----
gcc-4.5.0-rpmlintrc
gcc-4.5.0.tar.bz2
gcc45-use-atom.patch
spec files:
-----------
--- gcc.spec
+++ gcc.spec
@@ -1,11 +1,6 @@
-%global DATE 20091027
-%global SVNREV 153611
-%global gcc_version 4.4.2
-# Note, gcc_release must be integer, if you want to add suffixes to
-# %{release}, append them after %{gcc_release} on Release: line.
-%global gcc_release 7
+%global gcc_version 4.5.0
+%global gcc_release 1
%global _unpackaged_files_terminate_build 0
-%global multilib_64_archs x86_64
%global include_gappletviewer 0
%global build_ada 0
%global build_java 0
@@ -15,50 +10,36 @@
%global build_cloog 1
%endif
%global build_libstdcxx_docs 0
-# If you don't have already a usable gcc-java and libgcj for your arch,
-# do on some arch which has it rpmbuild -bc --with java_tar gcc41.spec
-# which creates libjava-classes-%{version}-%{release}.tar.bz2
-# With this then on the new arch do rpmbuild -ba -v --with java_bootstrap gcc41.spec
%global bootstrap_java %{?_with_java_bootstrap:%{build_java}}%{!?_with_java_bootstrap:0}
%global build_java_tar %{?_with_java_tar:%{build_java}}%{!?_with_java_tar:0}
+%global multilib_64_archs x86_64
%ifarch x86_64
%global multilib_32_arch i686
%endif
+%global build_64bit_multilib 0
Summary: Various compilers (C, C++, Objective-C, Java, ...)
Name: gcc
Version: %{gcc_version}
Release: %{gcc_release}
-# libgcc, libgfortran, libmudflap, libgomp, libstdc++ and crtstuff have
-# GCC Runtime Exception.
License: GPLv3+, GPLv3+ with exceptions and GPLv2+ with exceptions
Group: Development/Languages
-# The source for this package was pulled from upstream's vcs. Use the
-# following commands to generate the tarball:
-# svn export svn://gcc.gnu.org/svn/gcc/branches/redhat/gcc-4_4-branch@%{SVNREV} gcc-%{version}-%{DATE}
-# tar cf - gcc-%{version}-%{DATE} | bzip2 -9 > gcc-%{version}-%{DATE}.tar.bz2
-Source0: gcc-%{version}-%{DATE}.tar.bz2
+URL: http://gcc.gnu.org
+Source0: gcc-%{version}.tar.bz2
Source1: libgcc_post_upgrade.c
Source2: README.libgcjwebplugin.so
-Source3: protoize.1
%global fastjar_ver 0.97
Source4: http://download.savannah.nongnu.org/releases/fastjar/fastjar-%{fastjar_ver}.tar.gz
-Source100: gcc-rpmlintrc
-URL: http://gcc.gnu.org
+Source100: gcc-4.5.0-rpmlintrc
+
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-# Need binutils with -pie support >= 2.14.90.0.4-4
-# Need binutils which can omit dot symbols and overlap .opd on ppc64 >= 2.15.91.0.2-4
-# Need binutils which handle -msecure-plt on ppc >= 2.16.91.0.2-2
-# Need binutils which support .weakref >= 2.16.91.0.3-1
-# Need binutils which support --hash-style=gnu >= 2.17.50.0.2-7
-# Need binutils which support mffgpr and mftgpr >= 2.17.50.0.2-8
-# Need binutils which support --build-id >= 2.17.50.0.17-3
-# Need binutils which support %gnu_unique_object >= 2.19.51.0.14
BuildRequires: binutils >= 2.19.51.0.14
-# While gcc doesn't include statically linked binaries, during testing
-# -static is used several times.
BuildRequires: glibc-static
BuildRequires: zlib-devel, gettext, bison, flex, texinfo
+BuildRequires: mpc-devel
+BuildRequires: glibc-devel >= 2.4.90-13
+BuildRequires: elfutils-devel >= 0.72
+
%if %{build_java}
BuildRequires: /usr/share/java/eclipse-ecj.jar, zip, unzip
%if %{bootstrap_java}
@@ -67,48 +48,39 @@
BuildRequires: gcc-java, libgcj
%endif
%endif
-# Make sure pthread.h doesn't contain __thread tokens
-# Make sure glibc supports stack protector
-# Make sure glibc supports DT_GNU_HASH
-BuildRequires: glibc-devel >= 2.4.90-13
-BuildRequires: elfutils-devel >= 0.72
%if %{build_ada}
# Ada requires Ada to build
BuildRequires: gcc-gnat >= 3.1, libgnat >= 3.1
%endif
+
%if %{build_cloog}
BuildRequires: ppl >= 0.10, ppl-devel >= 0.10, cloog-ppl >= 0.15, cloog-ppl-devel >= 0.15
%endif
+
%if %{build_libstdcxx_docs}
BuildRequires: doxygen
BuildRequires: graphviz
%endif
+
Requires: cpp = %{version}-%{release}
-# Need .eh_frame ld optimizations
-# Need proper visibility support
-# Need -pie support
-# Need --as-needed/--no-as-needed support
-# On ppc64, need omit dot symbols support and --non-overlapping-opd
-# Need binutils that owns /usr/bin/c++filt
-# Need binutils that support .weakref
-# Need binutils that supports --hash-style=gnu
-# Need binutils that support mffgpr/mftgpr
-# Need binutils that support --build-id
-# Need binutils which support %gnu_unique_object
-Requires: binutils >= 2.19.51.0.14
-# Make sure gdb will understand DW_FORM_strp
-Conflicts: gdb < 5.1-2
-Requires: glibc-devel >= 2.2.90-12
Requires: libgcc >= %{version}-%{release}
Requires: libgomp = %{version}-%{release}
+Requires: glibc-devel
+
%if !%{build_ada}
Obsoletes: gcc-gnat < %{version}-%{release}
Obsoletes: libgnat < %{version}-%{release}
%endif
+
%if %{build_cloog}
Requires: cloog-ppl >= 0.15
%endif
+
+%if %{build_64bit_multilib}
+Requires: glibc64bit-helper
+%endif
+
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
Obsoletes: gcc < %{version}-%{release}
@@ -120,47 +92,38 @@
Patch2: gcc44-c++-builtin-redecl.patch
Patch4: gcc44-java-nomulti.patch
Patch9: gcc44-pr33763.patch
-Patch10: gcc44-rh330771.patch
Patch11: gcc44-rh341221.patch
Patch12: gcc44-java-debug-iface-type.patch
Patch13: gcc44-i386-libgomp.patch
Patch16: gcc44-libgomp-omp_h-multilib.patch
Patch20: gcc44-libtool-no-rpath.patch
-Patch21: gcc44-cloog-dl.patch
-Patch24: gcc44-unwind-debug-hook.patch
-Patch28: gcc44-pr38757.patch
-%if %{build_libstdcxx_docs}
Patch29: gcc44-libstdc++-docs.patch
-%endif
-
-Patch34: gcc44-pr41762.patch
-Patch40: gcc44-use-atom.patch
+Patch40: gcc45-use-atom.patch
Patch41: libgcc_post_upgrade.c.arm.patch
-Patch42: var-tracking1.patch
-Patch43: var-tracking2.patch
-Patch44: var-tracking3.patch
+#Patch42: var-tracking1.patch
+#Patch43: var-tracking2.patch
+#Patch44: var-tracking3.patch
-Patch45: gcc44-max-vartrack-size.patch
-Patch46: gcc44-max-vartrack-size-2.patch
+#Patch45: gcc44-max-vartrack-size.patch
+#Patch46: gcc44-max-vartrack-size-2.patch
Patch1000: fastjar-0.97-segfault.patch
-# On ARM EABI systems, we do want -gnueabi to be part of the
-# target triple.
+#We need -gnueabi indicator for ARM
%ifnarch %{arm}
%global _gnu %{nil}
%endif
%global gcc_target_platform %{_target_platform}
%description
-The gcc package contains the GNU Compiler Collection version 4.4.
+The gcc package contains the GNU Compiler Collection version 4.5.0.
You'll need this package in order to compile C code.
%package -n libgcc
-Summary: GCC version 4.4 shared support library
-Group: System/Libraries
+Summary: GCC version 4.5.0 shared support library
+Group: System Environment/Libraries
Obsoletes: libgcc < %{version}-%{release}
Obsoletes: libgcc43
Autoreq: false
@@ -186,13 +149,12 @@
%package -n libstdc++
Summary: GNU Standard C++ Library
-Group: System/Libraries
+Group: System Environment/Libraries
Obsoletes: libstdc++ < %{version}-%{release}
Obsoletes: libstdc++43
Obsoletes: libstdc++6 < %{version}-%{release}
Autoreq: true
Requires: glibc
-# >= 2.10.90-7
%description -n libstdc++
The libstdc++ package contains a rewritten standard compliant GCC Standard
@@ -249,7 +211,7 @@
%package -n libobjc
Summary: Objective-C runtime
-Group: System/Libraries
+Group: System Environment/Libraries
Obsoletes: libobjc < %{version}-%{release}
Obsoletes: libobjc43
Autoreq: true
@@ -261,9 +223,9 @@
%package gfortran
Summary: Fortran support
Group: Development/Languages
+BuildRequires: gmp-devel >= 4.1.2-8, mpfr-devel >= 2.2.1
Requires: gcc = %{version}-%{release}
Requires: libgfortran = %{version}-%{release}
-BuildRequires: gmp-devel >= 4.1.2-8, mpfr-devel >= 2.2.1
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
Obsoletes: gcc-fortran < %{version}-%{release}
@@ -277,7 +239,7 @@
%package -n libgfortran
Summary: Fortran runtime
-Group: System/Libraries
+Group: System Environment/Libraries
Obsoletes: libgfortran < %{version}-%{release}
Obsoletes: libgfortran43
Autoreq: true
@@ -288,7 +250,7 @@
%package -n libgomp
Summary: GCC OpenMP v3.0 shared support library
-Group: System/Libraries
+Group: System Environment/Libraries
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
Obsoletes: libgomp < %{version}-%{release}
@@ -300,7 +262,7 @@
%package -n libmudflap
Summary: GCC mudflap shared support library
-Group: System/Libraries
+Group: System Environment/Libraries
%description -n libmudflap
This package contains GCC shared support library which is needed
@@ -339,13 +301,7 @@
%package -n libgcj
Summary: Java runtime library for gcc
-Group: System/Libraries
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
-Requires: zip >= 2.1
-Requires: gtk2 >= 2.4.0
-Requires: glib2 >= 2.4.0
-Requires: libart_lgpl >= 2.1.0
+Group: System Environment/Libraries
%if %{build_java}
BuildRequires: gtk2-devel >= 2.4.0
BuildRequires: glib2-devel >= 2.4.0
@@ -355,6 +311,12 @@
BuildRequires: libXtst-devel
BuildRequires: libXt-devel
%endif
+Requires(post): /sbin/install-info
+Requires(preun): /sbin/install-info
+Requires: zip >= 2.1
+Requires: gtk2 >= 2.4.0
+Requires: glib2 >= 2.4.0
+Requires: libart_lgpl >= 2.1.0
Obsoletes: libgcj < %{version}-%{release}
Obsoletes: libgcj43
Autoreq: true
@@ -380,7 +342,7 @@
%package -n libgcj-src
Summary: Java library sources from GCC4 preview
-Group: System/Libraries
+Group: System Environment/Libraries
Requires: libgcj = %{version}-%{release}
Autoreq: true
@@ -392,6 +354,7 @@
Group: Development/Languages
Requires(post): /sbin/install-info
Requires(preun): /sbin/install-info
+Requires: mpc
Obsoletes: cpp < %{version}-%{release}
Obsoletes: cpp43
Autoreq: true
@@ -433,7 +396,7 @@
%package -n libgnat
Summary: GNU Ada 95 runtime shared libraries
-Group: System/Libraries
+Group: System Environment/Libraries
Autoreq: true
%description -n libgnat
@@ -442,45 +405,48 @@
%package -n libgnat-devel
Summary: GNU Ada 95 libraries
-Group: System/Libraries
+Group: System Environment/Libraries
Autoreq: true
%description -n libgnat-devel
GNAT is a GNU Ada 95 front-end to GCC. This package includes libraries,
which are required to compile with the GNAT.
+%package -n gcc-multilib
+Summary: for 64bit multilib support
+Group: System Environment/Libraries
+Autoreq: true
+
+%description -n gcc-multilib
+This is one set of libraries which support 64bit multilib on top of
+32bit enviroment from compiler side.
+
%prep
-%setup -q -n gcc-%{version}-%{DATE}
+%setup -q -n gcc-%{version}
%patch0 -p0 -b .hack~
%patch1 -p0 -b .build-id~
%patch2 -p0 -b .c++-builtin-redecl~
%patch4 -p0 -b .java-nomulti~
%patch9 -p0 -b .pr33763~
-%patch10 -p0 -b .rh330771~
%patch11 -p0 -b .rh341221~
%patch12 -p0 -b .java-debug-iface-type~
%patch13 -p0 -b .i386-libgomp~
%patch16 -p0 -b .libgomp-omp_h-multilib~
%patch20 -p0 -b .libtool-no-rpath~
-%if %{build_cloog}
-%patch21 -p0 -b .cloog-dl~
-%endif
-%patch24 -p0 -b .unwind-debug-hook~
-%patch28 -p0 -b .pr38757~
+
%if %{build_libstdcxx_docs}
%patch29 -p0 -b .libstdc++-docs~
%endif
-%patch34 -p0 -b .pr41762~
-
-%patch40 -p1 -b .atom
+#Fix me!
+#%patch40 -p1 -b .atom
-%patch42 -p0 -b .var-track1~
-%patch43 -p0 -b .var-track2~
-%patch44 -p0 -b .var-track3~
+#%patch42 -p0 -b .var-track1~
+#%patch43 -p0 -b .var-track2~
+#%patch44 -p0 -b .var-track3~
-%patch45 -p0 -b .max-vartrack-size~
-%patch46 -p1 -b .max-vartrack-size-2~
+#%patch45 -p0 -b .max-vartrack-size~
+#%patch46 -p1 -b .max-vartrack-size-2~
# This testcase doesn't compile.
rm libjava/testsuite/libjava.lang/PR35020*
@@ -493,7 +459,6 @@
tar xjf %{SOURCE10}
%endif
-sed -i -e 's/4\.4\.3/4.4.2/' gcc/BASE-VER
echo 'MeeGo %{version}-%{gcc_release}' > gcc/DEV-PHASE
# Default to -gdwarf-3 rather than -gdwarf-2
@@ -517,8 +482,6 @@
%build
%if %{build_java}
-# gjar isn't usable, so even when GCC source tree no longer includes
-# fastjar, build it anyway.
mkdir fastjar-%{fastjar_ver}/obj-%{gcc_target_platform}
cd fastjar-%{fastjar_ver}/obj-%{gcc_target_platform}
../configure CFLAGS="%{optflags}" --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir}
@@ -533,7 +496,6 @@
%if %{build_java}
%if !%{bootstrap_java}
-# If we don't have gjavah in $PATH, try to build it with the old gij
mkdir java_hacks
cd java_hacks
cp -a ../../libjava/classpath/tools/external external
@@ -583,14 +545,26 @@
%else
--with-bugurl=http://bugzilla.meego.com/ --enable-bootstrap \
--enable-shared --enable-threads=posix --enable-checking=release \
+%if %{build_64bit_multilib}
+ --enable-targets=all \
+ --enable-multilib \
+%endif
%endif
--with-system-zlib --enable-__cxa_atexit --disable-libunwind-exceptions \
- --enable-gnu-unique-object \
+ --enable-gnu-unique-object --enable-lto \
%if !%{build_ada}
+%if !%{build_java}
+ --enable-languages=c,c++,objc,obj-c++,fortran \
+%else
--enable-languages=c,c++,objc,obj-c++,java,fortran \
+%endif
+%else
+%if !%{build_java}
+ --enable-languages=c,c++,objc,obj-c++,fortran,ada \
%else
--enable-languages=c,c++,objc,obj-c++,java,fortran,ada \
%endif
+%endif
%if !%{build_java}
--disable-libgcj \
%else
@@ -627,8 +601,8 @@
GCJFLAGS="$OPT_FLAGS" make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" profiledbootstrap
%endif
-# Make protoize
-make -C gcc CC="./xgcc -B ./ -O2" proto
+# Make
+make -C gcc CC="./xgcc -B ./ -O2" all
# Make generated man pages even if Pod::Man is not new enough
perl -pi -e 's/head3/head2/' ../contrib/texi2pod.pl
@@ -722,7 +696,6 @@
FULLPATH=%{buildroot}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}
FULLEPATH=%{buildroot}%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}
-# fix some things
ln -sf gcc %{buildroot}%{_prefix}/bin/cc
mkdir -p %{buildroot}/lib
ln -sf ..%{_prefix}/bin/cpp %{buildroot}/lib/cpp
@@ -794,8 +767,6 @@
find %{buildroot} -name \*.la | xargs rm -f
%if %{build_java}
-# gcj -static doesn't work properly anyway, unless using --whole-archive
-# and saving 35MB is not bad.
find %{buildroot} -name libgcj.a -o -name libgtkpeer.a \
-o -name libgjsmalsa.a -o -name libgcj-tools.a -o -name libjvm.a \
-o -name libgij.a -o -name libgcj_bc.a -o -name libjavamath.a \
@@ -807,9 +778,9 @@
%endif
mkdir -p %{buildroot}/%{_lib}
-mv -f %{buildroot}%{_prefix}/%{_lib}/libgcc_s.so.1 %{buildroot}/%{_lib}/libgcc_s-%{gcc_version}-%{DATE}.so.1
-chmod 755 %{buildroot}/%{_lib}/libgcc_s-%{gcc_version}-%{DATE}.so.1
-ln -sf libgcc_s-%{gcc_version}-%{DATE}.so.1 %{buildroot}/%{_lib}/libgcc_s.so.1
+mv -f %{buildroot}%{_prefix}/%{_lib}/libgcc_s.so.1 %{buildroot}/%{_lib}/libgcc_s-%{gcc_version}.so.1
+chmod 755 %{buildroot}/%{_lib}/libgcc_s-%{gcc_version}.so.1
+ln -sf libgcc_s-%{gcc_version}.so.1 %{buildroot}/%{_lib}/libgcc_s.so.1
ln -sf /%{_lib}/libgcc_s.so.1 $FULLPATH/libgcc_s.so
%ifarch %{multilib_64_archs}
ln -sf /lib/libgcc_s.so.1 $FULLPATH/32/libgcc_s.so
@@ -845,6 +816,8 @@
pushd $FULLPATH
if [ "%{_lib}" = "lib" ]; then
ln -sf ../../../libobjc.so.2 libobjc.so
+#FIXME
+rm -fr ../../../libstdc++.so.6.*-gdb.py
ln -sf ../../../libstdc++.so.6.* libstdc++.so
ln -sf ../../../libgfortran.so.3.* libgfortran.so
ln -sf ../../../libgomp.so.1.* libgomp.so
@@ -1031,10 +1004,6 @@
touch %{buildroot}%{_prefix}/%{_lib}/gcj-%{version}/classmap.db
%endif
-install -m644 %{SOURCE3} %{buildroot}%{_mandir}/man1/protoize.1
-echo '.so man1/protoize.1' > %{buildroot}%{_mandir}/man1/unprotoize.1
-chmod 644 %{buildroot}%{_mandir}/man1/unprotoize.1
-
%check
%if 0
cd obj-%{gcc_target_platform}
@@ -1115,11 +1084,10 @@
--info-dir=%{_infodir} %{_infodir}/gnat-style.info.gz || :
fi
-# Because glibc Prereq's libgcc and /sbin/ldconfig
-# comes from glibc, it might not exist yet when
-# libgcc is installed
%post -n libgcc -p %{_prefix}/sbin/libgcc_post_upgrade
+%postun -n libgcc -p /sbin/ldconfig
+
%post -n libstdc++ -p /sbin/ldconfig
%postun -n libstdc++ -p /sbin/ldconfig
@@ -1177,15 +1145,12 @@
%{_prefix}/bin/c99
%{_prefix}/bin/gcc
%{_prefix}/bin/gcov
-%{_prefix}/bin/protoize
-%{_prefix}/bin/unprotoize
%ifnarch %{arm}
-%{_prefix}/bin/%{gcc_target_platform}-gcc
+%{_prefix}/bin/%{gcc_target_platform}-*
%endif
%{_mandir}/man1/gcc.1*
%{_mandir}/man1/gcov.1*
-%{_mandir}/man1/protoize.1*
-%{_mandir}/man1/unprotoize.1*
+%{_mandir}/man7/*
%{_infodir}/gcc*
%dir %{_prefix}/lib/gcc
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}
@@ -1194,38 +1159,11 @@
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}
%dir %{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/SYSCALLS.c.X
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/stddef.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/stdarg.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/stdfix.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/varargs.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/float.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/limits.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/stdbool.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/iso646.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/syslimits.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/unwind.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/omp.h
-%ifarch %{ix86} x86_64
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mmintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/xmmintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/emmintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/pmmintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/tmmintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/ammintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/smmintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/nmmintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/bmmintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/wmmintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/immintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/avxintrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/x86intrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/fma4intrin.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mm_malloc.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/mm3dnow.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/cpuid.h
-%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/cross-stdarg.h
-%endif
+%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/plugin
+%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/plugin/include
+%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/*
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/plugin/include/*
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include/*
%ifarch %{arm}
%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/include-fixed
@@ -1241,7 +1179,6 @@
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/install-tools
%endif
-%{_prefix}/libexec/gcc/%{gcc_target_platform}/%{gcc_version}/collect2
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/crt*.o
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcc.a
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libgcov.a
@@ -1281,8 +1218,8 @@
%files -n libgcc
%defattr(-,root,root,-)
-/%{_lib}/libgcc_s-%{gcc_version}-%{DATE}.so.1
-/%{_lib}/libgcc_s.so.1
+/%{_lib}/libgcc_s-%{gcc_version}.so.1
+/%{_lib}/libgcc_s.*
%{_prefix}/sbin/libgcc_post_upgrade
%doc gcc/COPYING.LIB
@@ -1315,7 +1252,9 @@
%files -n libstdc++
%defattr(-,root,root,-)
-%{_prefix}/%{_lib}/libstdc++.so.6*
+%{_prefix}/%{_lib}/libstdc++.*
+/usr/share/locale/de/LC_MESSAGES/libstdc++.mo
+/usr/share/locale/fr/LC_MESSAGES/libstdc++.mo
%files -n libstdc++-devel
%defattr(-,root,root,-)
@@ -1371,7 +1310,7 @@
%files -n libobjc
%defattr(-,root,root,-)
-%{_prefix}/%{_lib}/libobjc.so.2*
+%{_prefix}/%{_lib}/libobjc.*
%files gfortran
%defattr(-,root,root,-)
@@ -1404,7 +1343,7 @@
%files -n libgfortran
%defattr(-,root,root,-)
-%{_prefix}/%{_lib}/libgfortran.so.3*
+%{_prefix}/%{_lib}/libgfortran.*
%if %{build_java}
%files java
@@ -1565,14 +1504,14 @@
%files -n libgomp
%defattr(-,root,root,-)
-%{_prefix}/%{_lib}/libgomp.so.1*
+%{_prefix}/%{_lib}/libgomp.*
%{_infodir}/libgomp.info*
%doc rpm.doc/changelogs/libgomp/ChangeLog*
%files -n libmudflap
%defattr(-,root,root,-)
-%{_prefix}/%{_lib}/libmudflap.so.0*
-%{_prefix}/%{_lib}/libmudflapth.so.0*
+%{_prefix}/%{_lib}/libmudflap.*
+%{_prefix}/%{_lib}/libmudflapth.*
%files -n libmudflap-devel
%defattr(-,root,root,-)
@@ -1587,3 +1526,18 @@
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/libmudflapth.so
%doc rpm.doc/changelogs/libmudflap/ChangeLog*
+%if %{build_64bit_multilib}
+%files -n gcc-multilib
+%defattr(-,root,root,-)
+%dir %{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/crt*.o
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcc.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcov.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgcc_eh.a
+%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_version}/64/libgfortranbegin.a
+%dir %{_prefix}/lib64
+%{_prefix}/lib64/*
+%endif
+
+
+
other changes:
--------------
++++++ gcc-4.5.0-rpmlintrc (new)
--- gcc-4.5.0-rpmlintrc
+++ gcc-4.5.0-rpmlintrc
+setBadness('devel-file-in-non-devel-package', 0)
+addFilter("gcc.* devel-file-in-non-devel-package")
+addFilter("gcc-objc.* devel-file-in-non-devel-package")
+addFilter("gcc-multilib.* devel-file-in-non-devel-package")
+
++++++ gcc-4.4.2-20091027.tar.bz2 -> gcc-4.5.0.tar.bz2
12336583 lines of diff (skipped)
++++++ gcc45-use-atom.patch (new)
--- gcc45-use-atom.patch
+++ gcc45-use-atom.patch
+diff -Naurp gcc-4.5.0-orig/gcc/config/i386/i386.c gcc-4.5.0/gcc/config/i386/i386.c
+--- gcc-4.5.0-orig/gcc/config/i386/i386.c 2010-04-23 04:43:24.000000000 -0400
++++ gcc-4.5.0/gcc/config/i386/i386.c 2010-04-23 04:45:30.000000000 -0400
+@@ -1783,7 +1783,7 @@ enum asm_dialect ix86_asm_dialect = ASM_
+ enum tls_dialect ix86_tls_dialect = TLS_DIALECT_GNU;
+
+ /* Which unit we are generating floating point math for. */
+-enum fpmath_unit ix86_fpmath;
++enum fpmath_unit ix86_fpmath = FPMATH_SSE;
+
+ /* Which cpu are we scheduling for. */
+ enum attr_cpu ix86_schedule;
+@@ -1923,15 +1923,9 @@ static enum calling_abi ix86_function_ab
+ #endif
+
+ /* Whether -mtune= or -march= were specified */
+-static int ix86_tune_defaulted;
++static int ix86_tune_defaulted = 1;
+ static int ix86_arch_specified;
+
+-/* Bit flags that specify the ISA we are compiling for. */
+-int ix86_isa_flags = TARGET_64BIT_DEFAULT | TARGET_SUBTARGET_ISA_DEFAULT;
+-
+-/* A mask of ix86_isa_flags that includes bit X if X
+- was set or cleared on the command line. */
+-static int ix86_isa_flags_explicit;
+
+ /* Define a set of ISAs which are available when a given ISA is
+ enabled. MMX and SSE ISAs are handled separately. */
+@@ -2034,6 +2028,14 @@ static int ix86_isa_flags_explicit;
+ #define OPTION_MASK_ISA_MOVBE_UNSET OPTION_MASK_ISA_MOVBE
+ #define OPTION_MASK_ISA_CRC32_UNSET OPTION_MASK_ISA_CRC32
+
++/* Bit flags that specify the ISA we are compiling for. */
++int ix86_isa_flags = TARGET_64BIT_DEFAULT | TARGET_SUBTARGET_ISA_DEFAULT | OPTION_MASK_ISA_SSSE3_SET;
++
++/* A mask of ix86_isa_flags that includes bit X if X
++ was set or cleared on the command line. */
++static int ix86_isa_flags_explicit = OPTION_MASK_ISA_SSSE3_SET;
++
++
+ /* Vectorization library interface and handlers. */
+ tree (*ix86_veclib_handler)(enum built_in_function, tree, tree) = NULL;
+ static tree ix86_veclibabi_svml (enum built_in_function, tree, tree);
+@@ -2807,6 +2809,8 @@ override_options (bool main_args_p)
+ flag_pcc_struct_return = DEFAULT_PCC_STRUCT_RETURN;
+ }
+
++
++ ix86_tune_string = "atom";
+ /* Need to check -mtune=generic first. */
+ if (ix86_tune_string)
+ {
+@@ -2882,6 +2886,7 @@ override_options (bool main_args_p)
+ ix86_stringop_string, prefix, suffix, sw);
+ }
+
++ ix86_arch_string = "atom";
+ if (!ix86_arch_string)
+ ix86_arch_string = TARGET_64BIT ? "x86-64" : SUBTARGET32_DEFAULT_CPU;
+ else
+@@ -3311,7 +3316,7 @@ override_options (bool main_args_p)
+ && ! TARGET_SSE)
+ error ("%ssseregparm%s used without SSE enabled", prefix, suffix);
+
+- ix86_fpmath = TARGET_FPMATH_DEFAULT;
++ ix86_fpmath = FPMATH_SSE;
+ if (ix86_fpmath_string != 0)
+ {
+ if (! strcmp (ix86_fpmath_string, "387"))
++++++ deleted files:
--- gcc-rpmlintrc
--- gcc44-pr38757.patch
--- gcc44-pr41762.patch
--- gcc44-rh330771.patch
--- gcc44-unwind-debug-hook.patch
--- gcc44-use-atom.patch
More information about the Meego-packaging
mailing list