diff options
| -rw-r--r-- | libstdc++-v3/ChangeLog | 20 | ||||
| -rw-r--r-- | libstdc++-v3/Makefile.in | 2 | ||||
| -rw-r--r-- | libstdc++-v3/doc/Makefile.in | 2 | ||||
| -rw-r--r-- | libstdc++-v3/fragment.am | 3 | ||||
| -rw-r--r-- | libstdc++-v3/include/Makefile.in | 2 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/Makefile.am | 4 | ||||
| -rw-r--r-- | libstdc++-v3/libsupc++/Makefile.in | 6 | ||||
| -rw-r--r-- | libstdc++-v3/po/Makefile.in | 2 | ||||
| -rw-r--r-- | libstdc++-v3/python/Makefile.in | 2 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.am | 6 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.in | 8 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++11/Makefile.am | 4 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++11/Makefile.in | 6 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++98/Makefile.am | 6 | ||||
| -rw-r--r-- | libstdc++-v3/src/c++98/Makefile.in | 8 | ||||
| -rw-r--r-- | libstdc++-v3/testsuite/Makefile.in | 2 |
16 files changed, 52 insertions, 31 deletions
diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4642662..f9d0439 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,25 @@ 2012-09-28 Benjamin Kosnik <bkoz@redhat.com> + * fragment.am (CONFIG_CXXFLAGS): Remove EXTRA_CXX_FLAGS. + * libsupc++/Makefile.am (LTCXXCOMPILE): Add EXTRA_CXX_FLAGS here. + * src/Makefile.am: Same. + * src/c++98/Makefile.am: Same. + * src/c++11/Makefile.am: Same. + * Makefile.in: Regenerated. + * src/Makefile.am: Same. + * src/c++11/Makefile.in: Same. + * src/c++98/Makefile.in: Same. + * include/Makefile.in: Same. + * po/Makefile.in: Same. + * python/Makefile.in: Same. + * testsuite/Makefile.in: Same. + +2012-09-28 Benjamin Kosnik <bkoz@redhat.com> + + * src/c++98/Makefile.am: Fixup PARALLEL_FLAGS. + +2012-09-28 Benjamin Kosnik <bkoz@redhat.com> + * acinclude.m4 (GLIBCXX_ENABLE_PARALLEL): Remove ENABLE_PARALLEL. * include/Makefile.am: Same. * src/c++98/Makefile.am: Same. diff --git a/libstdc++-v3/Makefile.in b/libstdc++-v3/Makefile.in index 88f3a22..34d0e02 100644 --- a/libstdc++-v3/Makefile.in +++ b/libstdc++-v3/Makefile.in @@ -301,7 +301,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir) # These bits are all figured out from configure. Look in acinclude.m4 # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS. CONFIG_CXXFLAGS = \ - $(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ + $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@ WARN_CXXFLAGS = \ $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once diff --git a/libstdc++-v3/doc/Makefile.in b/libstdc++-v3/doc/Makefile.in index 9d93da3..240a68c 100644 --- a/libstdc++-v3/doc/Makefile.in +++ b/libstdc++-v3/doc/Makefile.in @@ -283,7 +283,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir) # These bits are all figured out from configure. Look in acinclude.m4 # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS. CONFIG_CXXFLAGS = \ - $(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ + $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@ WARN_CXXFLAGS = \ $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once diff --git a/libstdc++-v3/fragment.am b/libstdc++-v3/fragment.am index 64247af..5b1d503 100644 --- a/libstdc++-v3/fragment.am +++ b/libstdc++-v3/fragment.am @@ -22,7 +22,8 @@ endif # These bits are all figured out from configure. Look in acinclude.m4 # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS. CONFIG_CXXFLAGS = \ - $(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ + $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@ + WARN_CXXFLAGS = \ $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once diff --git a/libstdc++-v3/include/Makefile.in b/libstdc++-v3/include/Makefile.in index 0855f4e..a253690 100644 --- a/libstdc++-v3/include/Makefile.in +++ b/libstdc++-v3/include/Makefile.in @@ -273,7 +273,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir) # These bits are all figured out from configure. Look in acinclude.m4 # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS. CONFIG_CXXFLAGS = \ - $(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ + $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@ WARN_CXXFLAGS = \ $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once diff --git a/libstdc++-v3/libsupc++/Makefile.am b/libstdc++-v3/libsupc++/Makefile.am index 7c72f58..69cbf5c 100644 --- a/libstdc++-v3/libsupc++/Makefile.am +++ b/libstdc++-v3/libsupc++/Makefile.am @@ -179,14 +179,14 @@ LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared $(LIBTOOLFLAGS) --mode=comp # placed after --tag CXX lest things CXX undo the affect of # disable-shared. -# 2) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is +# 2) Need to explicitly set LTCXXCOMPILE so that EXTRA_CXX_FLAGS is # last. (That way, things like -O2 passed down from the toplevel can # be overridden by --enable-debug.) LTCXXCOMPILE = \ $(LIBTOOL) --tag CXX --tag disable-shared \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(EXTRA_CXX_FLAGS) LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) diff --git a/libstdc++-v3/libsupc++/Makefile.in b/libstdc++-v3/libsupc++/Makefile.in index 0124962..b2af9ba 100644 --- a/libstdc++-v3/libsupc++/Makefile.in +++ b/libstdc++-v3/libsupc++/Makefile.in @@ -333,7 +333,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir) # These bits are all figured out from configure. Look in acinclude.m4 # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS. CONFIG_CXXFLAGS = \ - $(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ + $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@ WARN_CXXFLAGS = \ $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once @@ -465,14 +465,14 @@ LTCOMPILE = $(LIBTOOL) --tag CC --tag disable-shared $(LIBTOOLFLAGS) --mode=comp # placed after --tag CXX lest things CXX undo the affect of # disable-shared. -# 2) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is +# 2) Need to explicitly set LTCXXCOMPILE so that EXTRA_CXX_FLAGS is # last. (That way, things like -O2 passed down from the toplevel can # be overridden by --enable-debug.) LTCXXCOMPILE = \ $(LIBTOOL) --tag CXX --tag disable-shared \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(EXTRA_CXX_FLAGS) LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) diff --git a/libstdc++-v3/po/Makefile.in b/libstdc++-v3/po/Makefile.in index b471177..b6e9def 100644 --- a/libstdc++-v3/po/Makefile.in +++ b/libstdc++-v3/po/Makefile.in @@ -273,7 +273,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir) # These bits are all figured out from configure. Look in acinclude.m4 # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS. CONFIG_CXXFLAGS = \ - $(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ + $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@ WARN_CXXFLAGS = \ $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once diff --git a/libstdc++-v3/python/Makefile.in b/libstdc++-v3/python/Makefile.in index 314fb46..d0fd51d 100644 --- a/libstdc++-v3/python/Makefile.in +++ b/libstdc++-v3/python/Makefile.in @@ -297,7 +297,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir) # These bits are all figured out from configure. Look in acinclude.m4 # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS. CONFIG_CXXFLAGS = \ - $(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ + $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@ WARN_CXXFLAGS = \ $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 0251289..d76318e 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -154,14 +154,14 @@ AM_CXXFLAGS = \ # placed after --tag CXX lest things CXX undo the affect of # disable-shared. -# 2) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is +# 2) Need to explicitly set LTCXXCOMPILE so that EXTRA_CXX_FLAGS is # last. (That way, things like -O2 passed down from the toplevel can -# be overridden by --enable-debug.) +# be overridden by --enable-debug and --enable-cxx-flags.) LTCXXCOMPILE = \ $(LIBTOOL) --tag CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=compile $(CXX) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(EXTRA_CXX_FLAGS) LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index 345a5e1..56eb09a 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -323,7 +323,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir) # These bits are all figured out from configure. Look in acinclude.m4 # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS. CONFIG_CXXFLAGS = \ - $(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ + $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@ WARN_CXXFLAGS = \ $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once @@ -425,14 +425,14 @@ AM_CXXFLAGS = \ # placed after --tag CXX lest things CXX undo the affect of # disable-shared. -# 2) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is +# 2) Need to explicitly set LTCXXCOMPILE so that EXTRA_CXX_FLAGS is # last. (That way, things like -O2 passed down from the toplevel can -# be overridden by --enable-debug.) +# be overridden by --enable-debug and --enable-cxx-flags.) LTCXXCOMPILE = \ $(LIBTOOL) --tag CXX \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=compile $(CXX) $(INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(EXTRA_CXX_FLAGS) LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) diff --git a/libstdc++-v3/src/c++11/Makefile.am b/libstdc++-v3/src/c++11/Makefile.am index 1e3dd99..4922461 100644 --- a/libstdc++-v3/src/c++11/Makefile.am +++ b/libstdc++-v3/src/c++11/Makefile.am @@ -99,14 +99,14 @@ AM_MAKEFLAGS = \ # placed after --tag CXX lest things CXX undo the affect of # disable-shared. -# 2) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is +# 2) Need to explicitly set LTCXXCOMPILE so that EXTRA_CXX_FLAGS is # last. (That way, things like -O2 passed down from the toplevel can # be overridden by --enable-debug.) LTCXXCOMPILE = \ $(LIBTOOL) --tag CXX --tag disable-shared \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(EXTRA_CXX_FLAGS) LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) diff --git a/libstdc++-v3/src/c++11/Makefile.in b/libstdc++-v3/src/c++11/Makefile.in index 32c5c62..22a8c53 100644 --- a/libstdc++-v3/src/c++11/Makefile.in +++ b/libstdc++-v3/src/c++11/Makefile.in @@ -290,7 +290,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir) # These bits are all figured out from configure. Look in acinclude.m4 # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS. CONFIG_CXXFLAGS = \ - $(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ + $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@ WARN_CXXFLAGS = \ $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once @@ -368,14 +368,14 @@ AM_MAKEFLAGS = \ # placed after --tag CXX lest things CXX undo the affect of # disable-shared. -# 2) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is +# 2) Need to explicitly set LTCXXCOMPILE so that EXTRA_CXX_FLAGS is # last. (That way, things like -O2 passed down from the toplevel can # be overridden by --enable-debug.) LTCXXCOMPILE = \ $(LIBTOOL) --tag CXX --tag disable-shared \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(EXTRA_CXX_FLAGS) LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) diff --git a/libstdc++-v3/src/c++98/Makefile.am b/libstdc++-v3/src/c++98/Makefile.am index 5733f34..6d83416 100644 --- a/libstdc++-v3/src/c++98/Makefile.am +++ b/libstdc++-v3/src/c++98/Makefile.am @@ -161,7 +161,7 @@ concept-inst.o: concept-inst.cc $(CXXCOMPILE) -D_GLIBCXX_CONCEPT_CHECKS -fimplicit-templates -c $< # Use special rules for parallel mode compilation. -PARALLEL_FLAGS = -fopenmp -D_GLIBCXX_PARALLEL -I$(glibcxx_builddir)/../libgomp +PARALLEL_FLAGS = -D_GLIBCXX_PARALLEL parallel_settings.lo: parallel_settings.cc $(LTCXXCOMPILE) $(PARALLEL_FLAGS) -c $< parallel_settings.o: parallel_settings.cc @@ -203,14 +203,14 @@ AM_MAKEFLAGS = \ # placed after --tag CXX lest things CXX undo the affect of # disable-shared. -# 2) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is +# 2) Need to explicitly set LTCXXCOMPILE so that EXTRA_CXX_FLAGS is # last. (That way, things like -O2 passed down from the toplevel can # be overridden by --enable-debug.) LTCXXCOMPILE = \ $(LIBTOOL) --tag CXX --tag disable-shared \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(EXTRA_CXX_FLAGS) LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) diff --git a/libstdc++-v3/src/c++98/Makefile.in b/libstdc++-v3/src/c++98/Makefile.in index 6cb0c7f..26608c5 100644 --- a/libstdc++-v3/src/c++98/Makefile.in +++ b/libstdc++-v3/src/c++98/Makefile.in @@ -306,7 +306,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir) # These bits are all figured out from configure. Look in acinclude.m4 # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS. CONFIG_CXXFLAGS = \ - $(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ + $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@ WARN_CXXFLAGS = \ $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once @@ -401,7 +401,7 @@ libc__98convenience_la_SOURCES = $(sources) GLIBCXX_INCLUDE_DIR = $(glibcxx_builddir)/include # Use special rules for parallel mode compilation. -PARALLEL_FLAGS = -fopenmp -D_GLIBCXX_PARALLEL -I$(glibcxx_builddir)/../libgomp +PARALLEL_FLAGS = -D_GLIBCXX_PARALLEL # 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 @@ -440,14 +440,14 @@ AM_MAKEFLAGS = \ # placed after --tag CXX lest things CXX undo the affect of # disable-shared. -# 2) Need to explicitly set LTCXXCOMPILE so that AM_CXXFLAGS is +# 2) Need to explicitly set LTCXXCOMPILE so that EXTRA_CXX_FLAGS is # last. (That way, things like -O2 passed down from the toplevel can # be overridden by --enable-debug.) LTCXXCOMPILE = \ $(LIBTOOL) --tag CXX --tag disable-shared \ $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) \ --mode=compile $(CXX) $(TOPLEVEL_INCLUDES) \ - $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) + $(AM_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) $(EXTRA_CXX_FLAGS) LTLDFLAGS = $(shell $(SHELL) $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) diff --git a/libstdc++-v3/testsuite/Makefile.in b/libstdc++-v3/testsuite/Makefile.in index 6dc8042..d286ce2 100644 --- a/libstdc++-v3/testsuite/Makefile.in +++ b/libstdc++-v3/testsuite/Makefile.in @@ -276,7 +276,7 @@ toolexeclibdir = $(glibcxx_toolexeclibdir) # These bits are all figured out from configure. Look in acinclude.m4 # or configure.ac to see how they are set. See GLIBCXX_EXPORT_FLAGS. CONFIG_CXXFLAGS = \ - $(SECTION_FLAGS) $(HWCAP_FLAGS) $(EXTRA_CXX_FLAGS) -frandom-seed=$@ + $(SECTION_FLAGS) $(HWCAP_FLAGS) -frandom-seed=$@ WARN_CXXFLAGS = \ $(WARN_FLAGS) $(WERROR_FLAG) -fdiagnostics-show-location=once |