diff options
| author | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-02-15 22:55:14 +0000 |
|---|---|---|
| committer | bkoz <bkoz@138bc75d-0d04-0410-961f-82ee72b054a4> | 2008-02-15 22:55:14 +0000 |
| commit | d0a2fac21caf11796c3905c5149f1efd0d56d591 (patch) | |
| tree | 9f3bbe671a305300df03669d118aef62e91ed107 /libstdc++-v3/src | |
| parent | 6b956f99210ee29085aa0428f5a42846a3f5a8d4 (diff) | |
| download | gcc-d0a2fac21caf11796c3905c5149f1efd0d56d591.tar.gz | |
2008-02-15 Benjamin Kosnik <bkoz@redhat.com>
* include/parallel/types.h: Move enum parallelism here. Use
tr1/cstdint's int16_t, uint16_t, int32_t, uint32_t, int64_t,
uint64_t.
* include/parallel/multiseq_selection.h: Adjust for cstdint.
* include/parallel/compatibility.h: Same.
* include/parallel/tags.h: Just compile-time tags.
* include/parallel/base.h: Put namespace bits here.
* src/Makefile.am (PARALLEL_FLAGS): Use it.
* src/Makefile.in: Regenerate.
* testsuite/25_algorithms/nth_element/1.cc: Add test variable.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@132354 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3/src')
| -rw-r--r-- | libstdc++-v3/src/Makefile.am | 7 | ||||
| -rw-r--r-- | libstdc++-v3/src/Makefile.in | 9 | ||||
| -rw-r--r-- | libstdc++-v3/src/parallel_list.cc | 2 |
3 files changed, 9 insertions, 9 deletions
diff --git a/libstdc++-v3/src/Makefile.am b/libstdc++-v3/src/Makefile.am index 56e690d5993..9bc4b557214 100644 --- a/libstdc++-v3/src/Makefile.am +++ b/libstdc++-v3/src/Makefile.am @@ -214,11 +214,12 @@ concept-inst.lo: concept-inst.cc concept-inst.o: concept-inst.cc $(CXXCOMPILE) -D_GLIBCXX_CONCEPT_CHECKS -fimplicit-templates -c $< -# Use special rules for parallel_list.cc compile. +# Use special rules for parallel mode compilation. +PARALLEL_FLAGS = -fopenmp -D_GLIBCXX_PARALLEL -I$(glibcxx_builddir)/../libgomp parallel_list.lo: parallel_list.cc - $(LTCXXCOMPILE) -I$(glibcxx_builddir)/../libgomp -c $< + $(LTCXXCOMPILE) $(PARALLEL_FLAGS) -c $< parallel_list.o: parallel_list.cc - $(CXXCOMPILE) -I$(glibcxx_builddir)/../libgomp -c $< + $(CXXCOMPILE) $(PARALLEL_FLAGS) -c $< # Use special rules for the C++0x sources so that the proper flags are passed. system_error.lo: system_error.cc diff --git a/libstdc++-v3/src/Makefile.in b/libstdc++-v3/src/Makefile.in index acab043c071..71ddb748452 100644 --- a/libstdc++-v3/src/Makefile.in +++ b/libstdc++-v3/src/Makefile.in @@ -429,6 +429,9 @@ libstdc___la_LDFLAGS = \ # deprecated include files. GLIBCXX_INCLUDE_DIR = $(glibcxx_builddir)/include +# 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 @@ -802,12 +805,10 @@ concept-inst.lo: concept-inst.cc $(LTCXXCOMPILE) -D_GLIBCXX_CONCEPT_CHECKS -fimplicit-templates -c $< concept-inst.o: concept-inst.cc $(CXXCOMPILE) -D_GLIBCXX_CONCEPT_CHECKS -fimplicit-templates -c $< - -# Use special rules for parallel_list.cc compile. parallel_list.lo: parallel_list.cc - $(LTCXXCOMPILE) -I$(glibcxx_builddir)/../libgomp -c $< + $(LTCXXCOMPILE) $(PARALLEL_FLAGS) -c $< parallel_list.o: parallel_list.cc - $(CXXCOMPILE) -I$(glibcxx_builddir)/../libgomp -c $< + $(CXXCOMPILE) $(PARALLEL_FLAGS) -c $< # Use special rules for the C++0x sources so that the proper flags are passed. system_error.lo: system_error.cc diff --git a/libstdc++-v3/src/parallel_list.cc b/libstdc++-v3/src/parallel_list.cc index a79a886904c..e038459a3df 100644 --- a/libstdc++-v3/src/parallel_list.cc +++ b/libstdc++-v3/src/parallel_list.cc @@ -27,6 +27,4 @@ // invalidate any other reasons why the executable file might be covered by // the GNU General Public License. -#define _GLIBCXX_PARALLEL - #include "list.cc" |