rpms/gcc/devel .cvsignore, 1.267, 1.268 gcc.spec, 1.39, 1.40 gcc44-power7.patch, 1.2, 1.3 gcc44-pr39543.patch, 1.1, 1.2 sources, 1.270, 1.271 gcc44-power7-2.patch, 1.1, NONE
Jakub Jelinek
jakub at fedoraproject.org
Tue Apr 14 15:46:47 UTC 2009
- Previous message: rpms/python-bugzilla/EL-5 python-bugzilla.spec, 1.5, 1.6 sources, 1.5, 1.6
- Next message: rpms/system-config-samba-docs/devel .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 system-config-samba-docs.spec, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jakub
Update of /cvs/pkgs/rpms/gcc/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv8401
Modified Files:
.cvsignore gcc.spec gcc44-power7.patch gcc44-pr39543.patch
sources
Removed Files:
gcc44-power7-2.patch
Log Message:
4.4.0-0.34
Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/.cvsignore,v
retrieving revision 1.267
retrieving revision 1.268
diff -u -r1.267 -r1.268
--- .cvsignore 9 Apr 2009 12:06:24 -0000 1.267
+++ .cvsignore 14 Apr 2009 15:46:14 -0000 1.268
@@ -1,2 +1,2 @@
fastjar-0.97.tar.gz
-gcc-4.4.0-20090409.tar.bz2
+gcc-4.4.0-20090414.tar.bz2
Index: gcc.spec
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc.spec,v
retrieving revision 1.39
retrieving revision 1.40
diff -u -r1.39 -r1.40
--- gcc.spec 10 Apr 2009 09:40:17 -0000 1.39
+++ gcc.spec 14 Apr 2009 15:46:15 -0000 1.40
@@ -1,9 +1,9 @@
-%define DATE 20090409
-%define SVNREV 145816
+%define DATE 20090414
+%define SVNREV 146037
%define gcc_version 4.4.0
# Note, gcc_release must be integer, if you want to add suffixes to
# %{release}, append them after %{gcc_release} on Release: line.
-%define gcc_release 0.33
+%define gcc_release 0.34
%define _unpackaged_files_terminate_build 0
%define multilib_64_archs sparc64 ppc64 s390x x86_64
%define include_gappletviewer 1
@@ -36,41 +36,13 @@
%ifarch x86_64
%define multilib_32_arch i586
%endif
-
-# java-1.5.0-gcj-compat related definitions
-
-# convert an absolute path to a relative path. each symbolic link is
-# specified relative to the directory in which it is installed so that
-# it will resolve properly within chrooted installations.
-%define abs2rel %{__perl} -e 'use File::Spec; print File::Spec->abs2rel($ARGV[0], $ARGV[1])'
-
-# python install location
-%{!?python_sitelib: %define python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print get_python_lib().replace('%{_prefix}','',1)")}
-
-# Java version information and alternatives priority
-%define javaver 1.5.0
-%define javabuildver 0
-%define javadirname java-%{javaver}-gcj-%{javaver}.%{javabuildver}
-%define origin gcj
-%define priority 1500
-
-# installation directory names corresponding to JPackage specifications
-%define sdklnk java-%{javaver}-%{origin}
-%define jrelnk jre-%{javaver}-%{origin}
-%define sdkdir java-%{javaver}-gcj-%{javaver}.%{javabuildver}
-%define jredir %{sdkdir}/jre
-%define sdkbindir %{_jvmdir}/%{sdklnk}/bin
-%define jrebindir %{_jvmdir}/%{jrelnk}/bin
-%define jvmjardir %{_jvmjardir}/java-%{javaver}-gcj-%{javaver}.%{javabuildver}
-
Summary: Various compilers (C, C++, Objective-C, Java, ...)
Name: gcc
Version: %{gcc_version}
Release: %{gcc_release}
-# libgcc, libgfortran, libmudflap and crtstuff have an exception which allows
-# linking it into any kind of programs or shared libraries without
-# restrictions.
-License: GPLv3+ and GPLv2+ with exceptions
+# 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:
@@ -82,7 +54,6 @@
Source3: protoize.1
%define fastjar_ver 0.97
Source4: http://download.savannah.nongnu.org/releases/fastjar/fastjar-%{fastjar_ver}.tar.gz
-Source5: generate-cacerts.pl
URL: http://gcc.gnu.org
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
# Need binutils with -pie support >= 2.14.90.0.4-4
@@ -177,10 +148,8 @@
Patch22: gcc44-raw-string.patch
Patch24: gcc44-atom.patch
Patch26: gcc44-power7.patch
-Patch27: gcc44-power7-2.patch
Patch28: gcc44-pr38757.patch
Patch30: gcc44-pr39543.patch
-Patch31: gcc44-libjava-i386.patch
Patch1000: fastjar-0.97-segfault.patch
@@ -387,165 +356,6 @@
%description -n libgcj-src
The Java(tm) runtime library sources for use in Eclipse.
-%package -n java-%{javaver}-gcj
-Summary: JPackage runtime compatibility layer for GCJ
-Group: Development/Languages
-
-BuildRequires: gcc-java >= %{version}
-BuildRequires: libgcj-src >= %{version}
-# required for cacerts generation
-BuildRequires: openssl
-BuildRequires: python-devel
-%if ! %{bootstrap_java}
-# required for javadoc
-BuildRequires: java-1.6.0-openjdk-devel
-%endif
-BuildRequires: unzip
-
-# required for tools and libgcj.jar
-Requires: libgcj = %{version}
-# required for directory structures
-Requires: jpackage-utils >= 1.7.3
-# required for java.security symlink
-Requires: %{_prefix}/%{_lib}/security/classpath.security
-%if ! %{bootstrap_java}
-# required for javadoc symlink
-Requires: sinjdoc
-%endif
-# post requires alternatives to install tool alternatives
-Requires(post): %{_sbindir}/alternatives
-# post requires gij to retrieve gcc version
-Requires(post): %{_bindir}/gij
-# post rebuilds the gcj database
-Requires(post): %{_bindir}/rebuild-gcj-db
-# rebuild-gcj-db requires gcj-dbtool
-Requires(post): %{_bindir}/gcj-dbtool
-# rebuild-gcj-db requires findutils
-Requires(post): findutils
-# postun requires alternatives to uninstall tool alternatives
-Requires(postun): %{_sbindir}/alternatives
-# postun requires gij to retrieve gcc version
-Requires(postun): %{_bindir}/gij
-# postun rebuilds the gcj database
-Requires(postun): %{_bindir}/rebuild-gcj-db
-# rebuild-gcj-db requires gcj-dbtool
-Requires(postun): %{_bindir}/gcj-dbtool
-# rebuild-gcj-db requires findutils
-Requires(postun): findutils
-
-# standard JPackage base provides
-Provides: jre-%{javaver}-%{origin} = %{version}-%{release}
-Provides: jre-%{origin} = %{version}-%{release}
-Provides: jre-%{javaver} = %{version}-%{release}
-Provides: java-%{javaver} = %{version}-%{release}
-Provides: jre = %{javaver}
-Provides: java-%{origin} = %{version}-%{release}
-Provides: java = %{javaver}
-# libgcj provides, translated to JPackage provides
-Provides: jaas = %{version}-%{release}
-Provides: jce = %{version}-%{release}
-Provides: jdbc-stdext = %{version}-%{release}
-Provides: jdbc-stdext = 3.0
-Provides: jndi = %{version}-%{release}
-Provides: jndi-cos = %{version}-%{release}
-Provides: jndi-dns = %{version}-%{release}
-Provides: jndi-ldap = %{version}-%{release}
-Provides: jndi-rmi = %{version}-%{release}
-Provides: jsse = %{version}-%{release}
-Provides: java-sasl = %{version}-%{release}
-Provides: jaxp_parser_impl = %{version}-%{release}
-# java-gcj-compat base provides
-Provides: java-gcj-compat = 1.0.79
-Provides: java-1.4.2-gcj-compat > 1.4.2.0-40jpp.111
-
-Obsoletes: java-1.4.2-gcj-compat <= 1.4.2.0-40jpp.111
-Obsoletes: gnu-crypto <= 2.1.0-2jpp.1
-Obsoletes: gnu-crypto-sasl-jdk1.4 <= 2.1.0-2jpp.1
-Obsoletes: jessie <= 1.0.1-7
-
-%description -n java-%{javaver}-gcj
-This package installs directory structures, shell scripts and symbolic
-links to simulate a JPackage-compatible runtime environment with GCJ.
-
-%package -n java-%{javaver}-gcj-devel
-Summary: JPackage development compatibility layer for GCJ
-Group: Development/Tools
-
-# require libgcj-src for tools.jar symlink
-Requires: libgcj-src = %{version}
-# require base package
-Requires: java-%{javaver}-gcj = %{version}-%{release}
-# require ecj for ecj binary
-Requires: ecj >= 3.2.1
-# require python for aot-compile
-Requires: python
-# require gcc-java for gjavah binary
-Requires: gcc-java = %{version}
-# post requires alternatives to install tool alternatives
-Requires(post): %{_sbindir}/alternatives
-# post requires gcj to retrieve gcj header file locations
-Requires(post): %{_bindir}/gcj
-# postun requires alternatives to uninstall tool alternatives
-Requires(postun): %{_sbindir}/alternatives
-
-# standard JPackage devel provides
-Provides: java-sdk-%{javaver}-%{origin} = %{version}
-Provides: java-sdk-%{javaver} = %{version}
-Provides: java-sdk-%{origin} = %{version}
-Provides: java-sdk = %{javaver}
-Provides: java-%{javaver}-devel = %{version}
-Provides: java-devel-%{origin} = %{version}
-Provides: java-devel = %{javaver}
-# java-gcj-compat devel provides
-Provides: java-gcj-compat-devel = 1.0.79
-Provides: java-1.4.2-gcj-compat-devel > 1.4.2.0-40jpp.111
-
-Obsoletes: java-1.4.2-gcj-compat-devel <= 1.4.2.0-40jpp.111
-
-%description -n java-%{javaver}-gcj-devel
-This package installs directory structures, shell scripts and symbolic
-links to simulate a JPackage-compatible development environment with
-GCJ.
-
-%package -n java-%{javaver}-gcj-src
-Summary: Source files for libgcj
-Group: Development/Libraries
-
-Requires: java-%{javaver}-gcj = %{version}-%{release}
-Requires: libgcj-src = %{version}
-# post requires gij to retrieve gcc version
-Requires(post): %{_bindir}/gij
-
-# java-gcj-compat src provides
-Provides: java-1.4.2-gcj-compat-src > 1.4.2.0-40jpp.111
-
-Obsoletes: java-1.4.2-gcj-compat-src <= 1.4.2.0-40jpp.111
-
-%description -n java-%{javaver}-gcj-src
-This package installs a src.zip symbolic link that points to a
-specific version of the libgcj sources.
-
-%if ! %{bootstrap_java}
-%package -n java-%{javaver}-gcj-javadoc
-Summary: API documentation for libgcj
-Group: Documentation
-
-# require base package
-Requires: java-%{javaver}-gcj = %{version}-%{release}
-
-# standard JPackage javadoc provides
-Provides: java-javadoc = %{version}-%{release}
-Provides: java-%{javaver}-javadoc = %{version}-%{release}
-# java-gcj-compat javadoc provides
-Provides: java-1.4.2-gcj-compat-javadoc > 1.4.2.0-40jpp.111
-
-Obsoletes: java-1.4.2-gcj-compat-javadoc <= 1.4.2.0-40jpp.111
-Obsoletes: gnu-crypto-javadoc <= 2.1.0-2jpp.1
-
-%description -n java-%{javaver}-gcj-javadoc
-This package installs Javadoc API documentation for libgcj.
-%endif
-
%package -n cpp
Summary: The C Preprocessor
Group: Development/Languages
@@ -626,10 +436,8 @@
%patch22 -p0 -b .raw-string~
%patch24 -p0 -b .atom~
%patch26 -p0 -b .power7~
-%patch27 -p0 -b .power7-2~
%patch28 -p0 -b .pr38757~
#%patch30 -p0 -b .pr39543~
-%patch31 -p0 -b .libjava-i386~
# This testcase doesn't compile.
rm libjava/testsuite/libjava.lang/PR35020*
@@ -756,7 +564,6 @@
../gcc/Makefile.in
;;
esac
-
CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`" XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" \
GCJFLAGS="$OPT_FLAGS" \
../configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
@@ -772,11 +579,8 @@
--disable-libgcj \
%else
--enable-java-awt=gtk --disable-dssi --enable-plugin \
- --with-java-home=%{_prefix}/lib/jvm/%{javadirname}/jre \
- --enable-libgcj-multifile --enable-java-home --enable-aot-compile-rpm \
- --with-jvm-root-dir=\${prefix}/lib/jvm/%{javadirname} \
- --with-jvm-jar-dir=\${prefix}/lib/jvm-exports/%{javadirname} \
- --with-python-dir=%{python_sitelib} \
+ --with-java-home=%{_prefix}/lib/jvm/java-1.5.0-gcj-1.5.0.0/jre \
+ --enable-libgcj-multifile \
%if !%{bootstrap_java}
--enable-java-maintainer-mode \
%endif
@@ -1305,126 +1109,6 @@
$RPM_BUILD_ROOT%{_prefix}/%{_lib}/gcj-%{version} \
$RPM_BUILD_ROOT%{_prefix}/%{_lib}/gcj-%{version}/classmap.db.d
touch $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gcj-%{version}/classmap.db
-
-# versionless symbolic links
-pushd $RPM_BUILD_ROOT%{_jvmdir}
- ln -s %{jredir} %{jrelnk}
- ln -s %{sdkdir} %{sdklnk}
-popd
-pushd $RPM_BUILD_ROOT%{_jvmjardir}
- ln -s %{sdkdir} %{jrelnk}
- ln -s %{sdkdir} %{sdklnk}
-popd
-
-# create relevant links in jre lib dir for backwards compatibility
-pushd $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib
-for jarname in jaas jce jdbc-stdext jndi jndi-cos jndi-dns \
- jndi-ldap jndi-rmi jsse sasl; do
- ln -sf rt.jar $jarname.jar;
-done
-popd
-
-# security directory and provider list
-install -dm 755 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
-pushd $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
- RELATIVE=$(%{abs2rel} %{_prefix}/%{_lib}/security \
- %{_jvmdir}/%{jredir}/lib/security)
- ln -sf $RELATIVE/classpath.security java.security
-popd
-# default security providers, provided by libgcj
-install -dm 755 $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d
-for provider in \
- 1000-gnu.java.security.provider.Gnu \
- 1001-gnu.javax.crypto.jce.GnuCrypto \
- 1002-gnu.javax.crypto.jce.GnuSasl \
- 1003-gnu.javax.net.ssl.provider.Jessie \
- 1004-gnu.javax.security.auth.callback.GnuCallbacks
-do
- cat > $RPM_BUILD_ROOT%{_sysconfdir}/java/security/security.d/$provider << EOF
-# This file's contents are ignored. Its name, of the form
-# <priority>-<provider name>, is used by post and postun scripts to
-# rebuild the list of security providers in libgcj's
-# classpath.security file.
-EOF
-
-done
-# cacerts
-%{__perl} %{SOURCE5}
-install -m 644 cacerts $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/security
-
-# classmap database directory
-install -dm 755 $RPM_BUILD_ROOT%{_prefix}/%{_lib}/gcj
-
-# set up ecj link
-RELATIVE=$(%{abs2rel} %{_prefix}/bin %{_jvmdir}/%{sdkdir}/bin)
-ln -sf \
- $RELATIVE/ecj \
- $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin/javac
-
-# source zip
-RELATIVE=$(%{abs2rel} %{_javadir} %{_jvmdir}/%{sdkdir})
-ln -s \
- $RELATIVE/src-%{version}.zip \
- $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/src.zip
-
-#use fastjar instead of gjar
-RELATIVE=$(%{abs2rel} %{_prefix}/bin %{_jvmdir}/%{sdkdir}/bin)
-ln -sf \
- $RELATIVE/fastjar \
- $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin/jar
-
-# use sinjdoc if not bootstrapping
-%if ! %{bootstrap_java}
-ln -sf \
- $RELATIVE/sinjdoc \
- $RPM_BUILD_ROOT%{_jvmdir}/%{sdkdir}/bin/javadoc
-%endif
-
-# arch dir for x86_64 should be x86_64, with amd64 being a link (to keep the
-# package backwards compatible)
-%ifarch x86_64
-if [ -d $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/amd64 ]; then
-
- mv $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/amd64 \
- $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/x86_64
-
- ln -s x86_64 $RPM_BUILD_ROOT%{_jvmdir}/%{jredir}/lib/amd64
-fi
-%endif
-
-%if ! %{bootstrap_java}
-# build and install API documentation
-install -dm 755 $RPM_BUILD_ROOT%{_javadocdir}/java-%{javaver}-gcj
-pushd $RPM_BUILD_ROOT%{_javadocdir}
- ln -s java-%{javaver}-gcj java
-popd
-rm -rf docsbuild
-mkdir docsbuild
-pushd docsbuild
- echo ==== CHECK ZIP ====
- unzip -tq $RPM_BUILD_ROOT/usr/share/java/src-%{version}.zip || :
- echo ==== END CHECK ZIP ====
- if unzip -tq /usr/share/java/src-%{version}.zip
- then
- fastjar xvf /usr/share/java/src-%{version}.zip
- rm -rf gnu
- find ./ -name \*.java | xargs -n 1 dirname | sort | uniq \
- | sed -e "s/\.\///" | sed -e "s/\//\./" \
- | sed -e "s/\//\./" | sed -e "s/\//\./" \
- | sed -e "s/\//\./" | sed -e "s/\//\./" \
- | xargs %{_jvmdir}/java-openjdk/bin/javadoc -quiet \
- -d $RPM_BUILD_ROOT%{_javadocdir}/%{name} \
- -encoding UTF-8 -breakiterator \
- -linksource -splitindex -doctitle "GNU libgcj %{version}" \
- -windowtitle "GNU libgcj %{version} Documentation"
- else
- # Work around https://bugzilla.redhat.com/show_bug.cgi?id=404981
- touch $RPM_BUILD_ROOT%{_javadocdir}/%{name}/package-list
- fi
-popd
-%endif
-
-
%endif
install -m644 %{SOURCE3} $RPM_BUILD_ROOT%{_mandir}/man1/protoize.1
@@ -1522,128 +1206,6 @@
%postun -n libgcj -p /sbin/ldconfig
-%post -n java-%{javaver}-gcj
-alternatives \
- --install %{_bindir}/java java %{jrebindir}/java %{priority} \
- --slave %{_jvmdir}/jre jre %{_jvmdir}/%{jrelnk} \
- --slave %{_jvmjardir}/jre jre_exports %{_jvmjardir}/%{jrelnk} \
- --slave %{_bindir}/keytool keytool %{jrebindir}/keytool \
- --slave %{_bindir}/rmiregistry rmiregistry %{jrebindir}/rmiregistry
-
-alternatives \
- --install %{_jvmdir}/jre-%{origin} \
- jre_%{origin} %{_jvmdir}/%{jrelnk} %{priority} \
- --slave %{_jvmjardir}/jre-%{origin} \
- jre_%{origin}_exports %{_jvmjardir}/%{jrelnk}
-
-alternatives \
- --install %{_jvmdir}/jre-%{javaver} \
- jre_%{javaver} %{_jvmdir}/%{jrelnk} %{priority} \
- --slave %{_jvmjardir}/jre-%{javaver} \
- jre_%{javaver}_exports %{_jvmjardir}/%{jrelnk}
-
-alternatives --install %{_javadir}/jaxp_parser_impl.jar \
- jaxp_parser_impl %{_javadir}/libgcj-%{version}.jar 20
-
-{
- # Rebuild the list of security providers in classpath.security.
- # This used to be a standalone script, rebuild-security-providers,
- # provided by the Fedora version of jpackage-utils. Now it is
- # inlined here and removed from Fedora's jpackage-utils for
- # compatibility with jpackage.org's jpackage-utils. See:
- # https://bugzilla.redhat.com/show_bug.cgi?id=260161
- suffix=security/classpath.security
- secfiles="/usr/lib/$suffix /usr/lib64/$suffix"
-
- for secfile in $secfiles
- do
- # check if this classpath.security file exists
- [ -f "$secfile" ] || continue
-
- sed -i '/^security\.provider\./d' "$secfile"
-
- count=0
- for provider in $(ls /etc/java/security/security.d)
- do
- count=$((count + 1))
- echo "security.provider.${count}=${provider#*-}" >> "$secfile"
- done
- done
-} || :
-
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-
-%postun -n java-%{javaver}-gcj
-if [ $1 -eq 0 ]
-then
- alternatives --remove java %{jrebindir}/java
- alternatives --remove jre_%{origin} %{_jvmdir}/%{jrelnk}
- alternatives --remove jre_%{javaver} %{_jvmdir}/%{jrelnk}
- alternatives --remove jaxp_parser_impl \
- %{_javadir}/libgcj-%{version}.jar
-fi
-
-{
- # Rebuild the list of security providers in classpath.security
- suffix=security/classpath.security
- secfiles="/usr/lib/$suffix /usr/lib64/$suffix"
-
- for secfile in $secfiles
- do
- # check if this classpath.security file exists
- [ -f "$secfile" ] || continue
-
- sed -i '/^security\.provider\./d' "$secfile"
-
- count=0
- for provider in $(ls /etc/java/security/security.d)
- do
- count=$((count + 1))
- echo "security.provider.${count}=${provider#*-}" >> "$secfile"
- done
- done
-} || :
-
-if [ -x %{_bindir}/rebuild-gcj-db ]
-then
- %{_bindir}/rebuild-gcj-db
-fi
-
-%post -n java-%{javaver}-gcj-devel
-alternatives \
- --install %{_bindir}/javac javac %{sdkbindir}/javac %{priority} \
- --slave %{_jvmdir}/java java_sdk %{_jvmdir}/%{sdklnk} \
- --slave %{_jvmjardir}/java java_sdk_exports %{_jvmjardir}/%{sdklnk} \
- --slave %{_bindir}/javadoc javadoc %{sdkbindir}/javadoc \
- --slave %{_bindir}/javah javah %{sdkbindir}/javah \
- --slave %{_bindir}/jar jar %{sdkbindir}/jar \
- --slave %{_bindir}/jarsigner jarsigner %{sdkbindir}/jarsigner \
- --slave %{_bindir}/appletviewer appletviewer %{sdkbindir}/appletviewer \
- --slave %{_bindir}/rmic rmic %{sdkbindir}/rmic
-
-alternatives \
- --install %{_jvmdir}/java-%{origin} \
- java_sdk_%{origin} %{_jvmdir}/%{sdklnk} %{priority} \
- --slave %{_jvmjardir}/java-%{origin} \
- java_sdk_%{origin}_exports %{_jvmjardir}/%{sdklnk}
-
-alternatives \
- --install %{_jvmdir}/java-%{javaver} \
- java_sdk_%{javaver} %{_jvmdir}/%{sdklnk} %{priority} \
- --slave %{_jvmjardir}/java-%{javaver} \
- java_sdk_%{javaver}_exports %{_jvmjardir}/%{sdklnk}
-
-%postun -n java-%{javaver}-gcj-devel
-if [ $1 -eq 0 ]
-then
- alternatives --remove javac %{sdkbindir}/javac
- alternatives --remove java_sdk_%{origin} %{_jvmdir}/%{sdklnk}
- alternatives --remove java_sdk_%{javaver} %{_jvmdir}/%{sdklnk}
-fi
-
%post -n libgfortran -p /sbin/ldconfig
%postun -n libgfortran -p /sbin/ldconfig
@@ -2093,137 +1655,6 @@
%dir %{_prefix}/share/java
%{_prefix}/share/java/src*.zip
%{_prefix}/share/java/libgcj-tools-%{version}.jar
-
-%files -n java-%{javaver}-gcj
-%defattr(-,root,root,-)
-%dir %{_jvmdir}/%{sdkdir}
-%dir %{_jvmdir}/%{jredir}
-%dir %{_jvmdir}/%{jredir}/bin
-%dir %{_jvmdir}/%{jredir}/lib
-%dir %{_jvmdir}/%{jredir}/lib/%{_arch}
-%dir %{_jvmdir}/%{jredir}/lib/%{_arch}/client
-%dir %{_jvmdir}/%{jredir}/lib/%{_arch}/server
-%dir %{_jvmdir}/%{jredir}/lib/security
-%dir %{jvmjardir}
-%dir %{_prefix}/%{_lib}/gcj
-%{_bindir}/rebuild-gcj-db
-%{_jvmdir}/%{jredir}/bin/java
-%{_jvmdir}/%{jredir}/bin/keytool
-%{_jvmdir}/%{jredir}/bin/rmiregistry
-%{_jvmdir}/%{jredir}/bin/orbd
-%{_jvmdir}/%{jredir}/bin/rmid
-%{_jvmdir}/%{jredir}/bin/tnameserv
-%{_jvmdir}/%{jredir}/lib/security/cacerts
-%{_jvmdir}/%{jredir}/lib/security/java.security
-%{_jvmdir}/%{jredir}/lib/jaas.jar
-%{_jvmdir}/%{jredir}/lib/jce.jar
-%{_jvmdir}/%{jredir}/lib/jdbc-stdext.jar
-%{_jvmdir}/%{jredir}/lib/jndi-cos.jar
-%{_jvmdir}/%{jredir}/lib/jndi-dns.jar
-%{_jvmdir}/%{jredir}/lib/jndi-ldap.jar
-%{_jvmdir}/%{jredir}/lib/jndi-rmi.jar
-%{_jvmdir}/%{jredir}/lib/jndi.jar
-%{_jvmdir}/%{jredir}/lib/jsse.jar
-%{_jvmdir}/%{jredir}/lib/sasl.jar
-%ifarch x86_64
-%{_jvmdir}/%{jredir}/lib/amd64
-%endif
-%{_jvmdir}/%{jrelnk}
-%{jvmjardir}/jaas.jar
-%{jvmjardir}/jaas-%{javaver}.jar
-%{jvmjardir}/jaas-%{javaver}.%{javabuildver}.jar
-%{jvmjardir}/jce.jar
-%{jvmjardir}/jce-%{javaver}.jar
-%{jvmjardir}/jce-%{javaver}.%{javabuildver}.jar
-%{jvmjardir}/jdbc-stdext.jar
-%{jvmjardir}/jdbc-stdext-%{javaver}.jar
-%{jvmjardir}/jdbc-stdext-%{javaver}.%{javabuildver}.jar
-%{jvmjardir}/jndi.jar
-%{jvmjardir}/jndi-%{javaver}.jar
-%{jvmjardir}/jndi-%{javaver}.%{javabuildver}.jar
-%{jvmjardir}/jndi-cos.jar
-%{jvmjardir}/jndi-cos-%{javaver}.jar
-%{jvmjardir}/jndi-cos-%{javaver}.%{javabuildver}.jar
-%{jvmjardir}/jndi-dns.jar
-%{jvmjardir}/jndi-dns-%{javaver}.jar
-%{jvmjardir}/jndi-dns-%{javaver}.%{javabuildver}.jar
-%{jvmjardir}/jndi-ldap.jar
-%{jvmjardir}/jndi-ldap-%{javaver}.jar
-%{jvmjardir}/jndi-ldap-%{javaver}.%{javabuildver}.jar
-%{jvmjardir}/jndi-rmi.jar
-%{jvmjardir}/jndi-rmi-%{javaver}.jar
-%{jvmjardir}/jndi-rmi-%{javaver}.%{javabuildver}.jar
-%{jvmjardir}/jsse.jar
-%{jvmjardir}/jsse-%{javaver}.jar
-%{jvmjardir}/jsse-%{javaver}.%{javabuildver}.jar
-%{jvmjardir}/sasl.jar
-%{jvmjardir}/sasl-%{javaver}.jar
-%{jvmjardir}/sasl-%{javaver}.%{javabuildver}.jar
-%{_jvmjardir}/%{jrelnk}
-%{_jvmdir}/%{sdkdir}/jre/lib/rt.jar
-%{_jvmdir}/%{jredir}/lib/%{_arch}/libjawt.so
-%{_jvmdir}/%{jredir}/lib/%{_arch}/client/libjvm.so
-%{_jvmdir}/%{jredir}/lib/%{_arch}/server/libjvm.so
-# These must not be marked %config(noreplace). Their file names are
-# used in post and postun. Their contents are ignored, so replacing
-# them doesn't matter. .rpmnew files are harmful since they're
-# interpreted by post and postun as classnames ending in rpmnew.
-%{_sysconfdir}/java/security/security.d/1000-gnu.java.security.provider.Gnu
-%{_sysconfdir}/java/security/security.d/1001-gnu.javax.crypto.jce.GnuCrypto
-%{_sysconfdir}/java/security/security.d/1002-gnu.javax.crypto.jce.GnuSasl
-%{_sysconfdir}/java/security/security.d/1003-gnu.javax.net.ssl.provider.Jessie
-%{_sysconfdir}/java/security/security.d/1004-gnu.javax.security.auth.callback.GnuCallbacks
-
-%files -n java-%{javaver}-gcj-devel
-%defattr(-,root,root,-)
-%dir %{_jvmdir}/%{sdkdir}/bin
-%dir %{_jvmdir}/%{sdkdir}/include
-%dir %{_jvmdir}/%{sdkdir}/include/linux
-%dir %{_jvmdir}/%{sdkdir}/lib
-%{_bindir}/aot-compile
-%{_bindir}/aot-compile-rpm
-%{_prefix}/%{python_sitelib}/aotcompile.py*
-%{_prefix}/%{python_sitelib}/classfile.py*
-%{_jvmdir}/%{sdkdir}/bin/appletviewer
-%{_jvmdir}/%{sdkdir}/bin/jar
-%{_jvmdir}/%{sdkdir}/bin/jarsigner
-%{_jvmdir}/%{sdkdir}/bin/java
-%{_jvmdir}/%{sdkdir}/bin/javac
-%{_jvmdir}/%{sdkdir}/bin/javadoc
-%{_jvmdir}/%{sdkdir}/bin/javah
-%{_jvmdir}/%{sdkdir}/bin/keytool
-%{_jvmdir}/%{sdkdir}/bin/native2ascii
-%{_jvmdir}/%{sdkdir}/bin/orbd
-%{_jvmdir}/%{sdkdir}/bin/rmic
-%{_jvmdir}/%{sdkdir}/bin/rmid
-%{_jvmdir}/%{sdkdir}/bin/rmiregistry
-%{_jvmdir}/%{sdkdir}/bin/serialver
-%{_jvmdir}/%{sdkdir}/bin/tnameserv
-%{_jvmdir}/%{sdklnk}
-%{_jvmjardir}/%{sdklnk}
-%{_jvmdir}/%{sdkdir}/include/jawt.h
-%{_jvmdir}/%{sdkdir}/include/jni.h
-%{_jvmdir}/%{sdkdir}/include/linux/jawt_md.h
-%{_jvmdir}/%{sdkdir}/include/linux/jni_md.h
-%{_jvmdir}/%{sdkdir}/lib/tools.jar
-
-%files -n java-%{javaver}-gcj-src
-%defattr(-,root,root,-)
-%{_jvmdir}/%{sdkdir}/src.zip
-
-%if ! %{bootstrap_java}
-%files -n java-%{javaver}-gcj-javadoc
-%defattr(-,root,root,-)
-%doc %{_javadocdir}/java-%{javaver}-gcj
-# A JPackage that "provides" this directory will, in its %post script,
-# remove the existing directory and install a new symbolic link to its
-# versioned directory. For Fedora we want clear file ownership so we
-# make java-1.5.0-gcj-javadoc own this file. Installing the
-# corresponding JPackage over java-1.5.0-gcj-javadoc will work but
-# will invalidate this file.
-%doc %{_javadocdir}/java
-%endif
-
%endif
%if %{build_ada}
@@ -2317,8 +1748,13 @@
%doc rpm.doc/changelogs/libmudflap/ChangeLog*
%changelog
-* Fri Apr 10 2009 Deepak Bhole <dbhole at redhat.com> 4.4.0-0.33
-- create new java-1.5.0-gcj* packages to install JPackage compliant links
+* Tue Apr 14 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.34
+- update from gcc-4_4-branch
+ - GCC 4.4.0-rc1
+ - license changes to GPLv3+ with GCC Runtime Exception for most of the
+ lib* files
+ - PRs c++/28301, c++/39480, c++/39742, c++/39750, c/39613, c/39614, c/39673,
+ libobjc/36610, target/39740, testsuite/35621, tree-optimization/39713
* Thu Apr 9 2009 Jakub Jelinek <jakub at redhat.com> 4.4.0-0.32
- update from gcc-4_4-branch
gcc44-power7.patch:
View full diff with command:
/usr/bin/cvs -f diff -kk -u -N -r 1.2 -r 1.3 gcc44-power7.patch
Index: gcc44-power7.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-power7.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc44-power7.patch 10 Mar 2009 11:23:08 -0000 1.2
+++ gcc44-power7.patch 14 Apr 2009 15:46:16 -0000 1.3
@@ -1,3 +1,247 @@
+2009-04-08 Michael Meissner <meissner at linux.vnet.ibm.com>
+
+ * doc/invoke.texi (-mvsx-vector-memory): Make debug switches
+ undoucmented.
+ (-mvsx-vector-float): Ditto.
+ (-mvsx-vector-double): Ditto.
+ (-mvsx-scalar-double): Ditto.
+ (-mvsx-scalar-memory): Ditto.
+
+ * config/rs6000/vector.md (VEC_R): New iterator for reload
+ patterns.
+ (mov<mode>): Don't call rs6000_emit_move.
+ (reload_<VEC_R:mode>_<P:mptrsize>_*): New insns for
+ secondary_reload support.
+ (vec_reload_and_plus_<mptrsize>): New insns in case reload needs
+ to move a VSX/Altivec (and (plus reg reg) -16) type address to a
+ base register.
+
+ * config/rs6000/rs6000-protos.h (rs6000_secondary_reload_inner):
+ Rename from rs6000_vector_secondary_reload.
+
+ * config/rs6000/rs6000.opt (-mvsx-vector-memory): Make debug
+ switches undoucmented.
+ (-mvsx-vector-float): Ditto.
+ (-mvsx-vector-double): Ditto.
+ (-mvsx-scalar-double): Ditto.
+ (-mvsx-scalar-memory): Ditto.
+ (-mvsx-v4sf-altivec-regs): New undocumented debug switch to
+ control whether V4SF types prefer the Altivec registers or all of
+ the VSX registers.
+ (-mreload-functions): New undocumented debug switch to
+ enable/disable the secondary reload support.
+
+ * config/rs6000/rs6000.c (rs6000_regno_regclass): New global to
+ map register number to regclass.
+ (rs6000_vector_reload): New array to hold the secondary reload
+ insn codes for the vector types.
+ (rs6000_init_hard_regno_mode_ok): Fill in rs6000_regno_regclass
+ and rs6000_vector_reload.
+ (rs6000_mode_dependent_address): Using AND in addresses is mode
+ dependent.
+ (rs6000_emit_move): Add debug information if -mdebug=addr.
+ (rs6000_reload_register_type): Classify register classes for
+ secondary reload.
+ (rs6000_secondary_reload): For the vector types, add reload
+ support to support reg+reg addressing for gprs, and reg+offset
+ addressing for vector registers.
+ (rs6000_secondary_reload_inner): Rename from
+ rs6000_vector_secondary_reload. Fixup gpr addressing to just reg
+ or reg+offset, and vector addressing to just reg or reg+reg.
+ (rs6000_preferred_reload_class): Make sure all cases set the
+ return value. If VSX/Altivec address with AND -16, prefer using
+ an Altivec register.
+ (rs6000_secondary_memory_needed): Handle things like SFmode that
+ can go in floating registers, but not altivec registers under
+ -mvsx.
+
+ * config/rs6000/vsx.md (VSX_U): New iterator for load/store with
+ update.
+ (VSi, VSI): Reorder fields.
+ (VSd): Add support for load/store with update rewrite.
+ (VSv): Ditto.
+ (VStype_load_update): New mode attribute for load/store with
+ update.
+ (VStype_store_update): Ditto.
+ (vsx_mov<type>): Use * instead of store/load attributes for
+ multi-instruction gpr loads/stores.
+ (vsx_reload**): Delete unused reload patterns.
+
+ * config/rs6000/rs6000.h (REGNO_REG_CLASS): Change from a bunch of
+ if statements to using a lookup table.
+ (rs6000_regno_regclass): Lookup table for REGNO_REG_CLASS.
+
+ * config/rs6000/altivec.md (altivec_reload*): Delete unused reload
+ patterns.
+
+ * config/rs6000/rs6000.md (tptrsize, mptrsize): New mode
+ attributes for -m32/-m64 support.
+
+2009-03-27 Jakub Jelinek <jakub at redhat.com>
+
+ PR target/39558
+ * macro.c (cpp_get_token): If macro_to_expand returns NULL
+ and used some tokens, add CPP_PADDING before next token.
+
+ * gcc.target/powerpc/altivec-29.c: New test.
+
+2009-03-27 Michael Meissner <meissner at linux.vnet.ibm.com>
+
+ * config/rs6000/constraints.md ("wZ" constraint): New constraint
+ for using Altivec loads/stores under VSX for vector realignment.
+
+ * config/rs6000/predicates.md
+ (altivec_indexed_or_indirect_operand): New predicate to recognize
+ Altivec load/stores with an explicit AND -16.
+
+ * config/rs6000/power7.md: Whitespace change.
+
+ * config/rs6000/rs6000.opt (-mpower7-adjust-cost): New debug
+ switch.
+
+ * config/rs6000/rs6000-c.c (altivec_categorize_keyword): If -mvsx
+ and -mno-altivec, recognize the 'vector' keyword, but do not
+ recognize 'bool' or 'pixel'. Recognize vector double under VSX.
+ (init_vector_keywords): Ditto.
+ (rs6000_macro_to_expand): Ditto.
+ (altivec_overloaded_builtins): Add VSX overloaded builtins.
+ (altivec_resolve_overloaded_builtin): Ditto.
+
+ * config/rs6000/rs6000.c (rs6000_debug_cost): New global for
+ -mdebug=cost.
+ (rs6000_debug_address_cost): New function for printing costs if
+ -mdebug=cost.
+ (rs6000_debug_rtx_costs): Ditto.
+ (rs6000_debug_adjust_cost): Ditto.
+ (rs6000_override_options): Add -mdebug=cost support.
+ (rs6000_legitimize_reload_address): Allow Altivec loads and stores
+ with an explicit AND -16, in VSX for vector realignment.
+ (rs6000_legitimize_reload_address): Ditto.
+ (rs6000_legitimate_address): Ditto.
+ (print_operand): Ditto.
+ (bdesc_3arg): Add VSX builtins.
+ (bdesc_2arg): Ditto.
+ (bdesc_1arg): Ditto.
+ (bdesc_abs): Ditto.
+ (vsx_expand_builtin): Stub function for expanding VSX builtins.
+ (rs6000_expand_builtin): Call vsx_expand_builtin.
+
+ * config/rs6000/vsx.md (most DF insns): Merge DF insns in with
+ V2DF and V4SF insns, rather than duplicating much of the code.
+ (all insns): Go through all insns, and alternatives to address the
+ full VSX register set, as a non-preferred option.
+ (vsx_mod<mode>): Add support for using Altivec load/store with
+ explicit AND -16. Use xxlor to copy registers, not copy sign.
+ (multiply/add insns): Add an expander and unspec so the insn can
+ be used directly even if -mno-fused-madd.
+ (vsx_tdiv<mode>3): New insn for use as a builtin function.
+ (vsx_tsqrt<mode>2): Ditto.
+ (vsx_rsqrte<mode>2): Ditto.
+
+ * config/rs6000/rs6000.h (rs6000_debug_cost): New for
+ -mdebug=cost.
+ (TARGET_DEBUG_COST): Ditto.
+ (VSX_BUILTIN_*): Merge the two forms of multiply/add instructions
+ into a single insn. Start to add overloaded VSX builtins.
+
+ * config/rs6000/altivec.md (build_vector_mask_for_load): Delete
+ VSX code.
+
+ * config/rs6000/rs6000.md (btruncsf2): Delete extra space.
+ (movdf_hardfloat32): Use xxlor instead of xscpsgndp to copy data.
+ (movdf_hardfloat64_mfpgpr): Ditto.
+ (movdf_hardfloat64): Ditto.
+
+2009-03-13 Michael Meissner <meissner at linux.vnet.ibm.com>
+
+ PR target/39457
+ * config/rs6000/rs6000.opt (-mdisallow-float-in-lr-ctr): Add
+ temporary debug switch.
+
+ * config/rs6000/rs6000.c (rs6000_hard_regno_mode_ok): Revert
+ behavior of disallowing
+
+2009-03-13 Michael Meissner <meissner at linux.vnet.ibm.com>
+
+ * config/rs6000/vector.md (vec_extract_evenv2df): Delete, insn
+ causes problems in building spec 2006.
+ (vec_extract_oddv2df): Ditto.
+ (vec_pack_trunc_v2df): New expanders for VSX vectorized
+ conversions.
+ (vec_pack_sfix_trunc_v2df): Ditto.
+ (vec_pack_ufix_trunc_v2df): Ditto.
+ (vec_unpacks_hi_v4sf): Ditto.
+ (vec_unpacks_lo_v4sf): Ditto.
+ (vec_unpacks_float_hi_v4si): Ditto.
+ (vec_unpacks_float_lo_v4si): Ditto.
+ (vec_unpacku_float_hi_v4si): Ditto.
+ (vec_unpacku_float_lo_v4si): Ditto.
+
+ * config/rs6000/rs6000-protos.h (rs6000_vector_secondary_reload):
+ Declaration for new target hook.
+
+ * config/rs6000/rs6000.c (TARGET_SECONDARY_RELOAD): Add new target
+ hook for eventually fixing up the memory references for Altivec
+ and VSX reloads to be reg+reg instead of reg+offset. Right now,
+ this is a stub function that prints debug information if
+ -mdebug=addr and then calls default_secondary_reload.
+ (rs6000_secondary_reload): Ditto.
+ (rs6000_vector_secondary_reload): Ditto.
+ (rs6000_builtin_conversion): Add support for V2DI/V2DF
+ conversions.
[...6105 lines suppressed...]
@@ -9023,7 +10939,7 @@
(set_attr "length" "4,4,4,4,4,8,8,8,8,8,8,12")])
(define_split
-@@ -7718,7 +7828,9 @@ (define_insn "*anddi3_internal3_mc"
+@@ -7718,7 +7838,9 @@
#
#
#"
@@ -9034,7 +10950,7 @@
(set_attr "length" "4,4,4,4,4,8,8,8,8,8,8,12")])
(define_split
-@@ -7858,7 +7970,7 @@ (define_insn "*booldi3_internal2"
+@@ -7858,7 +7980,7 @@
"@
%q4. %3,%1,%2
#"
@@ -9043,7 +10959,7 @@
(set_attr "length" "4,8")])
(define_split
-@@ -7887,7 +7999,7 @@ (define_insn "*booldi3_internal3"
+@@ -7887,7 +8009,7 @@
"@
%q4. %0,%1,%2
#"
@@ -9052,7 +10968,7 @@
(set_attr "length" "4,8")])
(define_split
-@@ -7958,7 +8070,7 @@ (define_insn "*boolcdi3_internal2"
+@@ -7958,7 +8080,7 @@
"@
%q4. %3,%2,%1
#"
@@ -9061,7 +10977,7 @@
(set_attr "length" "4,8")])
(define_split
-@@ -7987,7 +8099,7 @@ (define_insn "*boolcdi3_internal3"
+@@ -7987,7 +8109,7 @@
"@
%q4. %0,%2,%1
#"
@@ -9070,7 +10986,7 @@
(set_attr "length" "4,8")])
(define_split
-@@ -8024,7 +8136,7 @@ (define_insn "*boolccdi3_internal2"
+@@ -8024,7 +8146,7 @@
"@
%q4. %3,%1,%2
#"
@@ -9079,7 +10995,7 @@
(set_attr "length" "4,8")])
(define_split
-@@ -8053,7 +8165,7 @@ (define_insn "*boolccdi3_internal3"
+@@ -8053,7 +8175,7 @@
"@
%q4. %0,%1,%2
#"
@@ -9088,7 +11004,7 @@
(set_attr "length" "4,8")])
(define_split
-@@ -8070,6 +8182,51 @@ (define_split
+@@ -8070,6 +8192,51 @@
(compare:CC (match_dup 0)
(const_int 0)))]
"")
@@ -9140,7 +11056,7 @@
;; Now define ways of moving data around.
-@@ -8473,8 +8630,8 @@ (define_split
+@@ -8473,8 +8640,8 @@
;; The "??" is a kludge until we can figure out a more reasonable way
;; of handling these non-offsettable values.
(define_insn "*movdf_hardfloat32"
@@ -9151,14 +11067,14 @@
"! TARGET_POWERPC64 && TARGET_HARD_FLOAT && TARGET_FPRS && TARGET_DOUBLE_FLOAT
&& (gpc_reg_operand (operands[0], DFmode)
|| gpc_reg_operand (operands[1], DFmode))"
-@@ -8553,19 +8710,30 @@ (define_insn "*movdf_hardfloat32"
+@@ -8553,19 +8720,30 @@
return \"\";
}
case 3:
- return \"fmr %0,%1\";
case 4:
- return \"lfd%U1%X1 %0,%1\";
-+ return \"xscpsgndp %x0,%x1,%x1\";
++ return \"xxlor %x0,%x1,%x1\";
case 5:
- return \"stfd%U0%X0 %1,%0\";
case 6:
@@ -9187,7 +11103,7 @@
(define_insn "*movdf_softfloat32"
[(set (match_operand:DF 0 "nonimmediate_operand" "=r,r,m,r,r,r")
-@@ -8613,19 +8781,26 @@ (define_insn "*movdf_softfloat32"
+@@ -8613,19 +8791,26 @@
; ld/std require word-aligned displacements -> 'Y' constraint.
; List Y->r and r->Y before r->r for reload.
(define_insn "*movdf_hardfloat64_mfpgpr"
@@ -9204,8 +11120,8 @@
std%U0%X0 %1,%0
ld%U1%X1 %0,%1
mr %0,%1
-+ xscpsgndp %x0,%x1,%x1
-+ xscpsgndp %x0,%x1,%x1
++ xxlor %x0,%x1,%x1
++ xxlor %x0,%x1,%x1
+ lxsd%U1x %x0,%y1
+ lxsd%U1x %x0,%y1
+ stxsd%U0x %x1,%y0
@@ -9217,7 +11133,7 @@
mt%0 %1
mf%1 %0
{cror 0,0,0|nop}
-@@ -8634,33 +8809,40 @@ (define_insn "*movdf_hardfloat64_mfpgpr"
+@@ -8634,33 +8819,40 @@
#
mftgpr %0,%1
mffgpr %0,%1"
@@ -9242,8 +11158,8 @@
std%U0%X0 %1,%0
ld%U1%X1 %0,%1
mr %0,%1
-+ xscpsgndp %x0,%x1,%x1
-+ xscpsgndp %x0,%x1,%x1
++ xxlor %x0,%x1,%x1
++ xxlor %x0,%x1,%x1
+ lxsd%U1x %x0,%y1
+ lxsd%U1x %x0,%y1
+ stxsd%U0x %x1,%y0
@@ -9265,7 +11181,7 @@
(define_insn "*movdf_softfloat64"
[(set (match_operand:DF 0 "nonimmediate_operand" "=r,Y,r,cl,r,r,r,r,*h")
-@@ -9237,15 +9419,16 @@ (define_insn "*movti_string"
+@@ -9237,15 +9429,16 @@
(define_insn "*movti_ppc64"
[(set (match_operand:TI 0 "nonimmediate_operand" "=r,o<>,r")
(match_operand:TI 1 "input_operand" "r,r,m"))]
@@ -9285,7 +11201,7 @@
[(set (match_dup 2) (match_dup 4))
(set (match_dup 3) (match_dup 5))]
"
-@@ -9271,7 +9454,7 @@ (define_split
+@@ -9271,7 +9464,7 @@
(define_split
[(set (match_operand:TI 0 "nonimmediate_operand" "")
(match_operand:TI 1 "input_operand" ""))]
@@ -9294,7 +11210,7 @@
&& gpr_or_gpr_p (operands[0], operands[1])"
[(pc)]
{ rs6000_split_multireg_move (operands[0], operands[1]); DONE; })
-@@ -14891,6 +15074,8 @@ (define_insn "prefetch"
+@@ -14891,6 +15084,8 @@
(include "sync.md")
@@ -9303,8 +11219,8 @@
(include "altivec.md")
(include "spe.md")
(include "dfp.md")
---- gcc/config/rs6000/e500.h (.../trunk) (revision 144557)
-+++ gcc/config/rs6000/e500.h (.../branches/ibm/power7-meissner) (revision 144730)
+--- gcc/config/rs6000/e500.h (.../trunk) (revision 145777)
++++ gcc/config/rs6000/e500.h (.../branches/ibm/power7-meissner) (revision 146027)
@@ -37,6 +37,8 @@
{ \
if (TARGET_ALTIVEC) \
@@ -9314,8 +11230,8 @@
if (TARGET_64BIT) \
error ("64-bit E500 not supported"); \
if (TARGET_HARD_FLOAT && TARGET_FPRS) \
---- gcc/config/rs6000/driver-rs6000.c (.../trunk) (revision 144557)
-+++ gcc/config/rs6000/driver-rs6000.c (.../branches/ibm/power7-meissner) (revision 144730)
+--- gcc/config/rs6000/driver-rs6000.c (.../trunk) (revision 145777)
++++ gcc/config/rs6000/driver-rs6000.c (.../branches/ibm/power7-meissner) (revision 146027)
@@ -343,11 +343,115 @@ detect_processor_aix (void)
#endif /* _AIX */
@@ -9496,9 +11412,9 @@
return concat (cache, "-m", argv[0], "=", cpu, " ", options, NULL);
}
---- gcc/config/rs6000/sysv4.h (.../trunk) (revision 144557)
-+++ gcc/config/rs6000/sysv4.h (.../branches/ibm/power7-meissner) (revision 144730)
-@@ -119,9 +119,9 @@ do { \
+--- gcc/config/rs6000/sysv4.h (.../trunk) (revision 145777)
++++ gcc/config/rs6000/sysv4.h (.../branches/ibm/power7-meissner) (revision 146027)
+@@ -120,9 +120,9 @@ do { \
else if (!strcmp (rs6000_abi_name, "i960-old")) \
{ \
rs6000_current_abi = ABI_V4; \
gcc44-pr39543.patch:
Index: gcc44-pr39543.patch
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/gcc44-pr39543.patch,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- gcc44-pr39543.patch 28 Mar 2009 09:33:10 -0000 1.1
+++ gcc44-pr39543.patch 14 Apr 2009 15:46:16 -0000 1.2
@@ -1,4 +1,4 @@
-2009-03-27 Jakub Jelinek <jakub at redhat.com>
+2009-04-10 Jakub Jelinek <jakub at redhat.com>
PR rtl-optimization/39543
* fwprop.c (forward_propagate_asm): New function.
@@ -9,8 +9,8 @@
* gcc.target/i386/pr39543-2.c: New test.
* gcc.target/i386/pr39543-3.c: New test.
---- gcc/fwprop.c.jj 2009-03-27 07:55:33.000000000 +0100
-+++ gcc/fwprop.c 2009-03-27 10:00:48.000000000 +0100
+--- gcc/fwprop.c.jj 2009-03-30 12:45:45.000000000 +0200
++++ gcc/fwprop.c 2009-04-10 16:19:36.000000000 +0200
@@ -1,5 +1,5 @@
/* RTL-based forward propagation pass for GNU compiler.
- Copyright (C) 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
@@ -18,7 +18,7 @@
Contributed by Paolo Bonzini and Steven Bosscher.
This file is part of GCC.
-@@ -852,6 +852,73 @@ forward_propagate_subreg (df_ref use, rt
+@@ -852,6 +852,80 @@ forward_propagate_subreg (df_ref use, rt
return false;
}
@@ -50,20 +50,27 @@
+ asm_operands = use_pat;
+ break;
+ case SET:
-+ loc = &SET_DEST (use_pat);
-+ new_rtx = propagate_rtx (*loc, GET_MODE (*loc), reg, src, speed_p);
-+ if (new_rtx)
-+ validate_unshare_change (use_insn, loc, new_rtx, true);
++ if (MEM_P (SET_DEST (use_pat)))
++ {
++ loc = &SET_DEST (use_pat);
++ new_rtx = propagate_rtx (*loc, GET_MODE (*loc), reg, src, speed_p);
++ if (new_rtx)
++ validate_unshare_change (use_insn, loc, new_rtx, true);
++ }
+ asm_operands = SET_SRC (use_pat);
+ break;
+ case PARALLEL:
+ for (i = 0; i < XVECLEN (use_pat, 0); i++)
+ if (GET_CODE (XVECEXP (use_pat, 0, i)) == SET)
+ {
-+ loc = &SET_DEST (XVECEXP (use_pat, 0, i));
-+ new_rtx = propagate_rtx (*loc, GET_MODE (*loc), reg, src, speed_p);
-+ if (new_rtx)
-+ validate_unshare_change (use_insn, loc, new_rtx, true);
++ if (MEM_P (SET_DEST (XVECEXP (use_pat, 0, i))))
++ {
++ loc = &SET_DEST (XVECEXP (use_pat, 0, i));
++ new_rtx = propagate_rtx (*loc, GET_MODE (*loc), reg,
++ src, speed_p);
++ if (new_rtx)
++ validate_unshare_change (use_insn, loc, new_rtx, true);
++ }
+ asm_operands = SET_SRC (XVECEXP (use_pat, 0, i));
+ }
+ else if (GET_CODE (XVECEXP (use_pat, 0, i)) == ASM_OPERANDS)
@@ -92,7 +99,7 @@
/* Try to replace USE with SRC (defined in DEF_INSN) and simplify the
result. */
-@@ -863,12 +930,16 @@ forward_propagate_and_simplify (df_ref u
+@@ -863,12 +937,16 @@ forward_propagate_and_simplify (df_ref u
rtx src, reg, new_rtx, *loc;
bool set_reg_equal;
enum machine_mode mode;
@@ -111,7 +118,7 @@
return false;
/* If def and use are subreg, check if they match. */
-@@ -900,7 +971,7 @@ forward_propagate_and_simplify (df_ref u
+@@ -900,7 +978,7 @@ forward_propagate_and_simplify (df_ref u
if (MEM_P (src) && MEM_READONLY_P (src))
{
rtx x = avoid_constant_pool_reference (src);
@@ -120,7 +127,7 @@
{
rtx note = find_reg_note (use_insn, REG_EQUAL, NULL_RTX);
rtx old_rtx = note ? XEXP (note, 0) : SET_SRC (use_set);
-@@ -911,6 +982,9 @@ forward_propagate_and_simplify (df_ref u
+@@ -911,6 +989,9 @@ forward_propagate_and_simplify (df_ref u
return false;
}
@@ -130,8 +137,8 @@
/* Else try simplifying. */
if (DF_REF_TYPE (use) == DF_REF_REG_MEM_STORE)
---- gcc/testsuite/gcc.target/i386/pr39543-1.c.jj 2009-03-25 16:40:18.000000000 +0100
-+++ gcc/testsuite/gcc.target/i386/pr39543-1.c 2009-03-25 16:40:50.000000000 +0100
+--- gcc/testsuite/gcc.target/i386/pr39543-1.c.jj 2009-04-09 09:47:16.000000000 +0200
++++ gcc/testsuite/gcc.target/i386/pr39543-1.c 2009-04-09 09:47:16.000000000 +0200
@@ -0,0 +1,52 @@
+/* PR rtl-optimization/39543 */
+/* { dg-do compile } */
@@ -185,8 +192,8 @@
+{
+ bar (s0);
+}
---- gcc/testsuite/gcc.target/i386/pr39543-2.c.jj 2009-03-25 16:40:18.000000000 +0100
-+++ gcc/testsuite/gcc.target/i386/pr39543-2.c 2009-03-25 16:40:38.000000000 +0100
+--- gcc/testsuite/gcc.target/i386/pr39543-2.c.jj 2009-04-09 09:47:16.000000000 +0200
++++ gcc/testsuite/gcc.target/i386/pr39543-2.c 2009-04-09 09:47:16.000000000 +0200
@@ -0,0 +1,51 @@
+/* PR rtl-optimization/39543 */
+/* { dg-do compile } */
@@ -239,8 +246,8 @@
+{
+ bar (s0);
+}
---- gcc/testsuite/gcc.target/i386/pr39543-3.c.jj 2009-03-25 16:41:29.000000000 +0100
-+++ gcc/testsuite/gcc.target/i386/pr39543-3.c 2009-03-25 16:41:19.000000000 +0100
+--- gcc/testsuite/gcc.target/i386/pr39543-3.c.jj 2009-04-09 09:47:16.000000000 +0200
++++ gcc/testsuite/gcc.target/i386/pr39543-3.c 2009-04-09 09:47:16.000000000 +0200
@@ -0,0 +1,42 @@
+/* PR rtl-optimization/39543 */
+/* { dg-do compile } */
Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/gcc/devel/sources,v
retrieving revision 1.270
retrieving revision 1.271
diff -u -r1.270 -r1.271
--- sources 9 Apr 2009 12:06:24 -0000 1.270
+++ sources 14 Apr 2009 15:46:16 -0000 1.271
@@ -1,2 +1,2 @@
2659f09c2e43ef8b7d4406321753f1b2 fastjar-0.97.tar.gz
-e45f1b49ad6bc7e78ef8887cab726943 gcc-4.4.0-20090409.tar.bz2
+004cfd0a49b225032953517a827da968 gcc-4.4.0-20090414.tar.bz2
--- gcc44-power7-2.patch DELETED ---
- Previous message: rpms/python-bugzilla/EL-5 python-bugzilla.spec, 1.5, 1.6 sources, 1.5, 1.6
- Next message: rpms/system-config-samba-docs/devel .cvsignore, 1.3, 1.4 sources, 1.4, 1.5 system-config-samba-docs.spec, 1.4, 1.5
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the scm-commits
mailing list