rpms/gcc/devel gcc4-libstdc++-v3-versioning.patch, 1.2, 1.3 gcc4.spec, 1.48, 1.49 gcc4-libstdc++-v3-versioning2.patch, 1.1, NONE

fedora-cvs-commits at redhat.com fedora-cvs-commits at redhat.com
Thu Jun 16 17:13:07 UTC 2005


Author: jakub

Update of /cvs/dist/rpms/gcc/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv3154

Modified Files:
	gcc4-libstdc++-v3-versioning.patch gcc4.spec 
Removed Files:
	gcc4-libstdc++-v3-versioning2.patch 
Log Message:
4.0.0-12


gcc4-libstdc++-v3-versioning.patch:
 acconfig.h                 |   11 -
 acinclude.m4               |   31 +++
 config.h.in                |   17 -
 config/abi/compatibility.h |  179 ++++++++++++++++++++
 config/linker-map.gnu      |  310 +++++++++++++++++++++++++++++++----
 configure                  |  131 ++++++++++++++-
 configure.ac               |    2 
 include/Makefile.am        |    5 
 include/Makefile.in        |    5 
 include/bits/char_traits.h |   21 +-
 src/Makefile.am            |    1 
 src/Makefile.in            |    3 
 src/compatibility.cc       |  389 +++++++++++++++++++++++++++++++++++++++++++++
 src/istream.cc             |  129 --------------
 testsuite/testsuite_abi.cc |   45 +++--
 15 files changed, 1059 insertions(+), 220 deletions(-)

Index: gcc4-libstdc++-v3-versioning.patch
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc4-libstdc++-v3-versioning.patch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- gcc4-libstdc++-v3-versioning.patch	16 Jun 2005 10:16:53 -0000	1.2
+++ gcc4-libstdc++-v3-versioning.patch	16 Jun 2005 17:13:03 -0000	1.3
@@ -1,3 +1,28 @@
+2005-06-16  Jakub Jelinek  <jakub at redhat.com>
+
+	* src/compatibility.cc: Include bits/c++config.h first.
+	(_GLIBCXX_SYMVER_COMPATIBILITY): Define if _GLIBCXX_SYMVER
+	and PIC are both defined.
+	* include/bits/char_traits.h (char_traits::eq): Rename
+	only if _GLIBCXX_SYMVER_COMPATIBILITY is defined.
+
+2005-06-16  Jakub Jelinek  <jakub at redhat.com>
+
+	* acinclude.m4 ((GLIBCXX_ENABLE_SYMVERS): Rename _GLIBCXX_SIZE_T_IS_INT
+	to _GLIBCXX_SIZE_T_IS_UINT.  Define _GLIBCXX_PTRDIFF_T_IS_INT.
+	* configure: Regenerate.
+	* config.h.in: Regenerate.
+	* src/compatibility.cc (istream:ignore(streamsize)): Use
+	_GLIBCXX_PTRDIFF_T_IS_INT instead of _GLIBCXX_SIZE_T_IS_INT.
+	* config/abi/compatibility.h: Rename _GLIBCXX_SIZE_T_IS_INT
+	to _GLIBCXX_SIZE_T_IS_UINT.  Use _GLIBCXX_PTRDIFF_T_IS_INT
+	instead for symbols with streamsize arguments.
+
+2005-06-16  Jakub Jelinek  <jakub at redhat.com>
+
+	* config/linker-map.gnu: Also export
+	_ZNSt13basic_istreamIwSt11char_traitsIwEE6ignoreE[il][il].
+
 2005-06-15  Benjamin Kosnik  <bkoz at redhat.com>
 
 	* configure.ac (libtool_VERSION): To 6:5:0.
@@ -20,7 +45,7 @@
 	Remove deprecated versions.
 
 --- libstdc++-v3/acinclude.m4.jj	2005-04-19 17:30:07.000000000 +0200
-+++ libstdc++-v3/acinclude.m4	2005-06-16 09:15:00.000000000 +0200
++++ libstdc++-v3/acinclude.m4	2005-06-16 19:04:12.000000000 +0200
 @@ -1759,8 +1759,8 @@ fi
  
  # For GNU ld, we need at least this version.  The format is described in
@@ -41,7 +66,7 @@
          AC_MSG_WARN([=== Symbol versioning will be disabled.])
          enable_symvers=no
        else
-@@ -1809,6 +1807,20 @@ case $enable_symvers in
+@@ -1809,6 +1807,31 @@ case $enable_symvers in
      ;;
  esac
  
@@ -55,15 +80,26 @@
 +	         [glibcxx_size_t_is_i=yes], [glibcxx_size_t_is_i=no])
 +CFLAGS=$ac_save_CFLAGS
 +if test "$glibcxx_size_t_is_i" = yes; then
