toplevel *again* out of sync

classic Classic list List threaded Threaded
7 messages Options
Reply | Threaded
Open this post in threaded view
|

toplevel *again* out of sync

Paolo Bonzini-2
I hate to say this when I don't have the time to fix it myself, but
toplevel of gcc and src is once more out of sync, and this is bad.

I think that we should apply a *very* strict policy of not approving
toplevel patches unless the toplevel files are in sync.

Thanks in advance to anyone that "volunteers" to fix things...

Paolo
Reply | Threaded
Open this post in threaded view
|

Re: toplevel *again* out of sync

Ralf Wildenhues
Hi Paolo,

* Paolo Bonzini wrote on Sat, Oct 02, 2010 at 10:47:18AM CEST:
> I think that we should apply a *very* strict policy of not approving
> toplevel patches unless the toplevel files are in sync.
>
> Thanks in advance to anyone that "volunteers" to fix things...

You beat me by a couple of hours.  I'll fix it later today,
it's only a couple of patches (not from me though).

Cheers,
Ralf
Reply | Threaded
Open this post in threaded view
|

Re: toplevel *again* out of sync

Ralf Wildenhues
This is how things look like currently:

There are five patches in GCC not in src, four for toplevel and one for
config/; there are no patches in src not in GCC.  There is one
problematic sync.

Not in src:

b9a8e4c49ae2f195c2c0c4646a75f33ff926986f aka r162482
4ae8c98f346e631b735be15b09a41a1a043454d2 aka r163839
62932e4dc2db82e1bdef5e2afbad33154bb8d5f2 aka r164481
d34b0d1e4502f0a0879adac335534686cc5b550a aka r164756

The combined patch for the above four is at the end of this message.


The following patch has been committed to GCC and to src, but the two
commits are not identical, and the commit to src is lacking a ChangeLog
entry:

65b688d722ec8d604aa6e37a7fa16eb21c72fd8c aka r162530 aka

| 2010-07-26  Naveen.H.S  <[hidden email]>
|
|         * configure.ac: Support all v850 targets.
|         * configure: Regenerate.

Nick, Naveen, the diff between the GCC and the src commits is this;
which variant is correct?

| --- gcc/configure.ac        2010-10-02 09:33:07.000000000 +0200
| +++ src/configure.ac    2010-10-02 14:20:36.000000000 +0200
| @@ -968,7 +968,7 @@
|      noconfigdirs="$noconfigdirs bfd binutils gas gcc gdb ld target-libstdc++-v3 opcodes target-libgloss ${libgcj}"
|      ;;
|    v850*-*-*)
| -    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
| +    noconfigdirs="$noconfigdirs ${libgcj}"
|      ;;
|    vax-*-vms)
|      noconfigdirs="$noconfigdirs bfd binutils gdb ld target-newlib opcodes target-libgloss ${libgcj}"
|

Please fix the wrong side, and fix src/ChangeLog.  Thanks.


Other than that, below is the combined patch I intend to commit to src
unless there are disagreements.

Thanks,
Ralf

ChangeLog:
2010-10-02  Ralf Wildenhues  <[hidden email]>

        Sync from GCC:

        2010-09-30  Michael Eager  <[hidden email]>

        * configure.ac (microblaze): Add target-libssp to noconfigdirs.
        * configure: Regenerate.

        2010-09-21  Iain Sandoe  <[hidden email]>

        * configure.ac (enable-lto): Add Darwin to the list of supported lto
        targets and amend comment.
        * configure: Regenerate.

        2010-09-03  Jack Howarth <[hidden email]>

        * configure.ac: Enable LTO by default on Darwin.
        * configure: Regenerate.

        2010-07-23  Marc Glisse <[hidden email]>

        PR bootstrap/44455
        * configure.ac (extra_mpfr_configure_flags): Copy from
        extra_mpc_gmp_configure_flags.
        * configure: Re-generated.

