toplevel out of sync

toplevel out of sync

[Paolo Bonzini]

All,

the toplevel configury of gcc/gdb/binutils is very much out of sync.

If people agree, I would like to freeze commits to the toplevel 
configury until they are not diverging anymore.

Also, I would like to make a new policy that from now on patches to the 
toplevel cannot be committed by anyone who doesn't have write access to 
both gcc and src.  Is there any agreement on this?

Unfortunately I don't have much time to devote to bringing the trees 
back in shape, and not even to chase down committers of patches placed 
only on one side.  Can anybody help with this?  In particular, if DJ 
could provide with the last date when the tree was synchronized that 
would help.

Paolo

Re: toplevel out of sync

[Ralf Wildenhues]

* Paolo Bonzini wrote on Tue, May 25, 2010 at 06:06:16PM CEST:
> the toplevel configury of gcc/gdb/binutils is very much out of sync.

> Unfortunately I don't have much time to devote to bringing the trees
> back in shape, and not even to chase down committers of patches
> placed only on one side.  Can anybody help with this?

I can take a look.

> ... the last date when the tree was synchronized ...

It looked fairly good 3 months ago[1].

Do you prefer tracking down committers and letting them finish their
work, or should I just go ahead and sync sets of commits as I did last
time?

Thanks,
Ralf

[1]
$ L="git log --until=3.months.ago --pretty=format:%H"
$ diff <( cd gcc && git show $($L origin/trunk | head -n 1):configure.ac ) \
       <( cd src && git show $($L origin/master | head -n 1):configure.ac )

Re: toplevel out of sync

[Paolo Bonzini]

On 05/25/2010 07:09 PM, Ralf Wildenhues wrote:
> * Paolo Bonzini wrote on Tue, May 25, 2010 at 06:06:16PM CEST:
>> the toplevel configury of gcc/gdb/binutils is very much out of sync.
>
>> Unfortunately I don't have much time to devote to bringing the trees
>> back in shape, and not even to chase down committers of patches
>> placed only on one side.  Can anybody help with this?
>
> I can take a look.
>
>> ... the last date when the tree was synchronized ...
>
> It looked fairly good 3 months ago[1].
>
> Do you prefer tracking down committers and letting them finish their
> work, or should I just go ahead and sync sets of commits as I did last
> time?

As you prefer.  I'd rather see a list of commits before giving you green 
light though. :-)

Paolo

Re: toplevel out of sync

[Ralf Wildenhues]

* Paolo Bonzini wrote on Tue, May 25, 2010 at 07:10:33PM CEST:
> On 05/25/2010 07:09 PM, Ralf Wildenhues wrote:
> >>... the last date when the tree was synchronized ...
> >
> >It looked fairly good 3 months ago[1].

Toplevel and config/ went out of sync with commit 6c8aa2aa884d of the
GCC infradead git mirror, aka. r157945, on April 2.  Since then, there
have been no commits on src that were not synced to GCC.

> >Do you prefer tracking down committers and letting them finish their
> >work, or should I just go ahead and sync sets of commits as I did last
> >time?
> 
> As you prefer.  I'd rather see a list of commits before giving you
> green light though. :-)

commit id of infradead mirror, GCC SVN revision number:

17281d1ee17f204064cfcbcc82089aefa19e3779   159527
401f30d69e280e18a9581b819376d18786595d3b   159173
decab1d0d6db331f662d42679eb1a8d473f72920   159134
bcd70fb06d56d9316d49019f5c0a3109def08d39   158763
a9ed67d000f285282e61aa9b87cc8d992a8731df   158762
22c56f6f70e07d6d9991a294439613dbf8eb60e0   158550
8b6a3525690f368dc965cd1457dc128d1925c995   158459
7da77e3b5958bf72909a3d238b2be0aa0820cb41   158423
82cf45c792250d333911ae6d2719fea77b520f0d   158285
d1d17d418a5c66a792e9988a945ca25e89692632   157946
6c8aa2aa884de79314b9b16a374518f4fd6624aa   157945

There are no changes in intl, libiberty.  The sourceware git mirror
doesn't seem to carry libdecnumber.  Which files in include/ were
part of libiberty again?

Thanks,
Ralf

Re: toplevel out of sync

[Ralf Wildenhues]