-+  AC_DEFINE(_GLIBCXX_SIZE_T_IS_INT, 1, [Define if size_t is unsigned int.])
++  AC_DEFINE(_GLIBCXX_SIZE_T_IS_UINT, 1, [Define if size_t is unsigned int.])
 +fi
 +AC_MSG_RESULT([$glibcxx_size_t_is_i])
 +
++AC_MSG_CHECKING([for ptrdiff_t as int])
++ac_save_CFLAGS="$CFLAGS"
++CFLAGS="-Werror"
++AC_TRY_COMPILE(, [__PTRDIFF_TYPE__* ptp; int* ip; ptp = ip;], 
++	         [glibcxx_ptrdiff_t_is_i=yes], [glibcxx_ptrdiff_t_is_i=no])
++CFLAGS=$ac_save_CFLAGS
++if test "$glibcxx_ptrdiff_t_is_i" = yes; then
++  AC_DEFINE(_GLIBCXX_PTRDIFF_T_IS_INT, 1, [Define if ptrdiff_t is int.])
++fi
++AC_MSG_RESULT([$glibcxx_ptrdiff_t_is_i])
++
  AC_SUBST(SYMVER_MAP)
  AC_SUBST(port_specific_symbol_files)
  GLIBCXX_CONDITIONAL(GLIBCXX_BUILD_VERSIONED_SHLIB, test $enable_symvers != no)
 --- libstdc++-v3/configure.ac.jj	2005-05-12 13:31:03.000000000 +0200
-+++ libstdc++-v3/configure.ac	2005-06-16 09:15:00.000000000 +0200
++++ libstdc++-v3/configure.ac	2005-06-16 19:04:12.000000000 +0200
 @@ -13,7 +13,7 @@ AC_CONFIG_HEADER(config.h)
  ### am handles this now?  ORIGINAL_LD_FOR_MULTILIBS=$LD
  
@@ -74,8 +110,8 @@
  
  # Find the rest of the source tree framework.
 --- libstdc++-v3/src/compatibility.cc.jj	2005-06-16 09:15:00.000000000 +0200
-+++ libstdc++-v3/src/compatibility.cc	2005-06-16 09:15:00.000000000 +0200
-@@ -0,0 +1,383 @@
++++ libstdc++-v3/src/compatibility.cc	2005-06-16 19:04:12.000000000 +0200
+@@ -0,0 +1,389 @@
 +// Compatibility symbols for previous versions -*- C++ -*-
 +
 +// Copyright (C) 2005
@@ -106,6 +142,12 @@
 +// invalidate any other reasons why the executable file might be covered by
 +// the GNU General Public License.
 +
++#include <bits/c++config.h>
++
++#if defined(_GLIBCXX_SYMVER) && defined(PIC)
++# define _GLIBCXX_SYMVER_COMPATIBILITY 1
++#endif
++
 +#include <string>
 +#include <istream>
 +#include <fstream>
@@ -118,7 +160,7 @@
 +  template<>
 +    basic_istream<char>&
 +    basic_istream<char>::ignore(streamsize __n) 
-+#ifdef _GLIBCXX_SIZE_T_IS_INT
++#ifdef _GLIBCXX_PTRDIFF_T_IS_INT
 +    asm ("_W_ZNSi6ignoreEi");
 +#else
 +    asm ("_W_ZNSi6ignoreEl");
@@ -128,7 +170,7 @@
 +  template<>
 +    basic_istream<wchar_t>&
 +    basic_istream<wchar_t>::ignore(streamsize __n)
