packages: gcc/gcc-branch.diff - regenerated.

pluto pluto at pld-linux.org
Sat May 26 11:45:12 CEST 2012


Author: pluto                        Date: Sat May 26 09:45:12 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- regenerated.

---- Files affected:
packages/gcc:
   gcc-branch.diff (1.62 -> 1.63) 

---- Diffs:

================================================================
Index: packages/gcc/gcc-branch.diff
diff -u packages/gcc/gcc-branch.diff:1.62 packages/gcc/gcc-branch.diff:1.63
--- packages/gcc/gcc-branch.diff:1.62	Sat Mar 24 10:12:05 2012
+++ packages/gcc/gcc-branch.diff	Sat May 26 11:42:03 2012
@@ -1,7 +1,102 @@
+Index: libitm/ChangeLog
+===================================================================
+--- libitm/ChangeLog	(.../tags/gcc_4_7_0_release)	(wersja 187906)
++++ libitm/ChangeLog	(.../branches/gcc-4_7-branch)	(wersja 187906)
+@@ -1,3 +1,12 @@
++2012-04-04  H.J. Lu  <hongjiu.lu at intel.com>
++
++	Backported from mainline
++	2012-04-04  H.J. Lu  <hongjiu.lu at intel.com>
++
++	PR libitm/52854
++	* config/x86/target.h (gtm_jmpbuf): Replace long with long long
++	for x86-64.
++
+ 2012-03-22  Release Manager
+ 
+ 	* GCC 4.7.0 released.
+Index: libitm/config/x86/target.h
+===================================================================
+--- libitm/config/x86/target.h	(.../tags/gcc_4_7_0_release)	(wersja 187906)
++++ libitm/config/x86/target.h	(.../branches/gcc-4_7-branch)	(wersja 187906)
+@@ -29,13 +29,13 @@
+ typedef struct gtm_jmpbuf
+ {
+   void *cfa;
+-  unsigned long rbx;
+-  unsigned long rbp;
+-  unsigned long r12;
+-  unsigned long r13;
+-  unsigned long r14;
+-  unsigned long r15;
+-  unsigned long rip;
++  unsigned long long rbx;
++  unsigned long long rbp;
++  unsigned long long r12;
++  unsigned long long r13;
++  unsigned long long r14;
++  unsigned long long r15;
++  unsigned long long rip;
+ } gtm_jmpbuf;
+ #else
+ typedef struct gtm_jmpbuf
+Index: Makefile.in
+===================================================================
+--- Makefile.in	(.../tags/gcc_4_7_0_release)	(wersja 187906)
++++ Makefile.in	(.../branches/gcc-4_7-branch)	(wersja 187906)
+@@ -2426,11 +2426,12 @@
+ 		true ; \
+ 	fi
+ 
+-# install-no-fixedincludes is used because Cygnus can not distribute
+-# the fixed header files.
++# install-no-fixedincludes is used to allow the elaboration of binary packages
++# suitable for distribution, where we cannot include the fixed system header
++# files.
+ .PHONY: install-no-fixedincludes
+ install-no-fixedincludes: installdirs install-host-nogcc \
+-	install-target gcc-no-fixedincludes
++	install-target gcc-install-no-fixedincludes
+ 
+ .PHONY: install-strip
+ install-strip:
+@@ -40721,25 +40722,16 @@
+ check-go: check-gcc-go check-target-libgo
+ 
+ 
+-# Install the gcc headers files, but not the fixed include files,
+-# which Cygnus is not allowed to distribute.  This rule is very
+-# dependent on the workings of the gcc Makefile.in.
+-.PHONY: gcc-no-fixedincludes
+-gcc-no-fixedincludes:
++# The gcc part of install-no-fixedincludes, which relies on an intimate
++# knowledge of how a number of gcc internal targets (inter)operate.  Delegate.
++.PHONY: gcc-install-no-fixedincludes
++gcc-install-no-fixedincludes:
+ 	@if [ -f ./gcc/Makefile ]; then \
+-	  rm -rf gcc/tmp-include; \
+-	  mv gcc/include gcc/tmp-include 2>/dev/null; \
+-	  mkdir gcc/include; \
+-	  cp $(srcdir)/gcc/gsyslimits.h gcc/include/syslimits.h; \
+-	  touch gcc/stmp-fixinc gcc/include/fixed; \
+-	  rm -f gcc/stmp-headers gcc/stmp-int-hdrs; \
+ 	  r=`${PWD_COMMAND}`; export r; \
+-	  s=`cd $(srcdir); ${PWD_COMMAND}` ; export s; \
++	  s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
+ 	  $(HOST_EXPORTS) \
+-	  (cd ./gcc && \
+-	   $(MAKE) $(GCC_FLAGS_TO_PASS) install); \
+-	  rm -rf gcc/include; \
+-	  mv gcc/tmp-include gcc/include 2>/dev/null; \
++	  (cd ./gcc \
++	   && $(MAKE) $(GCC_FLAGS_TO_PASS) install-no-fixedincludes); \
+ 	else true; fi
+ @endif gcc
+ 
 Index: libgomp/ChangeLog
 ===================================================================