config/ChangeLog:
2010-10-02  Ralf Wildenhues  <[hidden email]>

        Sync from GCC:

        2010-09-10  Jonathan Yong  <[hidden email]>

        * dfp.m4: Enable decimal float for i?86 cygwin
        and mingw, and for x86_64 mingw.

Index: configure.ac
===================================================================
RCS file: /cvs/src/src/configure.ac,v
retrieving revision 1.106
diff -u -r1.106 configure.ac
--- configure.ac 27 Sep 2010 20:22:46 -0000 1.106
+++ configure.ac 2 Oct 2010 12:33:36 -0000
@@ -887,7 +887,7 @@
     noconfigdirs="$noconfigdirs ld binutils gprof target-libgloss ${libgcj}"
     ;;
   microblaze*)
-    noconfigdirs="$noconfigdirs gprof ${libgcj}"
+    noconfigdirs="$noconfigdirs gprof target-libssp ${libgcj}"
     ;;
   mips*-sde-elf*)
     skipdirs="$skipdirs target-libiberty"
@@ -1348,7 +1348,7 @@
 if test "x$with_gmp$with_gmp_include$with_gmp_lib" = x && test -d ${srcdir}/gmp; then
   gmplibs='-L$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir $gmplibs"
   gmpinc='-I$$r/$(HOST_SUBDIR)/gmp -I$$s/gmp '"$gmpinc"
-  extra_mpfr_configure_flags='--with-gmp-build=$$r/$(HOST_SUBDIR)/gmp'
+  extra_mpfr_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
   extra_mpc_gmp_configure_flags='--with-gmp-include=$$r/$(HOST_SUBDIR)/gmp --with-gmp-lib=$$r/$(HOST_SUBDIR)/gmp/'"$lt_cv_objdir"
   # Do not test the gmp version.  Assume that it is sufficient, since
   # it is in the source tree, and the library has not been built yet
@@ -1787,17 +1787,19 @@
   AC_SUBST(libelflibs)
   AC_SUBST(libelfinc)
 fi],[if test x"$default_enable_lto" = x"yes" ; then
-    # On non-ELF platforms, LTO must be explicitly enabled.
-    enable_lto=no
+    case $target in
+      *-apple-darwin*) ;;
+      # On other non-ELF platforms, LTO must be explicitly enabled.
+      *) enable_lto=no ;;
+    esac
   else
-  # Apart from ELF platforms, only Windows supports LTO so far.  It
-  # would also be nice to check the binutils support, but we don't
+  # Apart from ELF platforms, only Windows and Darwin support LTO so far.
+  # It would also be nice to check the binutils support, but we don't
   # have gcc_GAS_CHECK_FEATURE available here.  For now, we'll just
   # warn during gcc/ subconfigure; unless you're bootstrapping with
   # -flto it won't be needed until after installation anyway.
     case $target in
-      *-cygwin*|*-mingw*) ;;
-      *-apple-darwin*) ;;
+      *-cygwin*|*-mingw* | *-apple-darwin*) ;;
       *) if test x"$enable_lto" = x"yes"; then
  AC_MSG_ERROR([LTO support is not enabled for this target.])
         fi
Index: config/dfp.m4
===================================================================
RCS file: /cvs/src/src/config/dfp.m4,v
retrieving revision 1.2
diff -u -r1.2 dfp.m4
--- config/dfp.m4 6 Sep 2010 15:46:09 -0000 1.2
+++ config/dfp.m4 2 Oct 2010 12:33:38 -0000
@@ -20,7 +20,9 @@
 ],
 [
   case $1 in
-    powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux*)
+    powerpc*-*-linux* | i?86*-*-linux* | x86_64*-*-linux* | s390*-*-linux* | \
+    i?86*-*-mingw* | x86_64*-*-mingw* | \
+    i?86*-*-cygwin*)
       enable_decimal_float=yes
       ;;
     *)
