cvs commit: src/contrib/gcc c-common.c c-format.c c-opts.c c.opt function.c gcc.c toplev.c src/contrib/gcc/config freebsd-spec.h src/contrib/gcc/config/i386 freebsd.h i386.c i386.h

[Alexander Kabaev]

kan         2005-06-03 04:02:21 UTC

  FreeBSD src repository

  Modified files:
    contrib/gcc          c-common.c c-format.c c-opts.c c.opt 
                         function.c gcc.c toplev.c 
    contrib/gcc/config   freebsd-spec.h 
    contrib/gcc/config/i386 freebsd.h i386.c i386.h 
  Log:
  Merge conflicts for GCC 3.4.4.
  
  Revision  Changes    Path
  1.20      +43 -51    src/contrib/gcc/c-common.c
  1.10      +76 -6     src/contrib/gcc/c-format.c
  1.3       +27 -13    src/contrib/gcc/c-opts.c
  1.3       +5 -5      src/contrib/gcc/c.opt
  1.19      +17 -17    src/contrib/gcc/config/freebsd-spec.h
  1.70      +3 -10     src/contrib/gcc/config/i386/freebsd.h
  1.22      +97 -37    src/contrib/gcc/config/i386/i386.c
  1.20      +8 -6      src/contrib/gcc/config/i386/i386.h
  1.22      +51 -32    src/contrib/gcc/function.c
  1.40      +14 -6     src/contrib/gcc/gcc.c
  1.25      +10 -5     src/contrib/gcc/toplev.c