* Ralf Wildenhues wrote on Tue, May 25, 2010 at 07:33:53PM CEST:
> * Paolo Bonzini wrote on Tue, May 25, 2010 at 07:10:33PM CEST:
> > As you prefer.  I'd rather see a list of commits before giving you
> > green light though. :-)
> 
> commit id of infradead mirror, GCC SVN revision number:

One more missing in config/:
f299d473920cb31abfc07842575b43bbf08383d6   155648

Re: toplevel out of sync

[DJ Delorie]

> Also, I would like to make a new policy that from now on patches to
> the toplevel cannot be committed by anyone who doesn't have write
> access to both gcc and src.  Is there any agreement on this?

Our current policy certainly doesn't work, either we come up with
something that will, or abandon the whole idea and let chaos reign.

> In particular, if DJ could provide with the last date when the tree
> was synchronized that would help.

I don't recall.  It's stricly a manual process.

Re: toplevel out of sync

[DJ Delorie]

> There are no changes in intl, libiberty.  The sourceware git mirror
> doesn't seem to carry libdecnumber.  Which files in include/ were
> part of libiberty again?

Libiberty is kept in sync because gcc is the master and src is the
copy, so it can be mostly automated.  The libiberty sync includes
libiberty/, intl/, libdecnumber/, and those files in include/ that
exist in both repositories (src has more files therein which are
src-specific).

Re: toplevel out of sync

[NightStrike]

On Tue, May 25, 2010 at 4:38 PM, DJ Delorie <dj@redhat.com> wrote:
>
>> Also, I would like to make a new policy that from now on patches to
>> the toplevel cannot be committed by anyone who doesn't have write
>> access to both gcc and src.  Is there any agreement on this?
>
> Our current policy certainly doesn't work, either we come up with
> something that will, or abandon the whole idea and let chaos reign.

Ideas:
Switch to svn and use svn:externals to link the two repos
Make binutils be part of the gcc repository to begin with
Lock the files on the binutils side and only allow a specific user to
commit; Make that user a bot that's hooked onto the gcc commit

Re: toplevel out of sync

[Dave Korn]

On 25/05/2010 17:06, Paolo Bonzini wrote:

> Unfortunately I don't have much time to devote to bringing the trees
> back in shape, and not even to chase down committers of patches placed
> only on one side.  Can anybody help with this?  

  Augh.  I forgot to copy over this one:

> 	PR lto/42776
> 	* configure.ac (--enable-lto): Refactor handling so libelf tests
> 	are only performed inside then-clause of ACX_ELF_TARGET_IFELSE,
> 	and allow LTO to be explicitly enabled on non-ELF platforms that
> 	are known to support it inside else-clause.
> 	* configure: Regenerate.

  I'll do that right away.

    cheers,
      DaveK

Re: toplevel out of sync

[Dave Korn]

On 25/05/2010 18:33, Ralf Wildenhues wrote:

> bcd70fb06d56d9316d49019f5c0a3109def08d39   158763
> a9ed67d000f285282e61aa9b87cc8d992a8731df   158762

  I'm responsible for those two, and I'm copying them across right now; sorry
for forgetting.

    cheers,
      DaveK

Re: toplevel out of sync

[Dave Korn]

On 26/05/2010 05:58, Dave Korn wrote:
> On 25/05/2010 18:33, Ralf Wildenhues wrote:
> 
>> bcd70fb06d56d9316d49019f5c0a3109def08d39   158763
>> a9ed67d000f285282e61aa9b87cc8d992a8731df   158762
> 
>   I'm responsible for those two, and I'm copying them across right now; sorry
> for forgetting.

  And while I'm at it, I'll take care of these two as well:

> 17281d1ee17f204064cfcbcc82089aefa19e3779   159527
> 401f30d69e280e18a9581b819376d18786595d3b   159173

... since they're one-liner additions to the section I'm synching.

    cheers,
      DaveK

[PATCH, committed] Re: toplevel out of sync

[Dave Korn]