-+#ifdef _GLIBCXX_SIZE_T_IS_INT
++#ifdef _GLIBCXX_PTRDIFF_T_IS_INT
 +     asm ("_W_ZNSt13basic_istreamIwSt11char_traitsIwEE6ignoreEi");
 +#else
 +     asm ("_W_ZNSt13basic_istreamIwSt11char_traitsIwEE6ignoreEl");
@@ -460,7 +502,7 @@
 +
 +#endif
 --- libstdc++-v3/src/Makefile.am.jj	2004-11-16 00:33:05.000000000 +0100
-+++ libstdc++-v3/src/Makefile.am	2005-06-16 09:15:00.000000000 +0200
++++ libstdc++-v3/src/Makefile.am	2005-06-16 19:04:12.000000000 +0200
 @@ -100,6 +100,7 @@ sources = \
  	pool_allocator.cc \
  	mt_allocator.cc \
@@ -470,7 +512,7 @@
  	ctype.cc \
  	debug.cc \
 --- libstdc++-v3/src/istream.cc.jj	2005-01-12 00:35:43.000000000 +0100
-+++ libstdc++-v3/src/istream.cc	2005-06-16 09:15:00.000000000 +0200
++++ libstdc++-v3/src/istream.cc	2005-06-16 19:04:12.000000000 +0200
 @@ -108,71 +108,6 @@ namespace std
    template<>
      basic_istream<char>&
