commit gcc44 for openSUSE:Factory
Hello community, here is the log from the commit of package gcc44 for openSUSE:Factory checked in at Mon Nov 23 10:58:29 CET 2009. -------- --- gcc44/cross-avr-gcc44.changes 2009-10-08 15:06:04.000000000 +0200 +++ /mounts/work_src_done/STABLE/gcc44/cross-avr-gcc44.changes 2009-11-04 11:28:54.000000000 +0100 @@ -1,0 +2,11 @@ +Wed Nov 4 11:21:39 CET 2009 - rguenther@suse.de + +- Update to gcc-4_4-branch head (r153890). + * includes GCC 4.4.2 release. + +------------------------------------------------------------------- +Tue Nov 3 19:13:10 UTC 2009 - coolo@novell.com + +- updated patches to apply with fuzz=0 + +------------------------------------------------------------------- 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 gcc44.changes: same change libgcj44.changes: same change calling whatdependson for head-i586 Old: ---- classpath-fixes.tar gcc-4.4.1-20090817.tar.bz2 nvl544794.patch New: ---- gcc-4.4.2-20091104.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ cross-avr-gcc44.spec ++++++ --- /var/tmp/diff_new_pack.21uRfe/_old 2009-11-23 10:55:39.000000000 +0100 +++ /var/tmp/diff_new_pack.21uRfe/_new 2009-11-23 10:55:39.000000000 +0100 @@ -1,5 +1,5 @@ # -# spec file for package cross-avr-gcc44 (Version 4.4.1_20090817) +# spec file for package cross-avr-gcc44 (Version 4.4.2_20091104) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -64,8 +64,8 @@ # COMMON-BEGIN %define biarch_targets x86_64 s390x powerpc64 powerpc Url: http://gcc.gnu.org/ -Version: 4.4.1_20090817 -Release: 2 +Version: 4.4.2_20091104 +Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) %define snapshot_date %(echo %version | sed 's/[34]\.[0-4]\.[0-6]//' | sed 's/_/-/') @@ -80,7 +80,6 @@ Source3: gcc44-rpmlintrc Source4: ecj.jar Source5: README.First-for.SuSE.packagers -Source6: classpath-fixes.tar Patch1: gcc-dir-version.patch Patch2: gcc-sles-version.patch Patch3: gcc-noalias-warn.diff @@ -98,7 +97,6 @@ Patch29: build-id.diff Patch30: gcc43-no-unwind-tables.diff Patch31: gcc44-arm-boehm.patch -Patch32: nvl544794.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -148,7 +146,6 @@ %prep %setup -q -n gcc-%{gcc_version}%{snapshot_date} -tar xf %{SOURCE6} %patch1 %patch2 %patch3 @@ -170,7 +167,6 @@ %endif %patch30 %patch31 -%patch32 %patch51 %patch55 %patch57 cross-hppa-gcc-icecream-backend.spec: same change 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: same change cross-spu-gcc-static.spec: same change cross-x86_64-gcc-icecream-backend.spec: same change gcc44.spec: same change libgcj44.spec: same change ++++++ gcc-4.4.1-20090817.tar.bz2 -> gcc-4.4.2-20091104.tar.bz2 ++++++ gcc44/gcc-4.4.1-20090817.tar.bz2 /mounts/work_src_done/STABLE/gcc44/gcc-4.4.2-20091104.tar.bz2 differ: byte 11, line 1 ++++++ gcc44-rename-info-files.patch ++++++ --- /var/tmp/diff_new_pack.21uRfe/_old 2009-11-23 10:55:40.000000000 +0100 +++ /var/tmp/diff_new_pack.21uRfe/_new 2009-11-23 10:55:40.000000000 +0100 @@ -60,9 +60,9 @@ Index: libgomp/libgomp.texi =================================================================== ---- libgomp/libgomp.texi.orig 2008-07-01 11:33:42.000000000 +0200 -+++ libgomp/libgomp.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -32,7 +32,7 @@ texts being (a) (see below), and with th +--- libgomp/libgomp.texi.orig ++++ libgomp/libgomp.texi +@@ -31,7 +31,7 @@ texts being (a) (see below), and with th @ifinfo @dircategory GNU Libraries @direntry @@ -73,9 +73,9 @@ This manual documents the GNU implementation of the OpenMP API for Index: libgomp/Makefile.am =================================================================== ---- libgomp/Makefile.am.orig 2008-06-11 15:23:21.000000000 +0200 -+++ libgomp/Makefile.am 2008-07-20 13:38:48.000000000 +0200 -@@ -92,16 +92,19 @@ endif +--- libgomp/Makefile.am.orig ++++ libgomp/Makefile.am +@@ -93,16 +93,19 @@ endif all-local: $(STAMP_GENINSRC) @@ -102,9 +102,9 @@ MAINTAINERCLEANFILES = $(srcdir)/libgomp.info Index: libgomp/Makefile.in =================================================================== ---- libgomp/Makefile.in.orig 2008-06-11 15:25:28.000000000 +0200 -+++ libgomp/Makefile.in 2008-07-20 13:38:48.000000000 +0200 -@@ -322,7 +322,8 @@ info_TEXINFOS = libgomp.texi +--- libgomp/Makefile.in.orig ++++ libgomp/Makefile.in +@@ -336,7 +336,8 @@ info_TEXINFOS = libgomp.texi # AM_CONDITIONAL on configure check ACX_CHECK_PROG_VER([MAKEINFO]) @BUILD_INFO_TRUE@STAMP_BUILD_INFO = stamp-build-info @@ -114,7 +114,7 @@ MAINTAINERCLEANFILES = $(srcdir)/libgomp.info all: config.h $(MAKE) $(AM_MAKEFLAGS) all-recursive -@@ -1086,15 +1087,16 @@ install-pdf: $(PDFS) +@@ -1100,15 +1101,16 @@ install-pdf: $(PDFS) done all-local: $(STAMP_GENINSRC) @@ -138,8 +138,8 @@ # Otherwise a system limit (for SysV at least) may be exceeded. Index: gcc/doc/cpp.texi =================================================================== ---- gcc/doc/cpp.texi.orig 2008-07-01 11:33:44.000000000 +0200 -+++ gcc/doc/cpp.texi 2008-07-20 13:41:37.000000000 +0200 +--- gcc/doc/cpp.texi.orig ++++ gcc/doc/cpp.texi @@ -52,7 +52,7 @@ This manual contains no Invariant Sectio @ifinfo @dircategory Software development @@ -151,8 +151,8 @@ Index: gcc/doc/cppinternals.texi =================================================================== ---- gcc/doc/cppinternals.texi.orig 2008-02-15 10:52:51.000000000 +0100 -+++ gcc/doc/cppinternals.texi 2008-07-20 13:38:48.000000000 +0200 +--- gcc/doc/cppinternals.texi.orig ++++ gcc/doc/cppinternals.texi @@ -7,7 +7,7 @@ @ifinfo @dircategory Software development @@ -164,9 +164,9 @@ Index: gcc/doc/extend.texi =================================================================== ---- gcc/doc/extend.texi.orig 2008-07-19 13:58:10.000000000 +0200 -+++ gcc/doc/extend.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -11802,7 +11802,7 @@ want to write code that checks whether t +--- gcc/doc/extend.texi.orig ++++ gcc/doc/extend.texi +@@ -12339,7 +12339,7 @@ want to write code that checks whether t test for the GNU compiler the same way as for C programs: check for a predefined macro @code{__GNUC__}. You can also use @code{__GNUG__} to test specifically for GNU C++ (@pxref{Common Predefined Macros,, @@ -177,9 +177,9 @@ * Volatiles:: What constitutes an access to a volatile object. Index: gcc/doc/gcc.texi =================================================================== ---- gcc/doc/gcc.texi.orig 2008-07-01 11:33:44.000000000 +0200 -+++ gcc/doc/gcc.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -65,8 +65,8 @@ included in the section entitled ``GNU F +--- gcc/doc/gcc.texi.orig ++++ gcc/doc/gcc.texi +@@ -65,8 +65,8 @@ Texts being (a) (see below), and with th @ifnottex @dircategory Software development @direntry @@ -201,9 +201,9 @@ * G++ and GCC:: You can compile C or C++ programs. Index: gcc/doc/gccint.texi =================================================================== ---- gcc/doc/gccint.texi.orig 2008-07-01 11:33:44.000000000 +0200 -+++ gcc/doc/gccint.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -51,7 +51,7 @@ included in the section entitled ``GNU F +--- gcc/doc/gccint.texi.orig ++++ gcc/doc/gccint.texi +@@ -51,7 +51,7 @@ Texts being (a) (see below), and with th @ifnottex @dircategory Software development @direntry @@ -223,9 +223,9 @@ This manual is mainly a reference manual rather than a tutorial. It Index: gcc/doc/invoke.texi =================================================================== ---- gcc/doc/invoke.texi.orig 2008-07-19 13:58:10.000000000 +0200 -+++ gcc/doc/invoke.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -7552,7 +7552,7 @@ One of the standard libraries bypassed b +--- gcc/doc/invoke.texi.orig ++++ gcc/doc/invoke.texi +@@ -7942,7 +7942,7 @@ One of the standard libraries bypassed b @option{-nodefaultlibs} is @file{libgcc.a}, a library of internal subroutines that GCC uses to overcome shortcomings of particular machines, or special needs for some languages. @@ -234,7 +234,7 @@ Collection (GCC) Internals}, for more discussion of @file{libgcc.a}.) In most cases, you need @file{libgcc.a} even when you want to avoid -@@ -7560,7 +7560,7 @@ other standard libraries. In other word +@@ -7950,7 +7950,7 @@ other standard libraries. In other word or @option{-nodefaultlibs} you should usually specify @option{-lgcc} as well. This ensures that you have no unresolved references to internal GCC library subroutines. (For example, @samp{__main}, used to ensure C++ @@ -243,7 +243,7 @@ GNU Compiler Collection (GCC) Internals}.) @item -pie -@@ -15377,7 +15377,7 @@ Note that you can also specify places to +@@ -16211,7 +16211,7 @@ Note that you can also specify places to @option{-B}, @option{-I} and @option{-L} (@pxref{Directory Options}). These take precedence over places specified using environment variables, which in turn take precedence over those specified by the configuration of GCC@. @@ -252,7 +252,7 @@ GNU Compiler Collection (GCC) Internals}. @table @env -@@ -15532,7 +15532,7 @@ the headers it contains change. +@@ -16366,7 +16366,7 @@ the headers it contains change. A precompiled header file will be searched for when @code{#include} is seen in the compilation. As it searches for the included file @@ -263,8 +263,8 @@ the name specified in the @code{#include} with @samp{.gch} appended. If Index: gcc/doc/libgcc.texi =================================================================== ---- gcc/doc/libgcc.texi.orig 2008-07-01 11:33:44.000000000 +0200 -+++ gcc/doc/libgcc.texi 2008-07-20 13:38:48.000000000 +0200 +--- gcc/doc/libgcc.texi.orig ++++ gcc/doc/libgcc.texi @@ -24,7 +24,7 @@ that needs them. GCC will also generate calls to C library routines, such as @code{memcpy} and @code{memset}, in some cases. The set of routines @@ -276,9 +276,9 @@ mode, not a specific C type. @xref{Machine Modes}, for an explanation Index: gcc/doc/makefile.texi =================================================================== ---- gcc/doc/makefile.texi.orig 2008-07-01 11:33:44.000000000 +0200 -+++ gcc/doc/makefile.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -139,7 +139,7 @@ regardless of how it itself was compiled +--- gcc/doc/makefile.texi.orig ++++ gcc/doc/makefile.texi +@@ -140,7 +140,7 @@ regardless of how it itself was compiled @item profiledbootstrap Builds a compiler with profiling feedback information. For more information, see @@ -289,9 +289,9 @@ Restart a bootstrap, so that everything that was not built with Index: gcc/doc/passes.texi =================================================================== ---- gcc/doc/passes.texi.orig 2008-07-01 11:33:44.000000000 +0200 -+++ gcc/doc/passes.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -192,7 +192,7 @@ rid of it. This pass is located in @fil +--- gcc/doc/passes.texi.orig ++++ gcc/doc/passes.texi +@@ -196,7 +196,7 @@ rid of it. This pass is located in @fil @item Mudflap declaration registration If mudflap (@pxref{Optimize Options,,-fmudflap -fmudflapth @@ -302,8 +302,8 @@ those variable declarations that have their addresses taken, or whose Index: gcc/doc/standards.texi =================================================================== ---- gcc/doc/standards.texi.orig 2008-03-11 11:31:45.000000000 +0100 -+++ gcc/doc/standards.texi 2008-07-20 13:38:48.000000000 +0200 +--- gcc/doc/standards.texi.orig ++++ gcc/doc/standards.texi @@ -223,8 +223,8 @@ have additional useful information. GNAT Reference Manual}, for information on standard conformance and compatibility of the Ada compiler. @@ -317,8 +317,8 @@ for details of compatibility between @command{gcj} and the Java Platform. Index: gcc/java/Make-lang.in =================================================================== ---- gcc/java/Make-lang.in.orig 2008-07-19 13:58:11.000000000 +0200 -+++ gcc/java/Make-lang.in 2008-07-20 13:40:37.000000000 +0200 +--- gcc/java/Make-lang.in.orig ++++ gcc/java/Make-lang.in @@ -126,11 +126,23 @@ java.tags: force etags --include TAGS.sub --include ../TAGS.sub @@ -345,7 +345,7 @@ java.dvi: doc/gcj.dvi JAVA_PDFFILES = doc/gcj.pdf -@@ -189,8 +201,9 @@ java.uninstall: +@@ -190,8 +202,9 @@ java.uninstall: -rm -rf $(DESTDIR)$(man1dir)/gcj-dbtool$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/aot-compile$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/rebuild-gcj-db$(man1ext) @@ -358,9 +358,9 @@ @$(NORMAL_INSTALL) Index: gcc/java/gcj.texi =================================================================== ---- gcc/java/gcj.texi.orig 2008-07-03 10:39:46.000000000 +0200 -+++ gcc/java/gcj.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -56,21 +56,21 @@ man page gfdl(7). +--- gcc/java/gcj.texi.orig ++++ gcc/java/gcj.texi +@@ -55,21 +55,21 @@ man page gfdl(7). @format @dircategory Software development @direntry @@ -389,7 +389,7 @@ Analyze Garbage Collector (GC) memory dumps. * aot-compile: (gcj)Invoking aot-compile. Compile bytecode to native and generate databases. -@@ -160,7 +160,7 @@ and the Info entries for @file{gcj} and +@@ -159,7 +159,7 @@ and the Info entries for @file{gcj} and As @command{gcj} is just another front end to @command{gcc}, it supports many of the same options as gcc. @xref{Option Summary, , Option Summary, @@ -400,8 +400,8 @@ @c man end Index: gcc/fortran/Make-lang.in =================================================================== ---- gcc/fortran/Make-lang.in.orig 2008-07-19 13:58:22.000000000 +0200 -+++ gcc/fortran/Make-lang.in 2008-07-20 13:38:48.000000000 +0200 +--- gcc/fortran/Make-lang.in.orig ++++ gcc/fortran/Make-lang.in @@ -116,7 +116,8 @@ fortran.tags: force cd $(srcdir)/fortran; etags -o TAGS.sub *.c *.h; \ etags --include TAGS.sub --include ../TAGS.sub @@ -412,7 +412,7 @@ fortran.dvi: doc/gfortran.dvi doc/gfc-internals.dvi fortran.html: $(build_htmldir)/gfortran/index.html -@@ -158,10 +159,10 @@ GFORTRAN_TEXI = \ +@@ -165,10 +166,10 @@ GFORTRAN_TEXI = \ $(srcdir)/doc/include/gcc-common.texi \ gcc-vers.texi @@ -425,7 +425,7 @@ -o $@ $<; \ else true; fi -@@ -229,7 +230,7 @@ fortran.install-common: install-finclude +@@ -234,7 +235,7 @@ fortran.install-common: install-finclude fi ; \ fi @@ -434,7 +434,7 @@ fortran.install-man: $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext) -@@ -247,7 +248,7 @@ fortran.uninstall: +@@ -252,7 +253,7 @@ fortran.uninstall: rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \ rm -rf $(DESTDIR)$(man1dir)/$(GFORTRAN_INSTALL_NAME)$(man1ext); \ rm -rf $(DESTDIR)$(bindir)/$(GFORTRAN_TARGET_INSTALL_NAME)$(exeext); \ @@ -445,9 +445,9 @@ # Clean hooks: Index: gcc/fortran/gfortran.texi =================================================================== ---- gcc/fortran/gfortran.texi.orig 2008-07-01 11:34:00.000000000 +0200 -+++ gcc/fortran/gfortran.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -102,7 +102,7 @@ texts being (a) (see below), and with th +--- gcc/fortran/gfortran.texi.orig ++++ gcc/fortran/gfortran.texi +@@ -101,7 +101,7 @@ Texts being (a) (see below), and with th @ifinfo @dircategory Software development @direntry @@ -458,9 +458,9 @@ the GNU Fortran compiler, (@command{gfortran}). Index: gcc/Makefile.in =================================================================== ---- gcc/Makefile.in.orig 2008-07-20 13:38:35.000000000 +0200 -+++ gcc/Makefile.in 2008-07-20 13:38:48.000000000 +0200 -@@ -3724,8 +3724,27 @@ stmp-install-fixproto: fixproto +--- gcc/Makefile.in.orig ++++ gcc/Makefile.in +@@ -3814,8 +3814,27 @@ stmp-install-fixproto: fixproto doc: $(BUILD_INFO) $(GENERATED_MANPAGES) gccbug @@ -490,7 +490,7 @@ info: $(INFOFILES) lang.info @GENINSRC@ srcinfo lang.srcinfo -@@ -3775,21 +3794,41 @@ gcc-vers.texi: $(BASEVER) $(DEVPHASE) +@@ -3865,21 +3884,41 @@ gcc-vers.texi: $(BASEVER) $(DEVPHASE) # patterns. To use them, put each of the specific targets with its # specific dependencies but no build commands. @@ -539,7 +539,7 @@ -I $(gcc_docdir)/include -o $@ $<; \ fi -@@ -4100,11 +4139,11 @@ install-driver: installdirs xgcc$(exeext +@@ -4190,11 +4229,11 @@ install-driver: installdirs xgcc$(exeext # $(INSTALL_DATA) might be a relative pathname, so we can't cd into srcdir # to do the install. install-info:: doc installdirs \ @@ -556,7 +556,7 @@ lang.install-info $(DESTDIR)$(infodir)/%.info: doc/%.info installdirs -@@ -4305,8 +4344,11 @@ uninstall: lang.uninstall +@@ -4395,8 +4434,11 @@ uninstall: lang.uninstall -rm -rf $(DESTDIR)$(man1dir)/cpp$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/protoize$(man1ext) -rm -rf $(DESTDIR)$(man1dir)/unprotoize$(man1ext) @@ -572,9 +572,9 @@ # contains global variables that all the testsuites will use. Index: gcc/doc/install.texi =================================================================== ---- gcc/doc/install.texi.orig 2008-07-19 13:58:10.000000000 +0200 -+++ gcc/doc/install.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -96,7 +96,7 @@ Free Documentation License}''. +--- gcc/doc/install.texi.orig ++++ gcc/doc/install.texi +@@ -97,7 +97,7 @@ Free Documentation License}''. @end ifinfo @dircategory Software development @direntry @@ -585,9 +585,9 @@ @c Part 3 Titlepage and Copyright Index: gcc/ada/gnat-style.texi =================================================================== ---- gcc/ada/gnat-style.texi.orig 2007-10-29 12:59:35.000000000 +0100 -+++ gcc/ada/gnat-style.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -31,7 +31,7 @@ +--- gcc/ada/gnat-style.texi.orig ++++ gcc/ada/gnat-style.texi +@@ -31,7 +31,7 @@ Texts. A copy of the license is include @dircategory Software development @direntry @@ -598,9 +598,9 @@ @macro syntax{element} Index: gcc/ada/gnat_rm.texi =================================================================== ---- gcc/ada/gnat_rm.texi.orig 2008-07-01 11:33:57.000000000 +0200 -+++ gcc/ada/gnat_rm.texi 2008-07-20 13:38:48.000000000 +0200 -@@ -30,7 +30,7 @@ +--- gcc/ada/gnat_rm.texi.orig ++++ gcc/ada/gnat_rm.texi +@@ -38,7 +38,7 @@ included in the section entitled ``GNU F @dircategory GNU Ada tools @direntry @@ -608,4 +608,4 @@ +* GNAT Reference Manual: (gnat_rm-4.4). Reference Manual for GNU Ada tools. @end direntry - @copying + @titlepage ++++++ gcc-dir-version.patch ++++++ --- /var/tmp/diff_new_pack.21uRfe/_old 2009-11-23 10:55:40.000000000 +0100 +++ /var/tmp/diff_new_pack.21uRfe/_new 2009-11-23 10:55:40.000000000 +0100 @@ -1,133 +1,83 @@ Index: gcc/Makefile.in =================================================================== -*** gcc/Makefile.in (revision 130135) ---- gcc/Makefile.in (working copy) -*************** GTM_H = tm.h $(tm_file_list) -*** 726,737 **** - TM_H = $(GTM_H) insn-constants.h insn-flags.h options.h - - # Variables for version information. -! BASEVER := $(srcdir)/BASE-VER # 4.x.y - DEVPHASE := $(srcdir)/DEV-PHASE # experimental, prerelease, "" - DATESTAMP := $(srcdir)/DATESTAMP # YYYYMMDD or empty - REVISION := $(srcdir)/REVISION # [BRANCH revision XXXXXX] - - BASEVER_c := $(shell cat $(BASEVER)) - DEVPHASE_c := $(shell cat $(DEVPHASE)) - DATESTAMP_c := $(shell cat $(DATESTAMP)) - ---- 726,739 ---- - TM_H = $(GTM_H) insn-constants.h insn-flags.h options.h - - # Variables for version information. -! BASEVER := $(srcdir)/BASE-VER # 4.x -! FULLVER := $(srcdir)/FULL-VER # 4.x.y - DEVPHASE := $(srcdir)/DEV-PHASE # experimental, prerelease, "" - DATESTAMP := $(srcdir)/DATESTAMP # YYYYMMDD or empty - REVISION := $(srcdir)/REVISION # [BRANCH revision XXXXXX] - - BASEVER_c := $(shell cat $(BASEVER)) -+ FULLVER_c := $(shell cat $(FULLVER)) - DEVPHASE_c := $(shell cat $(DEVPHASE)) - DATESTAMP_c := $(shell cat $(DATESTAMP)) - -*************** version := $(BASEVER_c) -*** 749,754 **** ---- 751,757 ---- - # (i.e. if DEVPHASE_c is empty). The space immediately after the - # comma in the $(if ...) constructs is significant - do not remove it. - BASEVER_s := "\"$(BASEVER_c)\"" -+ FULLVER_s := "\"$(FULLVER_c)\"" - DEVPHASE_s := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\"" - DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\"" - PKGVERSION_s:= "\"@PKGVERSION@\"" -*************** gcc-options.o: options.c $(CONFIG_H) $(S -*** 1912,1923 **** - dumpvers: dumpvers.c - - ifdef REVISION_s -! version.o: version.c version.h $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE) - else -! version.o: version.c version.h $(DATESTAMP) $(BASEVER) $(DEVPHASE) - endif - $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \ -! -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \ - -DREVISION=$(REVISION_s) \ - -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \ - -DBUGURL=$(BUGURL_s) -c $(srcdir)/version.c $(OUTPUT_OPTION) ---- 1915,1926 ---- - dumpvers: dumpvers.c - - ifdef REVISION_s -! version.o: version.c version.h $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE) - else -! version.o: version.c version.h $(DATESTAMP) $(FULLVER) $(DEVPHASE) - endif - $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \ -! -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \ - -DREVISION=$(REVISION_s) \ - -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \ - -DBUGURL=$(BUGURL_s) -c $(srcdir)/version.c $(OUTPUT_OPTION) +--- gcc/Makefile.in.orig ++++ gcc/Makefile.in +@@ -753,12 +753,14 @@ GTM_H = tm.h $(tm_file_list) + TM_H = $(GTM_H) insn-constants.h insn-flags.h options.h + + # Variables for version information. +-BASEVER := $(srcdir)/BASE-VER # 4.x.y ++BASEVER := $(srcdir)/BASE-VER # 4.x ++FULLVER := $(srcdir)/FULL-VER # 4.x.y + DEVPHASE := $(srcdir)/DEV-PHASE # experimental, prerelease, "" + DATESTAMP := $(srcdir)/DATESTAMP # YYYYMMDD or empty + REVISION := $(srcdir)/REVISION # [BRANCH revision XXXXXX] + + BASEVER_c := $(shell cat $(BASEVER)) ++FULLVER_c := $(shell cat $(FULLVER)) + DEVPHASE_c := $(shell cat $(DEVPHASE)) + DATESTAMP_c := $(shell cat $(DATESTAMP)) + +@@ -776,6 +778,7 @@ version := $(BASEVER_c) + # (i.e. if DEVPHASE_c is empty). The space immediately after the + # comma in the $(if ...) constructs is significant - do not remove it. + BASEVER_s := "\"$(BASEVER_c)\"" ++FULLVER_s := "\"$(FULLVER_c)\"" + DEVPHASE_s := "\"$(if $(DEVPHASE_c), ($(DEVPHASE_c)))\"" + DATESTAMP_s := "\"$(if $(DEVPHASE_c), $(DATESTAMP_c))\"" + PKGVERSION_s:= "\"@PKGVERSION@\"" +@@ -2005,12 +2008,12 @@ gcc-options.o: options.c $(CONFIG_H) $(S + dumpvers: dumpvers.c + + ifdef REVISION_s +-version.o: version.c version.h $(REVISION) $(DATESTAMP) $(BASEVER) $(DEVPHASE) ++version.o: version.c version.h $(REVISION) $(DATESTAMP) $(FULLVER) $(DEVPHASE) + else +-version.o: version.c version.h $(DATESTAMP) $(BASEVER) $(DEVPHASE) ++version.o: version.c version.h $(DATESTAMP) $(FULLVER) $(DEVPHASE) + endif + $(CC) $(ALL_CFLAGS) $(ALL_CPPFLAGS) \ +- -DBASEVER=$(BASEVER_s) -DDATESTAMP=$(DATESTAMP_s) \ ++ -DBASEVER=$(FULLVER_s) -DDATESTAMP=$(DATESTAMP_s) \ + -DREVISION=$(REVISION_s) \ + -DDEVPHASE=$(DEVPHASE_s) -DPKGVERSION=$(PKGVERSION_s) \ + -DBUGURL=$(BUGURL_s) -c $(srcdir)/version.c $(OUTPUT_OPTION) Index: libjava/Makefile.am =================================================================== -*** libjava/Makefile.am (revision 130144) ---- libjava/Makefile.am (working copy) -*************** endif BUILD_ECJ1 -*** 473,479 **** - install-data-local: - $(PRE_INSTALL) - ## Install the .pc file. -! @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \ - file="libgcj-$${pc_version}.pc"; \ - $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \ - echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \ ---- 473,479 ---- - install-data-local: - $(PRE_INSTALL) - ## Install the .pc file. -! @pc_version=`echo $(GCJVERSION)`; \ - file="libgcj-$${pc_version}.pc"; \ - $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \ - echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \ +--- libjava/Makefile.am.orig ++++ libjava/Makefile.am +@@ -524,7 +524,7 @@ install_data_local_split = 50 + install-data-local: + $(PRE_INSTALL) + ## Install the .pc file. +- @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \ ++ @pc_version=`echo $(GCJVERSION)`; \ + file="libgcj-$${pc_version}.pc"; \ + $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \ + echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \ Index: libjava/Makefile.in =================================================================== -*** libjava/Makefile.in (revision 130144) ---- libjava/Makefile.in (working copy) -*************** install-exec-hook: install-toolexeclibLT -*** 11878,11884 **** - - install-data-local: - $(PRE_INSTALL) -! @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \ - file="libgcj-$${pc_version}.pc"; \ - $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \ - echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \ ---- 11878,11884 ---- - - install-data-local: - $(PRE_INSTALL) -! @pc_version=`echo $(GCJVERSION)`; \ - file="libgcj-$${pc_version}.pc"; \ - $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \ - echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \ +--- libjava/Makefile.in.orig ++++ libjava/Makefile.in +@@ -12384,7 +12384,7 @@ install-exec-hook: install-binPROGRAMS i + @BUILD_ECJ1_TRUE@ mv $(DESTDIR)$(libexecsubdir)/`echo ecjx | sed 's,^.*/,,;$(transform);s/$$/$(EXEEXT)/'` $(DESTDIR)$(libexecsubdir)/ecj1$(host_exeext) + install-data-local: + $(PRE_INSTALL) +- @pc_version=`echo $(GCJVERSION) | sed -e 's/[.][^.]*$$//'`; \ ++ @pc_version=`echo $(GCJVERSION)`; \ + file="libgcj-$${pc_version}.pc"; \ + $(mkinstalldirs) $(DESTDIR)$(pkgconfigdir); \ + echo " $(INSTALL_DATA) libgcj.pc $(DESTDIR)$(pkgconfigdir)/$$file"; \ Index: libjava/testsuite/lib/libjava.exp =================================================================== -*** libjava/testsuite/lib/libjava.exp (revision 131902) ---- libjava/testsuite/lib/libjava.exp (working copy) -*************** proc libjava_init { args } { -*** 168,174 **** - - set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"] - regexp " version \[^\n\r\]*" $text version -! set libjava_version [lindex $version 1] - - verbose "version: $libjava_version" - ---- 168,174 ---- - - set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"] - regexp " version \[^\n\r\]*" $text version -! set libjava_version 4.4 - - verbose "version: $libjava_version" - +--- libjava/testsuite/lib/libjava.exp.orig ++++ libjava/testsuite/lib/libjava.exp +@@ -168,7 +168,7 @@ proc libjava_init { args } { + + set text [eval exec "$GCJ_UNDER_TEST -B$specdir -v 2>@ stdout"] + regexp " version \[^\n\r\]*" $text version +- set libjava_version [lindex $version 1] ++ set libjava_version 4.4 + + verbose "version: $libjava_version" + ++++++ gcc.spec.in ++++++ --- /var/tmp/diff_new_pack.21uRfe/_old 2009-11-23 10:55:40.000000000 +0100 +++ /var/tmp/diff_new_pack.21uRfe/_new 2009-11-23 10:55:40.000000000 +0100 @@ -132,7 +132,7 @@ %define biarch_targets x86_64 s390x powerpc64 powerpc URL: http://gcc.gnu.org/ -Version: 4.4.1_20090817 +Version: 4.4.2_20091104 Release: 1 %define gcc_version %(echo %version | sed 's/_.*//') %define gcc_dir_version %(echo %gcc_version | cut -d '.' -f 1-2) @@ -163,7 +163,6 @@ Source3: gcc44-rpmlintrc Source4: ecj.jar Source5: README.First-for.SuSE.packagers -Source6: classpath-fixes.tar Patch1: gcc-dir-version.patch Patch2: gcc-sles-version.patch Patch3: gcc-noalias-warn.diff @@ -181,7 +180,6 @@ Patch29: build-id.diff Patch30: gcc43-no-unwind-tables.diff Patch31: gcc44-arm-boehm.patch -Patch32: nvl544794.patch # A set of patches from the RH srpm Patch51: gcc41-ia64-stack-protector.patch Patch55: gcc41-java-slow_pthread_self.patch @@ -855,7 +853,6 @@ %prep %setup -q -n gcc-%{gcc_version}%{snapshot_date} -tar xf %{SOURCE6} %patch1 %patch2 %patch3 @@ -877,7 +874,6 @@ %endif %patch30 %patch31 -%patch32 %patch51 %patch55 %patch57 ++++++ pr33763.diff ++++++ --- /var/tmp/diff_new_pack.21uRfe/_old 2009-11-23 10:55:40.000000000 +0100 +++ /var/tmp/diff_new_pack.21uRfe/_new 2009-11-23 10:55:40.000000000 +0100 @@ -1,19 +1,17 @@ Index: gcc/tree-inline.c =================================================================== -*** gcc/tree-inline.c (revision 130489) ---- gcc/tree-inline.c (working copy) -*************** expand_call_inline (basic_block bb, tree -*** 2573,2578 **** ---- 2573,2584 ---- - if (!cgraph_inline_p (cg_edge, &reason)) - { - if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) -+ /* For extern inline functions that get redefined we always -+ silently ignored alway_inline flag. Better behaviour would -+ be to be able to keep both bodies and use extern inline body -+ for inlining, but we can't do that because frontends overwrite -+ the body. */ -+ && !cg_edge->callee->local.redefined_extern_inline - /* Avoid warnings during early inline pass. */ - && (!flag_unit_at_a_time || cgraph_global_info_ready)) - { +--- gcc/tree-inline.c.orig ++++ gcc/tree-inline.c +@@ -3238,6 +3238,12 @@ expand_call_inline (basic_block bb, gimp + goto egress; + + if (lookup_attribute ("always_inline", DECL_ATTRIBUTES (fn)) ++ /* For extern inline functions that get redefined we always ++ silently ignored alway_inline flag. Better behaviour would ++ be to be able to keep both bodies and use extern inline body ++ for inlining, but we can't do that because frontends overwrite ++ the body. */ ++ && !cg_edge->callee->local.redefined_extern_inline + /* Avoid warnings during early inline pass. */ + && cgraph_global_info_ready) + { ++++++ program-transform-name.diff ++++++ --- /var/tmp/diff_new_pack.21uRfe/_old 2009-11-23 10:55:40.000000000 +0100 +++ /var/tmp/diff_new_pack.21uRfe/_new 2009-11-23 10:55:40.000000000 +0100 @@ -1,344 +0,0 @@ -Index: gcc/ada/gcc-interface/Make-lang.in -=================================================================== -*** gcc/ada/gcc-interface/Make-lang.in.orig 2008-06-11 15:24:06.000000000 +0200 ---- gcc/ada/gcc-interface/Make-lang.in 2008-06-11 15:48:23.000000000 +0200 -*************** doc/gnat-style.pdf: ada/gnat-style.texi -*** 494,499 **** ---- 494,515 ---- - # likewise for gnatf, gnatchop, and gnatlink, gnatkr, gnatmake, gnat, - # gnatprep, gnatls, gnatxref, gnatfind, gnatname, gnatclean, - # gnatsym -+ GNATBIND_INSTALL_NAME := $(shell echo gnatbind|sed '$(program_transform_name)') -+ GNATCHOP_INSTALL_NAME := $(shell echo gnatchop|sed '$(program_transform_name)') -+ GNAT_INSTALL_NAME := $(shell echo gnat|sed '$(program_transform_name)') -+ GNATKR_INSTALL_NAME := $(shell echo gnatkr|sed '$(program_transform_name)') -+ GNATLINK_INSTALL_NAME := $(shell echo gnatlink|sed '$(program_transform_name)') -+ GNATLS_INSTALL_NAME := $(shell echo gnatls|sed '$(program_transform_name)') -+ GNATMAKE_INSTALL_NAME := $(shell echo gnatmake|sed '$(program_transform_name)') -+ GNATNAME_INSTALL_NAME := $(shell echo gnatname|sed '$(program_transform_name)') -+ GNATPREP_INSTALL_NAME := $(shell echo gnatprep|sed '$(program_transform_name)') -+ GNATXREF_INSTALL_NAME := $(shell echo gnatxref|sed '$(program_transform_name)') -+ GNATFIND_INSTALL_NAME := $(shell echo gnatfind|sed '$(program_transform_name)') -+ GNATCLEAN_INSTALL_NAME := $(shell echo gnatclean|sed '$(program_transform_name)') -+ GNATSYM_INSTALL_NAME := $(shell echo gnatsym|sed '$(program_transform_name)') -+ GNATLBR_INSTALL_NAME := $(shell echo gnatlbr|sed '$(program_transform_name)') -+ GNATDLL_INSTALL_NAME := $(shell echo gnatdll|sed '$(program_transform_name)') -+ VXADDR2LINE_INSTALL_NAME := $(shell echo vxaddr2line|sed '$(program_transform_name)') - ada.install-common: - $(MKDIR) $(DESTDIR)$(bindir) - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 507,514 **** - $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatbind$(exeext); \ -! $(INSTALL_PROGRAM) gnatbind$(exeext) $(DESTDIR)$(bindir)/gnatbind$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 523,530 ---- - $(INSTALL_PROGRAM) gnatbind-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatbind$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATBIND_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatbind$(exeext) $(DESTDIR)$(bindir)/$(GNATBIND_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 522,529 **** - $(INSTALL_PROGRAM) gnatchop-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatchop$(exeext); \ - fi ; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatchop$(exeext); \ -! $(INSTALL_PROGRAM) gnatchop$(exeext) $(DESTDIR)$(bindir)/gnatchop$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 538,545 ---- - $(INSTALL_PROGRAM) gnatchop-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatchop$(exeext); \ - fi ; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATCHOP_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatchop$(exeext) $(DESTDIR)$(bindir)/$(GNATCHOP_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 537,544 **** - $(INSTALL_PROGRAM) gnat-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnat$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnat$(exeext); \ -! $(INSTALL_PROGRAM) gnat$(exeext) $(DESTDIR)$(bindir)/gnat$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 553,560 ---- - $(INSTALL_PROGRAM) gnat-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnat$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNAT_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnat$(exeext) $(DESTDIR)$(bindir)/$(GNAT_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 552,559 **** - $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatkr$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatkr$(exeext); \ -! $(INSTALL_PROGRAM) gnatkr$(exeext) $(DESTDIR)$(bindir)/gnatkr$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 568,575 ---- - $(INSTALL_PROGRAM) gnatkr-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatkr$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATKR_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatkr$(exeext) $(DESTDIR)$(bindir)/$(GNATKR_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 567,574 **** - $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatlink$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatlink$(exeext); \ -! $(INSTALL_PROGRAM) gnatlink$(exeext) $(DESTDIR)$(bindir)/gnatlink$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 583,590 ---- - $(INSTALL_PROGRAM) gnatlink-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatlink$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATLINK_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatlink$(exeext) $(DESTDIR)$(bindir)/$(GNATLINK_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 582,589 **** - $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatls$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatls$(exeext); \ -! $(INSTALL_PROGRAM) gnatls$(exeext) $(DESTDIR)$(bindir)/gnatls$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 598,605 ---- - $(INSTALL_PROGRAM) gnatls-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatls$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATLS_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatls$(exeext) $(DESTDIR)$(bindir)/$(GNATLS_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 597,604 **** - $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatmake$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatmake$(exeext); \ -! $(INSTALL_PROGRAM) gnatmake$(exeext) $(DESTDIR)$(bindir)/gnatmake$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 613,620 ---- - $(INSTALL_PROGRAM) gnatmake-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatmake$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATMAKE_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatmake$(exeext) $(DESTDIR)$(bindir)/$(GNATMAKE_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 608,615 **** - $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext); \ - $(INSTALL_PROGRAM) gnatname-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext); \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatname$(exeext); \ -! $(INSTALL_PROGRAM) gnatname$(exeext) $(DESTDIR)$(bindir)/gnatname$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 624,631 ---- - $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext); \ - $(INSTALL_PROGRAM) gnatname-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatname$(exeext); \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATNAME_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatname$(exeext) $(DESTDIR)$(bindir)/$(GNATNAME_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 623,630 **** - $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatprep$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatprep$(exeext); \ -! $(INSTALL_PROGRAM) gnatprep$(exeext) $(DESTDIR)$(bindir)/gnatprep$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 639,646 ---- - $(INSTALL_PROGRAM) gnatprep-cross$(exeext) $(DESTDIR)$(tooldir)/bin/gnatprep$(exeext); \ - fi; \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATPREP_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatprep$(exeext) $(DESTDIR)$(bindir)/$(GNATPREP_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 634,641 **** - $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext); \ - $(INSTALL_PROGRAM) gnatxref-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext); \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatxref$(exeext); \ -! $(INSTALL_PROGRAM) gnatxref$(exeext) $(DESTDIR)$(bindir)/gnatxref$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 650,657 ---- - $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext); \ - $(INSTALL_PROGRAM) gnatxref-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatxref$(exeext); \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATXREF_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatxref$(exeext) $(DESTDIR)$(bindir)/$(GNATXREF_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 645,652 **** - $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext); \ - $(INSTALL_PROGRAM) gnatfind-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext); \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatfind$(exeext); \ -! $(INSTALL_PROGRAM) gnatfind$(exeext) $(DESTDIR)$(bindir)/gnatfind$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ ---- 661,668 ---- - $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext); \ - $(INSTALL_PROGRAM) gnatfind-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatfind$(exeext); \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATFIND_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatfind$(exeext) $(DESTDIR)$(bindir)/$(GNATFIND_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -if [ -f gnat1$(exeext) ] ; \ -*************** ada.install-common: -*** 656,663 **** - $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatclean$(exeext); \ - $(INSTALL_PROGRAM) gnatclean-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatclean$(exeext); \ - else \ -! $(RM) $(DESTDIR)$(bindir)/gnatclean$(exeext); \ -! $(INSTALL_PROGRAM) gnatclean$(exeext) $(DESTDIR)$(bindir)/gnatclean$(exeext); \ - fi ; \ - fi - # ---- 672,679 ---- - $(RM) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatclean$(exeext); \ - $(INSTALL_PROGRAM) gnatclean-cross$(exeext) $(DESTDIR)$(bindir)/$(target_noncanonical)-gnatclean$(exeext); \ - else \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATCLEAN_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatclean$(exeext) $(DESTDIR)$(bindir)/$(GNATCLEAN_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - # -*************** ada.install-common: -*** 667,674 **** - then \ - if [ -f gnatsym$(exeext) ] ; \ - then \ -! $(RM) $(DESTDIR)$(bindir)/gnatsym$(exeext); \ -! $(INSTALL_PROGRAM) gnatsym$(exeext) $(DESTDIR)$(bindir)/gnatsym$(exeext); \ - fi ; \ - fi - # ---- 683,690 ---- - then \ - if [ -f gnatsym$(exeext) ] ; \ - then \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATSYM_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatsym$(exeext) $(DESTDIR)$(bindir)/$(GNATSYM_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - # -*************** ada.install-common: -*** 678,685 **** - then \ - if [ -f gnatlbr$(exeext) ] ; \ - then \ -! $(RM) $(DESTDIR)$(bindir)/gnatlbr$(exeext); \ -! $(INSTALL_PROGRAM) gnatlbr$(exeext) $(DESTDIR)$(bindir)/gnatlbr$(exeext); \ - fi ; \ - fi - # ---- 694,701 ---- - then \ - if [ -f gnatlbr$(exeext) ] ; \ - then \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATLBR_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatlbr$(exeext) $(DESTDIR)$(bindir)/$(GNATLBR_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - # -*************** ada.install-common: -*** 687,694 **** - # - -if [ -f gnat1$(exeext) ] ; \ - then \ -! $(RM) $(DESTDIR)$(bindir)/gnatdll$(exeext); \ -! $(INSTALL_PROGRAM) gnatdll$(exeext) $(DESTDIR)$(bindir)/gnatdll$(exeext); \ - fi - # - # vxaddr2line is only used for cross ports (it calls the underlying cross ---- 703,710 ---- - # - -if [ -f gnat1$(exeext) ] ; \ - then \ -! $(RM) $(DESTDIR)$(bindir)/$(GNATDLL_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) gnatdll$(exeext) $(DESTDIR)$(bindir)/$(GNATDLL_INSTALL_NAME)$(exeext); \ - fi - # - # vxaddr2line is only used for cross ports (it calls the underlying cross -*************** ada.install-common: -*** 698,705 **** - then \ - if [ -f vxaddr2line$(exeext) ] ; \ - then \ -! $(RM) $(DESTDIR)$(bindir)/vxaddr2line$(exeext); \ -! $(INSTALL_PROGRAM) vxaddr2line$(exeext) $(DESTDIR)$(bindir)/vxaddr2line$(exeext); \ - fi ; \ - fi - ---- 714,721 ---- - then \ - if [ -f vxaddr2line$(exeext) ] ; \ - then \ -! $(RM) $(DESTDIR)$(bindir)/$(VXADDR2LINE_INSTALL_NAME)$(exeext); \ -! $(INSTALL_PROGRAM) vxaddr2line$(exeext) $(DESTDIR)$(bindir)/$(VXADDR2LINE_INSTALL_NAME)$(exeext); \ - fi ; \ - fi - -*************** ada.uninstall: -*** 765,772 **** - -$(RM) $(DESTDIR)$(tooldir)/bin/gnatxref$(exeext) - -$(RM) $(DESTDIR)$(tooldir)/bin/gnatclean$(exeext) - -$(RM) $(DESTDIR)$(tooldir)/bin/gnatsym$(exeext) -- # Gnatlbr and Gnatchop are only used on VMS -- -$(RM) $(DESTDIR)$(bindir)/gnatlbr$(exeext) $(DESTDIR)$(bindir)/gnatchop$(exeext) - - # Clean hooks: - # A lot of the ancillary files are deleted by the main makefile. ---- 781,786 ---- ++++++ Wunprototyped-calls.diff ++++++ --- /var/tmp/diff_new_pack.21uRfe/_old 2009-11-23 10:55:40.000000000 +0100 +++ /var/tmp/diff_new_pack.21uRfe/_new 2009-11-23 10:55:40.000000000 +0100 @@ -1,94 +1,72 @@ Index: gcc/c.opt =================================================================== -*** gcc/c.opt (revision 131759) ---- gcc/c.opt (working copy) -*************** Wunknown-pragmas -*** 457,462 **** ---- 457,466 ---- - C ObjC C++ ObjC++ Warning - Warn about unrecognized pragmas - -+ Wunprototyped-calls -+ C Var(warn_unprototyped_calls) Warning -+ Warn about calls to unprototyped functions with at least one argument -+ - Wunused-macros - C ObjC C++ ObjC++ Warning - Warn about macros defined in the main file that are not used +--- gcc/c.opt.orig ++++ gcc/c.opt +@@ -472,6 +472,10 @@ Wunknown-pragmas + C ObjC C++ ObjC++ Warning + Warn about unrecognized pragmas + ++Wunprototyped-calls ++C Var(warn_unprototyped_calls) Warning ++Warn about calls to unprototyped functions with at least one argument ++ + Wunused-macros + C ObjC C++ ObjC++ Warning + Warn about macros defined in the main file that are not used Index: gcc/testsuite/gcc.dg/cleanup-1.c =================================================================== -*** gcc/testsuite/gcc.dg/cleanup-1.c (revision 131821) ---- gcc/testsuite/gcc.dg/cleanup-1.c (working copy) -*************** -*** 6,12 **** - #define C(x) __attribute__((cleanup(x))) - - static int f1(void *x U) { return 0; } -! static void f2() { } - static void f3(void) { } - static void f4(void *x U) { } - static void f5(int *x U) { } ---- 6,12 ---- - #define C(x) __attribute__((cleanup(x))) - - static int f1(void *x U) { return 0; } -! static void f2() { } /* { dg-message "declared here" "" } */ - static void f3(void) { } - static void f4(void *x U) { } - static void f5(int *x U) { } -*************** static void f9(int x U) { } -*** 18,24 **** - void test(void) - { - int o1 C(f1); -! int o2 C(f2); - int o3 C(f3); /* { dg-error "too many arguments" } */ - int o4 C(f4); - int o5 C(f5); ---- 18,24 ---- - void test(void) - { - int o1 C(f1); -! int o2 C(f2); /* { dg-warning "without a real prototype" } */ - int o3 C(f3); /* { dg-error "too many arguments" } */ - int o4 C(f4); - int o5 C(f5); +--- gcc/testsuite/gcc.dg/cleanup-1.c.orig ++++ gcc/testsuite/gcc.dg/cleanup-1.c +@@ -6,7 +6,7 @@ + #define C(x) __attribute__((cleanup(x))) + + static int f1(void *x U) { return 0; } +-static void f2() { } ++static void f2() { } /* { dg-message "declared here" "" } */ + static void f3(void) { } + static void f4(void *x U) { } + static void f5(int *x U) { } +@@ -18,7 +18,7 @@ static void f9(int x U) { } /* { dg-mess + void test(void) + { + int o1 C(f1); +- int o2 C(f2); ++ int o2 C(f2); /* { dg-warning "without a real prototype" } */ + int o3 C(f3); /* { dg-error "too many arguments" } */ + int o4 C(f4); + int o5 C(f5); Index: gcc/c-typeck.c =================================================================== -*** gcc/c-typeck.c (revision 133807) ---- gcc/c-typeck.c (working copy) -*************** build_function_call (tree function, tree -*** 2444,2449 **** ---- 2444,2461 ---- - if (nargs < 0) - return error_mark_node; - -+ /* If we cannot check function arguments because a prototype is -+ missing for the callee, warn here. */ -+ if (warn_unprototyped_calls -+ && nargs > 0 && !TYPE_ARG_TYPES (fntype) -+ && fundecl && !DECL_BUILT_IN (fundecl) && !C_DECL_IMPLICIT (fundecl) -+ && !DECL_ARGUMENTS (fundecl)) -+ { -+ warning (OPT_Wunprototyped_calls, -+ "call to function %qD without a real prototype", fundecl); -+ inform (DECL_SOURCE_LOCATION (fundecl), "%qD was declared here", fundecl); -+ } -+ - /* Check that the arguments to the function are valid. */ - - check_function_arguments (TYPE_ATTRIBUTES (fntype), nargs, argarray, +--- gcc/c-typeck.c.orig ++++ gcc/c-typeck.c +@@ -2477,6 +2477,18 @@ build_function_call (tree function, tree + && !check_builtin_function_arguments (fundecl, nargs, argarray)) + return error_mark_node; + ++ /* If we cannot check function arguments because a prototype is ++ missing for the callee, warn here. */ ++ if (warn_unprototyped_calls ++ && nargs > 0 && !TYPE_ARG_TYPES (fntype) ++ && fundecl && !DECL_BUILT_IN (fundecl) && !C_DECL_IMPLICIT (fundecl) ++ && !DECL_ARGUMENTS (fundecl)) ++ { ++ warning (OPT_Wunprototyped_calls, ++ "call to function %qD without a real prototype", fundecl); ++ inform (DECL_SOURCE_LOCATION (fundecl), "%qD was declared here", fundecl); ++ } ++ + /* Check that the arguments to the function are valid. */ + check_function_arguments (TYPE_ATTRIBUTES (fntype), nargs, argarray, + TYPE_ARG_TYPES (fntype)); Index: gcc/c-opts.c =================================================================== -*** gcc/c-opts.c (revision 143863) ---- gcc/c-opts.c (working copy) -*************** c_common_handle_option (size_t scode, co -*** 409,414 **** ---- 409,415 ---- - can turn it off only if it's not explicit. */ - if (warn_main == -1) - warn_main = (value ? 2 : 0); -+ warn_unprototyped_calls = 1; - } - else - { +--- gcc/c-opts.c.orig ++++ gcc/c-opts.c +@@ -409,6 +409,7 @@ c_common_handle_option (size_t scode, co + can turn it off only if it's not explicit. */ + if (warn_main == -1) + warn_main = (value ? 2 : 0); ++ warn_unprototyped_calls = 1; + } + else + { ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org
participants (1)
-
root＠Hilbert.suse.de