[-- Attachment #1: Type: text/plain, Size: 1594 bytes --]

On 26/05/2010 06:09, Dave Korn wrote:
> On 26/05/2010 05:58, Dave Korn wrote:
>> On 25/05/2010 18:33, Ralf Wildenhues wrote:
>>
>>> bcd70fb06d56d9316d49019f5c0a3109def08d39   158763
>>> a9ed67d000f285282e61aa9b87cc8d992a8731df   158762
>>   I'm responsible for those two, and I'm copying them across right now; sorry
>> for forgetting.
> 
>   And while I'm at it, I'll take care of these two as well:
> 
>> 17281d1ee17f204064cfcbcc82089aefa19e3779   159527
>> 401f30d69e280e18a9581b819376d18786595d3b   159173
> 
> ... since they're one-liner additions to the section I'm synching.

  I've synched across the above-mentioned GCC revisions to the top-level
configure.ac script in /src, with the following ChangeLog:

2010-05-26  Dave Korn  <dave.korn.cygwin AT gmail.com>

	Merge from gcc:

	2010-05-18  Steven Bosscher  <steven AT gcc.gnu.org>
	* configure.ac (--enable-lto): All *-apple-darwin* now support LTO.
	* configure: Regenerate.

	2010-05-07  Steven Bosscher  <steven AT gcc.gnu.org>
	* configure.ac (--enable-lto): Add x86_64-apple-darwin* as
	a platform that supports LTO.
	* configure: Regenerate.

	2010-04-27  Dave Korn  <dave.korn.cygwin AT gmail.com>
	PR lto/42776
	* configure.ac (--enable-lto): Refactor handling so libelf tests
	are only performed inside then-clause of ACX_ELF_TARGET_IFELSE,
	and allow LTO to be explicitly enabled on non-ELF platforms that
	are known to support it inside else-clause.
	* configure: Regenerate.

  Committed after building and testing binutils on i686-pc-cygwin just to make
sure nothing went wrong in the merge.

    cheers,
      DaveK


[-- Attachment #2: sync.diff --]
[-- Type: text/x-c, Size: 1876 bytes --]

Index: configure.ac
===================================================================
RCS file: /cvs/src/src/configure.ac,v
retrieving revision 1.102
diff -p -u -r1.102 configure.ac
--- configure.ac	27 Apr 2010 14:24:37 -0000	1.102
+++ configure.ac	26 May 2010 04:54:16 -0000
@@ -1651,17 +1651,8 @@ AC_ARG_ENABLE(lto,
 enable_lto=$enableval,
 enable_lto=yes; default_enable_lto=yes)
 
-ACX_ELF_TARGET_IFELSE([],
-if test x"$default_enable_lto" = x"yes" ; then
-  enable_lto=no
-else
-  if test x"$enable_lto" = x"yes"; then
-    AC_MSG_ERROR([LTO support requires an ELF target.])
-  fi
-fi
-default_enable_lto=no)
 
-if test x"$enable_lto" = x"yes" ; then
+ACX_ELF_TARGET_IFELSE([if test x"$enable_lto" = x"yes" ; then
   # Make sure that libelf.h and gelf.h are available.
   AC_ARG_WITH(libelf, [  --with-libelf=PATH       Specify prefix directory for the installed libelf package
                           Equivalent to --with-libelf-include=PATH/include
@@ -1777,7 +1768,25 @@ to specify its location.])
   # Flags needed for libelf.
   AC_SUBST(libelflibs)
   AC_SUBST(libelfinc)
-fi
+fi],[if test x"$default_enable_lto" = x"yes" ; then
+    # On non-ELF platforms, LTO must be explicitly enabled.
+    enable_lto=no
+  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
+  # 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*) ;;
+      *) if test x"$enable_lto" = x"yes"; then
+	AC_MSG_ERROR([LTO support is not enabled for this target.])
+        fi
+      ;;
+    esac
+  fi
+  default_enable_lto=no])
 
 
 # By default, C is the only stage 1 language.

Re: [PATCH, committed] Re: toplevel out of sync

[Ralf Wildenhues]

* Dave Korn wrote on Wed, May 26, 2010 at 07:36:26AM CEST:
> >>> bcd70fb06d56d9316d49019f5c0a3109def08d39   158763
> >>> a9ed67d000f285282e61aa9b87cc8d992a8731df   158762
> >> 17281d1ee17f204064cfcbcc82089aefa19e3779   159527
> >> 401f30d69e280e18a9581b819376d18786595d3b   159173

>   I've synched across the above-mentioned GCC revisions to the top-level
> configure.ac script in /src, with the following ChangeLog:

Remainders, in reverse chronological order:

2010-05-05  Sebastian Pop  <sebastian.pop@amd.com>

       * configure.ac: Allow all the versions greater than 0.10 of PPL.
       * configure: Regenerated.


2010-04-16  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

       * configure.ac: Check for elf_getshdrstrndx or elf_getshstrndx
       separately.
       * configure: Regenerate.


2010-04-13  Steve Ellcey  <sje@cup.hp.com>

       * configure: Regenerate after change to elf.m4.

config/
2010-04-13  Steve Ellcey  <sje@cup.hp.com>

       * elf.m4: Add hppa[12]*-*-hpux* to list of non-elf platforms.


2010-04-02  Sebastian Pop  <sebastian.pop@amd.com>

       * configure.ac: Add brackets around AC_TRY_COMPILE alternative.
       * configure: Regenerated.


2010-04-02  Sebastian Pop  <sebastian.pop@amd.com>

       * configure.ac: Print "buggy but acceptable" when CLooG
       revision is less than 9.
       * configure: Regenerated.


config/
2010-01-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>

       * stdint.m4 (GCC_HEADER_STDINT): Don't typedef uint8_t etc. if
       corresponding macros already exist.

Re: [PATCH, committed] Re: toplevel out of sync

[Paolo Bonzini]

> Remainders, in reverse chronological order:

Thanks Ralf. I'm CCing the people.

Paolo

> 2010-05-05  Sebastian Pop  <sebastian.pop@amd.com>
>
>       * configure.ac: Allow all the versions greater than 0.10 of PPL.
>       * configure: Regenerated.
>
>
> 2010-04-16  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
>
>       * configure.ac: Check for elf_getshdrstrndx or elf_getshstrndx
>       separately.
>       * configure: Regenerate.
>
>
> 2010-04-13  Steve Ellcey  <sje@cup.hp.com>
>
>       * configure: Regenerate after change to elf.m4.
>
> config/
> 2010-04-13  Steve Ellcey  <sje@cup.hp.com>
>
>       * elf.m4: Add hppa[12]*-*-hpux* to list of non-elf platforms.
>
>
> 2010-04-02  Sebastian Pop  <sebastian.pop@amd.com>
>
>       * configure.ac: Add brackets around AC_TRY_COMPILE alternative.
>       * configure: Regenerated.
>
>
> 2010-04-02  Sebastian Pop  <sebastian.pop@amd.com>
>
>       * configure.ac: Print "buggy but acceptable" when CLooG
>       revision is less than 9.
>       * configure: Regenerated.
>
>
> config/
> 2010-01-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
>
>       * stdint.m4 (GCC_HEADER_STDINT): Don't typedef uint8_t etc. if
>       corresponding macros already exist.

Re: toplevel out of sync

[Ralf Wildenhues]

[ moving from gcc@ to -patches ]

* Ralf Wildenhues wrote on Wed, May 26, 2010 at 08:25:37AM CEST:
> Remainders, in reverse chronological order:

OK, so I managed to mess up the list of remainders.  Sorry about that.
There is also these two:

2010-04-20  Eric Botcazou  <ebotcazou@adacore.com>

	* configure.ac (BUILD_CONFIG): Redirect output to /dev/null.
	* configure: Regenerate.

2010-04-17  Ralf Corsépius  <ralf.corsepius@rtems.org>

	* configure.ac (*-*-rtems*): Add target-libiberty to $skipdirs.
	* configure: Regenerate.


So in total we are talking about the sync patch below from GCC to src.
The GCC_HEADER_STDINT change causes a regeneration of bfd/configure,
otherwise there are no textual changes outside of toplevel and config/.

I've built binutils+gdb with it on x86_64-unknown-linux-gnu.
OK to commit to src as one patch?
(I have these patches split up in my git tree, so if you prefer split
commits that is possible too.)

As another issue, config.{guess,sub} have been updated in GCC in the
mean time.

Thanks,
Ralf

ChangeLog:
2010-05-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	Sync from GCC:

	2010-05-05  Sebastian Pop  <sebastian.pop@amd.com>
	* configure.ac: Allow all the versions greater than 0.10 of PPL.
	* configure: Regenerated.

	2010-04-20  Eric Botcazou  <ebotcazou@adacore.com>
	* configure.ac (BUILD_CONFIG): Redirect output to /dev/null.
	* configure: Regenerate.

	2010-04-17  Ralf Corsépius  <ralf.corsepius@rtems.org>
	* configure.ac (*-*-rtems*): Add target-libiberty to $skipdirs.
	* configure: Regenerate.

	2010-04-16  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
	* configure.ac: Check for elf_getshdrstrndx or elf_getshstrndx
	separately.
	* configure: Regenerate.

	2010-04-13  Steve Ellcey  <sje@cup.hp.com>
	* configure: Regenerate after change to elf.m4.

	2010-04-02  Sebastian Pop  <sebastian.pop@amd.com>
	* configure.ac: Add brackets around AC_TRY_COMPILE alternative.
	* configure: Regenerated.

	2010-04-02  Sebastian Pop  <sebastian.pop@amd.com>
	* configure.ac: Print "buggy but acceptable" when CLooG
	revision is less than 9.
	* configure: Regenerated.

config/ChangeLog:
2010-05-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	Sync from GCC:

	2010-04-13  Steve Ellcey  <sje@cup.hp.com>
	* elf.m4: Add hppa[12]*-*-hpux* to list of non-elf platforms.

	2010-01-05  Rainer Orth  <ro@CeBiTec.Uni-Bielefeld.DE>
	* stdint.m4 (GCC_HEADER_STDINT): Don't typedef uint8_t etc. if
	corresponding macros already exist.

bfd/ChangeLog:
2010-05-27  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* configure: Regenerate.

diff --git a/config/elf.m4 b/config/elf.m4
index 44d0249..007006e 100644
--- a/config/elf.m4
+++ b/config/elf.m4
@@ -15,7 +15,7 @@ target_elf=no
 case $target in
   *-darwin* | *-aix* | *-cygwin* | *-mingw* | *-aout* | *-*coff* | \
   *-msdosdjgpp* | *-netware* | *-vms* | *-wince* | *-*-pe* | \
-  alpha*-dec-osf* | *-interix*)
+  alpha*-dec-osf* | *-interix* | hppa[[12]]*-*-hpux*)
     target_elf=no
     ;;
   *)