@@ -615,7 +657,7 @@
      {
        if (traits_type::eq_int_type(__delim, traits_type::eof()))
 --- libstdc++-v3/src/Makefile.in.jj	2005-02-01 07:56:27.000000000 +0100
-+++ libstdc++-v3/src/Makefile.in	2005-06-16 10:01:47.000000000 +0200
++++ libstdc++-v3/src/Makefile.in	2005-06-16 19:05:49.000000000 +0200
 @@ -65,7 +65,7 @@ am__objects_1 = atomicity.lo codecvt_mem
  	numeric_members.lo time_members.lo
  am__objects_2 = basic_file.lo c++locale.lo
@@ -634,7 +676,7 @@
  	ctype.cc \
  	debug.cc \
 --- libstdc++-v3/config/linker-map.gnu.jj	2005-04-19 17:30:57.000000000 +0200
-+++ libstdc++-v3/config/linker-map.gnu	2005-06-16 09:15:00.000000000 +0200
++++ libstdc++-v3/config/linker-map.gnu	2005-06-16 19:04:12.000000000 +0200
 @@ -1,6 +1,6 @@
  ## Linker script for GNU ld 2.13.91+ only.
  ##
@@ -860,7 +902,7 @@
 +    _ZNKSt13basic_istreamIwSt11char_traitsIwEE[0-9][a-z]*;
 +    _ZNSt13basic_istreamIwSt11char_traitsIwEE[0-9][a-h]*;
 +    _ZNSt13basic_istreamIwSt11char_traitsIwEE[0-9][j-z]*;
-+    _ZNSt13basic_istreamIwSt11char_traitsIwEE6ignoreE[il][jm];
++    _ZNSt13basic_istreamIwSt11char_traitsIwEE6ignoreE[il][ijlm];
 +    _ZNSt13basic_istreamIwSt11char_traitsIwEErsE*;
 +
 +    # std::istream operators and inserters
@@ -1021,9 +1063,9 @@
  # Symbols in the support library (libsupc++) have their own tag.
  CXXABI_1.3 {
  
---- libstdc++-v3/config/abi/compatibility.h.jj	2005-06-16 09:15:00.000000000 +0200
-+++ libstdc++-v3/config/abi/compatibility.h	2005-06-16 09:15:00.000000000 +0200
-@@ -0,0 +1,181 @@
+--- libstdc++-v3/config/abi/compatibility.h.jj	2005-06-16 11:50:02.000000000 +0200
++++ libstdc++-v3/config/abi/compatibility.h	2005-06-16 19:04:12.000000000 +0200
+@@ -0,0 +1,179 @@
 +// Compatibility symbols for previous versions -*- C++ -*-
 +
 +// Copyright (C) 2005
@@ -1105,19 +1147,19 @@
 +{
 +_GLIBCXX_APPLY_SYMVER_SPECIAL(_ZNSt11char_traitsIcE2eqERKcS2_)
 +
-+#ifdef _GLIBCXX_SIZE_T_IS_INT
++#ifdef _GLIBCXX_SIZE_T_IS_UINT
 +_GLIBCXX_APPLY_SYMVER(_ZNSs7_M_copyEPcPKcj)
 +#else
 +_GLIBCXX_APPLY_SYMVER(_ZNSs7_M_copyEPcPKcm)
 +#endif
 +
-+#ifdef _GLIBCXX_SIZE_T_IS_INT
++#ifdef _GLIBCXX_SIZE_T_IS_UINT
 +_GLIBCXX_APPLY_SYMVER(_ZNSs7_M_moveEPcPKcj)
 +#else
 +_GLIBCXX_APPLY_SYMVER(_ZNSs7_M_moveEPcPKcm)
 +#endif
 +
-+#ifdef _GLIBCXX_SIZE_T_IS_INT
++#ifdef _GLIBCXX_SIZE_T_IS_UINT
 +_GLIBCXX_APPLY_SYMVER(_ZNSs9_M_assignEPcjc)
 +#else
 +_GLIBCXX_APPLY_SYMVER(_ZNSs9_M_assignEPcmc)
@@ -1125,13 +1167,13 @@
 +
 +_GLIBCXX_APPLY_SYMVER(_ZNKSs11_M_disjunctEPKc)
 +
-+#ifdef _GLIBCXX_SIZE_T_IS_INT
++#ifdef _GLIBCXX_SIZE_T_IS_UINT
 +_GLIBCXX_APPLY_SYMVER(_ZNKSs15_M_check_lengthEjjPKc)
 +#else
 +_GLIBCXX_APPLY_SYMVER(_ZNKSs15_M_check_lengthEmmPKc)
 +#endif
 +
-+#ifdef _GLIBCXX_SIZE_T_IS_INT
++#ifdef _GLIBCXX_SIZE_T_IS_UINT
 +  _GLIBCXX_APPLY_SYMVER(_ZNSs4_Rep26_M_set_length_and_sharableEj)
 +#else
 +  _GLIBCXX_APPLY_SYMVER(_ZNSs4_Rep26_M_set_length_and_sharableEm)
@@ -1139,8 +1181,7 @@
 +
 +_GLIBCXX_APPLY_SYMVER(_ZNSi6ignoreEv)
 +
-+  // Well, strictly speaking, this is streamsize, not size_t.
-+#ifdef _GLIBCXX_SIZE_T_IS_INT
++#ifdef _GLIBCXX_PTRDIFF_T_IS_INT
 +_GLIBCXX_APPLY_SYMVER_SPECIAL(_ZNSi6ignoreEi)
 +#else
 +_GLIBCXX_APPLY_SYMVER_SPECIAL(_ZNSi6ignoreEl)
@@ -1156,19 +1197,19 @@
 +#ifdef _GLIBCXX_USE_WCHAR_T
 +_GLIBCXX_APPLY_SYMVER_SPECIAL(_ZNSt11char_traitsIwE2eqERKwS2_)
 +
-+#ifdef _GLIBCXX_SIZE_T_IS_INT
++#ifdef _GLIBCXX_SIZE_T_IS_UINT
 +_GLIBCXX_APPLY_SYMVER(_ZNSbIwSt11char_traitsIwESaIwEE7_M_copyEPwPKwj)
 +#else
 +  _GLIBCXX_APPLY_SYMVER(_ZNSbIwSt11char_traitsIwESaIwEE7_M_copyEPwPKwm)
 +#endif
 +
-+#ifdef _GLIBCXX_SIZE_T_IS_INT
++#ifdef _GLIBCXX_SIZE_T_IS_UINT
 +_GLIBCXX_APPLY_SYMVER(_ZNSbIwSt11char_traitsIwESaIwEE7_M_moveEPwPKwj)
 +#else
 +_GLIBCXX_APPLY_SYMVER(_ZNSbIwSt11char_traitsIwESaIwEE7_M_moveEPwPKwm)
 +#endif
 +
-+#ifdef _GLIBCXX_SIZE_T_IS_INT
++#ifdef _GLIBCXX_SIZE_T_IS_UINT
 +_GLIBCXX_APPLY_SYMVER(_ZNSbIwSt11char_traitsIwESaIwEE9_M_assignEPwjw)
 +#else
 +_GLIBCXX_APPLY_SYMVER(_ZNSbIwSt11char_traitsIwESaIwEE9_M_assignEPwmw)
@@ -1176,13 +1217,13 @@
 +
 +_GLIBCXX_APPLY_SYMVER(_ZNKSbIwSt11char_traitsIwESaIwEE11_M_disjunctEPKw)
 +
-+#ifdef _GLIBCXX_SIZE_T_IS_INT
++#ifdef _GLIBCXX_SIZE_T_IS_UINT
 +_GLIBCXX_APPLY_SYMVER(_ZNKSbIwSt11char_traitsIwESaIwEE15_M_check_lengthEjjPKc)
 +#else
 +_GLIBCXX_APPLY_SYMVER(_ZNKSbIwSt11char_traitsIwESaIwEE15_M_check_lengthEmmPKc)
 +#endif
 +
-+#ifdef _GLIBCXX_SIZE_T_IS_INT
++#ifdef _GLIBCXX_SIZE_T_IS_UINT
 +_GLIBCXX_APPLY_SYMVER(_ZNSbIwSt11char_traitsIwESaIwEE4_Rep26_M_set_length_and_sharableEj)
 +#else
 +_GLIBCXX_APPLY_SYMVER(_ZNSbIwSt11char_traitsIwESaIwEE4_Rep26_M_set_length_and_sharableEm)
@@ -1190,8 +1231,7 @@
 +
 +_GLIBCXX_APPLY_SYMVER(_ZNSt13basic_istreamIwSt11char_traitsIwEE6ignoreEv)
 +
-+  // Well, strictly speaking, this is streamsize, not size_t.
-+#ifdef _GLIBCXX_SIZE_T_IS_INT
++#ifdef _GLIBCXX_PTRDIFF_T_IS_INT
 +_GLIBCXX_APPLY_SYMVER_SPECIAL(_ZNSt13basic_istreamIwSt11char_traitsIwEE6ignoreEi)
 +#else
 +_GLIBCXX_APPLY_SYMVER_SPECIAL(_ZNSt13basic_istreamIwSt11char_traitsIwEE6ignoreEl)
@@ -1206,7 +1246,7 @@
 +}
 +
 --- libstdc++-v3/config.h.in.jj	2005-02-24 19:55:17.000000000 +0100
-+++ libstdc++-v3/config.h.in	2005-06-16 09:56:00.000000000 +0200
++++ libstdc++-v3/config.h.in	2005-06-16 19:06:24.000000000 +0200
 @@ -35,17 +35,6 @@
  // Define to use symbol versioning in the shared library.
  #undef _GLIBCXX_SYMVER
@@ -1225,18 +1265,21 @@
  // Define if LFS support is available.
  #undef _GLIBCXX_USE_LFS
  
-@@ -896,6 +885,9 @@
+@@ -896,6 +885,12 @@
  /* Define to 1 if a full hosted library is built, or 0 if freestanding. */
  #undef _GLIBCXX_HOSTED
  
++/* Define if ptrdiff_t is int. */
++#undef _GLIBCXX_PTRDIFF_T_IS_INT
++
 +/* Define if size_t is unsigned int. */
-+#undef _GLIBCXX_SIZE_T_IS_INT
++#undef _GLIBCXX_SIZE_T_IS_UINT
 +
  /* Define if the compiler is configured for setjmp/longjmp exceptions. */
  #undef _GLIBCXX_SJLJ_EXCEPTIONS
  //
 --- libstdc++-v3/acconfig.h.jj	2005-02-24 19:55:16.000000000 +0100
-+++ libstdc++-v3/acconfig.h	2005-06-16 09:15:00.000000000 +0200
++++ libstdc++-v3/acconfig.h	2005-06-16 19:04:12.000000000 +0200
 @@ -34,17 +34,6 @@
  // Define to use symbol versioning in the shared library.
  #undef _GLIBCXX_SYMVER
@@ -1256,7 +1299,7 @@
  #undef _GLIBCXX_USE_LFS
  
 --- libstdc++-v3/include/Makefile.am.jj	2005-04-03 11:14:08.000000000 +0200
-+++ libstdc++-v3/include/Makefile.am	2005-06-16 09:15:00.000000000 +0200
++++ libstdc++-v3/include/Makefile.am	2005-06-16 19:04:12.000000000 +0200
 @@ -367,8 +367,10 @@ host_headers = \
  	${glibcxx_srcdir}/$(ABI_TWEAKS_SRCDIR)/cxxabi_tweaks.h
  
@@ -1278,7 +1321,7 @@
  	  $(LN_S) ${glibcxx_srcdir}/$(CTIME_H) time_members.h || true ;\
  	  $(LN_S) ${glibcxx_srcdir}/$(CCODECVT_H) codecvt_specializations.h || true);\
 --- libstdc++-v3/include/bits/char_traits.h.jj	2004-11-05 20:58:00.000000000 +0100
-+++ libstdc++-v3/include/bits/char_traits.h	2005-06-16 09:15:00.000000000 +0200
++++ libstdc++-v3/include/bits/char_traits.h	2005-06-16 19:04:12.000000000 +0200
 @@ -1,6 +1,6 @@
  // Character Traits for use by standard string and iostream -*- C++ -*-
  
@@ -1292,7 +1335,7 @@
        static bool
        eq(const char_type& __c1, const char_type& __c2)
 -      { return __c1 == __c2; }
-+#ifdef _GLIBCXX_SYMVER
++#ifdef _GLIBCXX_SYMVER_COMPATIBILITY
 +      asm ("_W_ZNSt11char_traitsIcE2eqERKcS2_");
 +#endif
 +      ;
@@ -1316,7 +1359,7 @@
 -      eq(const char_type& __c1, const char_type& __c2)
 -      { return __c1 == __c2; }
 +      eq(const char_type& __c1, const char_type& __c2) 
-+#ifdef _GLIBCXX_SYMVER
++#ifdef _GLIBCXX_SYMVER_COMPATIBILITY
 +      asm ("_W_ZNSt11char_traitsIwE2eqERKwS2_")
 +#endif
 +      ;
@@ -1335,7 +1378,7 @@
  
  } // namespace std
 --- libstdc++-v3/include/Makefile.in.jj	2005-04-03 11:14:08.000000000 +0200