Reply | Threaded
Open this post in threaded view
|

Re: toplevel *again* out of sync

Paolo Bonzini-2
> Other than that, below is the combined patch I intend to commit to src
> unless there are disagreements.

Ok, thanks.

DJ, can you amend your scripts so that the head of gcc/ChangeLog and
src/ChangeLog is included?  This will make it easier to bug relevant
people.

Paolo
Reply | Threaded
Open this post in threaded view
|

Re: toplevel *again* out of sync

DJ Delorie-2

> DJ, can you amend your scripts so that the head of gcc/ChangeLog and
> src/ChangeLog is included?  This will make it easier to bug relevant
> people.

Done.
Reply | Threaded
Open this post in threaded view
|

RE: toplevel *again* out of sync

Naveen H. S
In reply to this post by Ralf Wildenhues
Hi,

>> Nick, Naveen, the diff between the GCC and the src commits is this;
>> which variant is correct?
>> -    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
>> +    noconfigdirs="$noconfigdirs ${libgcj}"

The following variant in src is the correct version:-
+    noconfigdirs="$noconfigdirs ${libgcj}"

The GCC commit should be modified as per the src commit.
Sorry, hunk of GCC was my mistake in the modified patch.

>> Please fix the wrong side, and fix src/ChangeLog.  Thanks.

Sorry, I don't have the permissions to commit these changes.

Thanks & Regards,
Naveen


Reply | Threaded
Open this post in threaded view
|

Re: toplevel *again* out of sync

Ralf Wildenhues
* Naveen H. S wrote on Mon, Oct 04, 2010 at 10:44:40AM CEST:

> >> Nick, Naveen, the diff between the GCC and the src commits is this;
> >> which variant is correct?
> >> -    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
> >> +    noconfigdirs="$noconfigdirs ${libgcj}"
>
> The following variant in src is the correct version:-
> +    noconfigdirs="$noconfigdirs ${libgcj}"
>
> The GCC commit should be modified as per the src commit.
> Sorry, hunk of GCC was my mistake in the modified patch.
>
> >> Please fix the wrong side, and fix src/ChangeLog.  Thanks.
>
> Sorry, I don't have the permissions to commit these changes.

I've committed the first patch below to GCC now, and added the ChangeLog
entry below that to src/ChangeLog now.

Cheers,
Ralf

Fixup botched sync of toplevel configure from src.

/:
        Sync from src:
        * configure.ac (v850 support): Remove target-libgloss from
        noconfigdirs.
        * configure: Regenerate.

diff --git a/configure.ac b/configure.ac
index 5f80aa9..6af4be1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -968,7 +968,7 @@ case "${target}" in
     noconfigdirs="$noconfigdirs bfd binutils gas gcc gdb ld target-libstdc++-v3 opcodes target-libgloss ${libgcj}"
     ;;
   v850*-*-*)
-    noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
+    noconfigdirs="$noconfigdirs ${libgcj}"
     ;;
   vax-*-vms)
     noconfigdirs="$noconfigdirs bfd binutils gdb ld target-newlib opcodes target-libgloss ${libgcj}"



Add missing ChangeLog entry for toplevel configure from 2010-07-26.

Index: ChangeLog
===================================================================
RCS file: /cvs/src/src/ChangeLog,v
retrieving revision 1.932
diff -u -r1.932 ChangeLog
--- ChangeLog 2 Oct 2010 14:54:05 -0000 1.932
+++ ChangeLog 7 Oct 2010 19:24:50 -0000
@@ -51,6 +51,11 @@
  * configure.ac: Fix unportable shell quoting.
  * configure: Regenerate.
 
+2010-07-26  Naveen.H.S  <[hidden email]>
+
+ * configure.ac: Support all v850 targets.
+ * configure: Regenerate.
+
 2010-07-17  Jack Howarth  <[hidden email]>
 
  PR target/44862