diff --git a/config/stdint.m4 b/config/stdint.m4
index b26b4fc..d63081d 100644
--- a/config/stdint.m4
+++ b/config/stdint.m4
@@ -234,49 +234,61 @@ if test "$acx_cv_header_stdint" = stddef.h; then
     #define _UINT8_T
     #ifndef __uint8_t_defined
     #define __uint8_t_defined
+    #ifndef uint8_t
     typedef unsigned $acx_cv_type_int8_t uint8_t;
     #endif
     #endif
+    #endif
 
     #ifndef _UINT16_T
     #define _UINT16_T
     #ifndef __uint16_t_defined
     #define __uint16_t_defined
+    #ifndef uint16_t
     typedef unsigned $acx_cv_type_int16_t uint16_t;
     #endif
     #endif
+    #endif
 
     #ifndef _UINT32_T
     #define _UINT32_T
     #ifndef __uint32_t_defined
     #define __uint32_t_defined
+    #ifndef uint32_t
     typedef unsigned $acx_cv_type_int32_t uint32_t;
     #endif
     #endif
+    #endif
 
     #ifndef _INT8_T
     #define _INT8_T
     #ifndef __int8_t_defined
     #define __int8_t_defined
+    #ifndef int8_t
     typedef $acx_cv_type_int8_t int8_t;
     #endif
     #endif