-+++ libstdc++-v3/include/Makefile.in	2005-06-16 09:59:29.000000000 +0200
++++ libstdc++-v3/include/Makefile.in	2005-06-16 19:05:51.000000000 +0200
 @@ -580,8 +580,10 @@ host_headers = \
  
  
@@ -1357,7 +1400,7 @@
  	  $(LN_S) ${glibcxx_srcdir}/$(CTIME_H) time_members.h || true ;\
  	  $(LN_S) ${glibcxx_srcdir}/$(CCODECVT_H) codecvt_specializations.h || true);\
 --- libstdc++-v3/testsuite/testsuite_abi.cc.jj	2005-05-12 13:31:44.000000000 +0200
-+++ libstdc++-v3/testsuite/testsuite_abi.cc	2005-06-16 09:15:00.000000000 +0200
++++ libstdc++-v3/testsuite/testsuite_abi.cc	2005-06-16 19:04:12.000000000 +0200
 @@ -98,9 +98,9 @@ void
  symbol::print() const
  {
@@ -1457,7 +1500,7 @@
  	  const symbol& test = incompatible[j].second;
  	  test.print();
 --- libstdc++-v3/configure.jj	2005-05-12 13:31:03.000000000 +0200
-+++ libstdc++-v3/configure	2005-06-16 09:55:01.000000000 +0200
++++ libstdc++-v3/configure	2005-06-16 19:06:18.000000000 +0200
 @@ -1376,7 +1376,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
  ### am handles this now?  ORIGINAL_LD_FOR_MULTILIBS=$LD
  
@@ -1487,7 +1530,7 @@
  echo "$as_me: WARNING: === Symbol versioning will be disabled." >&2;}
          enable_symvers=no
        else