---- libgomp/ChangeLog	(.../tags/gcc_4_7_0_release)	(wersja 185750)
-+++ libgomp/ChangeLog	(.../branches/gcc-4_7-branch)	(wersja 185750)
+--- libgomp/ChangeLog	(.../tags/gcc_4_7_0_release)	(wersja 187906)
++++ libgomp/ChangeLog	(.../branches/gcc-4_7-branch)	(wersja 187906)
 @@ -1,3 +1,8 @@
 +2012-03-22  Jakub Jelinek  <jakub at redhat.com>
 +
@@ -14,7 +109,7 @@
 Index: libgomp/testsuite/libgomp.c/pr52547.c
 ===================================================================
 --- libgomp/testsuite/libgomp.c/pr52547.c	(.../tags/gcc_4_7_0_release)	(wersja 0)
-+++ libgomp/testsuite/libgomp.c/pr52547.c	(.../branches/gcc-4_7-branch)	(wersja 185750)
++++ libgomp/testsuite/libgomp.c/pr52547.c	(.../branches/gcc-4_7-branch)	(wersja 187906)
 @@ -0,0 +1,36 @@
 +/* PR middle-end/52547 */
 +/* { dg-do run } */
@@ -52,10 +147,1184 @@
 +    abort ();
 +  return 0;
 +}
