This is the mail archive of the
gdb@sourceware.org
mailing list for the GDB project.
sync toplevel between GCC and src
- From: Ralf Wildenhues <Ralf dot Wildenhues at gmx dot de>
- To: gcc-patches at gcc dot gnu dot org, binutils at sourceware dot org, gdb at sourceware dot org
- Date: Sun, 16 Aug 2009 17:09:58 +0200
- Subject: sync toplevel between GCC and src
Looking at these toplevel files:
Makefile.def
Makefile.tpl
Makefile.in
configure.ac
configure
in the git mirrors of gcc and binutils-gdb, they are in sync back in
these commits:
gcc ca874181dbca90a0d6afccd618f62602c735f1ca
src 3c78655ea2c05768fcf68ad81ae2ad7c4c48edb9
which corresponds to this change:
2009-03-18 Tom Tromey <tromey@redhat.com>
* configure: Rebuild.
* configure.ac (host_libs): Add libiconv.
* Makefile.in: Rebuild.
* Makefile.def (host_modules): Add libiconv.
(configure-gdb, all-gdb): Depend on libiconv.
(I have not verified that this was the latest time they were in sync;
that is irrelevant. Also, if you're not interested in the git trees,
just ignore the commit hash information; I'm merely noting it, alongside
with the remark that I'd refuse to do this work without having a git
mirror available.)
Since then, the above set of files has seen these changes
(in reverse chronological order)
- in src not in gcc:
4ee0cbc04f0887022359efcb56a65b91c2720e62
- in gcc not in src:
68a9cde253cf443d9128c48387e57ac2d6dd7ebb
6e886735331790326954fa190ac0344b3904396a
48565f505fa1dd9aba7a2f9bfa2fc770aa6b10ba
7ee95683c71f5e2a27d2c307458ec7f293d8591e
5e8a8ffc1f1348e50d2857e27652ef2333c068ed
4a4b30b655671b4fba03d439655af0cfe3402e46
99bac141650d61619721db29958fd941cadf6f6a
2f13c29ef90fe8755e7562467a1a9af2734f6c31
021ac0da1aaea4c67e5760ce844e7753820be873
2e547356d0fa210fe732eb45da7deeab8459f75e
613f5ea92f83871c7c58d635f2ee6eb6bf6c0860
540fcd944a2529122c95cbe2234c2a4c1452593e
ed38ce48095a7b7d431cf5910138fa48ff4d828e
Both trees changed darwin configury in different ways. This prevents a
fully mechanical merge and requires also looking at intermediate
darwin-related changes in configure.ac that _did_ occur in both trees:
These were the relevant ones, in GCC:
| commit ed38ce48095a7b7d431cf5910138fa48ff4d828e
| Author: andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4>
| Date: Thu Apr 9 21:50:14 2009 +0000
|
| 2009-04-09 Jack Howarth <howarth@bromo.med.uc.edu>
|
| * configure.ac: Restore match for darwin9 or later. Use double
| brackets since regeneration eats one pair.
| * configure: Regenerate.
|
|
| git-svn-id: svn://gcc.gnu.org/svn/gcc/trunk@145860 138bc75d-0d04-0410-961f-8
|
| diff --git a/configure.ac b/configure.ac
| index fd96122..c075987 100644
| --- a/configure.ac
| +++ b/configure.ac
| @@ -450,7 +450,7 @@ case "${target}" in
| noconfigdirs="$noconfigdirs ld gas gdb gprof"
| noconfigdirs="$noconfigdirs sim target-rda"
| ;;
| - i[[3456789]]86-*-darwin* | x86_64-*-darwin9*)
| + i[[3456789]]86-*-darwin* | x86_64-*-darwin[[912]]*)
| noconfigdirs="$noconfigdirs ld gas gprof"
| noconfigdirs="$noconfigdirs sim target-rda"
| ;;
|
| commit 3c54b125a42fc3bb3693cf434745342772372d58
| Author: brobecke <brobecke@138bc75d-0d04-0410-961f-82ee72b054a4>
| Date: Mon Mar 16 17:02:02 2009 +0000
|
| * configure.ac: Treat gdb as supported on x86_64-darwin.
| * configure: Regenerate.
|
|
| git-svn-id: svn://gcc.gnu.org/svn/gcc/trunk@144887 138bc75d-0d04-0410-961f-8
|
| diff --git a/configure.ac b/configure.ac
| index 9ac0824..3b51f74 100644
| --- a/configure.ac
| +++ b/configure.ac
| @@ -446,11 +446,11 @@ case "${target}" in
| *-*-chorusos)
| noconfigdirs="$noconfigdirs target-newlib target-libgloss ${libgcj}"
| ;;
| - powerpc-*-darwin* | x86_64-*-darwin[[912]]*)
| + powerpc-*-darwin*)
| noconfigdirs="$noconfigdirs ld gas gdb gprof"
| noconfigdirs="$noconfigdirs sim target-rda"
| ;;
| - i[[3456789]]86-*-darwin*)
| + i[[3456789]]86-*-darwin* | x86_64-*-darwin9*)
| noconfigdirs="$noconfigdirs ld gas gprof"
| noconfigdirs="$noconfigdirs sim target-rda"
| ;;
and in src:
| commit 4ee0cbc04f0887022359efcb56a65b91c2720e62
| Author: gingold <gingold>
| Date: Thu Jul 2 08:24:01 2009 +0000
|
| 2009-07-02 Tristan Gingold <gingold@adacore.com>
|
| * configure.ac: Do not exclude gas for i386-*-darwin.
| Add a case for x86_64-*-darwin.
| * configure: Regenerate.
|
| diff --git a/configure.ac b/configure.ac
| index e8bcc4b..a594222 100644
| --- a/configure.ac
| +++ b/configure.ac
| @@ -450,7 +450,11 @@ case "${target}" in
| noconfigdirs="$noconfigdirs ld gas gdb gprof"
| noconfigdirs="$noconfigdirs sim target-rda"
| ;;
| - i[[3456789]]86-*-darwin* | x86_64-*-darwin9*)
| + i[[3456789]]86-*-darwin*)
| + noconfigdirs="$noconfigdirs ld gprof"
| + noconfigdirs="$noconfigdirs sim target-rda"
| + ;;
| + x86_64-*-darwin9*)
| noconfigdirs="$noconfigdirs ld gas gprof"
| noconfigdirs="$noconfigdirs sim target-rda"
| ;;
|
Comparing ChangeLog entries, the following seems sufficient as a merge
to GCC, assuming that the match for darwin9 or later also holds for gas.
Since this merge is rather inconsequential for a GCC build, I have just
pushed the merge below to GCC now.
The merge from GCC to src will be posted in a reply to this message
(and not immediately pushed, don't worry).
Thanks,
Ralf
2009-08-16 Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Sync from src, merge:
2009-07-02 Tristan Gingold <gingold@adacore.com>
* configure.ac: Do not exclude gas for i386-*-darwin.
Add a case for x86_64-*-darwin.
* configure: Regenerate.
Index: configure.ac
===================================================================
--- configure.ac (Revision 150795)
+++ configure.ac (Arbeitskopie)
@@ -450,7 +450,11 @@
noconfigdirs="$noconfigdirs ld gas gdb gprof"
noconfigdirs="$noconfigdirs sim target-rda"
;;
- i[[3456789]]86-*-darwin* | x86_64-*-darwin[[912]]*)
+ i[[3456789]]86-*-darwin*)
+ noconfigdirs="$noconfigdirs ld gprof"
+ noconfigdirs="$noconfigdirs sim target-rda"
+ ;;
+ x86_64-*-darwin[[912]]*)
noconfigdirs="$noconfigdirs ld gas gprof"
noconfigdirs="$noconfigdirs sim target-rda"
;;