+    #endif
 
     #ifndef _INT16_T
     #define _INT16_T
     #ifndef __int16_t_defined
     #define __int16_t_defined
+    #ifndef int16_t
     typedef $acx_cv_type_int16_t int16_t;
     #endif
     #endif
+    #endif
 
     #ifndef _INT32_T
     #define _INT32_T
     #ifndef __int32_t_defined
     #define __int32_t_defined
+    #ifndef int32_t
     typedef $acx_cv_type_int32_t int32_t;
     #endif
     #endif
+    #endif
 EOF
 elif test "$ac_cv_type_u_int32_t" = yes; then
   sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -296,25 +308,31 @@ elif test "$ac_cv_type_u_int32_t" = yes; then
     #define _UINT8_T
     #ifndef __uint8_t_defined
     #define __uint8_t_defined
+    #ifndef uint8_t
     typedef u_int8_t uint8_t;
     #endif
     #endif
+    #endif
 
     #ifndef _UINT16_T
     #define _UINT16_T
     #ifndef __uint16_t_defined
     #define __uint16_t_defined
+    #ifndef uint16_t
     typedef u_int16_t uint16_t;
     #endif
     #endif
+    #endif
 
     #ifndef _UINT32_T
     #define _UINT32_T
     #ifndef __uint32_t_defined
     #define __uint32_t_defined