+Index: libstdc++-v3/configure
+===================================================================
+--- libstdc++-v3/configure	(.../tags/gcc_4_7_0_release)	(wersja 187906)
++++ libstdc++-v3/configure	(.../branches/gcc-4_7-branch)	(wersja 187906)
+@@ -3025,7 +3025,8 @@
+ target_alias=${target_alias-$host_alias}
+ 
+ # Handy for debugging:
+-#AC_MSG_NOTICE($build / $host / $target / $host_alias / $target_alias); sleep 5
++{ $as_echo "$as_me:${as_lineno-$LINENO}: $build / $host / $target / $host_alias / $target_alias" >&5
++$as_echo "$as_me: $build / $host / $target / $host_alias / $target_alias" >&6;}; sleep 5
+ 
+ if test "$build" != "$host"; then
+   # We are being configured with some form of cross compiler.
+@@ -11497,7 +11498,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11500 "configure"
++#line 11501 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -11603,7 +11604,7 @@
+   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
+   lt_status=$lt_dlunknown
+   cat > conftest.$ac_ext <<_LT_EOF
+-#line 11606 "configure"
++#line 11607 "configure"
+ #include "confdefs.h"
+ 
+ #if HAVE_DLFCN_H
+@@ -14961,7 +14962,7 @@
+     #
+     # Fake what AC_TRY_COMPILE does.  XXX Look at redoing this new-style.
+     cat > conftest.$ac_ext << EOF
+-#line 14964 "configure"
++#line 14965 "configure"
+ struct S { ~S(); };
+ void bar();
+ void foo()
+@@ -15296,7 +15297,7 @@
+   # Fake what AC_TRY_COMPILE does.
+ 
+     cat > conftest.$ac_ext << EOF
+-#line 15299 "configure"
++#line 15300 "configure"
+ int main()
+ {
+   typedef bool atomic_type;
+@@ -15331,7 +15332,7 @@
+     rm -f conftest*
+ 
+     cat > conftest.$ac_ext << EOF
+-#line 15334 "configure"
++#line 15335 "configure"
+ int main()
+ {
+   typedef short atomic_type;
+@@ -15366,7 +15367,7 @@
+     rm -f conftest*
+ 
+     cat > conftest.$ac_ext << EOF
+-#line 15369 "configure"
++#line 15370 "configure"
+ int main()
+ {
+   // NB: _Atomic_word not necessarily int.
+@@ -15402,7 +15403,7 @@
+     rm -f conftest*
+ 
+     cat > conftest.$ac_ext << EOF
+-#line 15405 "configure"
++#line 15406 "configure"
+ int main()
+ {
+   typedef long long atomic_type;
+@@ -15446,11 +15447,10 @@
+ ac_compiler_gnu=$ac_cv_c_compiler_gnu
+ 
+ 
+-  # Set atomicity_dir to builtins if all of above tests pass.
++  # Set atomicity_dir to builtins if all but the long long test above passes.
+   if test $glibcxx_cv_atomic_bool = yes \
+      && test $glibcxx_cv_atomic_short = yes \
+-     && test $glibcxx_cv_atomic_int = yes \
+-     && test $glibcxx_cv_atomic_long_long = yes ; then
++     && test $glibcxx_cv_atomic_int = yes; then
+ 
+ $as_echo "#define _GLIBCXX_ATOMIC_BUILTINS 1" >>confdefs.h
+ 
+Index: libstdc++-v3/src/Makefile.in
+===================================================================
+--- libstdc++-v3/src/Makefile.in	(.../tags/gcc_4_7_0_release)	(wersja 187906)
++++ libstdc++-v3/src/Makefile.in	(.../branches/gcc-4_7-branch)	(wersja 187906)
+@@ -88,20 +88,22 @@
+ am__installdirs = "$(DESTDIR)$(toolexeclibdir)"
+ LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
+ am__DEPENDENCIES_1 =
+-am_libstdc___la_OBJECTS =
++ at GLIBCXX_LDBL_COMPAT_TRUE@am__objects_1 = compatibility-ldbl.lo
++ at ENABLE_PARALLEL_TRUE@am__objects_2 = compatibility-parallel_list.lo \
++ at ENABLE_PARALLEL_TRUE@	compatibility-parallel_list-2.lo
++am__objects_3 = compatibility.lo compatibility-debug_list.lo \
++	compatibility-debug_list-2.lo compatibility-list.lo \
++	compatibility-list-2.lo $(am__objects_1) $(am__objects_2)
++am__objects_4 = compatibility-c++0x.lo compatibility-atomic-c++0x.lo \
++	compatibility-thread-c++0x.lo
++am_libstdc___la_OBJECTS = $(am__objects_3) $(am__objects_4)
+ libstdc___la_OBJECTS = $(am_libstdc___la_OBJECTS)
+ DEFAULT_INCLUDES = -I. at am__isrc@ -I$(top_builddir)
+ depcomp =
+ am__depfiles_maybe =
+-COMPILE = $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(AM_CPPFLAGS) \
+-	$(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-LTCOMPILE = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-	--mode=compile $(CC) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
+-	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CFLAGS) $(CFLAGS)
+-CCLD = $(CC)
+-LINK = $(LIBTOOL) --tag=CC $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
+-	--mode=link $(CCLD) $(AM_CFLAGS) $(CFLAGS) $(AM_LDFLAGS) \
+-	$(LDFLAGS) -o $@
++CXXCOMPILE = $(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
++CXXLD = $(CXX)
+ SOURCES = $(libstdc___la_SOURCES)
+ RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
+ 	html-recursive info-recursive install-data-recursive \
+@@ -331,7 +333,27 @@
+ 
+ # Cross compiler support.
+ toolexeclib_LTLIBRARIES = libstdc++.la
+-libstdc___la_SOURCES = 
++ at GLIBCXX_LDBL_COMPAT_FALSE@ldbl_compat_sources = 
++ at GLIBCXX_LDBL_COMPAT_TRUE@ldbl_compat_sources = compatibility-ldbl.cc
++ at ENABLE_PARALLEL_FALSE@parallel_compat_sources = 
++ at ENABLE_PARALLEL_TRUE@parallel_compat_sources = \
++ at ENABLE_PARALLEL_TRUE@	compatibility-parallel_list.cc  compatibility-parallel_list-2.cc
++
++cxx98_sources = \
++	compatibility.cc \
++	compatibility-debug_list.cc \
++	compatibility-debug_list-2.cc \
++	compatibility-list.cc \
++	compatibility-list-2.cc \
++	${ldbl_compat_sources} \
++	${parallel_compat_sources}
++
++cxx11_sources = \
++	compatibility-c++0x.cc \
++	compatibility-atomic-c++0x.cc \
++	compatibility-thread-c++0x.cc
++
++libstdc___la_SOURCES = $(cxx98_sources) $(cxx11_sources)
+ libstdc___la_LIBADD = \
+ 	$(GLIBCXX_LIBS) \
+ 	$(top_builddir)/libsupc++/libsupc++convenience.la \
+@@ -349,6 +371,9 @@
+ 
+ libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS)
+ 
++# Use special rules for parallel mode compilation.
++PARALLEL_FLAGS = -fopenmp -D_GLIBCXX_PARALLEL -I$(glibcxx_builddir)/../libgomp
++
+ # AM_CXXFLAGS needs to be in each subdirectory so that it can be
+ # modified in a per-library or per-sub-library way.  Need to manually
+ # set this option because CONFIG_CXXFLAGS has to be after
+@@ -356,12 +381,10 @@
+ # as the occasion calls for it.
+ AM_CXXFLAGS = \
+ 	$(XTEMPLATE_FLAGS) \
+-	$(WARN_CXXFLAGS) \
+-	$(OPTIMIZE_CXXFLAGS) \
+-	$(CONFIG_CXXFLAGS)
++	$(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS)
+ 
+ 
+-# libstdc++ libtool notes
++# Libtool notes
+ 
+ # 1) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is
+ # last. (That way, things like -O2 passed down from the toplevel can
+@@ -379,10 +402,11 @@
+ # correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe
+ # CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to
+ # attempt to infer which configuration to use
+-LTCXXCOMPILE = $(LIBTOOL) --tag CXX \
+-	       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
+-	       $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	       $(AM_CXXFLAGS) $(CXXFLAGS)
++LTCXXCOMPILE = \
++	$(LIBTOOL) --tag CXX \
++	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ 
+ LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
+ 
+@@ -392,8 +416,11 @@
+ # course is problematic at this point.  So, we get the top-level
+ # directory to configure libstdc++-v3 to use gcc as the C++
+ # compilation driver.
+-CXXLINK = $(LIBTOOL) --tag CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+-	  $(CXX) $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
++CXXLINK = \
++	$(LIBTOOL) --tag CXX \
++	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXX) \
++	$(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
+ 
+ @ENABLE_SYMVERS_TRUE at CLEANFILES = libstdc++-symbols.ver $(version_dep)
+ @ENABLE_SYMVERS_DARWIN_TRUE@@ENABLE_SYMVERS_TRUE at version_arg = -Wl,-exported_symbols_list,libstdc++-symbols.explist
+@@ -423,6 +450,7 @@
+ all: all-recursive
+ 
+ .SUFFIXES:
++.SUFFIXES: .cc .lo .o .obj
+ $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(top_srcdir)/fragment.am $(am__configure_deps)
+ 	@for dep in $?; do \
+ 	  case '$(am__configure_deps)' in \
+@@ -493,6 +521,15 @@
+ distclean-compile:
+ 	-rm -f *.tab.c
+ 
++.cc.o:
++	$(CXXCOMPILE) -c -o $@ $<
++
++.cc.obj:
++	$(CXXCOMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
++
++.cc.lo:
++	$(LTCXXCOMPILE) -c -o $@ $<
++
+ mostlyclean-libtool:
+ 	-rm -f *.lo
+ 
+@@ -757,9 +794,41 @@
+ 	uninstall-toolexeclibLTLIBRARIES
+ 
+ 
+-vpath % $(top_srcdir)/src
+-vpath % $(top_srcdir)
++vpath % $(top_srcdir)/src/c++98
++vpath % $(top_srcdir)/src/c++11
++compatibility-parallel_list.lo: compatibility-parallel_list.cc
++	$(LTCXXCOMPILE) -c $<
++compatibility-parallel_list.o: compatibility-parallel_list.cc
++	$(CXXCOMPILE) -c $<
+ 
++compatibility-parallel_list-2.lo: compatibility-parallel_list-2.cc
++	$(LTCXXCOMPILE) -c $<
++compatibility-parallel_list-2.o: compatibility-parallel_list-2.cc
++	$(CXXCOMPILE) -c $<
++
++# Use special rules for compatibility-ldbl.cc compilation, as we need to
++# pass -mlong-double-64.
++ at GLIBCXX_LDBL_COMPAT_TRUE@compatibility-ldbl.lo: compatibility-ldbl.cc
++ at GLIBCXX_LDBL_COMPAT_TRUE@	$(LTCXXCOMPILE) -mlong-double-64 -c $<
++ at GLIBCXX_LDBL_COMPAT_TRUE@compatibility-ldbl.o: compatibility-ldbl.cc
++ at GLIBCXX_LDBL_COMPAT_TRUE@	$(CXXCOMPILE) -mlong-double-64 -c $<
++
++# Use special rules for C++11 files/objects.
++compatibility-c++0x.lo: compatibility-c++0x.cc
++	$(LTCXXCOMPILE) -std=gnu++11 -c $<
++compatibility-c++0x.o: compatibility-c++0x.cc
++	$(CXXCOMPILE) -std=gnu++11 -c $<
++
++compatibility-atomic-c++0x.lo: compatibility-atomic-c++0x.cc
++	$(LTCXXCOMPILE) -std=gnu++11 -c $<
++compatibility-atomic-c++0x.o: compatibility-atomic-c++0x.cc
++	$(CXXCOMPILE) -std=gnu++11 -c $<
++
++compatibility-thread-c++0x.lo: compatibility-thread-c++0x.cc
++	$(LTCXXCOMPILE) -std=gnu++11 -c $<
++compatibility-thread-c++0x.o: compatibility-thread-c++0x.cc
++	$(CXXCOMPILE) -std=gnu++11 -c $<
++
+ # Symbol versioning for shared libraries.
+ @ENABLE_SYMVERS_TRUE at libstdc++-symbols.ver:  ${glibcxx_srcdir}/$(SYMVER_FILE) \
+ @ENABLE_SYMVERS_TRUE@		$(port_specific_symbol_files)
+@@ -777,7 +846,7 @@
+ @ENABLE_SYMVERS_TRUE@	  fi; \
+ @ENABLE_SYMVERS_TRUE@	fi
+ @ENABLE_SYMVERS_TRUE@	$(EGREP) -v '^[ 	]*#(#| |$$)' $@.tmp | \
+- at ENABLE_SYMVERS_TRUE@	  $(COMPILE) -E -P -include config.h - > $@ || (rm -f $@ ; exit 1)
++ at ENABLE_SYMVERS_TRUE@	  $(CC) -E -P -include ../config.h - > $@ || (rm -f $@ ; exit 1)
+ @ENABLE_SYMVERS_TRUE@	rm -f $@.tmp
+ @ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE at libstdc++-symbols.ver-sun : libstdc++-symbols.ver \
+ @ENABLE_SYMVERS_SUN_TRUE@@ENABLE_SYMVERS_TRUE@		$(toplevel_srcdir)/contrib/make_sunver.pl \
+@@ -800,7 +869,6 @@
+ @ENABLE_SYMVERS_DARWIN_TRUE@@ENABLE_SYMVERS_TRUE@	 > $@ || (rm -f $@ ; exit 1)
+ 
+ # Control additional build primary rules.
+-# EXTRA_LTLIBRARIES =
+ all-once: libstdc++convenience.la $(STAMP_DEBUG)
+ install-data-once: $(STAMP_INSTALL_DEBUG)
+ 
+@@ -846,7 +914,7 @@
+ 	  mv Makefile Makefile.tmp; \
+ 	  sed -e 's,all-local: all-once,all-local:,' \
+ 	      -e 's,install-data-local: install-data-once,install-data-local:,' \
+-	      -e 's,src/c,src/debug/c,' \
++	      -e '/vpath/!s,src/c,src/debug/c,' \
+ 	  < Makefile.tmp > Makefile ; \
+ 	  $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \
+ 	  toolexeclibdir=$(glibcxx_toolexeclibdir)/debug all) ;
+Index: libstdc++-v3/src/Makefile.am
+===================================================================
+--- libstdc++-v3/src/Makefile.am	(.../tags/gcc_4_7_0_release)	(wersja 187906)
++++ libstdc++-v3/src/Makefile.am	(.../branches/gcc-4_7-branch)	(wersja 187906)
+@@ -29,11 +29,38 @@
+ # Cross compiler support.
+ toolexeclib_LTLIBRARIES = libstdc++.la
+ 
+-vpath % $(top_srcdir)/src
+-vpath % $(top_srcdir)
++vpath % $(top_srcdir)/src/c++98
++vpath % $(top_srcdir)/src/c++11
+ 
+-libstdc___la_SOURCES =
++if GLIBCXX_LDBL_COMPAT
++ldbl_compat_sources = compatibility-ldbl.cc
++else
++ldbl_compat_sources =
++endif
+ 
++if ENABLE_PARALLEL
++parallel_compat_sources = \
++	compatibility-parallel_list.cc  compatibility-parallel_list-2.cc
++else
++parallel_compat_sources =
++endif
++
++cxx98_sources = \
++	compatibility.cc \
++	compatibility-debug_list.cc \
++	compatibility-debug_list-2.cc \
++	compatibility-list.cc \
++	compatibility-list-2.cc \
++	${ldbl_compat_sources} \
++	${parallel_compat_sources}
++
++cxx11_sources = \
++	compatibility-c++0x.cc \
++	compatibility-atomic-c++0x.cc \
++	compatibility-thread-c++0x.cc
++
++libstdc___la_SOURCES = $(cxx98_sources) $(cxx11_sources)
++
+ libstdc___la_LIBADD = \
+ 	$(GLIBCXX_LIBS) \
+ 	$(top_builddir)/libsupc++/libsupc++convenience.la \
+@@ -52,6 +79,43 @@
+ libstdc___la_LINK = $(CXXLINK) $(libstdc___la_LDFLAGS)
+ 
+ 
++# Use special rules for parallel mode compilation.
++PARALLEL_FLAGS = -fopenmp -D_GLIBCXX_PARALLEL -I$(glibcxx_builddir)/../libgomp
++compatibility-parallel_list.lo: compatibility-parallel_list.cc
++	$(LTCXXCOMPILE) -c $<
++compatibility-parallel_list.o: compatibility-parallel_list.cc
++	$(CXXCOMPILE) -c $<
++
++compatibility-parallel_list-2.lo: compatibility-parallel_list-2.cc
++	$(LTCXXCOMPILE) -c $<
++compatibility-parallel_list-2.o: compatibility-parallel_list-2.cc
++	$(CXXCOMPILE) -c $<
++
++# Use special rules for compatibility-ldbl.cc compilation, as we need to
++# pass -mlong-double-64.
++if GLIBCXX_LDBL_COMPAT
++compatibility-ldbl.lo: compatibility-ldbl.cc
++	$(LTCXXCOMPILE) -mlong-double-64 -c $<
++compatibility-ldbl.o: compatibility-ldbl.cc
++	$(CXXCOMPILE) -mlong-double-64 -c $<
++endif
++
++# Use special rules for C++11 files/objects.
++compatibility-c++0x.lo: compatibility-c++0x.cc
++	$(LTCXXCOMPILE) -std=gnu++11 -c $<
++compatibility-c++0x.o: compatibility-c++0x.cc
++	$(CXXCOMPILE) -std=gnu++11 -c $<
++
++compatibility-atomic-c++0x.lo: compatibility-atomic-c++0x.cc
++	$(LTCXXCOMPILE) -std=gnu++11 -c $<
++compatibility-atomic-c++0x.o: compatibility-atomic-c++0x.cc
++	$(CXXCOMPILE) -std=gnu++11 -c $<
++
++compatibility-thread-c++0x.lo: compatibility-thread-c++0x.cc
++	$(LTCXXCOMPILE) -std=gnu++11 -c $<
++compatibility-thread-c++0x.o: compatibility-thread-c++0x.cc
++	$(CXXCOMPILE) -std=gnu++11 -c $<
++
+ # AM_CXXFLAGS needs to be in each subdirectory so that it can be
+ # modified in a per-library or per-sub-library way.  Need to manually
+ # set this option because CONFIG_CXXFLAGS has to be after
+@@ -59,13 +123,10 @@
+ # as the occasion calls for it.
+ AM_CXXFLAGS = \
+ 	$(XTEMPLATE_FLAGS) \
+-	$(WARN_CXXFLAGS) \
+-	$(OPTIMIZE_CXXFLAGS) \
+-	$(CONFIG_CXXFLAGS)
++	$(WARN_CXXFLAGS) $(OPTIMIZE_CXXFLAGS) $(CONFIG_CXXFLAGS)
+ 
++# Libtool notes
+ 
+-# libstdc++ libtool notes
+-
+ # 1) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is
+ # last. (That way, things like -O2 passed down from the toplevel can
+ # be overridden by --enable-debug.)
+@@ -82,10 +143,11 @@
+ # correct solution is to add `--tag CXX' to LTCXXCOMPILE and maybe
+ # CXXLINK, just after $(LIBTOOL), so that libtool doesn't have to
+ # attempt to infer which configuration to use
+-LTCXXCOMPILE = $(LIBTOOL) --tag CXX \
+-	       $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=compile \
+-	       $(CXX) $(INCLUDES) $(AM_CPPFLAGS) $(CPPFLAGS) \
+-	       $(AM_CXXFLAGS) $(CXXFLAGS)
++LTCXXCOMPILE = \
++	$(LIBTOOL) --tag CXX \
++	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=compile $(CXX) $(INCLUDES) \
++	$(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS)
+ 
+ LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
+ 
+@@ -95,9 +157,13 @@
+ # course is problematic at this point.  So, we get the top-level
+ # directory to configure libstdc++-v3 to use gcc as the C++
+ # compilation driver.
+-CXXLINK = $(LIBTOOL) --tag CXX $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=link \
+-	  $(CXX) $(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
++CXXLINK = \
++	$(LIBTOOL) --tag CXX \
++	$(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \
++	--mode=link $(CXX) \
++	$(OPT_LDFLAGS) $(SECTION_LDFLAGS) $(AM_CXXFLAGS) $(LTLDFLAGS) -o $@
+ 
++
+ # Symbol versioning for shared libraries.
+ if ENABLE_SYMVERS
+ libstdc++-symbols.ver:  ${glibcxx_srcdir}/$(SYMVER_FILE) \
+@@ -116,7 +182,7 @@
+ 	  fi; \
+ 	fi
+ 	$(EGREP) -v '^[ 	]*#(#| |$$)' $@.tmp | \
+-	  $(COMPILE) -E -P -include config.h - > $@ || (rm -f $@ ; exit 1)
++	  $(CC) -E -P -include ../config.h - > $@ || (rm -f $@ ; exit 1)
+ 	rm -f $@.tmp
+ 
+ CLEANFILES = libstdc++-symbols.ver
+@@ -165,7 +231,6 @@
+ 
+ 
+ # Control additional build primary rules.
+-# EXTRA_LTLIBRARIES =
+ all-once: libstdc++convenience.la $(STAMP_DEBUG)
+ install-data-once: $(STAMP_INSTALL_DEBUG)
+ 
+@@ -228,7 +293,7 @@
+ 	  mv Makefile Makefile.tmp; \
+ 	  sed -e 's,all-local: all-once,all-local:,' \
+ 	      -e 's,install-data-local: install-data-once,install-data-local:,' \
+-	      -e 's,src/c,src/debug/c,' \
++	      -e '/vpath/!s,src/c,src/debug/c,' \
+ 	  < Makefile.tmp > Makefile ; \
+ 	  $(MAKE) CXXFLAGS='$(DEBUG_FLAGS)' \
+ 	  toolexeclibdir=$(glibcxx_toolexeclibdir)/debug all) ;
+Index: libstdc++-v3/src/c++98/Makefile.in
+===================================================================
+--- libstdc++-v3/src/c++98/Makefile.in	(.../tags/gcc_4_7_0_release)	(wersja 187906)
++++ libstdc++-v3/src/c++98/Makefile.in	(.../branches/gcc-4_7-branch)	(wersja 187906)
<<Diff was trimmed, longer than 597 lines>>

---- CVS-web:
    http://cvs.pld-linux.org/packages/gcc/gcc-branch.diff?r1=1.62&r2=1.63



More information about the pld-cvs-commit mailing list