-@@ -98331,6 +98331,69 @@ _ACEOF
+@@ -98331,6 +98331,129 @@ _ACEOF
      ;;
  esac
  
@@ -1547,13 +1590,73 @@
 +if test "$glibcxx_size_t_is_i" = yes; then
 +
 +cat >>confdefs.h <<\_ACEOF
-+#define _GLIBCXX_SIZE_T_IS_INT 1
++#define _GLIBCXX_SIZE_T_IS_UINT 1
 +_ACEOF
 +
 +fi
 +echo "$as_me:$LINENO: result: $glibcxx_size_t_is_i" >&5
 +echo "${ECHO_T}$glibcxx_size_t_is_i" >&6
 +
++echo "$as_me:$LINENO: checking for ptrdiff_t as int" >&5
++echo $ECHO_N "checking for ptrdiff_t as int... $ECHO_C" >&6
++ac_save_CFLAGS="$CFLAGS"
++CFLAGS="-Werror"
++cat >conftest.$ac_ext <<_ACEOF
++/* confdefs.h.  */
++_ACEOF
++cat confdefs.h >>conftest.$ac_ext
++cat >>conftest.$ac_ext <<_ACEOF
++/* end confdefs.h.  */
++
++int
++main ()
++{
++__PTRDIFF_TYPE__* ptp; int* ip; ptp = ip;
++  ;
++  return 0;
++}
++_ACEOF
++rm -f conftest.$ac_objext
++if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
++  (eval $ac_compile) 2>conftest.er1
++  ac_status=$?
++  grep -v '^ *+' conftest.er1 >conftest.err
++  rm -f conftest.er1
++  cat conftest.err >&5
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); } &&
++	 { ac_try='test -z "$ac_c_werror_flag"
++			 || test ! -s conftest.err'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; } &&
++	 { ac_try='test -s conftest.$ac_objext'
++  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
++  (eval $ac_try) 2>&5
++  ac_status=$?
++  echo "$as_me:$LINENO: \$? = $ac_status" >&5
++  (exit $ac_status); }; }; then
++  glibcxx_ptrdiff_t_is_i=yes
++else
++  echo "$as_me: failed program was:" >&5
++sed 's/^/| /' conftest.$ac_ext >&5
++
++glibcxx_ptrdiff_t_is_i=no
++fi
++rm -f conftest.err conftest.$ac_objext conftest.$ac_ext
++CFLAGS=$ac_save_CFLAGS
++if test "$glibcxx_ptrdiff_t_is_i" = yes; then
++
++cat >>confdefs.h <<\_ACEOF
++#define _GLIBCXX_PTRDIFF_T_IS_INT 1
++_ACEOF
++
++fi
++echo "$as_me:$LINENO: result: $glibcxx_ptrdiff_t_is_i" >&5
++echo "${ECHO_T}$glibcxx_ptrdiff_t_is_i" >&6
++
  
  
  


Index: gcc4.spec
===================================================================
RCS file: /cvs/dist/rpms/gcc/devel/gcc4.spec,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -r1.48 -r1.49
--- gcc4.spec	16 Jun 2005 10:16:53 -0000	1.48
+++ gcc4.spec	16 Jun 2005 17:13:03 -0000	1.49
@@ -98,7 +98,6 @@
 Patch26: gcc4-libltdl-multilib.patch
 Patch27: gcc4-pr21850.patch
 Patch28: gcc4-libstdc++-v3-versioning.patch
-Patch29: gcc4-libstdc++-v3-versioning2.patch
 
 %define _gnu %{nil}
 %ifarch sparc
@@ -436,7 +435,6 @@
 %patch26 -p0 -b .libltdl-multilib~
 %patch27 -p0 -b .pr21850~
 %patch28 -p0 -b .libstdc++-v3-versioning~
-%patch29 -p0 -b .libstdc++-v3-versioning2~
 
 perl -pi -e 's/4\.0\.0/4.0.0/' gcc/version.c
 perl -pi -e 's/"%{gcc_version}"/"%{gcc_version} \(release\)"/' gcc/version.c


--- gcc4-libstdc++-v3-versioning2.patch DELETED ---




More information about the fedora-cvs-commits mailing list