+    #ifndef uint32_t
     typedef u_int32_t uint32_t;
     #endif
     #endif
+    #endif
 EOF
 else
   sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -364,9 +382,11 @@ elif test "$ac_cv_type_u_int64_t" = yes; then
     #define _UINT64_T
     #ifndef __uint64_t_defined
     #define __uint64_t_defined
+    #ifndef uint64_t
     typedef u_int64_t uint64_t;
     #endif
     #endif
+    #endif
 EOF
 elif test -n "$acx_cv_type_int64_t"; then
   sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -374,15 +394,19 @@ elif test -n "$acx_cv_type_int64_t"; then
     /* architecture has a 64-bit type, $acx_cv_type_int64_t */
     #ifndef _INT64_T
     #define _INT64_T
+    #ifndef int64_t
     typedef $acx_cv_type_int64_t int64_t;
     #endif
+    #endif
     #ifndef _UINT64_T
     #define _UINT64_T
     #ifndef __uint64_t_defined
     #define __uint64_t_defined
+    #ifndef uint64_t
     typedef unsigned $acx_cv_type_int64_t uint64_t;
     #endif
     #endif
+    #endif
 EOF
 else
   sed 's/^ *//' >> tmp-stdint.h <<EOF
@@ -392,13 +416,17 @@ else
     #ifndef _INT64_T
     #define _INT64_T
     #ifndef __int64_t_defined
+    #ifndef int64_t
     typedef long long int64_t;
     #endif
     #endif
+    #endif
     #ifndef _UINT64_T
     #define _UINT64_T
+    #ifndef uint64_t
     typedef unsigned long long uint64_t;
     #endif
+    #endif
 
     #elif defined __GNUC__ && defined (__STDC__) && __STDC__-0
     /* NextStep 2.0 cc is really gcc 1.93 but it defines __GNUC__ = 2 and
@@ -410,24 +438,32 @@ else
 
     # ifndef _INT64_T
     # define _INT64_T
+    # ifndef int64_t
     __extension__ typedef long long int64_t;
     # endif
+    # endif
     # ifndef _UINT64_T
     # define _UINT64_T
+    # ifndef uint64_t
     __extension__ typedef unsigned long long uint64_t;
     # endif
+    # endif
 
     #elif !defined __STRICT_ANSI__
     # if defined _MSC_VER || defined __WATCOMC__ || defined __BORLANDC__
 
     #  ifndef _INT64_T
     #  define _INT64_T
+    #  ifndef int64_t
     typedef __int64 int64_t;
     #  endif
+    #  endif
     #  ifndef _UINT64_T
     #  define _UINT64_T
+    #  ifndef uint64_t
     typedef unsigned __int64 uint64_t;
     #  endif
+    #  endif
     # endif /* compiler */
 
     #endif /* ANSI version */
@@ -440,11 +476,15 @@ if test "$ac_cv_type_uintptr_t" != yes; then
 
     /* Define intptr_t based on sizeof(void*) = $ac_cv_sizeof_void_p */
     #ifndef __uintptr_t_defined
+    #ifndef uintptr_t
     typedef u$acx_cv_type_intptr_t uintptr_t;
     #endif
+    #endif
     #ifndef __intptr_t_defined
+    #ifndef intptr_t
     typedef $acx_cv_type_intptr_t  intptr_t;
     #endif
+    #endif
 EOF
 fi
 
@@ -496,16 +536,20 @@ if test "$ac_cv_type_uintmax_t" != yes; then
   sed 's/^ *//' >> tmp-stdint.h <<EOF
 
     /* Define intmax based on what we found */
+    #ifndef intmax_t
     #ifdef _INT64_T
     typedef int64_t       intmax_t;
     #else
     typedef long          intmax_t;
     #endif
+    #endif
+    #ifndef uintmax_t
     #ifdef _UINT64_T
     typedef uint64_t      uintmax_t;
     #else
     typedef unsigned long uintmax_t;
     #endif
+    #endif
 EOF
 fi
 
