From 41304db18e26e6f4b63a7e458a7914bd0bd6416b Mon Sep 17 00:00:00 2001 From: DJ Delorie Date: Thu, 20 Sep 2007 21:56:16 +0000 Subject: [PATCH] Merge from gcc: 2007-09-19 Benjamin Kosnik * configure.ac (TOPLEVEL_CONFIGURE_ARGUMENTS): Move libgomp before libstdc++. * Makefile.def: Add libgomp config as a maybe dependency for libstdc++. * configure: Regenerate. * Makefile.in: Regenerate. --- ChangeLog | 8 ++++++++ Makefile.def | 1 + Makefile.in | 1 + configure | 4 ++-- configure.ac | 4 ++-- 5 files changed, 14 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 4dc8fb8a71..57c6e2a8e6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -3,6 +3,14 @@ * configure.ac (mipsisa*-*-elfoabi*): New stanza. * configure: Regenerate. +2007-09-19 Benjamin Kosnik + + * configure.ac (TOPLEVEL_CONFIGURE_ARGUMENTS): Move libgomp before + libstdc++. + * Makefile.def: Add libgomp config as a maybe dependency for libstdc++. + * configure: Regenerate. + * Makefile.in: Regenerate. + 2007-09-17 Andreas Schwab * configure.ac: Raise minimum makeinfo version to 4.6. diff --git a/Makefile.def b/Makefile.def index 3d9a95d617..6d57c081a1 100644 --- a/Makefile.def +++ b/Makefile.def @@ -486,6 +486,7 @@ dependencies = { module=configure-target-libobjc; on=configure-target-boehm-gc; dependencies = { module=all-target-libobjc; on=all-target-libiberty; }; dependencies = { module=all-target-libobjc; on=all-target-boehm-gc; }; dependencies = { module=all-target-libstdc++-v3; on=all-target-libiberty; }; +dependencies = { module=configure-target-libstdc++-v3; on=configure-target-libgomp; }; // Target modules in the 'src' repository. lang_env_dependencies = { module=examples; }; diff --git a/Makefile.in b/Makefile.in index 80b2474686..4f33f9f8ba 100644 --- a/Makefile.in +++ b/Makefile.in @@ -51881,6 +51881,7 @@ configure-target-libobjc: maybe-configure-target-boehm-gc all-target-libobjc: maybe-all-target-libiberty all-target-libobjc: maybe-all-target-boehm-gc all-target-libstdc++-v3: maybe-all-target-libiberty +configure-target-libstdc++-v3: maybe-configure-target-libgomp all-target-libgloss: maybe-configure-target-newlib all-target-winsup: maybe-all-target-libiberty all-target-winsup: maybe-all-target-libtermcap diff --git a/configure b/configure index e894cf0b6e..eca027f19e 100755 --- a/configure +++ b/configure @@ -1865,6 +1865,7 @@ target_libraries="target-libgcc \ target-libiberty \ target-libgloss \ target-newlib \ + target-libgomp \ target-libstdc++-v3 \ target-libmudflap \ target-libssp \ @@ -1872,8 +1873,7 @@ target_libraries="target-libgcc \ target-boehm-gc \ ${libgcj} \ target-libobjc \ - target-libada \ - target-libgomp" + target-libada" # these tools are built using the target libraries, and are intended to # run only in the target environment diff --git a/configure.ac b/configure.ac index 5c5518e2a8..1496347d86 100644 --- a/configure.ac +++ b/configure.ac @@ -176,6 +176,7 @@ target_libraries="target-libgcc \ target-libiberty \ target-libgloss \ target-newlib \ + target-libgomp \ target-libstdc++-v3 \ target-libmudflap \ target-libssp \ @@ -183,8 +184,7 @@ target_libraries="target-libgcc \ target-boehm-gc \ ${libgcj} \ target-libobjc \ - target-libada \ - target-libgomp" + target-libada" # these tools are built using the target libraries, and are intended to # run only in the target environment -- 2.11.0