August 2008 - openSUSE Commits - openSUSE Mailing Lists

commit yast2-ldap-server
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package yast2-ldap-server checked in at Fri Aug 8 17:30:39 CEST 2008. -------- --- yast2-ldap-server/yast2-ldap-server.changes 2008-05-16 17:14:11.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2-ldap-server/yast2-ldap-server.changes 2008-08-08 15:12:02.000000000 +0200 @@ -2 +2,14 @@ -Tue Fri 16 16:49:30 CEST 2008 - rhafer(a)suse.de +Fri Aug 8 12:50:21 CEST 2008 - rhafer(a)suse.de + +- Version 2.17.0 +- Major rewrite of the whole module. yast2-ldap-server is using + OpenLDAP's configuration database (back-config) now instead of + /etc/openldap/slapd.conf +- The module can handle /etc/sysconfig/openldap settings now. + (Fate#303058) +- Automatically setup TLS if certificates exist (Fate#303165) +- CA-Management Module can be launched from within + yast2-ldap-server (Fate#303546) + +------------------------------------------------------------------- +Fri May 16 16:49:30 CEST 2008 - rhafer(a)suse.de Old: ---- yast2-ldap-server-2.16.3.tar.bz2 New: ---- yast2-ldap-server-2.17.0.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2-ldap-server.spec ++++++ --- /var/tmp/diff_new_pack.b16626/_old 2008-08-08 17:30:34.000000000 +0200 +++ /var/tmp/diff_new_pack.b16626/_new 2008-08-08 17:30:34.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2-ldap-server (Version 2.16.3) +# spec file for package yast2-ldap-server (Version 2.17.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,16 +19,15 @@ Name: yast2-ldap-server -Version: 2.16.3 +Version: 2.17.0 Release: 1 License: GPL v2 or later; X11/MIT Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-ldap-server-2.16.3.tar.bz2 +Source0: yast2-ldap-server-2.17.0.tar.bz2 Prefix: /usr -BuildRequires: perl-XML-Writer pkg-config update-desktop-files yast2 yast2-core yast2-devtools -Requires: acl yast2 yast2-users yast2-ldap-client yast2-network perl perl-gettext yast2-perl-bindings yast2-ca-management perl-X500-DN perl-Digest-SHA1 net-tools -BuildArch: noarch +BuildRequires: boost-devel gcc-c++ libldapcpp-devel perl-Digest-SHA1 perl-X500-DN perl-gettext pkg-config update-desktop-files yast2 yast2-core-devel yast2-devtools +Requires: acl net-tools perl perl-Digest-SHA1 perl-gettext perl-X500-DN yast2 yast2-ca-management yast2-ldap-client yast2-network yast2-perl-bindings yast2-users Summary: YaST2 - OpenLDAP Server Configuration %description @@ -35,7 +41,7 @@ Andreas Bauer <abauer(a)suse.de> %prep -%setup -n yast2-ldap-server-2.16.3 +%setup -n yast2-ldap-server-2.17.0 %build %{prefix}/bin/y2tool y2autoconf @@ -54,27 +60,46 @@ d=${f##*/} %suse_update_desktop_file -d ycc_${d%.desktop} ${d%.desktop} done +rm -f $RPM_BUILD_ROOT/%{_libdir}/libslapdconfig.la +rm -f $RPM_BUILD_ROOT/%{_libdir}/libslapdconfig.so +rm -f $RPM_BUILD_ROOT/%{_libdir}/YaST2/plugin/libpy2ag_slapdconfig.la +rm -f $RPM_BUILD_ROOT/%{_libdir}/YaST2/plugin/libpy2ag_slapdconfig.so %clean rm -rf "$RPM_BUILD_ROOT" +%post -p /sbin/ldconfig + +%postun -p /sbin/ldconfig + %files %defattr(-,root,root) %dir /usr/share/YaST2/include/ldap-server %dir /usr/share/YaST2/modules/YaPI +%{_libdir}/libslapdconfig.so.* /usr/share/YaST2/include/ldap-server/* /usr/share/YaST2/clients/ldap-server.ycp /usr/share/YaST2/clients/ldap-server_*.ycp /usr/share/YaST2/modules/LdapServer.* -/usr/share/YaST2/modules/LdapServerConf.* +/usr/share/YaST2/modules/LdapDatabase.* /usr/share/YaST2/modules/YaPI/LdapServer.pm %{prefix}/share/applications/YaST2/ldap-server.desktop +%{_libdir}/YaST2/plugin/libpy2ag_slapdconfig.* /usr/share/YaST2/schema/autoyast/rnc/ldap-server.rnc /usr/share/YaST2/scrconf/* -/usr/lib/YaST2/servers_non_y2/* %doc %{prefix}/share/doc/packages/yast2-ldap-server %changelog -* Mon May 16 2016 rhafer(a)suse.de +* Fri Aug 08 2008 rhafer(a)suse.de +- Version 2.17.0 +- Major rewrite of the whole module. yast2-ldap-server is using + OpenLDAP's configuration database (back-config) now instead of + /etc/openldap/slapd.conf +- The module can handle /etc/sysconfig/openldap settings now. + (Fate#303058) +- Automatically setup TLS if certificates exist (Fate#303165) +- CA-Management Module can be launched from within + yast2-ldap-server (Fate#303546) +* Fri May 16 2008 rhafer(a)suse.de - Error out if Database does not exist in YaPI::LdapServer->AddIndex() (bnc#389144) - Version 2.16.3 ++++++ yast2-ldap-server-2.16.3.tar.bz2 -> yast2-ldap-server-2.17.0.tar.bz2 ++++++ ++++ 52416 lines of diff (skipped) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit yast2
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package yast2 checked in at Fri Aug 8 17:30:19 CEST 2008. -------- --- yast2/yast2.changes 2008-07-25 16:04:32.000000000 +0200 +++ /mounts/work_src_done/STABLE/yast2/yast2.changes 2008-08-08 13:19:33.000000000 +0200 @@ -1,0 +2,29 @@ +Fri Aug 8 13:19:03 CEST 2008 - locilka(a)suse.cz + +- Fixed the latest Progress patch to pass the testsuite. +- 2.17.10 + +------------------------------------------------------------------- +Fri Aug 8 10:28:38 CEST 2008 - jsuchome(a)suse.cz + +- anyxml agent documentation added to anyxml.scr (bnc#405291) + +------------------------------------------------------------------- +Wed Aug 6 14:23:14 CEST 2008 - tgoettlicher(a)suse.de + +- Fixed bnc #413516: HideBackButton() always hides back button + in wizard + +------------------------------------------------------------------- +Wed Aug 6 10:34:07 CEST 2008 - locilka(a)suse.cz + +- Converting old built-in allowed services configuration in + firewall to services defined by packages (bnc #399217). + +------------------------------------------------------------------- +Wed Jul 30 11:53:35 CEST 2008 - lslezak(a)suse.cz + +- PackageLock::Connect() - display more details about owner of the + zypp lock (bnc#280537) + +------------------------------------------------------------------- Old: ---- yast2-2.17.9.tar.bz2 New: ---- yast2-2.17.10.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ yast2.spec ++++++ --- /var/tmp/diff_new_pack.V14845/_old 2008-08-08 17:30:09.000000000 +0200 +++ /var/tmp/diff_new_pack.V14845/_new 2008-08-08 17:30:09.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package yast2 (Version 2.17.9) +# spec file for package yast2 (Version 2.17.10) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,12 +19,12 @@ Name: yast2 -Version: 2.17.9 +Version: 2.17.10 Release: 1 License: GPL v2 or later Group: System/YaST BuildRoot: %{_tmppath}/%{name}-%{version}-build -Source0: yast2-2.17.9.tar.bz2 +Source0: yast2-2.17.10.tar.bz2 Prefix: /usr Source1: yast2-rpmlintrc BuildRequires: perl-XML-Writer update-desktop-files yast2-devtools yast2-perl-bindings yast2-testsuite @@ -141,7 +148,7 @@ Steffen Winterfeldt <snwint(a)suse.de> %prep -%setup -n yast2-2.17.9 +%setup -n yast2-2.17.10 %build %{prefix}/bin/y2tool y2autoconf @@ -244,7 +251,22 @@ %doc %{prefix}/share/doc/packages/yast2/system %doc %{prefix}/share/doc/packages/yast2/types %doc %{prefix}/share/doc/packages/yast2/wizard + %changelog +* Fri Aug 08 2008 locilka(a)suse.cz +- Fixed the latest Progress patch to pass the testsuite. +- 2.17.10 +* Fri Aug 08 2008 jsuchome(a)suse.cz +- anyxml agent documentation added to anyxml.scr (bnc#405291) +* Wed Aug 06 2008 tgoettlicher(a)suse.de +- Fixed bnc #413516: HideBackButton() always hides back button + in wizard +* Wed Aug 06 2008 locilka(a)suse.cz +- Converting old built-in allowed services configuration in + firewall to services defined by packages (bnc #399217). +* Wed Jul 30 2008 lslezak(a)suse.cz +- PackageLock::Connect() - display more details about owner of the + zypp lock (bnc#280537) * Fri Jul 25 2008 mzugec(a)suse.cz - support for tunnel devices in NetworkInterfaces (FaTE#302184) - 2.17.9 ++++++ yast2-2.17.9.tar.bz2 -> yast2-2.17.10.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/configure new/yast2-2.17.10/configure --- old/yast2-2.17.9/configure 2008-07-25 15:57:49.000000000 +0200 +++ new/yast2-2.17.10/configure 2008-08-08 13:13:28.000000000 +0200 @@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.61 for yast2 2.17.8. +# Generated by GNU Autoconf 2.61 for yast2 2.17.9. # # Report bugs to <http://bugs.opensuse.org/>. # @@ -574,8 +574,8 @@ # Identity of this package. PACKAGE_NAME='yast2' PACKAGE_TARNAME='yast2' -PACKAGE_VERSION='2.17.8' -PACKAGE_STRING='yast2 2.17.8' +PACKAGE_VERSION='2.17.9' +PACKAGE_STRING='yast2 2.17.9' PACKAGE_BUGREPORT='http://bugs.opensuse.org/' ac_unique_file="RPMNAME" @@ -1199,7 +1199,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures yast2 2.17.8 to adapt to many kinds of systems. +\`configure' configures yast2 2.17.9 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1270,7 +1270,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of yast2 2.17.8:";; + short | recursive ) echo "Configuration of yast2 2.17.9:";; esac cat <<\_ACEOF @@ -1348,7 +1348,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -yast2 configure 2.17.8 +yast2 configure 2.17.9 generated by GNU Autoconf 2.61 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1362,7 +1362,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by yast2 $as_me 2.17.8, which was +It was created by yast2 $as_me 2.17.9, which was generated by GNU Autoconf 2.61. Invocation command line was $ $0 $@ @@ -2183,7 +2183,7 @@ # Define the identity of the package. PACKAGE='yast2' - VERSION='2.17.8' + VERSION='2.17.9' cat >>confdefs.h <<_ACEOF @@ -2411,7 +2411,7 @@ -VERSION="2.17.8" +VERSION="2.17.9" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" @@ -3412,7 +3412,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by yast2 $as_me 2.17.8, which was +This file was extended by yast2 $as_me 2.17.9, which was generated by GNU Autoconf 2.61. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -3455,7 +3455,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -yast2 config.status 2.17.8 +yast2 config.status 2.17.9 configured by $0, generated by GNU Autoconf 2.61, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/configure.in new/yast2-2.17.10/configure.in --- old/yast2-2.17.9/configure.in 2008-07-25 15:57:41.000000000 +0200 +++ new/yast2-2.17.10/configure.in 2008-08-08 13:13:25.000000000 +0200 @@ -1,9 +1,9 @@ dnl configure.in for yast2 dnl -dnl -- This file is generated by y2autoconf 2.17.0 - DO NOT EDIT! -- +dnl -- This file is generated by y2autoconf 2.17.5 - DO NOT EDIT! -- dnl (edit configure.in.in instead) -AC_INIT(yast2, 2.17.8, http://bugs.opensuse.org/, yast2) +AC_INIT(yast2, 2.17.9, http://bugs.opensuse.org/, yast2) dnl Check for presence of file 'RPMNAME' AC_CONFIG_SRCDIR([RPMNAME]) @@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE(tar-ustar -Wno-portability) dnl Important YaST2 variables -VERSION="2.17.8" +VERSION="2.17.9" RPMNAME="yast2" MAINTAINER="Jiri Srain <jsrain(a)suse.cz>" diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/library/agents/anyxml.scr new/yast2-2.17.10/library/agents/anyxml.scr --- old/yast2-2.17.9/library/agents/anyxml.scr 2008-05-13 13:13:43.000000000 +0200 +++ new/yast2-2.17.10/library/agents/anyxml.scr 2008-08-08 10:50:44.000000000 +0200 @@ -1,13 +1,66 @@ /** * File: anyxml.scr * - * Summary: Agent for reading any XML files. + * Summary: Agent for reading and writing simple XML files. + + * Description: Agent is using Perl XML::Simple library. + * Write access is supported, but check the limitations + * at XML-Simple page (e.g. order of elements is lost in the + * maps) * * Authors: Jiri Suchomel <jsuchome(a)suse.cz> * - * Example: SCR::Read (.anyxml, "/root/some_file.xml") + * See: http://search.cpan.org/dist/XML-Simple/lib/XML/Simple.pm + * + * Example: + * + * Read a file /tmp/in.xml into YCP map: + * + * map config = (map)SCR::Read (.anyxml, "/tmp/in.xml") + * + * Using the agent this way, these default options of XML::Simple library + * will be used for reading: + * + * ForceContent => 1 + * ForceArray => 1 + * KeepRoot => 1, + * KeyAttr => [], + * + * Find the description of these arguments in the XML::Simple documentaion. + * For example, ForceArray set to 1 "forces nested elements to be represented + * as arrays even when there is only one". + * + * Alternative way of reading is using the argument map. This way it is + * possible to specify non-default read options in the "args" submap: + * + * map config = (map)SCR::Read (.anyxml, $[ + * "file" : "/tmp/in.xml", + * "args" : $[ + * "ForceArray" : 0, + * "KeepRoot" : 1 + * ] + * ]) + * + * Example: + * + * Writing with the default options: + * + * Write (.anyxml, $[ + * "file" : "/tmp/config.xml", + * "xml" : config, + * ]) + * + * Non-default write options could be used by passing extra submap with + * "args" key in the write map: * - * $Id:$ + * Write (.anyxml, $[ + * "file" : "c.xml", + * "xml" : config, + * "args : $[ + * "XMLDecl" : <?xml version="123456789"?>, + * "RootName" : "test" + * ] + * ]); */ .anyxml diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/library/log/src/ALog.ycp new/yast2-2.17.10/library/log/src/ALog.ycp --- old/yast2-2.17.9/library/log/src/ALog.ycp 1970-01-01 01:00:00.000000000 +0100 +++ new/yast2-2.17.10/library/log/src/ALog.ycp 2008-08-07 11:51:28.000000000 +0200 @@ -0,0 +1,83 @@ +/** + * File: modules/ALog.ycp + * Package: YaST2 + * Summary: Admin's Log, producing a summary of what YaST did to the system + * Authors: Martin Vidner <mvidner(a)suse.cz> + * + * $Id: ALog.ycp 49776 2008-08-06 13:50:01Z mvidner $ + * FATE#303700 + * TODO stability tag. + * + * <pre> + * ALog::Item("/etc/ntp.conf: added 'server ntp.example.org'"); + * ALog::Item("enabled /etd/init.d/ntp"); + * ALog::Item("started /etd/init.d/ntp"); + * + * ALog::CommitPopup(); + * ALog::Note("set up ntp from local server"); + * </pre> + */ + +{ +module "ALog"; +textdomain "base"; + +import "Label"; + +void doLog(string type, string msg) { + // TODO make a separate log, this is just a prototype + y2internal("{%1} %2", type, msg); +} + +/** + * Log a change to the system from the system point of view. + * msg should include the file being changed, and what changes are made + * (TODO: with all detail? or summary?) + * Example "/etc/ntp.conf: added 'server ntp.example.org'" + * @param msg message + */ +global void Item(string msg) { + doLog ("item", msg); +} + +/** + * Log a change to the system from the human point of view. + * (It will appear slightly differently in the log) + * Example "get proper time from the corporate time server + * as requested in ticket bofh#327" + * @param msg message + */ +global void Note(string msg) { + doLog ("note", msg); +} + +string uiInput(string label) { + // TODO more lines? + term d = `VBox( + `InputField (`id (`val), label, ""), + `PushButton (`id (`ok), `opt (`default, `key_F10), Label::OKButton ()) + ); + UI::OpenDialog (d); + any ui = nil; + do { + ui = UI::UserInput (); + } while (ui != `ok || ui != `cancel); + + string val = nil; + if (ui == `ok) { + val = (string) UI::QueryWidget (`id (`val), `Value); + } + return val; +} + +/** + * Prompt the user for a message to describe the changes + * that she did using YaST, logs it using @ref Note + */ +global void CommitPopup() { + string i = uiInput(_("Enter a log message to describe the changes that you did")); + string msg = (i == nil)? "*empty log message*": i; + Note(msg); +} + +} diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/library/log/src/Makefile.am new/yast2-2.17.10/library/log/src/Makefile.am --- old/yast2-2.17.9/library/log/src/Makefile.am 2008-04-10 08:47:35.000000000 +0200 +++ new/yast2-2.17.10/library/log/src/Makefile.am 2008-08-07 11:51:28.000000000 +0200 @@ -1,6 +1,7 @@ # Makefile.am for yast2/library/log/src module_DATA = \ + ALog.ycp \ LogView.ycp \ LogViewCore.ycp diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/library/log/src/Makefile.in new/yast2-2.17.10/library/log/src/Makefile.in --- old/yast2-2.17.9/library/log/src/Makefile.in 2008-07-25 15:57:54.000000000 +0200 +++ new/yast2-2.17.10/library/log/src/Makefile.in 2008-08-08 13:13:30.000000000 +0200 @@ -178,6 +178,7 @@ yncludedir = @yncludedir@ ystartupdir = @ystartupdir@ module_DATA = \ + ALog.ycp \ LogView.ycp \ LogViewCore.ycp diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/library/modules/Version.ycp new/yast2-2.17.10/library/modules/Version.ycp --- old/yast2-2.17.9/library/modules/Version.ycp 2008-07-25 16:02:10.000000000 +0200 +++ new/yast2-2.17.10/library/modules/Version.ycp 2008-08-08 13:15:44.000000000 +0200 @@ -20,7 +20,7 @@ /** * Version of the yast2 package */ -global string yast2 = "2.17.9"; +global string yast2 = "2.17.10"; /* EOF */ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/library/network/src/SuSEFirewallServices.ycp new/yast2-2.17.10/library/network/src/SuSEFirewallServices.ycp --- old/yast2-2.17.9/library/network/src/SuSEFirewallServices.ycp 2008-07-24 14:53:23.000000000 +0200 +++ new/yast2-2.17.10/library/network/src/SuSEFirewallServices.ycp 2008-08-06 10:52:19.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Definition of Supported Firewall Services and Port Aliases. * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: SuSEFirewallServices.ycp 49191 2008-07-16 16:42:13Z locilka $ + * $Id: SuSEFirewallServices.ycp 49750 2008-08-06 08:52:18Z locilka $ * * Global Definition of Firewall Services * Defined using TCP, UDP and RPC ports and IP protocols and Broadcast UDP @@ -25,6 +25,7 @@ // MORE INFORMATION IN FEATURE #300687: Ports for SuSEfirewall added via packages. // ANOTHER REFERENCE: Bugzilla #246911. // + // See also http://en.opensuse.org/SuSEfirewall2/Service_Definitions_Added_via_Packages // /*** @@ -77,14 +78,14 @@ /** * Services definitions for conversion to the new ones. */ - define map <string, map<string, any> > OLD_SERVICES = $[ + global define map <string, map<string, any> > OLD_SERVICES = $[ "http" : $[ "tcp_ports" : [ "http" ], - "convert_to" : [ "apache2", "lighttpd" ], + "convert_to" : [ "service:apache2", "service:lighttpd" ], ], "https" : $[ "tcp_ports" : [ "https" ], - "convert_to" : [ "apache2-ssl", "lighttpd-ssl" ], + "convert_to" : [ "service:apache2-ssl", "service:lighttpd-ssl" ], ], "smtp" : $[ "tcp_ports" : [ "smtp" ], @@ -100,11 +101,11 @@ ], "imap" : $[ "tcp_ports" : [ "imap" ], - "convert_to" : [ "courier-imapd" ], + "convert_to" : [ "service:courier-imapd" ], ], "imaps" : $[ "tcp_ports" : [ "imaps" ], - "convert_to" : [ "courier-imap-ssl" ], + "convert_to" : [ "service:courier-imap-ssl" ], ], "samba-server" : $[ "tcp_ports" : [ "netbios-ssn", "microsoft-ds" ], // TCP: 139, 445 @@ -114,7 +115,7 @@ ], "ssh" : $[ "tcp_ports" : [ "ssh" ], - "convert_to" : [ "sshd" ], + "convert_to" : [ "service:sshd" ], ], "rsync" : $[ "tcp_ports" : [ "rsync" ], @@ -123,7 +124,7 @@ "dhcp-server" : $[ "udp_ports" : [ "bootps" ], "broadcast_ports" : [ "bootps" ], - "convert_to" : [ "dhcp-server" ], + "convert_to" : [ "service:dhcp-server" ], ], "dhcp-client" : $[ "udp_ports" : [ "bootpc" ], @@ -132,11 +133,11 @@ "dns-server" : $[ "tcp_ports" : [ "domain" ], "udp_ports" : [ "domain" ], - "convert_to" : [ "bind" ], + "convert_to" : [ "service:bind" ], ], "nfs-client" : $[ "rpc_ports" : [ "portmap", "status", "nlockmgr" ], - "convert_to" : [ "nfs-client" ], + "convert_to" : [ "service:nfs-client" ], ], "nfs-server" : $[ "rpc_ports" : [ "portmap", "status", "nlockmgr", "mountd", "nfs", "nfs_acl" ], @@ -144,7 +145,7 @@ ], "nis-client" : $[ "rpc_ports" : [ "portmap", "ypbind" ], - "convert_to" : [ "ypserv" ], + "convert_to" : [ "service:ypserv" ], ], "nis-server" : $[ "rpc_ports" : [ "portmap", "ypserv", "fypxfrd", "ypbind", "yppasswdd" ], @@ -174,11 +175,11 @@ "ntp-server" : $[ "udp_ports" : [ "ntp" ], "broadcast_ports" : [ "ntp" ], - "convert_to" : [ "ntp" ], + "convert_to" : [ "service:ntp" ], ], "ldap" : $[ "tcp_ports" : [ "ldap" ], - "convert_to" : [ "openldap" ], + "convert_to" : [ "service:openldap" ], ], "ldaps" : $[ "tcp_ports" : [ "ldaps" ], @@ -216,11 +217,11 @@ ], "mysql-server" : $[ "tcp_ports" : [ "mysql" ], - "convert_to" : [ "mysql" ], + "convert_to" : [ "service:mysql" ], ], "iscsi-server" : $[ "tcp_ports" : [ "iscsi-target" ], - "convert_to" : [ "iscsitarget" ], + "convert_to" : [ "service:iscsitarget" ], ], ]; @@ -388,7 +389,7 @@ /** * Function returns the map of supported (known) services. * - * @return map <string, string> + * @return map <string, string> supported services * * @struct * $[ service_id : localized_service_name ] @@ -525,6 +526,7 @@ if (! IsKnownService(service)) { y2error("Uknown service '%1'", service); + y2milestone("Known services: %1", SERVICES); return nil; } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/library/network/src/SuSEFirewall.ycp new/yast2-2.17.10/library/network/src/SuSEFirewall.ycp --- old/yast2-2.17.9/library/network/src/SuSEFirewall.ycp 2008-07-24 14:53:23.000000000 +0200 +++ new/yast2-2.17.10/library/network/src/SuSEFirewall.ycp 2008-08-06 10:36:32.000000000 +0200 @@ -6,7 +6,7 @@ * Summary: Interface manipulation of /etc/sysconfig/SuSEFirewall * Authors: Lukas Ocilka <locilka(a)suse.cz> * - * $Id: SuSEFirewall.ycp 49191 2008-07-16 16:42:13Z locilka $ + * $Id: SuSEFirewall.ycp 49749 2008-08-06 08:36:31Z locilka $ * * Module for handling SuSEfirewall2. */ @@ -25,6 +25,8 @@ import "Progress"; import "PortRanges"; import "PackageSystem"; + import "FileUtils"; + import "Directory"; //  @@ -2213,6 +2215,15 @@ ReadSysconfigSuSEFirewall ( GetListOfSuSEFirewallVariables() ); } + // old internal services definitions are converted to new services defined by packages + // but only once + string converted_to_services_dbp_file = Directory::vardir + "/yast2-firewall-already-converted-to-sdbp"; + + // services have been already converted + boolean already_converted = false; + + global void ConvertToServicesDefinedByPackages(); + /** * Function for reading SuSEFirewall configuration. * Fills internal variables only. @@ -2322,6 +2333,10 @@ if (have_progress) Progress::NextStage(); + // bnc #399217 + // Converting built-in service definitions to services defined by packages + ConvertToServicesDefinedByPackages(); + if (have_progress) Progress::Finish(); return true; @@ -2481,6 +2496,13 @@ if (have_progress) Progress::NextStage(); + if (already_converted && ! FileUtils::Exists (converted_to_services_dbp_file)) { + y2milestone ("Writing %1: %2", + converted_to_services_dbp_file, + SCR::Write (.target.string, converted_to_services_dbp_file, "") + ); + } + if (have_progress) Progress::Finish(); return true; @@ -2570,7 +2592,7 @@ // only when the service is allowed in zone - remove all its needed ports if (IsServiceSupportedInZone(service_id, zone) == true) { - // all needed ports etc for service/protocol, well, I'm not good at function pointers :-< + // all needed ports etc for service/protocol list <string> needed_all = []; if (protocol == "TCP") { needed_all = SuSEFirewallServices::GetNeededTCPPorts(service_id); @@ -3259,6 +3281,124 @@ } } + /** + * Removes old-service definitions before they are added as services defined + * by packages. + */ + void RemoveOldAllowedServiceFromZone (map <string, any> old_service_def, string zone) { + y2milestone ("Removing: %1 from zone %2", old_service_def, zone); + + if (old_service_def["tcp_ports"]:[] != []) { + foreach (string one_service, old_service_def["tcp_ports"]:[], { + RemoveService (one_service, "TCP", zone); + }); + } + + if (old_service_def["udp_ports"]:[] != []) { + foreach (string one_service, old_service_def["udp_ports"]:[], { + RemoveService (one_service, "UDP", zone); + }); + } + + if (old_service_def["rpc_ports"]:[] != []) { + foreach (string one_service, old_service_def["rpc_ports"]:[], { + RemoveService (one_service, "RPC", zone); + }); + } + + if (old_service_def["ip_protocols"]:[] != []) { + foreach (string one_service, old_service_def["ip_protocols"]:[], { + RemoveService (one_service, "IP", zone); + }); + } + + if (old_service_def["broadcast_ports"]:[] != []) { + map <string, list <string> > broadcast = GetBroadcastAllowedPorts(); + + broadcast[zone] = filter (string one_port, broadcast[zone]:[], { + return (! contains (old_service_def["broadcast_ports"]:[], one_port)); + }); + + SetBroadcastAllowedPorts (broadcast); + } + } + + /** + * Converts old built-in service definitions to services defined by packages. + * + * @see #bnc 399217 + */ + global void ConvertToServicesDefinedByPackages () { + if (already_converted) { + return; + } + + if (FileUtils::Exists (converted_to_services_dbp_file)) { + y2milestone ("Configuration has been already converted"); + already_converted = true; + return; + } + + // $[ zone : $[ protocol : [ list of ports ] ] ] + map <string, map <string, list <string> > > current_conf = $[]; + + foreach (string zone, GetKnownFirewallZones (), { + current_conf[zone] = $[]; + + foreach (string protocol, supported_protocols, { + current_conf[zone, protocol] = GetAllowedServicesForZoneProto (zone, protocol); + current_conf[zone, "broadcast"] = splitstring (GetBroadcastConfiguration (zone), " \n"); + }); + }); + + y2milestone ("Current conf: %1", current_conf); + + foreach (string zone, GetKnownFirewallZones (), { + foreach (string old_service_id, map <string, any> old_service_def, SuSEFirewallServices::OLD_SERVICES, { + y2milestone ("Checking %1 in %2 zone", old_service_id, zone); + + if (old_service_def["tcp_ports"]:[] != [] && ArePortsOrServicesAllowed (old_service_def["tcp_ports"]:[], "TCP", zone, true) != true) + return; + + if (old_service_def["udp_ports"]:[] != [] && ArePortsOrServicesAllowed (old_service_def["udp_ports"]:[], "UDP", zone, true) != true) + return; + + if (old_service_def["rpc_ports"]:[] != [] && ArePortsOrServicesAllowed (old_service_def["rpc_ports"]:[], "RPC", zone, false) != true) + return; + + if (old_service_def["ip_protocols"]:[] != [] && ArePortsOrServicesAllowed (old_service_def["ip_protocols"]:[], "IP", zone, false) != true) + return; + + if (old_service_def["broadcast_ports"]:[] != [] && IsBroadcastAllowed (old_service_def["broadcast_ports"]:[], zone) != true) + return; + + if (old_service_def["convert_to"]:[] == []) { + y2milestone ("Service %1 supported, but it doesn't have any replacement", old_service_id); + return; + } + + boolean replaced = false; + + foreach (string replacement, old_service_def["convert_to"]:[], { + if (SuSEFirewallServices::IsKnownService (replacement)) { + y2milestone ("Old service %1 matches %2", old_service_id, replacement); + RemoveOldAllowedServiceFromZone (old_service_def, zone); + SetServicesForZones ([replacement], [zone], true); + replaced = true; + break; + } + }); + + if (! replaced) { + y2warning ("Old service %1 matches %2 but none are installed", old_service_id, old_service_def["convert_to"]:[]); + } + }); + }); + + y2milestone ("Converting done"); + already_converted = true; + } + //  /* EOF */ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/library/packages/src/PackageLock.ycp new/yast2-2.17.10/library/packages/src/PackageLock.ycp --- old/yast2-2.17.9/library/packages/src/PackageLock.ycp 2008-06-06 11:47:21.000000000 +0200 +++ new/yast2-2.17.10/library/packages/src/PackageLock.ycp 2008-08-04 11:55:30.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Packages manipulation (system) * Authors: Martin Vidner <mvidner(a)suse.cz> * - * $Id: PackageLock.ycp 48079 2008-06-04 15:25:51Z lslezak $ + * $Id: PackageLock.ycp 49511 2008-07-30 09:58:25Z lslezak $ * * This should be used everywhere before Pkg is first used. #160319 */ @@ -43,11 +43,9 @@ try_again = (Popup::AnyQuestion ( // TRANSLATORS: a popup headline _("Accessing the Package Management Failed"), + Pkg::LastError() + "\n\n" + // TRANSLATORS: an error message with question - _("Another process is accessing the package database. -Package management cannot be used now. - -Would you like to continue without having access + _("Would you like to continue without having access to the package management or retry to access it? "), Label::ContinueButton(), @@ -89,11 +87,8 @@ symbol ret = Popup::AnyQuestion3( // TRANSLATORS: a popup headline _("Accessing the Package Management Failed"), + Pkg::LastError() + "\n\n" + // TRANSLATORS: an error message with question - _("Another process is accessing the package database. -Package management cannot be used now. -") - + "\n" + _("Would you like to retry to access it, continue without having access to the package management or abort? @@ -118,11 +113,8 @@ boolean ret = Popup::AnyQuestion( // TRANSLATORS: a popup headline _("Accessing the Package Management Failed"), + Pkg::LastError() + "\n\n" + // TRANSLATORS: an error message with question - _("Another process is accessing the package database. -Package management cannot be used now. -") - + "\n" + _("Would you like to abort or retry to access it? "), Label::RetryButton(), diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/library/wizard/src/Progress.ycp new/yast2-2.17.10/library/wizard/src/Progress.ycp --- old/yast2-2.17.9/library/wizard/src/Progress.ycp 2008-06-06 17:26:25.000000000 +0200 +++ new/yast2-2.17.10/library/wizard/src/Progress.ycp 2008-08-08 13:19:43.000000000 +0200 @@ -4,7 +4,7 @@ * Summary: Progress bar * Authors: Petr Blahos <pblahos(a)suse.cz> * - * $Id: Progress.ycp 48107 2008-06-06 10:52:39Z locilka $ + * $Id: Progress.ycp 49864 2008-08-08 11:19:43Z locilka $ * * Functions for progress bar.<br> * <pre> @@ -489,7 +489,8 @@ } } - UI::ReplaceWidget (`id (`contents), bar); + // patch from Michal Srb https://bugzilla.novell.com/show_bug.cgi?id=406890#c7 + if (! Mode::test() && UI::WidgetExists (`id (`contents))) UI::ReplaceWidget (`id (`contents), bar); if (! UI::WizardCommand(`SetDialogHeading( window_title ) ) ) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/library/wizard/src/Wizard.ycp new/yast2-2.17.10/library/wizard/src/Wizard.ycp --- old/yast2-2.17.9/library/wizard/src/Wizard.ycp 2008-07-16 18:21:23.000000000 +0200 +++ new/yast2-2.17.10/library/wizard/src/Wizard.ycp 2008-08-07 11:51:28.000000000 +0200 @@ -785,47 +785,6 @@ Wizard::SetContents("", `Empty(), "", false, false); } - - /** - * Set contents and Buttons of wizard dialog - * - * Additionally set its title, help_text and buttons labels. Enables both back and next button. - * - * @params - * - * @param title title of window - * @param contents contents of dialog - * @param help_text help text - * @param back_label label of back button - * @param next_label label of next button - **/ - global void SetContentsButtons( string title, - term contents, - string help_text, - string back_label, - string next_label ) - { - UI::PostponeShortcutCheck (); - - if ( UI::WizardCommand(`SetBackButtonLabel( back_label ) ) == true ) - { - UI::WizardCommand(`SetNextButtonLabel( next_label ) ); - Wizard::SetContents( title, contents, help_text, true, true ); - } - else - { - // Set button labels first to avoid geometry problems: SetContents() - // calls ReplaceWidget() wich triggers a re-layout. - - if ( UI::WidgetExists(`id(`back ) ) ) UI::ChangeWidget(`id (`back), `Label, back_label); - if ( UI::WidgetExists(`id(`next ) ) ) UI::ChangeWidget(`id (`next), `Label, next_label); - Wizard::SetContents( title, contents, help_text, true, true ); - } - SetHelpText( help_text ); - UI::CheckShortcuts (); - } - - /** * Set the dialog's "Next" button with a new label and a new ID * @@ -991,6 +950,53 @@ } + + /** + * Set contents and Buttons of wizard dialog + * + * Additionally set its title, help_text and buttons labels. Enables both back and next button. + * + * @params + * + * @param title title of window + * @param contents contents of dialog + * @param help_text help text + * @param back_label label of back button + * @param next_label label of next button + **/ + global void SetContentsButtons( string title, + term contents, + string help_text, + string back_label, + string next_label ) + { + + + UI::PostponeShortcutCheck (); + + Wizard::RestoreBackButton(); + Wizard::RestoreNextButton(); + + if ( UI::WizardCommand(`SetBackButtonLabel( back_label ) ) == true ) + { + UI::WizardCommand(`SetNextButtonLabel( next_label ) ); + Wizard::SetContents( title, contents, help_text, true, true ); + } + else + { + // Set button labels first to avoid geometry problems: SetContents() + // calls ReplaceWidget() wich triggers a re-layout. + + if ( UI::WidgetExists(`id(`back ) ) ) UI::ChangeWidget(`id (`back), `Label, back_label); + if ( UI::WidgetExists(`id(`next ) ) ) UI::ChangeWidget(`id (`next), `Label, next_label); + Wizard::SetContents( title, contents, help_text, true, true ); + } + SetHelpText( help_text ); + UI::CheckShortcuts (); + + } + + /** * Sets the wizard 'title' icon to the specified icon from the standard icon * directory. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/yast2-2.17.9/VERSION new/yast2-2.17.10/VERSION --- old/yast2-2.17.9/VERSION 2008-07-25 16:00:40.000000000 +0200 +++ new/yast2-2.17.10/VERSION 2008-08-08 13:15:13.000000000 +0200 @@ -1 +1 @@ -2.17.9 +2.17.10 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gdb
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package gdb checked in at Fri Aug 8 17:28:56 CEST 2008. -------- --- gdb/gdb.changes 2008-07-18 13:18:48.000000000 +0200 +++ /mounts/work_src_done/STABLE/gdb/gdb.changes 2008-08-08 15:33:22.000000000 +0200 @@ -1,0 +2,6 @@ +Fri Aug 8 15:30:07 CEST 2008 - schwab(a)suse.de + +- Update to head of trunk. +- Enable multi-target support. + +------------------------------------------------------------------- Old: ---- gdb-6.8.50.20080718-cvs.tar.bz2 New: ---- gdb-6.8.50.20080808-cvs.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ gdb.spec ++++++ --- /var/tmp/diff_new_pack.Q12552/_old 2008-08-08 17:28:41.000000000 +0200 +++ /var/tmp/diff_new_pack.Q12552/_new 2008-08-08 17:28:41.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package gdb (Version 6.8.50.20080718) +# spec file for package gdb (Version 6.8.50.20080808) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -29,7 +36,7 @@ AutoReqProv: on PreReq: %{install_info_prereq} Summary: The GNU Debugger -Version: 6.8.50.20080718 +Version: 6.8.50.20080808 Release: 1 %define sss -cvs Source: gdb-%{version}%{sss}.tar.bz2 @@ -114,8 +121,20 @@ %patch10 %build +%ifarch %ix86 ia64 ppc ppc64 s390 s390x x86_64 +%define build_multitarget 1 +%else +%define build_multitarget 0 +%endif +%define target_list i686 ia64 powerpc powerpc64 s390 s390x x86_64 %define DIST %(echo '%distribution' | sed 's/ (.*)//') -./configure --prefix=%{_prefix} --libdir=%{_libdir} --infodir=%{_infodir} \ +%if %build_multitarget +ADDITIONAL_TARGETS="%(echo %target_list | sed -e 's/[^ ]\+/&-suse-linux/g')" +%else +ADDITIONAL_TARGETS= +%endif +./configure CFLAGS="$RPM_OPT_FLAGS" \ + --prefix=%{_prefix} --libdir=%{_libdir} --infodir=%{_infodir} \ --mandir=%{_mandir} --with-system-readline \ %ifarch ia64 --with-libunwind \ @@ -124,10 +143,9 @@ %endif --with-separate-debug-dir=%{_prefix}/lib/debug \ --enable-64-bit-bfd --disable-werror --disable-sim \ - --with-bugurl=http://bugs.opensuse.org/ \ - --with-pkgversion="GDB; %{DIST}" \ + --with-bugurl=http://bugs.opensuse.org/ --with-pkgversion="GDB; %{DIST}" \ --build=%{_target_cpu}-suse-linux \ - CFLAGS="$RPM_OPT_FLAGS" + ${ADDITIONAL_TARGETS:+--enable-targets="${ADDITIONAL_TARGETS// /,}"} make %{?jobs:-j%jobs} make info @@ -174,6 +192,9 @@ %endif %changelog +* Fri Aug 08 2008 schwab(a)suse.de +- Update to head of trunk. +- Enable multi-target support. * Fri Jul 18 2008 schwab(a)suse.de - Update to head of trunk. * Mon Jul 07 2008 schwab(a)suse.de ++++++ gdb-6.8.50.20080718-cvs.tar.bz2 -> gdb-6.8.50.20080808-cvs.tar.bz2 ++++++ gdb/gdb-6.8.50.20080718-cvs.tar.bz2 /mounts/work_src_done/STABLE/gdb/gdb-6.8.50.20080808-cvs.tar.bz2 differ: byte 11, line 1 ++++++ pie-relocate.diff ++++++ --- /var/tmp/diff_new_pack.Q12552/_old 2008-08-08 17:28:41.000000000 +0200 +++ /var/tmp/diff_new_pack.Q12552/_new 2008-08-08 17:28:41.000000000 +0200 @@ -1,23 +1,3 @@ ---- gdb/Makefile.in -+++ gdb/Makefile.in -@@ -2605,7 +2605,7 @@ objfiles.o: objfiles.c $(defs_h) $(bfd_h - $(gdb_assert_h) $(gdb_stat_h) $(gdb_obstack_h) $(gdb_string_h) \ - $(hashtab_h) $(breakpoint_h) $(block_h) $(dictionary_h) $(source_h) \ - $(parser_defs_h) $(expression_h) $(addrmap_h) $(arch_utils_h) \ -- $(exec_h) -+ $(exec_h) $(auxv_h) $(elf_common_h) - observer.o: observer.c $(defs_h) $(observer_h) $(command_h) $(gdbcmd_h) \ - $(observer_inc) - obsd-tdep.o: obsd-tdep.c $(defs_h) $(frame_h) $(symtab_h) $(obsd_tdep_h) -@@ -2810,7 +2810,7 @@ solib-sunos.o: solib-sunos.c $(defs_h) $ - $(bcache_h) $(regcache_h) - solib-svr4.o: solib-svr4.c $(defs_h) $(elf_external_h) $(elf_common_h) \ - $(elf_mips_h) $(symtab_h) $(bfd_h) $(symfile_h) $(objfiles_h) \ -- $(gdbcore_h) $(target_h) $(inferior_h) $(gdb_assert_h) \ -+ $(gdbcore_h) $(target_h) $(inferior_h) $(command_h) $(gdb_assert_h) \ - $(solist_h) $(solib_h) $(solib_svr4_h) $(bfd_target_h) $(elf_bfd_h) \ - $(exec_h) $(auxv_h) - solib-target.o: solib-target.c $(defs_h) $(objfiles_h) $(solist_h) \ --- gdb/breakpoint.c +++ gdb/breakpoint.c @@ -4045,6 +4045,7 @@ describe_other_breakpoints (CORE_ADDR pc ++++++ readnever.patch ++++++ --- /var/tmp/diff_new_pack.Q12552/_old 2008-08-08 17:28:41.000000000 +0200 +++ /var/tmp/diff_new_pack.Q12552/_new 2008-08-08 17:28:41.000000000 +0200 @@ -7,17 +7,6 @@ * main.c (captured_main): Add --readnever option. ================================================================================ ---- gdb/Makefile.in -+++ gdb/Makefile.in -@@ -2101,7 +2101,7 @@ dwarf2read.o: dwarf2read.c $(defs_h) $(b - $(objfiles_h) $(elf_dwarf2_h) $(buildsym_h) $(demangle_h) \ - $(expression_h) $(filenames_h) $(macrotab_h) $(language_h) \ - $(complaints_h) $(bcache_h) $(dwarf2expr_h) $(dwarf2loc_h) \ -- $(cp_support_h) $(hashtab_h) $(command_h) $(gdbcmd_h) \ -+ $(cp_support_h) $(hashtab_h) $(command_h) $(gdbcmd_h) $(top_h) \ - $(addrmap_h) $(gdb_string_h) $(gdb_assert_h) - elfread.o: elfread.c $(defs_h) $(bfd_h) $(gdb_string_h) $(elf_bfd_h) \ - $(elf_mips_h) $(symtab_h) $(symfile_h) $(objfiles_h) $(buildsym_h) \ --- gdb/dwarf2read.c +++ gdb/dwarf2read.c @@ -46,6 +46,7 @@ ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit gcc43
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package gcc43 checked in at Fri Aug 8 17:28:21 CEST 2008. -------- --- gcc43/cross-avr-gcc43.changes 2008-07-17 17:47:38.000000000 +0200 +++ /mounts/work_src_done/STABLE/gcc43/cross-avr-gcc43.changes 2008-08-06 23:05:03.000000000 +0200 @@ -1,0 +2,19 @@ +Tue Aug 5 14:13:09 CEST 2008 - rguenther(a)suse.de + +- Update to gcc-4_3-branch head (r138797). +- Add patches for context sensitive vector keyword support (IBM). +- Add patch for PR36613. + +------------------------------------------------------------------- +Fri Jul 25 18:05:49 CEST 2008 - rguenther(a)suse.de + +- Update to gcc-4_3-branch head (r138144). +- Add patches for early complete loop unrolling. + +------------------------------------------------------------------- +Mon Jul 21 16:00:22 CEST 2008 - rguenther(a)suse.de + +- Add patches to support SSE5 vectorized shift instructions. +- Add patch for PR36765. + +------------------------------------------------------------------- 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-ppc64-gcc-icecream-backend.changes: same change cross-ppc-gcc-icecream-backend.changes: same change cross-s390-gcc-icecream-backend.changes: same change cross-s390x-gcc-icecream-backend.changes: same change cross-spu-gcc.changes: same change cross-spu-gcc-static.changes: same change cross-x86_64-gcc-icecream-backend.changes: same change gcc43.changes: same change libgcj43.changes: same change Old: ---- gcc-4.3.2-20080715.tar.bz2 New: ---- amd-cunroll-1.diff amd-cunroll-2.diff amd-SSE5-shift-ppc-1.diff amd-SSE5-shift-ppc-2.diff gcc-4.3.2-20080806.tar.bz2 ibm-vector-keyword-1 ibm-vector-keyword-2 ibm-vector-keyword-3 pr36613.diff pr36765.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-avr-gcc43.spec ++++++ --- /var/tmp/diff_new_pack.xT1721/_old 2008-08-08 17:26:45.000000000 +0200 +++ /var/tmp/diff_new_pack.xT1721/_new 2008-08-08 17:26:45.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package cross-avr-gcc43 (Version 4.3.2_20080715) +# spec file for package cross-avr-gcc43 (Version 4.3.2_20080806) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -14,7 +21,6 @@ # # spec file for package gcc (Version 4.0.1) # -# Copyright (c) 2005 SUSE Linux AG, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -55,7 +61,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later; X11/MIT -Version: 4.3.2_20080715 +Version: 4.3.2_20080806 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -87,6 +93,8 @@ Patch30: Wunprototyped-calls.diff Patch31: pr27799.diff Patch39: pr36343.diff +Patch40: pr36765.diff +Patch41: pr36613.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -100,6 +108,11 @@ Patch72: pr34043-3.diff Patch73: pr34043-4.diff Patch74: pr34043-5.diff +Patch75: amd-SSE5-shift-ppc-1.diff +Patch76: amd-SSE5-shift-ppc-2.diff +Patch77: amd-SSE5-shift.diff +Patch78: amd-cunroll-1.diff +Patch79: amd-cunroll-2.diff # Patches for Intel features Patch80: intel303993-aes.diff # Patches for IBM features @@ -112,6 +125,9 @@ Patch96: pr36745.diff Patch97: pr36822.diff Patch98: ibm-mpower4.diff +Patch99: ibm-vector-keyword-1 +Patch100: ibm-vector-keyword-2 +Patch101: ibm-vector-keyword-3 # LIBJAVA-DELETE-BEGIN %description @@ -169,6 +185,8 @@ %patch30 %patch31 %patch39 +%patch40 +%patch41 %patch51 %patch55 %patch57 @@ -179,6 +197,11 @@ %patch72 %patch73 %patch74 -p1 +%patch75 +%patch76 +%patch77 +%patch78 +%patch79 %patch80 %patch90 %patch91 @@ -189,6 +212,9 @@ %patch96 %patch97 #%patch98 +%patch99 +%patch100 +%patch101 %build # Avoid rebuilding of generated files @@ -355,7 +381,6 @@ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "powerpc64" - --with-cpu=default64 \ --enable-secureplt \ --with-long-double-128 \ %endif @@ -390,6 +415,16 @@ %defattr(-,root,root) %{_prefix} %changelog +* Tue Aug 05 2008 rguenther(a)suse.de +- Update to gcc-4_3-branch head (r138797). +- Add patches for context sensitive vector keyword support (IBM). +- Add patch for PR36613. +* Fri Jul 25 2008 rguenther(a)suse.de +- Update to gcc-4_3-branch head (r138144). +- Add patches for early complete loop unrolling. +* Mon Jul 21 2008 rguenther(a)suse.de +- Add patches to support SSE5 vectorized shift instructions. +- Add patch for PR36765. * Tue Jul 15 2008 rguenther(a)suse.de - Update to gcc-4_3-branch head (r137837). - Make it build on SLES9. ++++++ cross-hppa-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.xT1721/_old 2008-08-08 17:26:45.000000000 +0200 +++ /var/tmp/diff_new_pack.xT1721/_new 2008-08-08 17:26:45.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package cross-hppa-gcc-icecream-backend (Version 4.3.2_20080715) +# spec file for package cross-hppa-gcc-icecream-backend (Version 4.3.2_20080806) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -34,7 +41,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later; X11/MIT -Version: 4.3.2_20080715 +Version: 4.3.2_20080806 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -66,6 +73,8 @@ Patch30: Wunprototyped-calls.diff Patch31: pr27799.diff Patch39: pr36343.diff +Patch40: pr36765.diff +Patch41: pr36613.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -79,6 +88,11 @@ Patch72: pr34043-3.diff Patch73: pr34043-4.diff Patch74: pr34043-5.diff +Patch75: amd-SSE5-shift-ppc-1.diff +Patch76: amd-SSE5-shift-ppc-2.diff +Patch77: amd-SSE5-shift.diff +Patch78: amd-cunroll-1.diff +Patch79: amd-cunroll-2.diff # Patches for Intel features Patch80: intel303993-aes.diff # Patches for IBM features @@ -91,6 +105,9 @@ Patch96: pr36745.diff Patch97: pr36822.diff Patch98: ibm-mpower4.diff +Patch99: ibm-vector-keyword-1 +Patch100: ibm-vector-keyword-2 +Patch101: ibm-vector-keyword-3 # LIBJAVA-DELETE-BEGIN %description @@ -151,6 +168,8 @@ %patch30 %patch31 %patch39 +%patch40 +%patch41 %patch51 %patch55 %patch57 @@ -161,6 +180,11 @@ %patch72 %patch73 %patch74 -p1 +%patch75 +%patch76 +%patch77 +%patch78 +%patch79 %patch80 %patch90 %patch91 @@ -171,6 +195,9 @@ %patch96 %patch97 #%patch98 +%patch99 +%patch100 +%patch101 %build # Avoid rebuilding of generated files @@ -337,7 +364,6 @@ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "powerpc64" - --with-cpu=default64 \ --enable-secureplt \ --with-long-double-128 \ %endif @@ -410,6 +436,16 @@ /usr/share/icecream-envs %changelog +* Tue Aug 05 2008 rguenther(a)suse.de +- Update to gcc-4_3-branch head (r138797). +- Add patches for context sensitive vector keyword support (IBM). +- Add patch for PR36613. +* Fri Jul 25 2008 rguenther(a)suse.de +- Update to gcc-4_3-branch head (r138144). +- Add patches for early complete loop unrolling. +* Mon Jul 21 2008 rguenther(a)suse.de +- Add patches to support SSE5 vectorized shift instructions. +- Add patch for PR36765. * Tue Jul 15 2008 rguenther(a)suse.de - Update to gcc-4_3-branch head (r137837). - Make it build on SLES9. cross-i386-gcc-icecream-backend.spec: same change cross-ia64-gcc-icecream-backend.spec: same change cross-ppc64-gcc-icecream-backend.spec: same change cross-ppc-gcc-icecream-backend.spec: same change cross-s390-gcc-icecream-backend.spec: same change cross-s390x-gcc-icecream-backend.spec: same change ++++++ cross-spu-gcc.spec ++++++ --- /var/tmp/diff_new_pack.xT1721/_old 2008-08-08 17:26:46.000000000 +0200 +++ /var/tmp/diff_new_pack.xT1721/_new 2008-08-08 17:26:46.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package cross-spu-gcc (Version 4.3.2_20080715) +# spec file for package cross-spu-gcc (Version 4.3.2_20080806) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -45,7 +52,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ License: GPL v2 or later -Version: 4.3.2_20080715 +Version: 4.3.2_20080806 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -77,6 +84,8 @@ Patch30: Wunprototyped-calls.diff Patch31: pr27799.diff Patch39: pr36343.diff +Patch40: pr36765.diff +Patch41: pr36613.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -90,6 +99,11 @@ Patch72: pr34043-3.diff Patch73: pr34043-4.diff Patch74: pr34043-5.diff +Patch75: amd-SSE5-shift-ppc-1.diff +Patch76: amd-SSE5-shift-ppc-2.diff +Patch77: amd-SSE5-shift.diff +Patch78: amd-cunroll-1.diff +Patch79: amd-cunroll-2.diff # Patches for Intel features Patch80: intel303993-aes.diff # Patches for IBM features @@ -102,6 +116,9 @@ Patch96: pr36745.diff Patch97: pr36822.diff Patch98: ibm-mpower4.diff +Patch99: ibm-vector-keyword-1 +Patch100: ibm-vector-keyword-2 +Patch101: ibm-vector-keyword-3 # LIBJAVA-DELETE-BEGIN %description @@ -154,6 +171,8 @@ %patch30 %patch31 %patch39 +%patch40 +%patch41 %patch51 %patch55 %patch57 @@ -164,6 +183,11 @@ %patch72 %patch73 %patch74 -p1 +%patch75 +%patch76 +%patch77 +%patch78 +%patch79 %patch80 %patch90 %patch91 @@ -174,6 +198,9 @@ %patch96 %patch97 #%patch98 +%patch99 +%patch100 +%patch101 %build # Avoid rebuilding of generated files @@ -340,7 +367,6 @@ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "powerpc64" - --with-cpu=default64 \ --enable-secureplt \ --with-long-double-128 \ %endif @@ -375,6 +401,16 @@ %defattr(-,root,root) %{_prefix} %changelog +* Tue Aug 05 2008 rguenther(a)suse.de +- Update to gcc-4_3-branch head (r138797). +- Add patches for context sensitive vector keyword support (IBM). +- Add patch for PR36613. +* Fri Jul 25 2008 rguenther(a)suse.de +- Update to gcc-4_3-branch head (r138144). +- Add patches for early complete loop unrolling. +* Mon Jul 21 2008 rguenther(a)suse.de +- Add patches to support SSE5 vectorized shift instructions. +- Add patch for PR36765. * Tue Jul 15 2008 rguenther(a)suse.de - Update to gcc-4_3-branch head (r137837). - Make it build on SLES9. ++++++ cross-spu-gcc-static.spec ++++++ --- /var/tmp/diff_new_pack.xT1721/_old 2008-08-08 17:26:46.000000000 +0200 +++ /var/tmp/diff_new_pack.xT1721/_new 2008-08-08 17:26:46.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package cross-spu-gcc-static (Version 4.3.2_20080715) +# spec file for package cross-spu-gcc-static (Version 4.3.2_20080806) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -14,7 +21,6 @@ # # spec file for package gcc (Version 4.0.1) # -# Copyright (c) 2005 SUSE Linux AG, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -55,7 +61,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ License: GPL v2 or later -Version: 4.3.2_20080715 +Version: 4.3.2_20080806 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -87,6 +93,8 @@ Patch30: Wunprototyped-calls.diff Patch31: pr27799.diff Patch39: pr36343.diff +Patch40: pr36765.diff +Patch41: pr36613.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -100,6 +108,11 @@ Patch72: pr34043-3.diff Patch73: pr34043-4.diff Patch74: pr34043-5.diff +Patch75: amd-SSE5-shift-ppc-1.diff +Patch76: amd-SSE5-shift-ppc-2.diff +Patch77: amd-SSE5-shift.diff +Patch78: amd-cunroll-1.diff +Patch79: amd-cunroll-2.diff # Patches for Intel features Patch80: intel303993-aes.diff # Patches for IBM features @@ -112,6 +125,9 @@ Patch96: pr36745.diff Patch97: pr36822.diff Patch98: ibm-mpower4.diff +Patch99: ibm-vector-keyword-1 +Patch100: ibm-vector-keyword-2 +Patch101: ibm-vector-keyword-3 # LIBJAVA-DELETE-BEGIN %description @@ -164,6 +180,8 @@ %patch30 %patch31 %patch39 +%patch40 +%patch41 %patch51 %patch55 %patch57 @@ -174,6 +192,11 @@ %patch72 %patch73 %patch74 -p1 +%patch75 +%patch76 +%patch77 +%patch78 +%patch79 %patch80 %patch90 %patch91 @@ -184,6 +207,9 @@ %patch96 %patch97 #%patch98 +%patch99 +%patch100 +%patch101 %build # Avoid rebuilding of generated files @@ -350,7 +376,6 @@ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "powerpc64" - --with-cpu=default64 \ --enable-secureplt \ --with-long-double-128 \ %endif @@ -385,6 +410,16 @@ %defattr(-,root,root) %{_prefix} %changelog +* Tue Aug 05 2008 rguenther(a)suse.de +- Update to gcc-4_3-branch head (r138797). +- Add patches for context sensitive vector keyword support (IBM). +- Add patch for PR36613. +* Fri Jul 25 2008 rguenther(a)suse.de +- Update to gcc-4_3-branch head (r138144). +- Add patches for early complete loop unrolling. +* Mon Jul 21 2008 rguenther(a)suse.de +- Add patches to support SSE5 vectorized shift instructions. +- Add patch for PR36765. * Tue Jul 15 2008 rguenther(a)suse.de - Update to gcc-4_3-branch head (r137837). - Make it build on SLES9. ++++++ cross-x86_64-gcc-icecream-backend.spec ++++++ --- /var/tmp/diff_new_pack.xT1721/_old 2008-08-08 17:26:46.000000000 +0200 +++ /var/tmp/diff_new_pack.xT1721/_new 2008-08-08 17:26:46.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package cross-x86_64-gcc-icecream-backend (Version 4.3.2_20080715) +# spec file for package cross-x86_64-gcc-icecream-backend (Version 4.3.2_20080806) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -34,7 +41,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ License: BSD 3-Clause; GPL v2 or later; LGPL v2.1 or later; X11/MIT -Version: 4.3.2_20080715 +Version: 4.3.2_20080806 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -66,6 +73,8 @@ Patch30: Wunprototyped-calls.diff Patch31: pr27799.diff Patch39: pr36343.diff +Patch40: pr36765.diff +Patch41: pr36613.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -79,6 +88,11 @@ Patch72: pr34043-3.diff Patch73: pr34043-4.diff Patch74: pr34043-5.diff +Patch75: amd-SSE5-shift-ppc-1.diff +Patch76: amd-SSE5-shift-ppc-2.diff +Patch77: amd-SSE5-shift.diff +Patch78: amd-cunroll-1.diff +Patch79: amd-cunroll-2.diff # Patches for Intel features Patch80: intel303993-aes.diff # Patches for IBM features @@ -91,6 +105,9 @@ Patch96: pr36745.diff Patch97: pr36822.diff Patch98: ibm-mpower4.diff +Patch99: ibm-vector-keyword-1 +Patch100: ibm-vector-keyword-2 +Patch101: ibm-vector-keyword-3 # LIBJAVA-DELETE-BEGIN %description @@ -151,6 +168,8 @@ %patch30 %patch31 %patch39 +%patch40 +%patch41 %patch51 %patch55 %patch57 @@ -161,6 +180,11 @@ %patch72 %patch73 %patch74 -p1 +%patch75 +%patch76 +%patch77 +%patch78 +%patch79 %patch80 %patch90 %patch91 @@ -171,6 +195,9 @@ %patch96 %patch97 #%patch98 +%patch99 +%patch100 +%patch101 %build # Avoid rebuilding of generated files @@ -337,7 +364,6 @@ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "powerpc64" - --with-cpu=default64 \ --enable-secureplt \ --with-long-double-128 \ %endif @@ -410,6 +436,16 @@ /usr/share/icecream-envs %changelog +* Tue Aug 05 2008 rguenther(a)suse.de +- Update to gcc-4_3-branch head (r138797). +- Add patches for context sensitive vector keyword support (IBM). +- Add patch for PR36613. +* Fri Jul 25 2008 rguenther(a)suse.de +- Update to gcc-4_3-branch head (r138144). +- Add patches for early complete loop unrolling. +* Mon Jul 21 2008 rguenther(a)suse.de +- Add patches to support SSE5 vectorized shift instructions. +- Add patch for PR36765. * Tue Jul 15 2008 rguenther(a)suse.de - Update to gcc-4_3-branch head (r137837). - Make it build on SLES9. ++++++ gcc43.spec ++++++ --- /var/tmp/diff_new_pack.xT1721/_old 2008-08-08 17:26:46.000000000 +0200 +++ /var/tmp/diff_new_pack.xT1721/_new 2008-08-08 17:26:46.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package gcc43 (Version 4.3.2_20080715) +# spec file for package gcc43 (Version 4.3.2_20080806) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -107,7 +114,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ License: GPL v3 or later -Version: 4.3.2_20080715 +Version: 4.3.2_20080806 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -150,6 +157,8 @@ Patch30: Wunprototyped-calls.diff Patch31: pr27799.diff Patch39: pr36343.diff +Patch40: pr36765.diff +Patch41: pr36613.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -163,6 +172,11 @@ Patch72: pr34043-3.diff Patch73: pr34043-4.diff Patch74: pr34043-5.diff +Patch75: amd-SSE5-shift-ppc-1.diff +Patch76: amd-SSE5-shift-ppc-2.diff +Patch77: amd-SSE5-shift.diff +Patch78: amd-cunroll-1.diff +Patch79: amd-cunroll-2.diff # Patches for Intel features Patch80: intel303993-aes.diff # Patches for IBM features @@ -175,6 +189,9 @@ Patch96: pr36745.diff Patch97: pr36822.diff Patch98: ibm-mpower4.diff +Patch99: ibm-vector-keyword-1 +Patch100: ibm-vector-keyword-2 +Patch101: ibm-vector-keyword-3 # LIBJAVA-DELETE-BEGIN %description @@ -1328,6 +1345,8 @@ %patch30 %patch31 %patch39 +%patch40 +%patch41 %patch51 %patch55 %patch57 @@ -1338,6 +1357,11 @@ %patch72 %patch73 %patch74 -p1 +%patch75 +%patch76 +%patch77 +%patch78 +%patch79 %patch80 %patch90 %patch91 @@ -1348,6 +1372,9 @@ %patch96 %patch97 #%patch98 +%patch99 +%patch100 +%patch101 %build # Avoid rebuilding of generated files @@ -1514,7 +1541,6 @@ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "powerpc64" - --with-cpu=default64 \ --enable-secureplt \ --with-long-double-128 \ %endif @@ -1548,6 +1574,8 @@ mv %{GCCDIST}/libstdc++-v3/testsuite/libstdc++.log %{GCCDIST}/libstdc++-v3/testsuite/libstdc++-abi.log mv %{GCCDIST}/libstdc++-v3/testsuite/libstdc++.sum %{GCCDIST}/libstdc++-v3/testsuite/libstdc++-abi.sum make -k check $PARALLEL || true +mkdir ../testresults +../contrib/test_summary > ../testresults/test_summary.txt %endif %install @@ -1738,7 +1766,6 @@ mv $l.new $l done %if %{run_tests} -mkdir ../testresults cp `find . -name "*.sum"` ../testresults/ cp `find . -name "*.log" \! -name "config.log" |grep -v 'acats/tests' ` ../testresults/ chmod 644 ../testresults/* @@ -2355,11 +2382,22 @@ %files -n gcc43-testresults %defattr(-,root,root) +%doc testresults/test_summary.txt %doc testresults/*.sum %doc testresults/*.log %endif %changelog +* Tue Aug 05 2008 rguenther(a)suse.de +- Update to gcc-4_3-branch head (r138797). +- Add patches for context sensitive vector keyword support (IBM). +- Add patch for PR36613. +* Fri Jul 25 2008 rguenther(a)suse.de +- Update to gcc-4_3-branch head (r138144). +- Add patches for early complete loop unrolling. +* Mon Jul 21 2008 rguenther(a)suse.de +- Add patches to support SSE5 vectorized shift instructions. +- Add patch for PR36765. * Tue Jul 15 2008 rguenther(a)suse.de - Update to gcc-4_3-branch head (r137837). - Make it build on SLES9. ++++++ libgcj43.spec ++++++ --- /var/tmp/diff_new_pack.xT1721/_old 2008-08-08 17:26:46.000000000 +0200 +++ /var/tmp/diff_new_pack.xT1721/_new 2008-08-08 17:26:46.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package libgcj43 (Version 4.3.2_20080715) +# spec file for package libgcj43 (Version 4.3.2_20080806) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -16,7 +23,6 @@ # # spec file for package gcc (Version 4.3.x) # -# Copyright (c) 2005 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -119,7 +125,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ License: GPL v2 or later; LGPL v2.1 or later -Version: 4.3.2_20080715 +Version: 4.3.2_20080806 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -162,6 +168,8 @@ Patch30: Wunprototyped-calls.diff Patch31: pr27799.diff Patch39: pr36343.diff +Patch40: pr36765.diff +Patch41: pr36613.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -175,6 +183,11 @@ Patch72: pr34043-3.diff Patch73: pr34043-4.diff Patch74: pr34043-5.diff +Patch75: amd-SSE5-shift-ppc-1.diff +Patch76: amd-SSE5-shift-ppc-2.diff +Patch77: amd-SSE5-shift.diff +Patch78: amd-cunroll-1.diff +Patch79: amd-cunroll-2.diff # Patches for Intel features Patch80: intel303993-aes.diff # Patches for IBM features @@ -187,6 +200,9 @@ Patch96: pr36745.diff Patch97: pr36822.diff Patch98: ibm-mpower4.diff +Patch99: ibm-vector-keyword-1 +Patch100: ibm-vector-keyword-2 +Patch101: ibm-vector-keyword-3 Summary: Java Runtime Library for gcc Group: System/Libraries %define gcj_sover 9 @@ -567,6 +583,8 @@ %patch30 %patch31 %patch39 +%patch40 +%patch41 %patch51 %patch55 %patch57 @@ -577,6 +595,11 @@ %patch72 %patch73 %patch74 -p1 +%patch75 +%patch76 +%patch77 +%patch78 +%patch79 %patch80 %patch90 %patch91 @@ -587,6 +610,9 @@ %patch96 %patch97 #%patch98 +%patch99 +%patch100 +%patch101 %build # Avoid rebuilding of generated files @@ -753,7 +779,6 @@ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "powerpc64" - --with-cpu=default64 \ --enable-secureplt \ --with-long-double-128 \ %endif @@ -787,6 +812,8 @@ mv %{GCCDIST}/libstdc++-v3/testsuite/libstdc++.log %{GCCDIST}/libstdc++-v3/testsuite/libstdc++-abi.log mv %{GCCDIST}/libstdc++-v3/testsuite/libstdc++.sum %{GCCDIST}/libstdc++-v3/testsuite/libstdc++-abi.sum make -k check $PARALLEL || true +mkdir ../testresults +../contrib/test_summary > ../testresults/test_summary.txt %endif %install @@ -911,7 +938,6 @@ mv $l.new $l done %if %{run_tests} -mkdir ../testresults cp `find . -name "*.sum"` ../testresults/ cp `find . -name "*.log" \! -name "config.log" |grep -v 'acats/tests' ` ../testresults/ chmod 644 ../testresults/* @@ -1168,11 +1194,22 @@ %files -n gcc43-testresults %defattr(-,root,root) +%doc testresults/test_summary.txt %doc testresults/*.sum %doc testresults/*.log %endif %changelog +* Tue Aug 05 2008 rguenther(a)suse.de +- Update to gcc-4_3-branch head (r138797). +- Add patches for context sensitive vector keyword support (IBM). +- Add patch for PR36613. +* Fri Jul 25 2008 rguenther(a)suse.de +- Update to gcc-4_3-branch head (r138144). +- Add patches for early complete loop unrolling. +* Mon Jul 21 2008 rguenther(a)suse.de +- Add patches to support SSE5 vectorized shift instructions. +- Add patch for PR36765. * Tue Jul 15 2008 rguenther(a)suse.de - Update to gcc-4_3-branch head (r137837). - Make it build on SLES9. ++++++ amd-cunroll-1.diff ++++++ ++++ 766 lines (skipped) ++++++ amd-cunroll-2.diff ++++++ 2008-04-29 Richard Guenther <rguenther(a)suse.de> PR tree-optimization/36078 * tree-ssa-loop-ivcanon.c (tree_unroll_loops_completely): Update virtual SSA form after cleaning up the CFG. * gfortran.fortran-torture/compile/pr36078.f90: New testcase. Index: gcc/testsuite/gfortran.fortran-torture/compile/pr36078.f90 =================================================================== *** gcc/testsuite/gfortran.fortran-torture/compile/pr36078.f90 (revision 0) --- gcc/testsuite/gfortran.fortran-torture/compile/pr36078.f90 (revision 0) *************** *** 0 **** --- 1,22 ---- + subroutine foo(func,p,eval) + real(kind=kind(1.0d0)), dimension(3,0:4,0:4,0:4) :: p + logical(kind=kind(.true.)), dimension(5,5,5) :: eval + interface + subroutine func(values,pt) + real(kind=kind(1.0d0)), dimension(:), intent(out) :: values + real(kind=kind(1.0d0)), dimension(:,:), intent(in) :: pt + end subroutine + end interface + real(kind=kind(1.0d0)), dimension(125,3) :: pt + integer(kind=kind(1)) :: n_pt + + n_pt = 1 + pt(1:n_pt,:) = & + reshape( & + pack( & + transpose(reshape(p,(/3,125/))), & + spread(reshape(eval,(/125/)),dim=2,ncopies=3)), & + (/n_pt,3/)) + + end subroutine + end Index: gcc/tree-ssa-loop-ivcanon.c =================================================================== *** gcc/tree-ssa-loop-ivcanon.c (revision 134791) --- gcc/tree-ssa-loop-ivcanon.c (working copy) *************** tree_unroll_loops_completely (bool may_i *** 366,372 **** /* This will take care of removing completely unrolled loops from the loop structures so we can continue unrolling now innermost loops. */ ! cleanup_tree_cfg (); /* Clean up the information about numbers of iterations, since complete unrolling might have invalidated it. */ --- 366,373 ---- /* This will take care of removing completely unrolled loops from the loop structures so we can continue unrolling now innermost loops. */ ! if (cleanup_tree_cfg ()) ! update_ssa (TODO_update_ssa_only_virtuals); /* Clean up the information about numbers of iterations, since complete unrolling might have invalidated it. */ ++++++ amd-SSE5-shift.diff ++++++ ++++ 1351 lines (skipped) ++++ between gcc43/amd-SSE5-shift.diff ++++ and /mounts/work_src_done/STABLE/gcc43/amd-SSE5-shift.diff ++++++ amd-SSE5-shift-ppc-1.diff ++++++ 2008-03-09 Ira Rosen <irar(a)il.ibm.com> * config/rs6000/rs6000.c (builtin_description): Rename vector left shift operations. * config/rs6000/altivec.md (UNSPEC_VSL): Remove. (altivec_vsl<VI_char>): Rename to ... (ashl<mode>3): ... new name. (mulv4sf3, mulv4si3, negv4sf2): Replace gen_altivec_vslw with gen_ashlv4si3. (absv4sf2): Convert to use ashift:V4SI instead of UNSPEC_VSL. Index: gcc/config/rs6000/rs6000.c =================================================================== --- gcc/config/rs6000/rs6000.c (revision 133050) +++ gcc/config/rs6000/rs6000.c (revision 133051) @@ -7090,9 +7090,9 @@ static struct builtin_description bdesc_ { MASK_ALTIVEC, CODE_FOR_altivec_vrlb, "__builtin_altivec_vrlb", ALTIVEC_BUILTIN_VRLB }, { MASK_ALTIVEC, CODE_FOR_altivec_vrlh, "__builtin_altivec_vrlh", ALTIVEC_BUILTIN_VRLH }, { MASK_ALTIVEC, CODE_FOR_altivec_vrlw, "__builtin_altivec_vrlw", ALTIVEC_BUILTIN_VRLW }, - { MASK_ALTIVEC, CODE_FOR_altivec_vslb, "__builtin_altivec_vslb", ALTIVEC_BUILTIN_VSLB }, - { MASK_ALTIVEC, CODE_FOR_altivec_vslh, "__builtin_altivec_vslh", ALTIVEC_BUILTIN_VSLH }, - { MASK_ALTIVEC, CODE_FOR_altivec_vslw, "__builtin_altivec_vslw", ALTIVEC_BUILTIN_VSLW }, + { MASK_ALTIVEC, CODE_FOR_ashlv16qi3, "__builtin_altivec_vslb", ALTIVEC_BUILTIN_VSLB }, + { MASK_ALTIVEC, CODE_FOR_ashlv8hi3, "__builtin_altivec_vslh", ALTIVEC_BUILTIN_VSLH }, + { MASK_ALTIVEC, CODE_FOR_ashlv4si3, "__builtin_altivec_vslw", ALTIVEC_BUILTIN_VSLW }, { MASK_ALTIVEC, CODE_FOR_altivec_vsl, "__builtin_altivec_vsl", ALTIVEC_BUILTIN_VSL }, { MASK_ALTIVEC, CODE_FOR_altivec_vslo, "__builtin_altivec_vslo", ALTIVEC_BUILTIN_VSLO }, { MASK_ALTIVEC, CODE_FOR_altivec_vspltb, "__builtin_altivec_vspltb", ALTIVEC_BUILTIN_VSPLTB }, Index: gcc/config/rs6000/altivec.md =================================================================== --- gcc/config/rs6000/altivec.md (revision 133050) +++ gcc/config/rs6000/altivec.md (revision 133051) @@ -64,7 +64,6 @@ (define_constants (UNSPEC_VPKUWUS 102) (UNSPEC_VPKSWUS 103) (UNSPEC_VRL 104) - (UNSPEC_VSL 107) (UNSPEC_VSLV4SI 110) (UNSPEC_VSLO 111) (UNSPEC_VSR 118) @@ -576,7 +575,7 @@ (define_expand "mulv4sf3" /* Generate [-0.0, -0.0, -0.0, -0.0]. */ neg0 = gen_reg_rtx (V4SImode); emit_insn (gen_altivec_vspltisw (neg0, constm1_rtx)); - emit_insn (gen_altivec_vslw (neg0, neg0, neg0)); + emit_insn (gen_ashlv4si3 (neg0, neg0, neg0)); /* Use the multiply-add. */ emit_insn (gen_altivec_vmaddfp (operands[0], operands[1], operands[2], @@ -635,7 +634,7 @@ (define_expand "mulv4si3" high_product = gen_reg_rtx (V4SImode); emit_insn (gen_altivec_vmsumuhm (high_product, one, small_swap, zero)); - emit_insn (gen_altivec_vslw (high_product, high_product, sixteen)); + emit_insn (gen_ashlv4si3 (high_product, high_product, sixteen)); emit_insn (gen_addv4si3 (operands[0], high_product, low_product)); @@ -1221,15 +1220,6 @@ (define_insn "altivec_vrl<VI_char>" "vrl<VI_char> %0,%1,%2" [(set_attr "type" "vecsimple")]) -(define_insn "altivec_vsl<VI_char>" - [(set (match_operand:VI 0 "register_operand" "=v") - (unspec:VI [(match_operand:VI 1 "register_operand" "v") - (match_operand:VI 2 "register_operand" "v")] - UNSPEC_VSL))] - "TARGET_ALTIVEC" - "vsl<VI_char> %0,%1,%2" - [(set_attr "type" "vecsimple")]) - (define_insn "altivec_vsl" [(set (match_operand:V4SI 0 "register_operand" "=v") (unspec:V4SI [(match_operand:V4SI 1 "register_operand" "v") @@ -1248,6 +1238,14 @@ (define_insn "altivec_vslo" "vslo %0,%1,%2" [(set_attr "type" "vecperm")]) +(define_insn "ashl<mode>3" + [(set (match_operand:VI 0 "register_operand" "=v") + (ashift:VI (match_operand:VI 1 "register_operand" "v") + (match_operand:VI 2 "register_operand" "v") ))] + "TARGET_ALTIVEC" + "vsl<VI_char> %0,%1,%2" + [(set_attr "type" "vecsimple")]) + (define_insn "lshr<mode>3" [(set (match_operand:VI 0 "register_operand" "=v") (lshiftrt:VI (match_operand:VI 1 "register_operand" "v") @@ -2039,7 +2037,7 @@ (define_expand "absv4sf2" [(set (match_dup 2) (vec_duplicate:V4SI (const_int -1))) (set (match_dup 3) - (unspec:V4SI [(match_dup 2) (match_dup 2)] UNSPEC_VSL)) + (ashift:V4SI (match_dup 2) (match_dup 2))) (set (match_operand:V4SF 0 "register_operand" "=v") (and:V4SF (not:V4SF (subreg:V4SF (match_dup 3) 0)) (match_operand:V4SF 1 "register_operand" "v")))] @@ -2642,7 +2640,7 @@ (define_expand "negv4sf2" /* Generate [-0.0, -0.0, -0.0, -0.0]. */ neg0 = gen_reg_rtx (V4SImode); emit_insn (gen_altivec_vspltisw (neg0, constm1_rtx)); - emit_insn (gen_altivec_vslw (neg0, neg0, neg0)); + emit_insn (gen_ashlv4si3 (neg0, neg0, neg0)); /* XOR */ emit_insn (gen_xorv4sf3 (operands[0], ++++++ amd-SSE5-shift-ppc-2.diff ++++++ 2008-05-14 Michael Meissner <michael.meissner(a)amd.com> Paolo Bonzini <bonzini at gnu dot org> * config/rs6000/rs6000.c (bdesc_2arg): Change the names of vector shift patterns. * config/rs6000/altivec.md (vashl<mode>3): Rename from ashl<mode>3. (vlshr<mode>3): Rename from vlshr<mode>3. (vashr<mode>3): Rename from vashr<mode>3. (mulv4sf3): Change the names of vector shift patterns. (mulv4si3): Ditto. (negv4sf2): Ditt. * config/spu/spu.c (spu_initialize_trampoline): Rename vector shift insns. * config/spu/spu-builtins.def (SI_SHLH): Rename vector shift insns. (SI_SHLHI): Ditto. (SI_SHL): Ditto. (SI_SHLI): Ditto. (SI_ROTH): Ditto. (SI_ROTHI): Ditto. (SI_ROT): Ditto. (SI_ROTI): Ditto. (SPU_RL_0): Ditto. (SPU_RL_1): Ditto. (SPU_RL_2): Ditto. (SPU_RL_3): Ditto. (SPU_RL_4): Ditto. (SPU_RL_5): Ditto. (SPU_RL_6): Ditto. (SPU_RL_7): Ditto. (SPU_SL_0): Ditto. (SPU_SL_1): Ditto. (SPU_SL_2): Ditto. (SPU_SL_3): Ditto. (SPU_SL_4): Ditto. (SPU_SL_5): Ditto. (SPU_SL_6): Ditto. (SPU_SL_7): Ditto. * config/spu/spu.md (v): New iterator macro to add v for vector types. (floatunssidf2_internal): Change vector/vector shift names. (floatunsdidf2_internal): Ditto. (mulv8hi3): Ditto. (ashrdi3): Ditto. (ashrti3): Ditto. (cgt_df): Ditto. (cgt_v2df): Ditto. (dftsv): Ditto. (vashl<mode>3): Rename from ashl<mode>3. (vashr<mode>3): Rename from ashr<mode>3. (vlshr<mode>3): Rename from lshr<mode>3. (vrotl<mode>3): Rename from rotl<mode>3. Index: gcc/config/spu/spu.c =================================================================== --- gcc/config/spu/spu.c (revision 135303) +++ gcc/config/spu/spu.c (revision 135304) @@ -4799,7 +4799,7 @@ spu_initialize_trampoline (rtx tramp, rt insnc = force_reg (V4SImode, array_to_constant (V4SImode, insna)); emit_insn (gen_shufb (shuf, fnaddr, cxt, shufc)); - emit_insn (gen_rotlv4si3 (rotl, shuf, spu_const (V4SImode, 7))); + emit_insn (gen_vrotlv4si3 (rotl, shuf, spu_const (V4SImode, 7))); emit_insn (gen_movv4si (mask, spu_const (V4SImode, 0xffff << 7))); emit_insn (gen_selb (insn, insnc, rotl, mask)); Index: gcc/config/spu/spu-builtins.def =================================================================== --- gcc/config/spu/spu-builtins.def (revision 135303) +++ gcc/config/spu/spu-builtins.def (revision 135304) @@ -107,19 +107,19 @@ DEF_BUILTIN (SI_NOR, CODE_FOR_no DEF_BUILTIN (SI_EQV, CODE_FOR_eqv_v16qi, "si_eqv", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD)) DEF_BUILTIN (SI_SELB, CODE_FOR_selb, "si_selb", B_INSN, _A4(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD)) DEF_BUILTIN (SI_SHUFB, CODE_FOR_shufb, "si_shufb", B_INSN, _A4(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD)) -DEF_BUILTIN (SI_SHLH, CODE_FOR_ashlv8hi3, "si_shlh", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD)) -DEF_BUILTIN (SI_SHLHI, CODE_FOR_ashlv8hi3, "si_shlhi", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_7)) -DEF_BUILTIN (SI_SHL, CODE_FOR_ashlv4si3, "si_shl", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD)) -DEF_BUILTIN (SI_SHLI, CODE_FOR_ashlv4si3, "si_shli", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_7)) +DEF_BUILTIN (SI_SHLH, CODE_FOR_vashlv8hi3, "si_shlh", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD)) +DEF_BUILTIN (SI_SHLHI, CODE_FOR_vashlv8hi3, "si_shlhi", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_7)) +DEF_BUILTIN (SI_SHL, CODE_FOR_vashlv4si3, "si_shl", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD)) +DEF_BUILTIN (SI_SHLI, CODE_FOR_vashlv4si3, "si_shli", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_7)) DEF_BUILTIN (SI_SHLQBI, CODE_FOR_shlqbi_ti, "si_shlqbi", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD)) DEF_BUILTIN (SI_SHLQBII, CODE_FOR_shlqbi_ti, "si_shlqbii", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_7)) DEF_BUILTIN (SI_SHLQBY, CODE_FOR_shlqby_ti, "si_shlqby", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD)) DEF_BUILTIN (SI_SHLQBYI, CODE_FOR_shlqby_ti, "si_shlqbyi", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_7)) DEF_BUILTIN (SI_SHLQBYBI, CODE_FOR_shlqbybi_ti, "si_shlqbybi", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD)) -DEF_BUILTIN (SI_ROTH, CODE_FOR_rotlv8hi3, "si_roth", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD)) -DEF_BUILTIN (SI_ROTHI, CODE_FOR_rotlv8hi3, "si_rothi", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_7)) -DEF_BUILTIN (SI_ROT, CODE_FOR_rotlv4si3, "si_rot", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD)) -DEF_BUILTIN (SI_ROTI, CODE_FOR_rotlv4si3, "si_roti", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_7)) +DEF_BUILTIN (SI_ROTH, CODE_FOR_vrotlv8hi3, "si_roth", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD)) +DEF_BUILTIN (SI_ROTHI, CODE_FOR_vrotlv8hi3, "si_rothi", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_7)) +DEF_BUILTIN (SI_ROT, CODE_FOR_vrotlv4si3, "si_rot", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD)) +DEF_BUILTIN (SI_ROTI, CODE_FOR_vrotlv4si3, "si_roti", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_7)) DEF_BUILTIN (SI_ROTQBY, CODE_FOR_rotqby_ti, "si_rotqby", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD)) DEF_BUILTIN (SI_ROTQBYI, CODE_FOR_rotqby_ti, "si_rotqbyi", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_7)) DEF_BUILTIN (SI_ROTQBYBI, CODE_FOR_rotqbybi_ti, "si_rotqbybi", B_INSN, _A3(SPU_BTI_QUADWORD, SPU_BTI_QUADWORD, SPU_BTI_QUADWORD)) @@ -536,14 +536,14 @@ DEF_BUILTIN (SPU_XOR_13, CODE_ DEF_BUILTIN (SPU_XOR_14, CODE_FOR_xorv4si3, "spu_xor_14", B_INTERNAL, _A3(SPU_BTI_UV4SI, SPU_BTI_UV4SI, SPU_BTI_UINTSI)) DEF_BUILTIN (SPU_XOR_15, CODE_FOR_xorv4si3, "spu_xor_15", B_INTERNAL, _A3(SPU_BTI_V4SI, SPU_BTI_V4SI, SPU_BTI_INTSI)) DEF_BUILTIN (SPU_RL, CODE_FOR_nothing, "spu_rl", B_OVERLOAD, _A1(SPU_BTI_VOID)) -DEF_BUILTIN (SPU_RL_0, CODE_FOR_rotlv8hi3, "spu_rl_0", B_INTERNAL, _A3(SPU_BTI_UV8HI, SPU_BTI_UV8HI, SPU_BTI_V8HI)) -DEF_BUILTIN (SPU_RL_1, CODE_FOR_rotlv8hi3, "spu_rl_1", B_INTERNAL, _A3(SPU_BTI_V8HI, SPU_BTI_V8HI, SPU_BTI_V8HI)) -DEF_BUILTIN (SPU_RL_2, CODE_FOR_rotlv4si3, "spu_rl_2", B_INTERNAL, _A3(SPU_BTI_UV4SI, SPU_BTI_UV4SI, SPU_BTI_V4SI)) -DEF_BUILTIN (SPU_RL_3, CODE_FOR_rotlv4si3, "spu_rl_3", B_INTERNAL, _A3(SPU_BTI_V4SI, SPU_BTI_V4SI, SPU_BTI_V4SI)) -DEF_BUILTIN (SPU_RL_4, CODE_FOR_rotlv8hi3, "spu_rl_4", B_INTERNAL, _A3(SPU_BTI_UV8HI, SPU_BTI_UV8HI, SPU_BTI_INTHI)) -DEF_BUILTIN (SPU_RL_5, CODE_FOR_rotlv8hi3, "spu_rl_5", B_INTERNAL, _A3(SPU_BTI_V8HI, SPU_BTI_V8HI, SPU_BTI_INTHI)) -DEF_BUILTIN (SPU_RL_6, CODE_FOR_rotlv4si3, "spu_rl_6", B_INTERNAL, _A3(SPU_BTI_UV4SI, SPU_BTI_UV4SI, SPU_BTI_INTSI)) -DEF_BUILTIN (SPU_RL_7, CODE_FOR_rotlv4si3, "spu_rl_7", B_INTERNAL, _A3(SPU_BTI_V4SI, SPU_BTI_V4SI, SPU_BTI_INTSI)) +DEF_BUILTIN (SPU_RL_0, CODE_FOR_vrotlv8hi3, "spu_rl_0", B_INTERNAL, _A3(SPU_BTI_UV8HI, SPU_BTI_UV8HI, SPU_BTI_V8HI)) +DEF_BUILTIN (SPU_RL_1, CODE_FOR_vrotlv8hi3, "spu_rl_1", B_INTERNAL, _A3(SPU_BTI_V8HI, SPU_BTI_V8HI, SPU_BTI_V8HI)) +DEF_BUILTIN (SPU_RL_2, CODE_FOR_vrotlv4si3, "spu_rl_2", B_INTERNAL, _A3(SPU_BTI_UV4SI, SPU_BTI_UV4SI, SPU_BTI_V4SI)) +DEF_BUILTIN (SPU_RL_3, CODE_FOR_vrotlv4si3, "spu_rl_3", B_INTERNAL, _A3(SPU_BTI_V4SI, SPU_BTI_V4SI, SPU_BTI_V4SI)) +DEF_BUILTIN (SPU_RL_4, CODE_FOR_vrotlv8hi3, "spu_rl_4", B_INTERNAL, _A3(SPU_BTI_UV8HI, SPU_BTI_UV8HI, SPU_BTI_INTHI)) +DEF_BUILTIN (SPU_RL_5, CODE_FOR_vrotlv8hi3, "spu_rl_5", B_INTERNAL, _A3(SPU_BTI_V8HI, SPU_BTI_V8HI, SPU_BTI_INTHI)) +DEF_BUILTIN (SPU_RL_6, CODE_FOR_vrotlv4si3, "spu_rl_6", B_INTERNAL, _A3(SPU_BTI_UV4SI, SPU_BTI_UV4SI, SPU_BTI_INTSI)) +DEF_BUILTIN (SPU_RL_7, CODE_FOR_vrotlv4si3, "spu_rl_7", B_INTERNAL, _A3(SPU_BTI_V4SI, SPU_BTI_V4SI, SPU_BTI_INTSI)) DEF_BUILTIN (SPU_RLQW, CODE_FOR_nothing, "spu_rlqw", B_OVERLOAD, _A1(SPU_BTI_VOID)) DEF_BUILTIN (SPU_RLQW_0, CODE_FOR_rotqbi_ti, "spu_rlqw_0", B_INTERNAL, _A3(SPU_BTI_UV16QI, SPU_BTI_UV16QI, SPU_BTI_INTSI)) DEF_BUILTIN (SPU_RLQW_1, CODE_FOR_rotqbi_ti, "spu_rlqw_1", B_INTERNAL, _A3(SPU_BTI_V16QI, SPU_BTI_V16QI, SPU_BTI_INTSI)) @@ -629,14 +629,14 @@ DEF_BUILTIN (SPU_RLMASKQWBYTEBC_7, CODE_ DEF_BUILTIN (SPU_RLMASKQWBYTEBC_8, CODE_FOR_rotqmbybi_ti, "spu_rlmaskqwbytebc_8", B_INTERNAL, _A3(SPU_BTI_V4SF, SPU_BTI_V4SF, SPU_BTI_INTSI)) DEF_BUILTIN (SPU_RLMASKQWBYTEBC_9, CODE_FOR_rotqmbybi_ti, "spu_rlmaskqwbytebc_9", B_INTERNAL, _A3(SPU_BTI_V2DF, SPU_BTI_V2DF, SPU_BTI_INTSI)) DEF_BUILTIN (SPU_SL, CODE_FOR_nothing, "spu_sl", B_OVERLOAD, _A1(SPU_BTI_VOID)) -DEF_BUILTIN (SPU_SL_0, CODE_FOR_ashlv8hi3, "spu_sl_0", B_INTERNAL, _A3(SPU_BTI_UV8HI, SPU_BTI_UV8HI, SPU_BTI_UV8HI)) -DEF_BUILTIN (SPU_SL_1, CODE_FOR_ashlv8hi3, "spu_sl_1", B_INTERNAL, _A3(SPU_BTI_V8HI, SPU_BTI_V8HI, SPU_BTI_UV8HI)) -DEF_BUILTIN (SPU_SL_2, CODE_FOR_ashlv4si3, "spu_sl_2", B_INTERNAL, _A3(SPU_BTI_UV4SI, SPU_BTI_UV4SI, SPU_BTI_UV4SI)) -DEF_BUILTIN (SPU_SL_3, CODE_FOR_ashlv4si3, "spu_sl_3", B_INTERNAL, _A3(SPU_BTI_V4SI, SPU_BTI_V4SI, SPU_BTI_UV4SI)) -DEF_BUILTIN (SPU_SL_4, CODE_FOR_ashlv8hi3, "spu_sl_4", B_INTERNAL, _A3(SPU_BTI_UV8HI, SPU_BTI_UV8HI, SPU_BTI_UINTSI)) -DEF_BUILTIN (SPU_SL_5, CODE_FOR_ashlv8hi3, "spu_sl_5", B_INTERNAL, _A3(SPU_BTI_V8HI, SPU_BTI_V8HI, SPU_BTI_UINTSI)) -DEF_BUILTIN (SPU_SL_6, CODE_FOR_ashlv4si3, "spu_sl_6", B_INTERNAL, _A3(SPU_BTI_UV4SI, SPU_BTI_UV4SI, SPU_BTI_UINTSI)) -DEF_BUILTIN (SPU_SL_7, CODE_FOR_ashlv4si3, "spu_sl_7", B_INTERNAL, _A3(SPU_BTI_V4SI, SPU_BTI_V4SI, SPU_BTI_UINTSI)) +DEF_BUILTIN (SPU_SL_0, CODE_FOR_vashlv8hi3, "spu_sl_0", B_INTERNAL, _A3(SPU_BTI_UV8HI, SPU_BTI_UV8HI, SPU_BTI_UV8HI)) +DEF_BUILTIN (SPU_SL_1, CODE_FOR_vashlv8hi3, "spu_sl_1", B_INTERNAL, _A3(SPU_BTI_V8HI, SPU_BTI_V8HI, SPU_BTI_UV8HI)) +DEF_BUILTIN (SPU_SL_2, CODE_FOR_vashlv4si3, "spu_sl_2", B_INTERNAL, _A3(SPU_BTI_UV4SI, SPU_BTI_UV4SI, SPU_BTI_UV4SI)) +DEF_BUILTIN (SPU_SL_3, CODE_FOR_vashlv4si3, "spu_sl_3", B_INTERNAL, _A3(SPU_BTI_V4SI, SPU_BTI_V4SI, SPU_BTI_UV4SI)) +DEF_BUILTIN (SPU_SL_4, CODE_FOR_vashlv8hi3, "spu_sl_4", B_INTERNAL, _A3(SPU_BTI_UV8HI, SPU_BTI_UV8HI, SPU_BTI_UINTSI)) +DEF_BUILTIN (SPU_SL_5, CODE_FOR_vashlv8hi3, "spu_sl_5", B_INTERNAL, _A3(SPU_BTI_V8HI, SPU_BTI_V8HI, SPU_BTI_UINTSI)) +DEF_BUILTIN (SPU_SL_6, CODE_FOR_vashlv4si3, "spu_sl_6", B_INTERNAL, _A3(SPU_BTI_UV4SI, SPU_BTI_UV4SI, SPU_BTI_UINTSI)) +DEF_BUILTIN (SPU_SL_7, CODE_FOR_vashlv4si3, "spu_sl_7", B_INTERNAL, _A3(SPU_BTI_V4SI, SPU_BTI_V4SI, SPU_BTI_UINTSI)) DEF_BUILTIN (SPU_SLQW, CODE_FOR_nothing, "spu_slqw", B_OVERLOAD, _A1(SPU_BTI_VOID)) DEF_BUILTIN (SPU_SLQW_0, CODE_FOR_shlqbi_ti, "spu_slqw_0", B_INTERNAL, _A3(SPU_BTI_V2DI, SPU_BTI_V2DI, SPU_BTI_UINTSI)) DEF_BUILTIN (SPU_SLQW_1, CODE_FOR_shlqbi_ti, "spu_slqw_1", B_INTERNAL, _A3(SPU_BTI_UV2DI, SPU_BTI_UV2DI, SPU_BTI_UINTSI)) Index: gcc/config/spu/spu.md =================================================================== --- gcc/config/spu/spu.md (revision 135303) +++ gcc/config/spu/spu.md (revision 135304) @@ -211,6 +211,9 @@ (define_mode_iterator VCMPU [V16QI V8HI V4SI]) +(define_mode_attr v [(V8HI "v") (V4SI "v") + (HI "") (SI "")]) + (define_mode_attr bh [(QI "b") (V16QI "b") (HI "h") (V8HI "h") (SI "") (V4SI "")]) @@ -727,7 +730,7 @@ (define_insn_and_split "floatunssidf2_in rtx op6_ti = gen_rtx_REG (TImode, REGNO (ops[6])); emit_insn (gen_clzv4si2 (ops[3],op1_v4si)); emit_move_insn (ops[6], spu_const (V4SImode, 1023+31)); - emit_insn (gen_ashlv4si3 (ops[4],op1_v4si,ops[3])); + emit_insn (gen_vashlv4si3 (ops[4],op1_v4si,ops[3])); emit_insn (gen_ceq_v4si (ops[5],ops[3],spu_const (V4SImode, 32))); emit_insn (gen_subv4si3 (ops[6],ops[6],ops[3])); emit_insn (gen_addv4si3 (ops[4],ops[4],ops[4])); @@ -822,7 +825,7 @@ (define_insn_and_split "floatunsdidf2_in rtx op4_df = gen_rtx_REG (DFmode, REGNO(ops[4])); rtx op5_df = gen_rtx_REG (DFmode, REGNO(ops[5])); emit_insn (gen_clzv4si2 (ops[4],op1_v4si)); - emit_insn (gen_ashlv4si3 (ops[5],op1_v4si,ops[4])); + emit_insn (gen_vashlv4si3 (ops[5],op1_v4si,ops[4])); emit_insn (gen_ceq_v4si (ops[6],ops[4],spu_const (V4SImode, 32))); emit_insn (gen_subv4si3 (ops[4],ops[3],ops[4])); emit_insn (gen_addv4si3 (ops[5],ops[5],ops[5])); @@ -1222,7 +1225,7 @@ (define_expand "mulv8hi3" emit_move_insn (mask, spu_const (V4SImode, 0x0000ffff)); emit_insn (gen_spu_mpyhh (high, operands[1], operands[2])); emit_insn (gen_spu_mpy (low, operands[1], operands[2])); - emit_insn (gen_ashlv4si3 (shift, high, spu_const(V4SImode, 16))); + emit_insn (gen_vashlv4si3 (shift, high, spu_const(V4SImode, 16))); emit_insn (gen_selb (result, shift, low, mask)); DONE; }") @@ -2100,9 +2103,9 @@ (define_insn "sumb_si" [(set_attr "type" "fxb")]) -;; ashl +;; ashl, vashl -(define_insn "ashl<mode>3" +(define_insn "<v>ashl<mode>3" [(set (match_operand:VHSI 0 "spu_reg_operand" "=r,r") (ashift:VHSI (match_operand:VHSI 1 "spu_reg_operand" "r,r") (match_operand:VHSI 2 "spu_nonmem_operand" "r,W")))] @@ -2234,9 +2237,9 @@ (define_insn "shlqby_ti" [(set_attr "type" "shuf,shuf")]) -;; lshr +;; lshr, vlshr -(define_insn_and_split "lshr<mode>3" +(define_insn_and_split "<v>lshr<mode>3" [(set (match_operand:VHSI 0 "spu_reg_operand" "=r,r") (lshiftrt:VHSI (match_operand:VHSI 1 "spu_reg_operand" "r,r") (match_operand:VHSI 2 "spu_nonmem_operand" "r,W"))) @@ -2363,9 +2366,9 @@ (define_insn "rotqmby_<mode>" [(set_attr "type" "shuf")]) -;; ashr +;; ashr, vashr -(define_insn_and_split "ashr<mode>3" +(define_insn_and_split "<v>ashr<mode>3" [(set (match_operand:VHSI 0 "spu_reg_operand" "=r,r") (ashiftrt:VHSI (match_operand:VHSI 1 "spu_reg_operand" "r,r") (match_operand:VHSI 2 "spu_nonmem_operand" "r,W"))) @@ -2430,7 +2433,7 @@ (define_insn_and_split "ashrdi3" emit_insn (gen_lshrti3 (op0, op1, GEN_INT (32))); emit_insn (gen_spu_xswd (op0d, op0v)); if (val > 32) - emit_insn (gen_ashrv4si3 (op0v, op0v, spu_const (V4SImode, val - 32))); + emit_insn (gen_vashrv4si3 (op0v, op0v, spu_const (V4SImode, val - 32))); } else { @@ -2479,7 +2482,7 @@ (define_expand "ashrti3" rtx op1_v4si = spu_gen_subreg (V4SImode, operands[1]); rtx t = gen_reg_rtx (TImode); emit_insn (gen_subsi3 (sign_shift, GEN_INT (128), force_reg (SImode, operands[2]))); - emit_insn (gen_ashrv4si3 (sign_mask_v4si, op1_v4si, spu_const (V4SImode, 31))); + emit_insn (gen_vashrv4si3 (sign_mask_v4si, op1_v4si, spu_const (V4SImode, 31))); emit_insn (gen_fsm_ti (sign_mask, sign_mask)); emit_insn (gen_ashlti3 (sign_mask, sign_mask, sign_shift)); emit_insn (gen_lshrti3 (t, operands[1], operands[2])); @@ -2496,9 +2499,9 @@ (define_insn "fsm_ti" [(set_attr "type" "shuf")]) -;; rotl +;; vrotl, rotl -(define_insn "rotl<mode>3" +(define_insn "<v>rotl<mode>3" [(set (match_operand:VHSI 0 "spu_reg_operand" "=r,r") (rotate:VHSI (match_operand:VHSI 1 "spu_reg_operand" "r,r") (match_operand:VHSI 2 "spu_nonmem_operand" "r,W")))] @@ -3046,14 +3049,14 @@ (define_expand "cgt_df" emit_insn (gen_iorv4si3 (a_nan, a_nan, b_nan)); } emit_move_insn (zero, CONST0_RTX (V4SImode)); - emit_insn (gen_ashrv4si3 (asel, ra, spu_const (V4SImode, 31))); + emit_insn (gen_vashrv4si3 (asel, ra, spu_const (V4SImode, 31))); emit_insn (gen_shufb (asel, asel, asel, hi_promote)); emit_insn (gen_bg_v4si (abor, zero, a_abs)); emit_insn (gen_shufb (abor, abor, abor, borrow_shuffle)); emit_insn (gen_sfx_v4si (abor, zero, a_abs, abor)); emit_insn (gen_selb (abor, a_abs, abor, asel)); - emit_insn (gen_ashrv4si3 (bsel, rb, spu_const (V4SImode, 31))); + emit_insn (gen_vashrv4si3 (bsel, rb, spu_const (V4SImode, 31))); emit_insn (gen_shufb (bsel, bsel, bsel, hi_promote)); emit_insn (gen_bg_v4si (bbor, zero, b_abs)); emit_insn (gen_shufb (bbor, bbor, bbor, borrow_shuffle)); @@ -3154,13 +3157,13 @@ (define_expand "cgt_v2df" emit_insn (gen_shufb (b_nan, b_nan, b_nan, hi_promote)); emit_insn (gen_iorv4si3 (a_nan, a_nan, b_nan)); emit_move_insn (zero, CONST0_RTX (V4SImode)); - emit_insn (gen_ashrv4si3 (asel, ra, spu_const (V4SImode, 31))); + emit_insn (gen_vashrv4si3 (asel, ra, spu_const (V4SImode, 31))); emit_insn (gen_shufb (asel, asel, asel, hi_promote)); emit_insn (gen_bg_v4si (abor, zero, a_abs)); emit_insn (gen_shufb (abor, abor, abor, borrow_shuffle)); emit_insn (gen_sfx_v4si (abor, zero, a_abs, abor)); emit_insn (gen_selb (abor, a_abs, abor, asel)); - emit_insn (gen_ashrv4si3 (bsel, rb, spu_const (V4SImode, 31))); + emit_insn (gen_vashrv4si3 (bsel, rb, spu_const (V4SImode, 31))); emit_insn (gen_shufb (bsel, bsel, bsel, hi_promote)); emit_insn (gen_bg_v4si (bbor, zero, b_abs)); emit_insn (gen_shufb (bbor, bbor, bbor, borrow_shuffle)); @@ -3344,7 +3347,7 @@ (define_expand "dftsv" 0x08090A0B, 0x08090A0B); emit_move_insn (hi_promote, pat); - emit_insn (gen_ashrv4si3 (sign, ra, spu_const (V4SImode, 31))); + emit_insn (gen_vashrv4si3 (sign, ra, spu_const (V4SImode, 31))); emit_insn (gen_shufb (sign, sign, sign, hi_promote)); emit_insn (gen_andv4si3 (abs, ra, sign_mask)); Index: gcc/config/rs6000/rs6000.c =================================================================== --- gcc/config/rs6000/rs6000.c (revision 135303) +++ gcc/config/rs6000/rs6000.c (revision 135304) @@ -7109,20 +7109,20 @@ static struct builtin_description bdesc_ { MASK_ALTIVEC, CODE_FOR_altivec_vrlb, "__builtin_altivec_vrlb", ALTIVEC_BUILTIN_VRLB }, { MASK_ALTIVEC, CODE_FOR_altivec_vrlh, "__builtin_altivec_vrlh", ALTIVEC_BUILTIN_VRLH }, { MASK_ALTIVEC, CODE_FOR_altivec_vrlw, "__builtin_altivec_vrlw", ALTIVEC_BUILTIN_VRLW }, - { MASK_ALTIVEC, CODE_FOR_ashlv16qi3, "__builtin_altivec_vslb", ALTIVEC_BUILTIN_VSLB }, - { MASK_ALTIVEC, CODE_FOR_ashlv8hi3, "__builtin_altivec_vslh", ALTIVEC_BUILTIN_VSLH }, - { MASK_ALTIVEC, CODE_FOR_ashlv4si3, "__builtin_altivec_vslw", ALTIVEC_BUILTIN_VSLW }, + { MASK_ALTIVEC, CODE_FOR_vashlv16qi3, "__builtin_altivec_vslb", ALTIVEC_BUILTIN_VSLB }, + { MASK_ALTIVEC, CODE_FOR_vashlv8hi3, "__builtin_altivec_vslh", ALTIVEC_BUILTIN_VSLH }, + { MASK_ALTIVEC, CODE_FOR_vashlv4si3, "__builtin_altivec_vslw", ALTIVEC_BUILTIN_VSLW }, { MASK_ALTIVEC, CODE_FOR_altivec_vsl, "__builtin_altivec_vsl", ALTIVEC_BUILTIN_VSL }, { MASK_ALTIVEC, CODE_FOR_altivec_vslo, "__builtin_altivec_vslo", ALTIVEC_BUILTIN_VSLO }, { MASK_ALTIVEC, CODE_FOR_altivec_vspltb, "__builtin_altivec_vspltb", ALTIVEC_BUILTIN_VSPLTB }, { MASK_ALTIVEC, CODE_FOR_altivec_vsplth, "__builtin_altivec_vsplth", ALTIVEC_BUILTIN_VSPLTH }, { MASK_ALTIVEC, CODE_FOR_altivec_vspltw, "__builtin_altivec_vspltw", ALTIVEC_BUILTIN_VSPLTW }, - { MASK_ALTIVEC, CODE_FOR_lshrv16qi3, "__builtin_altivec_vsrb", ALTIVEC_BUILTIN_VSRB }, - { MASK_ALTIVEC, CODE_FOR_lshrv8hi3, "__builtin_altivec_vsrh", ALTIVEC_BUILTIN_VSRH }, - { MASK_ALTIVEC, CODE_FOR_lshrv4si3, "__builtin_altivec_vsrw", ALTIVEC_BUILTIN_VSRW }, - { MASK_ALTIVEC, CODE_FOR_ashrv16qi3, "__builtin_altivec_vsrab", ALTIVEC_BUILTIN_VSRAB }, - { MASK_ALTIVEC, CODE_FOR_ashrv8hi3, "__builtin_altivec_vsrah", ALTIVEC_BUILTIN_VSRAH }, - { MASK_ALTIVEC, CODE_FOR_ashrv4si3, "__builtin_altivec_vsraw", ALTIVEC_BUILTIN_VSRAW }, + { MASK_ALTIVEC, CODE_FOR_vlshrv16qi3, "__builtin_altivec_vsrb", ALTIVEC_BUILTIN_VSRB }, + { MASK_ALTIVEC, CODE_FOR_vlshrv8hi3, "__builtin_altivec_vsrh", ALTIVEC_BUILTIN_VSRH }, + { MASK_ALTIVEC, CODE_FOR_vlshrv4si3, "__builtin_altivec_vsrw", ALTIVEC_BUILTIN_VSRW }, + { MASK_ALTIVEC, CODE_FOR_vashrv16qi3, "__builtin_altivec_vsrab", ALTIVEC_BUILTIN_VSRAB }, + { MASK_ALTIVEC, CODE_FOR_vashrv8hi3, "__builtin_altivec_vsrah", ALTIVEC_BUILTIN_VSRAH }, + { MASK_ALTIVEC, CODE_FOR_vashrv4si3, "__builtin_altivec_vsraw", ALTIVEC_BUILTIN_VSRAW }, { MASK_ALTIVEC, CODE_FOR_altivec_vsr, "__builtin_altivec_vsr", ALTIVEC_BUILTIN_VSR }, { MASK_ALTIVEC, CODE_FOR_altivec_vsro, "__builtin_altivec_vsro", ALTIVEC_BUILTIN_VSRO }, { MASK_ALTIVEC, CODE_FOR_subv16qi3, "__builtin_altivec_vsububm", ALTIVEC_BUILTIN_VSUBUBM }, Index: gcc/config/rs6000/altivec.md =================================================================== --- gcc/config/rs6000/altivec.md (revision 135303) +++ gcc/config/rs6000/altivec.md (revision 135304) @@ -575,7 +575,7 @@ (define_expand "mulv4sf3" /* Generate [-0.0, -0.0, -0.0, -0.0]. */ neg0 = gen_reg_rtx (V4SImode); emit_insn (gen_altivec_vspltisw (neg0, constm1_rtx)); - emit_insn (gen_ashlv4si3 (neg0, neg0, neg0)); + emit_insn (gen_vashlv4si3 (neg0, neg0, neg0)); /* Use the multiply-add. */ emit_insn (gen_altivec_vmaddfp (operands[0], operands[1], operands[2], @@ -634,7 +634,7 @@ (define_expand "mulv4si3" high_product = gen_reg_rtx (V4SImode); emit_insn (gen_altivec_vmsumuhm (high_product, one, small_swap, zero)); - emit_insn (gen_ashlv4si3 (high_product, high_product, sixteen)); + emit_insn (gen_vashlv4si3 (high_product, high_product, sixteen)); emit_insn (gen_addv4si3 (operands[0], high_product, low_product)); @@ -1238,7 +1238,7 @@ (define_insn "altivec_vslo" "vslo %0,%1,%2" [(set_attr "type" "vecperm")]) -(define_insn "ashl<mode>3" +(define_insn "vashl<mode>3" [(set (match_operand:VI 0 "register_operand" "=v") (ashift:VI (match_operand:VI 1 "register_operand" "v") (match_operand:VI 2 "register_operand" "v") ))] @@ -1246,7 +1246,7 @@ (define_insn "ashl<mode>3" "vsl<VI_char> %0,%1,%2" [(set_attr "type" "vecsimple")]) -(define_insn "lshr<mode>3" +(define_insn "vlshr<mode>3" [(set (match_operand:VI 0 "register_operand" "=v") (lshiftrt:VI (match_operand:VI 1 "register_operand" "v") (match_operand:VI 2 "register_operand" "v") ))] @@ -1254,7 +1254,7 @@ (define_insn "lshr<mode>3" "vsr<VI_char> %0,%1,%2" [(set_attr "type" "vecsimple")]) -(define_insn "ashr<mode>3" +(define_insn "vashr<mode>3" [(set (match_operand:VI 0 "register_operand" "=v") (ashiftrt:VI (match_operand:VI 1 "register_operand" "v") (match_operand:VI 2 "register_operand" "v") ))] @@ -2640,7 +2640,7 @@ (define_expand "negv4sf2" /* Generate [-0.0, -0.0, -0.0, -0.0]. */ neg0 = gen_reg_rtx (V4SImode); emit_insn (gen_altivec_vspltisw (neg0, constm1_rtx)); - emit_insn (gen_ashlv4si3 (neg0, neg0, neg0)); + emit_insn (gen_vashlv4si3 (neg0, neg0, neg0)); /* XOR */ emit_insn (gen_xorv4sf3 (operands[0], ++++++ gcc-4.3.2-20080715.tar.bz2 -> gcc-4.3.2-20080806.tar.bz2 ++++++ gcc43/gcc-4.3.2-20080715.tar.bz2 /mounts/work_src_done/STABLE/gcc43/gcc-4.3.2-20080806.tar.bz2 differ: byte 11, line 1 ++++++ gcc.spec.in ++++++ --- gcc43/gcc.spec.in 2008-07-17 17:46:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/gcc43/gcc.spec.in 2008-08-06 14:41:52.000000000 +0200 @@ -122,7 +122,7 @@ URL: http://gcc.gnu.org/ License: GPL -Version: 4.3.2_20080715 +Version: 4.3.2_20080806 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -167,6 +167,8 @@ Patch30: Wunprototyped-calls.diff Patch31: pr27799.diff Patch39: pr36343.diff +Patch40: pr36765.diff +Patch41: pr36613.diff # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -180,6 +182,11 @@ Patch72: pr34043-3.diff Patch73: pr34043-4.diff Patch74: pr34043-5.diff +Patch75: amd-SSE5-shift-ppc-1.diff +Patch76: amd-SSE5-shift-ppc-2.diff +Patch77: amd-SSE5-shift.diff +Patch78: amd-cunroll-1.diff +Patch79: amd-cunroll-2.diff # Patches for Intel features Patch80: intel303993-aes.diff # Patches for IBM features @@ -192,6 +199,9 @@ Patch96: pr36745.diff Patch97: pr36822.diff Patch98: ibm-mpower4.diff +Patch99: ibm-vector-keyword-1 +Patch100: ibm-vector-keyword-2 +Patch101: ibm-vector-keyword-3 # LIBJAVA-DELETE-BEGIN %description @@ -830,6 +840,8 @@ %patch30 %patch31 %patch39 +%patch40 +%patch41 %patch51 %patch55 %patch57 @@ -840,6 +852,11 @@ %patch72 %patch73 %patch74 -p1 +%patch75 +%patch76 +%patch77 +%patch78 +%patch79 %patch80 %patch90 %patch91 @@ -850,6 +867,9 @@ %patch96 %patch97 #%patch98 +%patch99 +%patch100 +%patch101 %build # Avoid rebuilding of generated files @@ -1026,7 +1046,6 @@ --with-long-double-128 \ %endif %if "%{TARGET_ARCH}" == "powerpc64" - --with-cpu=default64 \ --enable-secureplt \ --with-long-double-128 \ %endif @@ -1062,6 +1081,8 @@ mv %{GCCDIST}/libstdc++-v3/testsuite/libstdc++.log %{GCCDIST}/libstdc++-v3/testsuite/libstdc++-abi.log mv %{GCCDIST}/libstdc++-v3/testsuite/libstdc++.sum %{GCCDIST}/libstdc++-v3/testsuite/libstdc++-abi.sum make -k check $PARALLEL || true +mkdir ../testresults +../contrib/test_summary > ../testresults/test_summary.txt %endif %install @@ -1262,7 +1283,6 @@ done %if %{run_tests} -mkdir ../testresults cp `find . -name "*.sum"` ../testresults/ cp `find . -name "*.log" \! -name "config.log" |grep -v 'acats/tests' ` ../testresults/ chmod 644 ../testresults/* @@ -1957,6 +1977,7 @@ %if %{run_tests} %files -n gcc@base_ver@-testresults %defattr(-,root,root) +%doc testresults/test_summary.txt %doc testresults/*.sum %doc testresults/*.log %endif ++++++ ibm-vector-keyword-1 ++++++ ++++ 705 lines (skipped) ++++++ ibm-vector-keyword-2 ++++++ 2008-07-24 Ben Elliston <bje(a)au.ibm.com> * config/rs6000/rs6000-c.c: Move GTY(()) markers to match conventional usage. Index: gcc/config/rs6000/rs6000-c.c =================================================================== --- gcc/config/rs6000/rs6000-c.c (revision 138103) +++ gcc/config/rs6000/rs6000-c.c (revision 138104) @@ -85,12 +85,12 @@ rs6000_pragma_longcall (cpp_reader *pfil #define builtin_assert(TXT) cpp_assert (pfile, TXT) /* Keep the AltiVec keywords handy for fast comparisons. */ -static tree __vector_keyword; -static tree vector_keyword; -static tree __pixel_keyword; -static tree pixel_keyword; -static tree __bool_keyword; -static tree bool_keyword; +static GTY(()) tree __vector_keyword; +static GTY(()) tree vector_keyword; +static GTY(()) tree __pixel_keyword; +static GTY(()) tree pixel_keyword; +static GTY(()) tree __bool_keyword; +static GTY(()) tree bool_keyword; /* Preserved across calls. */ static tree expand_bool_pixel; ++++++ ibm-vector-keyword-3 ++++++ 2008-07-24 Ben Elliston <bje(a)au.ibm.com> * config/spu/spu-c.c (__vector_keyword): New variable. (vector_keyword): Likewise. (spu_categorize_keyword): New function. (spu_macro_to_expand): Likewise. (spu_cpu_cpp_builtins): Enable context-sensitive macros if not compiling an ISO C dialect. 2008-07-24 Ben Elliston <bje(a)au.ibm.com> * gcc.target/spu/vector.c: New test. * gcc.target/spu/vector-ansi.c: Likewise. Index: gcc/testsuite/gcc.target/spu/vector.c =================================================================== --- gcc/testsuite/gcc.target/spu/vector.c (revision 0) +++ gcc/testsuite/gcc.target/spu/vector.c (revision 138106) @@ -0,0 +1,32 @@ +/* { dg-do compile } */ +/* { dg-options "" } */ + +#ifndef __VECTOR_KEYWORD_SUPPORTED__ +#error __VECTOR_KEYWORD_SUPPORTED__ is not defined +#endif + +/* __vector is expanded unconditionally. */ +__vector int vi; +__vector unsigned char vuc; +__vector signed char vsc; +__vector unsigned short vus; +__vector signed short vss; +__vector unsigned int vui; +__vector signed int vsi; +__vector unsigned long long ull; +__vector signed long long sll; +__vector float vf; +__vector double vd; + +/* vector is expanded conditionally, based on the context. */ +vector int vi; +vector unsigned char vuc; +vector signed char vsc; +vector unsigned short vus; +vector signed short vss; +vector unsigned int vui; +vector signed int vsi; +vector unsigned long long ull; +vector signed long long sll; +vector float vf; +vector double vd; Index: gcc/testsuite/gcc.target/spu/vector-ansi.c =================================================================== --- gcc/testsuite/gcc.target/spu/vector-ansi.c (revision 0) +++ gcc/testsuite/gcc.target/spu/vector-ansi.c (revision 138106) @@ -0,0 +1,35 @@ +/* { dg-do compile } */ +/* { dg-options "-ansi" } */ + +/* This is done by spu_internals.h, but we not include it here to keep + down the dependencies. */ + +#ifndef __VECTOR_KEYWORD_SUPPORTED__ +#define vector __vector +#endif + +/* __vector is expanded unconditionally by the preprocessor. */ +__vector int vi; +__vector unsigned char vuc; +__vector signed char vsc; +__vector unsigned short vus; +__vector signed short vss; +__vector unsigned int vui; +__vector signed int vsi; +__vector unsigned long long ull; +__vector signed long long sll; +__vector float vf; +__vector double vd; + +/* vector is expanded by the define above, regardless of context. */ +vector int vi; +vector unsigned char vuc; +vector signed char vsc; +vector unsigned short vus; +vector signed short vss; +vector unsigned int vui; +vector signed int vsi; +vector unsigned long long ull; +vector signed long long sll; +vector float vf; +vector double vd; Index: gcc/config/spu/spu-c.c =================================================================== --- gcc/config/spu/spu-c.c (revision 138105) +++ gcc/config/spu/spu-c.c (revision 138106) @@ -35,6 +35,64 @@ #include "spu-builtins.h" +/* Keep the vector keywords handy for fast comparisons. */ +static GTY(()) tree __vector_keyword; +static GTY(()) tree vector_keyword; + +static cpp_hashnode * +spu_categorize_keyword (const cpp_token *tok) +{ + if (tok->type == CPP_NAME) + { + cpp_hashnode *ident = tok->val.node; + + if (ident == C_CPP_HASHNODE (vector_keyword) + || ident == C_CPP_HASHNODE (__vector_keyword)) + return C_CPP_HASHNODE (__vector_keyword); + else + return ident; + } + return 0; +} + +/* Called to decide whether a conditional macro should be expanded. + Since we have exactly one such macro (i.e, 'vector'), we do not + need to examine the 'tok' parameter. */ + +static cpp_hashnode * +spu_macro_to_expand (cpp_reader *pfile, const cpp_token *tok) +{ + cpp_hashnode *expand_this = tok->val.node; + cpp_hashnode *ident; + + ident = spu_categorize_keyword (tok); + if (ident == C_CPP_HASHNODE (__vector_keyword)) + { + tok = cpp_peek_token (pfile, 0); + ident = spu_categorize_keyword (tok); + + if (ident) + { + enum rid rid_code = (enum rid)(ident->rid_code); + if (ident->type == NT_MACRO) + { + (void) cpp_get_token (pfile); + tok = cpp_peek_token (pfile, 0); + ident = spu_categorize_keyword (tok); + if (ident) + rid_code = (enum rid)(ident->rid_code); + } + + if (rid_code == RID_UNSIGNED || rid_code == RID_LONG + || rid_code == RID_SHORT || rid_code == RID_SIGNED + || rid_code == RID_INT || rid_code == RID_CHAR + || rid_code == RID_FLOAT || rid_code == RID_DOUBLE) + expand_this = C_CPP_HASHNODE (__vector_keyword); + } + } + return expand_this; +} + /* target hook for resolve_overloaded_builtin(). Returns a function call RTX if we can resolve the overloaded builtin */ tree @@ -140,6 +198,22 @@ spu_cpu_cpp_builtins (struct cpp_reader if (spu_arch == PROCESSOR_CELLEDP) builtin_define_std ("__SPU_EDP__"); builtin_define_std ("__vector=__attribute__((__spu_vector__))"); + + if (!flag_iso) + { + /* Define this when supporting context-sensitive keywords. */ + cpp_define (pfile, "__VECTOR_KEYWORD_SUPPORTED__"); + cpp_define (pfile, "vector=vector"); + + /* Initialize vector keywords. */ + __vector_keyword = get_identifier ("__vector"); + C_CPP_HASHNODE (__vector_keyword)->flags |= NODE_CONDITIONAL; + vector_keyword = get_identifier ("vector"); + C_CPP_HASHNODE (vector_keyword)->flags |= NODE_CONDITIONAL; + + /* Enable context-sensitive macros. */ + cpp_get_callbacks (pfile)->macro_to_expand = spu_macro_to_expand; + } } void ++++++ pr36613.diff ++++++ Hi, reload has a problem when it tries to reuse (not to be confused with inheriting) a reload with a different mode. In the problematic case at hand we first find a SImode reload of %ecx to %edx (using %ecx as reload_reg), and try to fit a second reload from %cl to %dl into that. This is quite fine, just that the merging of both reloads overwrites the in/out members, and leaves us with a QImode reload. Or better, it merges the inmode/outmode (depending on size, i.e. leaves the larger), but overwrites the reload operands itself. So we are left with a SImode reload dealing with %cl and %dl. Unfortunately do_input_reload (and do_output_reload) don't care that much for inmode/outmode (which would be correct here), but rather simply take what is noted in in/out. So we emit a QImode move, thereby not correctly emitting the insns for the first reload. As I noted in the large bugzilla comment I see two ways of fixing this: 1) also take the size of operands into account while merging the in/out members, in push_reload 2) overhaul do_input_reload and do_output_reload to care for inmode/outmode _first_ before falling back to the operands. Option (2) is more complicated as it potentially requires adjusting the RTXes we find in in/out for the mode we want. There's also a large scary comment at do_input_reload speculating about all kinds of potential breakages, it's very old and probably half of the fear in there doesn't apply anymore, but I didn't feel like poking into 20 year old history to see why and how it mattered exactly. I think the whole comment is mood when we rely on inmode/outmode, but in the end I only did (1), found it to fix the testcase and regstrapped this successfully on i686 and x86_64. Since that I somewhat changed the patch, so I'm currently regstrapping it again. Okay for trunk if that passes? At least 4.3 needs that too, eventually. If someone also wants to test this on 4.2 I would be glad. Ciao, Michael. PR target/36613 * reload.c (push_reload): Merge in,out,in_reg,out_reg members for reused reload, instead of overwriting them. * gcc.target/i386/pr36613.c: New testcase. Index: gcc/reload.c =================================================================== *** gcc/reload.c (revision 137652) --- gcc/reload.c (working copy) *************** push_reload (rtx in, rtx out, rtx *inloc *** 1403,1415 **** else remove_address_replacements (rld[i].in); } ! rld[i].in = in; ! rld[i].in_reg = in_reg; } if (out != 0) { ! rld[i].out = out; ! rld[i].out_reg = outloc ? *outloc : 0; } if (reg_class_subset_p (class, rld[i].class)) rld[i].class = class; --- 1403,1438 ---- else remove_address_replacements (rld[i].in); } ! /* When emitting reloads we don't necessarily look at the in- ! and outmode, but also directly at the operands (in and out). ! So we can't simply overwrite them with whatever we have found ! for this (to-be-merged) reload, we have to "merge" that too. ! Reusing another reload already verified that we deal with the ! same operands, just possibly in different modes. So we ! overwrite the operands only when the new mode is larger. ! See also PR33613. */ ! if (!rld[i].in ! || GET_MODE_SIZE (GET_MODE (in)) ! > GET_MODE_SIZE (GET_MODE (rld[i].in))) ! rld[i].in = in; ! if (!rld[i].in_reg ! || (in_reg ! && GET_MODE_SIZE (GET_MODE (in_reg)) ! > GET_MODE_SIZE (GET_MODE (rld[i].in_reg)))) ! rld[i].in_reg = in_reg; } if (out != 0) { ! if (!rld[i].out ! || (out ! && GET_MODE_SIZE (GET_MODE (out)) ! > GET_MODE_SIZE (GET_MODE (rld[i].out)))) ! rld[i].out = out; ! if (outloc ! && (!rld[i].out_reg ! || GET_MODE_SIZE (GET_MODE (*outloc)) ! > GET_MODE_SIZE (GET_MODE (rld[i].out_reg)))) ! rld[i].out_reg = *outloc; } if (reg_class_subset_p (class, rld[i].class)) rld[i].class = class; ++++++ pr36765.diff ++++++ 2008-07-11 Richard Guenther <rguenther(a)suse.de> PR tree-optimization/36765 * tree-ssa-alias.c (compute_flow_insensitive_aliasing): Add aliases from HEAP vars to SMTs. * gcc.c-torture/execute/pr36765.c: New testcase. Index: gcc/tree-ssa-alias.c =================================================================== *** gcc/tree-ssa-alias.c (revision 137712) --- gcc/tree-ssa-alias.c (working copy) *************** have_common_aliases_p (bitmap tag1aliase *** 2370,2375 **** --- 2370,2377 ---- static void compute_flow_insensitive_aliasing (struct alias_info *ai) { + referenced_var_iterator rvi; + tree var; size_t i; timevar_push (TV_FLOW_INSENSITIVE); *************** compute_flow_insensitive_aliasing (struc *** 2460,2465 **** --- 2462,2485 ---- add_may_alias (tag1, tag2); } } + + /* We have to add all HEAP variables to all SMTs aliases bitmaps. + As we don't know which effective type the HEAP will have we cannot + do better here and we need the conflicts with obfuscated pointers + (a simple (*(int[n] *)ptr)[i] will do, with ptr from a VLA array + allocation). */ + for (i = 0; i < ai->num_pointers; i++) + { + struct alias_map_d *p_map = ai->pointers[i]; + tree tag = symbol_mem_tag (p_map->var); + + FOR_EACH_REFERENCED_VAR (var, rvi) + { + if (var_ann (var)->is_heapvar) + add_may_alias (tag, var); + } + } + timevar_pop (TV_FLOW_INSENSITIVE); } Index: gcc/testsuite/gcc.c-torture/execute/pr36765.c =================================================================== *** gcc/testsuite/gcc.c-torture/execute/pr36765.c (revision 0) --- gcc/testsuite/gcc.c-torture/execute/pr36765.c (revision 0) *************** *** 0 **** --- 1,15 ---- + int __attribute__((noinline)) + foo(int i) + { + int *p = __builtin_malloc (4 * sizeof(int)); + *p = 0; + p[i] = 1; + return *p; + } + extern void abort (void); + int main() + { + if (foo(0) != 1) + abort (); + return 0; + } ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit xorg-x11-driver-video-unichrome
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package xorg-x11-driver-video-unichrome checked in at Fri Aug 8 17:25:12 CEST 2008. -------- --- arch/i386/xorg-x11-driver-video-unichrome/xorg-x11-driver-video-unichrome.changes 2008-08-08 05:07:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/xorg-x11-driver-video-unichrome/xorg-x11-driver-video-unichrome.changes 2008-08-08 14:22:24.431604630 +0200 @@ -1,0 +2,5 @@ +Fri Aug 8 14:21:23 CEST 2008 - sndirsch(a)suse.de + +- fixed Prerequires (bnc #415674) + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ xorg-x11-driver-video-unichrome.spec ++++++ --- /var/tmp/diff_new_pack.G15269/_old 2008-08-08 17:24:47.000000000 +0200 +++ /var/tmp/diff_new_pack.G15269/_new 2008-08-08 17:24:47.000000000 +0200 @@ -42,9 +42,9 @@ Group: System/X11/Servers/XF86_4 AutoReqProv: on Version: 20080807 -Release: 1 +Release: 2 Summary: The Unichrome Project -PreReq: /bin/ls /bin/cat bin/rm +PreReq: /bin/ls /bin/cat /bin/rm Requires: xorg-x11-server Provides: xorg-x11-driver-video:%{_libdir}/xorg/modules/drivers/unichrome_drv.so Source: xf86-video-unichrome-fa90a8f.tar.bz2 @@ -198,6 +198,8 @@ %changelog * Fri Aug 08 2008 sndirsch(a)suse.de +- fixed Prerequires (bnc #415674) +* Fri Aug 08 2008 sndirsch(a)suse.de - update to git commit fa90a8f (2008-08-07) * Port driver to work on top of libpciaccess. * Thu Jul 31 2008 sndirsch(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit tgt
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package tgt checked in at Fri Aug 8 17:24:37 CEST 2008. -------- --- tgt/tgt.changes 2007-08-09 19:12:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/tgt/tgt.changes 2008-08-08 15:02:36.174411000 +0200 @@ -1,0 +2,8 @@ +Fri Aug 8 15:01:22 CEST 2008 - hare(a)suse.de + +- Update to latest released version 20080805 + * Include FCP backend + * Include FCoE backend + * Bugfixes + +------------------------------------------------------------------- Old: ---- tgt-git-update tgt.hash.patch tgt-ibmvio-build-local tgt-mmc-read-toc-swapped-args tgt-r849.tar.bz2 tgt-update-scsi-header-file New: ---- tgt-20080805.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ tgt.spec ++++++ --- /var/tmp/diff_new_pack.p13879/_old 2008-08-08 17:24:26.000000000 +0200 +++ /var/tmp/diff_new_pack.p13879/_new 2008-08-08 17:24:26.000000000 +0200 @@ -1,37 +1,39 @@ # -# spec file for package tgt (Version 0.1) +# spec file for package tgt (Version 20080805) # -# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. +# Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild + Name: tgt BuildRequires: libaio-devel openssl-devel Obsoletes: iscsitarget -URL: http://stgt.berlios.de +Url: http://stgt.berlios.de License: GPL v2 or later Group: System/Daemons -Prereq: %fillup_prereq %insserv_prereq -Autoreqprov: on -Version: 0.1 -Release: 23 -Requires: kernel +PreReq: %fillup_prereq %insserv_prereq +AutoReqProv: on +Version: 20080805 +Release: 1 Summary: Generic Linux target framework (tgt) -Source: %{name}-r849.tar.bz2 +Source: %{name}-%{version}.tar.bz2 Source1: %{name}.init Source2: scsi_tgt_if.h Source3: %{name}.services -Patch1: %{name}-git-update -Patch2: %{name}-mmc-read-toc-swapped-args -Patch10: %{name}-update-scsi-header-file Patch11: %{name}-fix-build -Patch12: %{name}-ibmvio-build-local -Patch13: tgt.hash.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build %description @@ -50,27 +52,24 @@ Mike Christie <michaelc(a)cs.wisc.edu> %prep -%setup -n %{name}-r849 -%patch1 -p1 -%patch2 -p1 -%patch10 -p1 +%setup -n %{name}-%{version} %patch11 -p1 -%patch12 -p1 -%patch13 -p1 +cp %{S:2} usr %build -cp %{S:2} usr/scsi_tgt_if.h cd usr %ifarch ppc ppc64 -IBMVIO=1 +%define backends ISCSI=1 FCP=1 FCOE=1 IBMVIO=1 %else -IBMVIO=0 +%define backends ISCSI=1 FCP=1 FCOE=1 %endif -%{__make} CFLAGS="${RPM_OPT_FLAGS}" ISCSI=1 IBMVIO=$IBMVIO +%{__make} OPTFLAGS="${RPM_OPT_FLAGS}" %{backends} %install -install -vD usr/tgtd ${RPM_BUILD_ROOT}/usr/sbin/tgtd -install -vD usr/tgtadm ${RPM_BUILD_ROOT}/usr/sbin/tgtadm +cd usr +%{__make} DESTDIR=${RPM_BUILD_ROOT} install +cd ../scripts +install -vD -m 755 tgt-admin ${RPM_BUILD_ROOT}/usr/sbin/tgt-admin install -vD -m 755 %{S:1} ${RPM_BUILD_ROOT}/etc/init.d/tgtd install -vD %{S:3} ${RPM_BUILD_ROOT}/etc/sysconfig/SuSEfirewall2.d/services/iscsitarget @@ -81,22 +80,31 @@ %post %{fillup_and_insserv tgtd} +%preun +%stop_on_removal + %postun %{insserv_cleanup} %files -%attr(755,root,root)/usr/sbin/* -%attr(755,root,root)/etc/init.d/tgtd -%attr(644,root,root)/etc/sysconfig/SuSEfirewall2.d/services/iscsitarget %defattr(-,root,root) +/usr/sbin/* +/etc/init.d/tgtd +%config %attr(0644,root,root) /etc/sysconfig/SuSEfirewall2.d/services/iscsitarget %doc README doc/README.iscsi doc/TODO +%doc %{_mandir}/man8/* %changelog -* Thu Aug 09 2007 - olh(a)suse.de +* Fri Aug 08 2008 hare(a)suse.de +- Update to latest released version 20080805 + * Include FCP backend + * Include FCoE backend + * Bugfixes +* Thu Aug 09 2007 olh(a)suse.de - remove inclusion of linux/hash.h, include it directly -* Wed Apr 04 2007 - hare(a)suse.de +* Wed Apr 04 2007 hare(a)suse.de - Added service definition for SUSEFirewall2 (#251679) -* Wed Apr 04 2007 - hare(a)suse.de +* Wed Apr 04 2007 hare(a)suse.de - Initial version svn r849 - Update to latest git version - Fixes for build on openSUSE ++++++ scsi_tgt_if.h ++++++ --- tgt/scsi_tgt_if.h 2007-04-04 10:13:41.000000000 +0200 +++ /mounts/work_src_done/STABLE/tgt/scsi_tgt_if.h 2008-08-08 14:45:06.639934000 +0200 @@ -23,13 +23,15 @@ #define __SCSI_TARGET_IF_H /* user -> kernel */ -#define TGT_UEVENT_CMD_RSP 0x0001 -#define TGT_UEVENT_TSK_MGMT_RSP 0x0002 +#define TGT_UEVENT_CMD_RSP 0x0001 +#define TGT_UEVENT_IT_NEXUS_RSP 0x0002 +#define TGT_UEVENT_TSK_MGMT_RSP 0x0003 /* kernel -> user */ -#define TGT_KEVENT_CMD_REQ 0x1001 -#define TGT_KEVENT_CMD_DONE 0x1002 -#define TGT_KEVENT_TSK_MGMT_REQ 0x1003 +#define TGT_KEVENT_CMD_REQ 0x1001 +#define TGT_KEVENT_CMD_DONE 0x1002 +#define TGT_KEVENT_IT_NEXUS_REQ 0x1003 +#define TGT_KEVENT_TSK_MGMT_REQ 0x1004 struct tgt_event_hdr { uint16_t version; @@ -46,6 +48,7 @@ struct { int host_no; int result; + aligned_u64 itn_id; aligned_u64 tag; aligned_u64 uaddr; aligned_u64 sense_uaddr; @@ -55,15 +58,22 @@ } cmd_rsp; struct { int host_no; - aligned_u64 mid; int result; + aligned_u64 itn_id; + aligned_u64 mid; } tsk_mgmt_rsp; - + struct { + __s32 host_no; + __s32 result; + aligned_u64 itn_id; + __u32 function; + } it_nexus_rsp; /* kernel -> user */ struct { int host_no; uint32_t data_len; + aligned_u64 itn_id; uint8_t scb[16]; uint8_t lun[8]; int attribute; @@ -71,16 +81,25 @@ } cmd_req; struct { int host_no; - aligned_u64 tag; int result; + aligned_u64 itn_id; + aligned_u64 tag; } cmd_done; struct { int host_no; int function; + aligned_u64 itn_id; aligned_u64 tag; uint8_t lun[8]; aligned_u64 mid; } tsk_mgmt_req; + struct { + __s32 host_no; + __u32 function; + aligned_u64 itn_id; + __u32 max_cmds; + __u8 initiator_id[16]; + } it_nexus_req; } p; } __attribute__ ((aligned (sizeof(uint64_t)))); ++++++ tgt-r849.tar.bz2 -> tgt-20080805.tar.bz2 ++++++ ++++ 40045 lines of diff (skipped) ++++++ tgt-fix-build ++++++ --- tgt/tgt-fix-build 2007-04-04 10:10:44.000000000 +0200 +++ /mounts/work_src_done/STABLE/tgt/tgt-fix-build 2008-08-08 14:59:02.012924000 +0200 @@ -1,71 +1,58 @@ +diff --git a/scripts/tgt-setup-lun b/scripts/tgt-setup-lun +index 1e214ee..2ae9193 100755 +--- a/scripts/tgt-setup-lun ++++ b/scripts/tgt-setup-lun +@@ -1,3 +1,5 @@ ++#!/bin/bash ++ + # LUN assignment script + # + # Copyright (C) 2007 Erez Zilber <erezz(a)voltaire.com> +@@ -17,8 +19,6 @@ + # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + # 02110-1301 USA + +-#!/bin/bash +- + usage() + { + name=$(basename $0) diff --git a/usr/Makefile b/usr/Makefile -index 30cd34a..125274b 100644 +index 4245709..1720d89 100644 --- a/usr/Makefile +++ b/usr/Makefile -@@ -1,3 +1,7 @@ -+# -+# Makefile for tgt userspace tools -+# -+ - ifneq ($(XEN),) - XEN_ROOT = ../.. - include $(XEN_ROOT)/tools/Rules.mk -@@ -6,9 +10,9 @@ INCLUDES += -I$(XEN_LIBXC) -I$(XEN_XENST - INCLUDES += -I$(LINUX_ROOT)/include -I. - LIBAIO_DIR = ../libaio/src - AIOLIBS := $(LIBAIO_DIR)/libaio.a --CFLAGS += -I$(XEN_LIBXC) -I$(LIBAIO_DIR) --CFLAGS += $(INCLUDES) -I. -I../../xenstore --CFLAGS += -DXEN -DUSE_KERNEL -+INCLUDES += -I$(XEN_LIBXC) -I$(LIBAIO_DIR) -+INCLUDES += -I. -I../../xenstore -+DEFINES += -DXEN -DUSE_KERNEL - LIBS := -L. -L.. -L../lib - LIBS += -L$(XEN_LIBXC) - LIBS += -lxenctrl -@@ -16,7 +20,7 @@ LIBS += -L$(XEN_XENSTORE) -lxenstore $(A - TGTD_OBJS += $(addprefix xen/, xen.o xs_api.o xenbus.o) - TGTD_OBJS += tgtif.o bs_xen.o - else --INCLUDES += -I../include -I$(KERNELSRC)/include -+INCLUDES += -I../include - LIBS += -laio - endif - -@@ -26,14 +30,14 @@ else - TGTD_OBJS += spt_sgv3.o - endif - --ifneq ($(IBMVIO),) --CFLAGS += -DIBMVIO -DUSE_KERNEL -+ifeq ($(IBMVIO),1) -+DEFINES += -DIBMVIO -DUSE_KERNEL - TGTD_OBJS += $(addprefix ibmvio/, ibmvio.o) - TGTD_OBJS += bs_mmap.o tgtif.o - endif - --ifneq ($(ISCSI),) --CFLAGS += -DISCSI -+ifeq ($(ISCSI),1) -+DEFINES += -DISCSI - TGTD_OBJS += $(addprefix iscsi/, conn.o param.o session.o iscsid.o target.o \ - chap.o transport.o iscsi_tcp.o) - TGTD_OBJS += bs_aio.o -@@ -41,7 +45,8 @@ LIBS += -lcrypto -lpthread - endif - - INCLUDES += -I. --CFLAGS += -Wall -g -O2 -Wstrict-prototypes -fPIC -D_LARGEFILE64_SOURCE $(INCLUDES) -+DEFINES += -D_LARGEFILE64_SOURCE -+CFLAGS += -Wall -g -O2 -Wstrict-prototypes -fPIC - - PROGRAMS += tgtd tgtadm - TGTD_OBJS += tgtd.o mgmt.o target.o spc.o sbc.o mmc.o osd.o spt.o scsi.o log.o \ -@@ -62,3 +67,7 @@ endif +@@ -50,7 +50,7 @@ INCLUDES += -I. -I../include -I$(KERNELSRC)/include - clean: - rm -f *.o $(PROGRAMS) iscsi/*.o ibmvio/*.o xen/*.o -+ -+%.o: %.c -+ $(CC) $(CFLAGS) $(INCLUDES) $(DEFINES) -c $< -o $@ -+ + CFLAGS += -D_GNU_SOURCE + CFLAGS += $(INCLUDES) +-CFLAGS += -g -O2 -Wall -Wstrict-prototypes -fPIC ++CFLAGS += $(OPTFLAGS) + + LIBS += -lpthread + +diff --git a/usr/fc/fc.c b/usr/fc/fc.c +index febb1e9..59f7573 100644 +--- a/usr/fc/fc.c ++++ b/usr/fc/fc.c +@@ -29,6 +29,8 @@ + #include <syscall.h> + #include <unistd.h> + #include <linux/fs.h> ++#include <linux/types.h> ++typedef __u8 u8; + #include <scsi/scsi.h> + #include <sys/mman.h> + +diff --git a/usr/tgtif.c b/usr/tgtif.c +index fd5ad5b..9b87b13 100644 +--- a/usr/tgtif.c ++++ b/usr/tgtif.c +@@ -36,7 +36,7 @@ + #ifndef aligned_u64 + #define aligned_u64 unsigned long long __attribute__((aligned(8))) + #endif +-#include <scsi/scsi_tgt_if.h> ++#include "scsi_tgt_if.h" + + #include "list.h" + #include "util.h" ++++++ tgt.init ++++++ --- tgt/tgt.init 2007-04-03 15:37:05.000000000 +0200 +++ /mounts/work_src_done/STABLE/tgt/tgt.init 2008-08-08 14:56:21.357811000 +0200 @@ -4,14 +4,14 @@ # ### BEGIN INIT INFO # Provides: tgtd -# Required-Start: $network +# Required-Start: $remote_fs $network # Should-Start: # Required-Stop: # Should-Stop: # Default-Start: 3 5 # Default-Stop: -# Short-Description: Starts and stops the generic storage target daemon -# +# Short-Description: generic storage target daemon +# Description: Starts and stops the generic storage target subsystem ### END INIT INFO # @@ -48,7 +48,7 @@ fi rc_status -v ;; - restart) + restart|reload) $0 stop $0 start ;; ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit scout
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package scout checked in at Fri Aug 8 17:24:18 CEST 2008. -------- --- scout/scout.changes 2008-06-12 19:14:42.000000000 +0200 +++ /mounts/work_src_done/STABLE/scout/scout.changes 2008-08-08 16:34:04.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Aug 6 20:48:45 CEST 2008 - prusnak(a)suse.cz + +- updated to 0.1.0 + * enabled search in zypp repositories + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ scout.spec ++++++ --- /var/tmp/diff_new_pack.X12546/_old 2008-08-08 17:23:42.000000000 +0200 +++ /var/tmp/diff_new_pack.X12546/_new 2008-08-08 17:23:42.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package scout (Version 0.0.2) +# spec file for package scout (Version 0.1.0) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -12,8 +19,8 @@ Name: scout -Version: 0.0.2 -Release: 2 +Version: 0.1.0 +Release: 1 Url: http://en.opensuse.org/Scout License: X11/MIT Group: System/Packages @@ -26,6 +33,10 @@ BuildRequires: python-xml Requires: python-xml %endif +%if 0%{?suse_version} > 1030 +BuildRequires: python-satsolver > 0.10.2 +Requires: python-satsolver > 0.10.2 +%endif %if 0%{?fedora_version} || 0%{?rhel_version} || 0%{?centos_version} %define py_sitedir %(python -c "from distutils.sysconfig import get_python_lib; print get_python_lib(1)") %endif @@ -39,28 +50,35 @@ -%package -n command-not-found -Version: 0.1.0 -Release: 2 -License: X11/MIT -Group: System/Packages -Summary: Command Not Found extension for shell -Requires: python rpm-python -Requires: bash(CommandNotFound) -%define distro error +%define cnfrepo none %if 0%{?suse_version} > 1030 -%define distro suse110 +%define cnfrepo zypp %endif %if 0%{?suse_version} <= 1030 && 0%{?suse_version} > 1020 -%define distro suse103 +%define cnfrepo suse103 %endif %if 0%{?suse_version} <= 1020 && 0%{?suse_version} > 1010 -%define distro suse102 +%define cnfrepo suse102 %endif %if 0%{?suse_version} <= 1010 && 0%{?suse_version} > 1000 -%define distro suse101 +%define cnfrepo suse101 +%endif +%if 0%{?sles_version} == 10 +%define cnfrepo sle10 +%endif +%if %{cnfrepo} != none + +%package -n command-not-found +Version: 0.1.0 +Release: 8 +License: X11/MIT +Group: System/Packages +Summary: Command Not Found extension for shell +Requires: python rpm-python scout +# Requires: bash(CommandNotFound) +%if %{cnfrepo} != zypp +Requires: scout-bin-%{cnfrepo} %endif -Requires: scout scout-bin-%{distro} %description -n command-not-found The "command not found" message is not very helpful. If e.g. the unzip @@ -70,6 +88,8 @@ +%endif + %prep %setup -q -n %{name} @@ -91,12 +111,14 @@ install -D -m 0644 scout-bash-completion $RPM_BUILD_ROOT%{_sysconfdir}/bash_completion.d/scout # install manpage install -D -m 0644 doc/scout.1 $RPM_BUILD_ROOT%{_mandir}/man1/scout.1 +%if %{cnfrepo} != none # --- command-not-found --- install -D -m 755 handlers/bin/command-not-found $RPM_BUILD_ROOT%{_bindir}/command-not-found for shell in bash zsh; do install -D -m 644 handlers/bin/command_not_found_${shell} $RPM_BUILD_ROOT%{_sysconfdir}/${shell}_command_not_found - sed -i 's:__DISTRO__:%{distro}:' $RPM_BUILD_ROOT%{_sysconfdir}/${shell}_command_not_found + sed -i 's:__REPO__:%{cnfrepo}:' $RPM_BUILD_ROOT%{_sysconfdir}/${shell}_command_not_found done +%endif %clean rm -rf $RPM_BUILD_ROOT @@ -109,13 +131,18 @@ %{_datadir}/%{name} %{_sysconfdir}/bash_completion.d/* %{_mandir}/man1/* +%if %{cnfrepo} != none %files -n command-not-found %defattr(-,root,root) %doc handlers/bin/README %{_bindir}/command-not-found %{_sysconfdir}/*_command_not_found +%endif %changelog +* Wed Aug 06 2008 prusnak(a)suse.cz +- updated to 0.1.0 + * enabled search in zypp repositories * Thu Jun 12 2008 prusnak(a)suse.cz - created package ++++++ scout.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scout/AUTHORS new/scout/AUTHORS --- old/scout/AUTHORS 2008-06-24 10:33:45.000000000 +0200 +++ new/scout/AUTHORS 2008-08-04 16:26:06.000000000 +0200 @@ -13,3 +13,6 @@ Docbook documentation: Thomas Schraitle <toms(a)suse.de> + +Help with python-satsolver: +Klaus Kaempf <kkaempf(a)suse.de> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scout/doc/scout.1 new/scout/doc/scout.1 --- old/scout/doc/scout.1 2008-07-15 10:56:56.000000000 +0200 +++ new/scout/doc/scout.1 2008-08-04 16:27:01.000000000 +0200 @@ -1,11 +1,11 @@ .\" Title: scout .\" Author: Pavol Rusnak <stick(a)gk2.sk> .\" Generator: DocBook XSL Stylesheets v1.73.2 <http://docbook.sf.net/> -.\" Date: 07/15/2008 +.\" Date: 08/04/2008 .\" Manual: http://en.opensuse.org/Scout .\" Source: http://repo.or.cz/w/scout.git 0.0.2 .\" -.TH "SCOUT" "1" "07/15/2008" "http://repo\.or\.cz/w/scout\.g" "http://en\.opensuse\.org/Scout" +.TH "SCOUT" "1" "08/04/2008" "http://repo\.or\.cz/w/scout\.g" "http://en\.opensuse\.org/Scout" .\" disable hyphenation .nh .\" disable justification (adjust text to left margin only) @@ -216,6 +216,11 @@ .sp -1n .IP "" 4 Docbook documentation +.PP +\fBKlaus Kaempf\fR <\&kkaempf(a)suse\.de\&> +.sp -1n +.IP "" 4 +Help with python\-satsolver .SH "NOTES" .IP " 1." 4 Scout OBS data repository Files old/scout/doc/scout.pdf and new/scout/doc/scout.pdf differ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scout/doc/scout.xml.in new/scout/doc/scout.xml.in --- old/scout/doc/scout.xml.in 2008-07-15 10:56:56.000000000 +0200 +++ new/scout/doc/scout.xml.in 2008-08-04 16:26:58.000000000 +0200 @@ -46,6 +46,12 @@ <surname>Schraitle</surname> <email>toms(a)suse.de</email> </othercredit> + <othercredit> + <contrib>Help with python-satsolver</contrib> + <firstname>Klaus</firstname> + <surname>Kaempf</surname> + <email>kkaempf(a)suse.de</email> + </othercredit> </authorgroup> </refentryinfo> <refmeta> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scout/handlers/bin/command-not-found new/scout/handlers/bin/command-not-found --- old/scout/handlers/bin/command-not-found 2008-07-15 10:56:56.000000000 +0200 +++ new/scout/handlers/bin/command-not-found 2008-08-07 12:24:33.000000000 +0200 @@ -10,9 +10,13 @@ print print "The program '%s' can be found in the following package(s):" % term for row in rows: - print " * %s (%s/%s)" % (row[3], row[2], row[1]) + print " * %s [ path: %s/%s, repository: %s ]" % (row[3], row[2], row[1], row[0]) print - print 'Try:', INSTALL_CMD + print 'Try:', INSTALL_CMD, + if len(rows) > 1: + print '<selected_package>' + else: + print rows[0][3] print sys.exit(EX_NOTFOUND) @@ -31,7 +35,7 @@ mi = ts.dbMatch('name', term) return mi.count() > 0 -if len(sys.argv) < 2: +if len(sys.argv) < 3: sys.exit(EX_NOTFOUND) import scout @@ -39,11 +43,11 @@ import bin term = sys.argv[1] -if len(sys.argv) > 2: - repo = sys.argv[2] - rows = bin.ScoutModule.query_repo(repo, term) -else: +repo = sys.argv[2] +if repo == 'zypp': rows = bin.ScoutModule.query_zypp(term) +else: + rows = bin.ScoutModule.query_repo(repo, term) if rows == None or len(rows) == 0: sys.exit(EX_NOTFOUND) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scout/handlers/bin/command_not_found_bash new/scout/handlers/bin/command_not_found_bash --- old/scout/handlers/bin/command_not_found_bash 2008-07-15 10:56:56.000000000 +0200 +++ new/scout/handlers/bin/command_not_found_bash 2008-07-28 14:11:18.000000000 +0200 @@ -1,3 +1,3 @@ command_not_found_handle() { - command-not-found "$*" __DISTRO__ || return 127 + command-not-found "$*" __REPO__ } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scout/handlers/bin/command_not_found_zsh new/scout/handlers/bin/command_not_found_zsh --- old/scout/handlers/bin/command_not_found_zsh 2008-07-15 10:56:56.000000000 +0200 +++ new/scout/handlers/bin/command_not_found_zsh 2008-07-28 14:11:18.000000000 +0200 @@ -5,7 +5,7 @@ function precmd() { (($?)) && [ -n "$command" ] && { whence -- "$command" >& /dev/null || - command-not-found "$command" __DISTRO__ + command-not-found "$command" __REPO__ unset command } } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scout/repos.conf new/scout/repos.conf --- old/scout/repos.conf 2008-07-09 10:55:56.000000000 +0200 +++ new/scout/repos.conf 2008-08-01 11:25:37.000000000 +0200 @@ -25,6 +25,9 @@ [suse110] name=openSUSE 11.0 baseurl=http://download.opensuse.org/distribution/11.0/repo/oss/ +[suse111] +name=openSUSE 11.1 +baseurl=http://download.opensuse.org/distribution/11.1/repo/oss/ [zypp] name=Zypp Repositories baseurl= diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/scout/scout/bin.py new/scout/scout/bin.py --- old/scout/scout/bin.py 2008-07-09 13:08:42.000000000 +0200 +++ new/scout/scout/bin.py 2008-08-07 15:12:26.000000000 +0200 @@ -3,34 +3,46 @@ import scout import sys -# import zypp -# class ZyppParser(object): -# -# rebuild_cache = False -# -# @classmethod -# def list(cls): -# z = zypp.ZYppFactory_instance().getZYpp() -# repoManager = zypp.RepoManager() -# repos = repoManager.knownRepositories() -# -# for repo in repos: -# if not repo.enabled(): -# continue -# if cls.rebuild_cache and not repoManager.isCached(repo): -# repoManager.buildCache(repo) -# z.addResolvables(repoManager.createFromCache(repo).resolvables()) -# -# print "Available items: %d" % ( z.pool().size() ) -# for item in z.pool(): -# print "* %s:%s-%s.%s\t(%s)" % ( item.resolvable().kind(), -# item.resolvable().name(), -# item.resolvable().edition(), -# item.resolvable().arch(), -# item.resolvable().repository().info().alias() ) - -paths = [ "/bin", "/sbin", "/usr/bin", "/usr/sbin", "/usr/games", "/opt/kde3/bin", "/opt/kde3/sbin", "/opt/gnome/bin", "/opt/gnome/sbin" ]; +try: + satsolver = __import__('satsolver') + import os + from fnmatch import fnmatch + from ConfigParser import SafeConfigParser +except: + satsolver = None + +class SolvParser(object): + + etcpath = '/etc/zypp/repos.d' + solvfile = '/var/cache/zypp/solv/%s/solv' + binpaths = ( '/bin/', '/sbin/', '/usr/bin/', '/usr/sbin/', '/usr/games/', '/opt/kde3/bin/', '/opt/kde3/sbin/', '/opt/gnome/bin/', '/opt/gnome/sbin/' ) + + def __init__(self): + self.pool = satsolver.Pool() + self.parser = SafeConfigParser() + for repofile in filter(lambda x: fnmatch(x, '*.repo'), os.listdir(self.etcpath)): + try: + name = os.path.splitext(repofile)[0] + self.parser.read( '%s/%s' % (self.etcpath, repofile) ) + if self.parser.get(name, 'enabled') == '1': + repo = self.pool.add_solv( self.solvfile % name ) + repo.set_name(name) + except: + pass + + def search(self, term): + filematch = map(lambda x: x + term, self.binpaths) + pkgmatch = [] + for solv in self.pool: + if not solv.attr_exists('solvable:filelist'): + continue + for file in solv.attr('solvable:filelist'): + if file in filematch: + row = ( 'zypp (%s)' % solv.repo().name(), term, file[:-len(term)-1] , solv.name() ) + if not row in pkgmatch: + pkgmatch.append( row ) + return pkgmatch class ScoutModule(object): @@ -39,9 +51,10 @@ @classmethod def query_zypp(cls, term): - # TODO: implement - print "Querying zypp repositories is not yet implemented" - return None + if satsolver == None: + return None + s = SolvParser() + return s.search(term) @classmethod def query_repo(cls, repo, term): @@ -59,8 +72,7 @@ def main(cls): p = scout.Parser(cls.name) - # TODO: do not add zypp repo for now (not implemented) - # p.add_repo('zypp') + p.add_repo('zypp') if not p.parse(): return None term = p.args[0] ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit rpm
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package rpm checked in at Fri Aug 8 17:23:32 CEST 2008. -------- --- rpm/rpm-python.changes 2008-04-07 15:33:45.000000000 +0200 +++ /mounts/work_src_done/STABLE/rpm/rpm-python.changes 2008-08-07 16:06:13.000000000 +0200 @@ -1,0 +2,5 @@ +Thu Aug 7 16:05:51 CEST 2008 - dmueller(a)suse.de + +- fix build against python 2.6 + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rpm-python.spec ++++++ --- /var/tmp/diff_new_pack.OH9251/_old 2008-08-08 17:22:58.000000000 +0200 +++ /var/tmp/diff_new_pack.OH9251/_new 2008-08-08 17:22:58.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package rpm-python (Version 4.4.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -17,7 +24,7 @@ Group: System/Packages Summary: Python Bindings for Manipulating RPM Packages Version: 4.4.2 -Release: 251 +Release: 265 Requires: rpm = %{version} %py_requires Source99: rpm.spec @@ -62,13 +69,15 @@ %{_libdir}/python* %changelog +* Thu Aug 07 2008 dmueller(a)suse.de +- fix build against python 2.6 * Thu Mar 27 2008 coolo(a)suse.de - fix buildrequires * Fri May 25 2007 mls(a)suse.de - fix unicode queries * Fri Mar 30 2007 rguenther(a)suse.de - add ncurses-devel and zlib-devel BuildRequires. -* Wed Oct 18 2006 mls(a)suse.de +* Thu Oct 19 2006 mls(a)suse.de - use rpm.spec for building instead of duplication everything - delete superfluous .a and .la files [#202604] - create .pyc and .pyo files [#205711] ++++++ rpm.spec ++++++ --- /var/tmp/diff_new_pack.OH9251/_old 2008-08-08 17:22:58.000000000 +0200 +++ /var/tmp/diff_new_pack.OH9251/_new 2008-08-08 17:22:58.000000000 +0200 @@ -2,9 +2,16 @@ # spec file for package rpm (Version 4.4.2) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -20,7 +27,7 @@ AutoReqProv: on Summary: The RPM Package Manager Version: 4.4.2 -Release: 203 +Release: 209 Source: rpm-%{version}.tar.bz2 Source1: RPM-HOWTO.tar.bz2 Source2: RPM-Tips.html.tar.bz2 @@ -353,7 +360,7 @@ License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 431 +Release: 437 # %description -n popt @@ -376,7 +383,7 @@ License: LGPL v2.1 or later Group: System/Libraries Version: 1.7 -Release: 431 +Release: 437 Requires: popt = 1.7 Requires: glibc-devel ++++++ build.diff ++++++ --- /var/tmp/diff_new_pack.OH9251/_old 2008-08-08 17:22:58.000000000 +0200 +++ /var/tmp/diff_new_pack.OH9251/_new 2008-08-08 17:22:59.000000000 +0200 @@ -167,13 +167,25 @@ dnl TVM: dnl horrible *temporary* hack to make sure that if we found gettext() in dnl -lintl that we add -lintl *back* to $LIBS. -@@ -943,54 +919,74 @@ withval=auto +@@ -943,54 +919,86 @@ withval=auto AC_ARG_WITH(python, [ --with-python build rpm python bindings ]) WITH_PYTHON_VERSION=$withval -if test $withval = auto ; then +if test "$WITH_PYTHON_VERSION" = auto ; then ++AC_MSG_CHECKING(for python 2.6) ++AC_RUN_IFELSE([AC_LANG_SOURCE([[ ++#include <python2.6/Python.h> ++main() { ++ exit(strncmp("2.6", PY_VERSION, 3)); ++} ]])],[withval=yes],[withval=no],[withval=yes]) ++AC_MSG_RESULT($withval) ++if test $withval = yes ; then ++ WITH_PYTHON_VERSION="2.6" ++fi ++fi ++if test "$WITH_PYTHON_VERSION" = auto ; then +AC_MSG_CHECKING(for python 2.5) +AC_RUN_IFELSE([AC_LANG_SOURCE([[ +#include <python2.5/Python.h> @@ -283,7 +295,7 @@ fi if test "$WITH_PYTHON_VERSION" != no ; then -@@ -1283,6 +1279,7 @@ arm*) RPMCANONCOLOR=0; RPMCANONARCH="${ +@@ -1283,6 +1291,7 @@ arm*) RPMCANONCOLOR=0; RPMCANONARCH="${ mipsel*) RPMCANONCOLOR=0; RPMCANONARCH=mipsel ;; mips*) RPMCANONCOLOR=0; RPMCANONARCH=mips ;; m68k*) RPMCANONCOLOR=0; RPMCANONARCH=m68k ;; @@ -291,7 +303,7 @@ *) RPMCANONCOLOR=0; RPMCANONARCH=unknown ;; esac case "${build_os_noversion}" in -@@ -1290,7 +1287,8 @@ mint) RPMCANONARCH=m68kmint ;; +@@ -1290,7 +1299,8 @@ mint) RPMCANONARCH=m68kmint ;; esac RPMCANONVENDOR="$build_vendor" case "${build_vendor}" in @@ -301,7 +313,7 @@ test -f /etc/redhat-release && RPMCANONVENDOR=redhat test -f /etc/pld-release && RPMCANONVENDOR=pld test -f /etc/mandrake-release && RPMCANONVENDOR=mandrake -@@ -1372,7 +1370,7 @@ dnl XXX this causes popt to depend on zl +@@ -1372,7 +1382,7 @@ dnl XXX this causes popt to depend on zl dnl # XXX Propagate -lucb to popt ... dnl export LIBS INCPATH CONFIG_SITE ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit binutils
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package binutils checked in at Fri Aug 8 17:22:56 CEST 2008. -------- --- binutils/binutils.changes 2008-07-18 15:08:29.000000000 +0200 +++ /mounts/work_src_done/STABLE/binutils/binutils.changes 2008-08-08 11:09:46.000000000 +0200 @@ -1,0 +2,5 @@ +Fri Aug 8 11:09:38 CEST 2008 - schwab(a)suse.de + +- Update to head of trunk. + +------------------------------------------------------------------- cross-alpha-binutils.changes: same change cross-arm-binutils.changes: same change cross-avr-binutils.changes: same change cross-hppa64-binutils.changes: same change cross-hppa-binutils.changes: same change cross-i386-binutils.changes: same change cross-ia64-binutils.changes: same change cross-mips-binutils.changes: same change cross-ppc64-binutils.changes: same change cross-ppc-binutils.changes: same change cross-s390-binutils.changes: same change cross-s390x-binutils.changes: same change cross-sh4-binutils.changes: same change cross-sparc-binutils.changes: same change cross-spu-binutils.changes: same change cross-x86_64-binutils.changes: same change ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ binutils.spec ++++++ --- /var/tmp/diff_new_pack.Mn1025/_old 2008-08-08 17:22:22.000000000 +0200 +++ /var/tmp/diff_new_pack.Mn1025/_new 2008-08-08 17:22:22.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package binutils (Version 2.18.50.20080718) +# spec file for package binutils (Version 2.18.50.20080808) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -45,7 +52,7 @@ Group: Development/Tools/Building PreReq: %{install_info_prereq} AutoReqProv: on -Version: 2.18.50.20080718 +Version: 2.18.50.20080808 Release: 1 %define binutils_version %(echo %version | sed 's/\\.[0-9]\\{8\\}$//') Summary: GNU Binutils @@ -440,6 +447,8 @@ %{_libdir}/lib*.a %changelog +* Fri Aug 08 2008 schwab(a)suse.de +- Update to head of trunk. * Fri Jul 18 2008 schwab(a)suse.de - Update to head of trunk. * Sun Jul 13 2008 olh(a)suse.de ++++++ cross-alpha-binutils.spec ++++++ --- /var/tmp/diff_new_pack.Mn1025/_old 2008-08-08 17:22:22.000000000 +0200 +++ /var/tmp/diff_new_pack.Mn1025/_new 2008-08-08 17:22:22.000000000 +0200 @@ -1,10 +1,17 @@ # -# spec file for package cross-alpha-binutils (Version 2.18.50.20080718) +# spec file for package cross-alpha-binutils (Version 2.18.50.20080808) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # @@ -45,7 +52,7 @@ Group: Development/Tools/Building PreReq: %{install_info_prereq} AutoReqProv: on -Version: 2.18.50.20080718 +Version: 2.18.50.20080808 Release: 1 %define binutils_version %(echo %version | sed 's/\\.[0-9]\\{8\\}$//') Summary: GNU binutils for Cross-Development to ALPHA Processors @@ -368,6 +375,8 @@ %endif %changelog +* Fri Aug 08 2008 schwab(a)suse.de +- Update to head of trunk. * Fri Jul 18 2008 schwab(a)suse.de - Update to head of trunk. * Sun Jul 13 2008 olh(a)suse.de cross-arm-binutils.spec: same change cross-avr-binutils.spec: same change cross-hppa64-binutils.spec: same change cross-hppa-binutils.spec: same change cross-i386-binutils.spec: same change cross-ia64-binutils.spec: same change cross-mips-binutils.spec: same change cross-ppc64-binutils.spec: same change cross-ppc-binutils.spec: same change cross-s390-binutils.spec: same change cross-s390x-binutils.spec: same change cross-sh4-binutils.spec: same change cross-sparc-binutils.spec: same change cross-spu-binutils.spec: same change cross-x86_64-binutils.spec: same change ++++++ binutils-2.18.50.tar.bz2 ++++++ binutils/binutils-2.18.50.tar.bz2 /mounts/work_src_done/STABLE/binutils/binutils-2.18.50.tar.bz2 differ: byte 11, line 1 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0

commit mpfr
by root＠Hilbert.suse.de 08 Aug '08

08 Aug '08

Hello community, here is the log from the commit of package mpfr checked in at Fri Aug 8 17:22:44 CEST 2008. -------- --- mpfr/mpfr.changes 2008-07-15 17:17:23.000000000 +0200 +++ /mounts/work_src_done/STABLE/mpfr/mpfr.changes 2008-08-02 17:21:36.000000000 +0200 @@ -1,0 +2,5 @@ +Sat Aug 2 17:21:09 CEST 2008 - rguenther(a)suse.de + +- make mpfr-debuginfo depend on libmpfr1 instead of mpfr + +------------------------------------------------------------------- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ mpfr.spec ++++++ --- /var/tmp/diff_new_pack.Ha2100/_old 2008-08-08 17:22:31.000000000 +0200 +++ /var/tmp/diff_new_pack.Ha2100/_new 2008-08-08 17:22:31.000000000 +0200 @@ -2,14 +2,22 @@ # spec file for package mpfr (Version 2.3.1) # # Copyright (c) 2008 SUSE LINUX Products GmbH, Nuernberg, Germany. -# This file and all modifications and additions to the pristine -# package are under the same license as the package itself. # +# All modifications and additions to the file contributed by third parties +# remain the property of their copyright owners, unless otherwise agreed +# upon. The license for this file, and modifications and additions to the +# file, is the same license as for the pristine package itself (unless the +# license for the pristine package is not an Open Source License, in which +# case the license is the MIT License). An "Open Source License" is a +# license that conforms to the Open Source Definition (Version 1.9) +# published by the Open Source Initiative. + # Please submit bugfixes or comments via http://bugs.opensuse.org/ # # norootforbuild +%define debug_package_requires libmpfr1 Name: mpfr BuildRequires: gmp-devel @@ -18,7 +26,7 @@ AutoReqProv: on Requires: gmp Version: 2.3.1 -Release: 6 +Release: 7 Summary: The MPFR multiple-precision floating-point library Url: http://www.mpfr.org/ Source: mpfr-%{version}.tar.bz2 @@ -135,6 +143,8 @@ %{_prefix}/include/mpfr.h %changelog +* Sat Aug 02 2008 rguenther(a)suse.de +- make mpfr-debuginfo depend on libmpfr1 instead of mpfr * Tue Jul 15 2008 rguenther(a)suse.de - allow build on SLES9 by disabling TLS usage there * Tue Apr 29 2008 cthiel(a)suse.de ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: opensuse-commit+help(a)opensuse.org

1 0