diff --git a/configure.ac b/configure.ac
index 507ab54..f78c527 100644
--- a/configure.ac
+++ b/configure.ac
@@ -548,6 +548,7 @@ case "${target}" in
     noconfigdirs="$noconfigdirs target-newlib target-libiberty target-libgloss ${libgcj} target-libmudflap"
     ;;
   *-*-rtems*)
+    skipdirs="${skipdirs} target-libiberty"
     noconfigdirs="$noconfigdirs target-libgloss ${libgcj}"
     ;;
     # The tpf target doesn't support gdb yet.
@@ -1374,13 +1375,13 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then
   #if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4,2,0)
   choke me
   #endif
-  ], AC_TRY_COMPILE([#include <gmp.h>],[
+  ], [AC_TRY_COMPILE([#include <gmp.h>],[
   #define GCC_GMP_VERSION_NUM(a,b,c) (((a) << 16L) | ((b) << 8) | (c))
   #define GCC_GMP_VERSION GCC_GMP_VERSION_NUM(__GNU_MP_VERSION,__GNU_MP_VERSION_MINOR,__GNU_MP_VERSION_PATCHLEVEL)
   #if GCC_GMP_VERSION < GCC_GMP_VERSION_NUM(4,3,2)
   choke me
   #endif
-  ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])]),
+  ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])])],
    [AC_MSG_RESULT([no]); have_gmp=no])
 
   # If we have GMP, check the MPFR version.
@@ -1392,12 +1393,12 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then
     #if MPFR_VERSION < MPFR_VERSION_NUM(2,3,1)
     choke me
     #endif
-    ], AC_TRY_COMPILE([#include <gmp.h>
+    ], [AC_TRY_COMPILE([#include <gmp.h>
     #include <mpfr.h>],[
     #if MPFR_VERSION < MPFR_VERSION_NUM(2,4,2)
     choke me
     #endif
-    ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])]),
+    ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])])],
      [AC_MSG_RESULT([no]); have_gmp=no])
   fi
 
@@ -1409,11 +1410,11 @@ if test -d ${srcdir}/gcc && test "x$have_gmp" = xno; then
     #if MPC_VERSION < MPC_VERSION_NUM(0,8,0)
     choke me
     #endif
-    ], AC_TRY_COMPILE([#include <mpc.h>],[
+    ], [AC_TRY_COMPILE([#include <mpc.h>],[
     #if MPC_VERSION < MPC_VERSION_NUM(0,8,1)
     choke me
     #endif
-    ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])]),
+    ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])])],
      [AC_MSG_RESULT([no]); have_gmp=no])
   fi
 
@@ -1530,8 +1531,6 @@ AC_ARG_WITH(boot-ldflags,
 AC_SUBST(poststage1_ldflags)
 
 # Check for PPL
-ppl_major_version=0
-ppl_minor_version=10
 ppllibs=" -lppl_c -lppl -lgmpxx"
 pplinc=
 
@@ -1572,9 +1571,9 @@ ENABLE_PPL_CHECK=yes)
 if test "x$with_ppl" != "xno" -a "${ENABLE_PPL_CHECK}" = "yes"; then
   saved_CFLAGS="$CFLAGS"
   CFLAGS="$CFLAGS $pplinc $gmpinc"
-  AC_MSG_CHECKING([for version $ppl_major_version.$ppl_minor_version of PPL])
+  AC_MSG_CHECKING([for version 0.10 (or later revision) of PPL])
   AC_TRY_COMPILE([#include "ppl_c.h"],[
-  #if PPL_VERSION_MAJOR != $ppl_major_version || PPL_VERSION_MINOR != $ppl_minor_version
+  #if PPL_VERSION_MAJOR != 0 || PPL_VERSION_MINOR < 10
   choke me
   #endif
   ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); ppllibs= ; pplinc= ; with_ppl=no ])
@@ -1637,7 +1636,12 @@ if test "x$with_cloog" != "xno" -a "${ENABLE_CLOOG_CHECK}" = "yes"; then
   #if CLOOG_VERSION_MAJOR != 0 || CLOOG_VERSION_MINOR != 15 || CLOOG_VERSION_REVISION < 5
   choke me
   #endif
-  ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no]); clooglibs= ; clooginc= ])
+  ], [AC_TRY_COMPILE([#include "cloog/cloog.h"],[
+  #if CLOOG_VERSION_MAJOR != 0 || CLOOG_VERSION_MINOR != 15 || CLOOG_VERSION_REVISION < 9
+  choke me
+  #endif
+  ], [AC_MSG_RESULT([yes])], [AC_MSG_RESULT([buggy but acceptable])])],
+  [AC_MSG_RESULT([no]); clooglibs= ; clooginc= ])
   CFLAGS="$saved_CFLAGS"
 fi
 
@@ -1741,7 +1745,6 @@ ACX_ELF_TARGET_IFELSE([if test x"$enable_lto" = x"yes" ; then
       elf_nextscn (0, 0);
       elf_strptr (0, 0, 0);
       elf_getident (0, 0);
-      elf_getshdrstrndx (0, 0);
       elf_begin (0, 0, 0);
       elf_ndxscn (0);
       elf_end (0);
@@ -1750,6 +1753,27 @@ ACX_ELF_TARGET_IFELSE([if test x"$enable_lto" = x"yes" ; then
       [AC_MSG_RESULT([no]); enable_lto=no; libelflibs= ; libelfinc= ]
     )
 
+    # Check for elf_getshdrstrndx or elf_getshstrndx.  The latter's flavor
+    # is determined in gcc/configure.ac.
+    if test x"$enable_lto" = x"yes" ; then
+      AC_MSG_CHECKING([for elf_getshdrstrndx])
+      AC_TRY_LINK(
+        [#include <libelf.h>],[
+	elf_getshdrstrndx (0, 0);
+        ],
+        [AC_MSG_RESULT([yes]);],
+        [AC_MSG_RESULT([no]);
+	 AC_MSG_CHECKING([for elf_getshstrndx])
+         AC_TRY_LINK(
+           [#include <libelf.h>],[
+	   elf_getshstrndx (0, 0);
+           ],
+           [AC_MSG_RESULT([yes]);],
+           [AC_MSG_RESULT([no]); enable_lto=no; libelflibs= ; libelfinc= ]
+         )]
+      )
+    fi
+
     # If we couldn't enable LTO and the user forced it, emit an error.
     if test x"$enable_lto" = x"no" \
        && test x"$default_enable_lto" != x"yes" ; then
@@ -2723,7 +2747,7 @@ else
        mv conftest.o conftest.o.g0 &&
        ${CC} -c -g conftest.c &&
        mv conftest.o conftest.o.g &&
-       ${srcdir}/contrib/compare-debug conftest.o.g0 conftest.o.g; then
+       ${srcdir}/contrib/compare-debug conftest.o.g0 conftest.o.g > /dev/null 2>&1; then
       :
     else
       BUILD_CONFIG=

Re: toplevel out of sync

[Paolo Bonzini]

> I've built binutils+gdb with it on x86_64-unknown-linux-gnu.
> OK to commit to src as one patch?

Please wait 48 hours for binutils/gdb maintainers to comment.

However, only the stdint change should be relevant for them, so feel
free to commit the others if you prefer.

> As another issue, config.{guess,sub} have been updated in GCC in the
> mean time.

Yes, this was the final straw that convinced me to write about the issue. :-)

Paolo

Re: toplevel out of sync

[Ralf Wildenhues]

* Paolo Bonzini wrote on Fri, May 28, 2010 at 09:08:27AM CEST:
> > I've built binutils+gdb with it on x86_64-unknown-linux-gnu.
> > OK to commit to src as one patch?
> 
> Please wait 48 hours for binutils/gdb maintainers to comment.
> 
> However, only the stdint change should be relevant for them, so feel
> free to commit the others if you prefer.

Committed now.  Thanks for the feedback.

> > As another issue, config.{guess,sub} have been updated in GCC in the
> > mean time.
> 
> Yes, this was the final straw that convinced me to write about the issue. :-)

I'll update these two files in src next.

Cheers,
Ralf

Re: toplevel out of sync

[Ralf Wildenhues]

* Ralf Wildenhues wrote on Tue, Jun 01, 2010 at 07:29:37PM CEST:
> * Paolo Bonzini wrote on Fri, May 28, 2010 at 09:08:27AM CEST:
> > > As another issue, config.{guess,sub} have been updated in GCC in the
> > > mean time.
> > 
> > Yes, this was the final straw that convinced me to write about the issue. :-)
> 
> I'll update these two files in src next.

Committed to src, bringing GCC and src toplevel back in sync:

2010-06-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>

	* config.sub, config.guess: Update from upstream sources.