Message ID | 260e8caa-74d0-8055-816e-4c807b0c2a9f@linux.vnet.ibm.com |
---|---|
State | New |
Headers | show |
On 08/26/2016 09:25 AM, Paul E. Murphy wrote: > diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c > index c9c7704..9666741 100644 > --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c > +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c > @@ -29,4 +29,4 @@ weak_alias (__fdim, fdim) > # define __fdim __fdim_generic > #endif > > -#include <math/s_fdim.c> > +#include <ldbl-opt/s_fdim.c> Note, Joseph mentioned in BZ this is used for 64b builds, which does not use ldbl-opt. So, this is not a correct fix.
On Fri, 26 Aug 2016, Paul E. Murphy wrote: > On 08/26/2016 09:25 AM, Paul E. Murphy wrote: > > diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c > > index c9c7704..9666741 100644 > > --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c > > +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c > > @@ -29,4 +29,4 @@ weak_alias (__fdim, fdim) > > # define __fdim __fdim_generic > > #endif > > > > -#include <math/s_fdim.c> > > +#include <ldbl-opt/s_fdim.c> > > Note, Joseph mentioned in BZ this is used for 64b builds, As it's in sysdeps/sparc/sparc32/sparcv9 it shouldn't be used for 64b builds....
On 2016-08-26 09:34, Paul E. Murphy wrote: > > > On 08/26/2016 09:25 AM, Paul E. Murphy wrote: > > diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c > > index c9c7704..9666741 100644 > > --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c > > +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c > > @@ -29,4 +29,4 @@ weak_alias (__fdim, fdim) > > # define __fdim __fdim_generic > > #endif > > > > -#include <math/s_fdim.c> > > +#include <ldbl-opt/s_fdim.c> > > Note, Joseph mentioned in BZ this is used for 64b builds, > which does not use ldbl-opt. So, this is not a correct fix. I actually think your fix is the correct one. I have found an old build log and this is the file used when building with --disable-multiarch. I will run a build to confirm that. I do wonder if simply using "#include_next <s_fdim.c>" would prevent this kind of error. It's a GNU extension, but it's seems to be used in many places already, so it's probably acceptable. Aurelien
From: Joseph Myers <joseph@codesourcery.com> Date: Fri, 26 Aug 2016 16:02:11 +0000 > On Fri, 26 Aug 2016, Paul E. Murphy wrote: > >> On 08/26/2016 09:25 AM, Paul E. Murphy wrote: >> > diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c >> > index c9c7704..9666741 100644 >> > --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c >> > +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c >> > @@ -29,4 +29,4 @@ weak_alias (__fdim, fdim) >> > # define __fdim __fdim_generic >> > #endif >> > >> > -#include <math/s_fdim.c> >> > +#include <ldbl-opt/s_fdim.c> >> >> Note, Joseph mentioned in BZ this is used for 64b builds, > > As it's in sysdeps/sparc/sparc32/sparcv9 it shouldn't be used for 64b > builds.... Right, that directory is for 32-bit v9 builds.
diff --git a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c index c9c7704..9666741 100644 --- a/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c +++ b/sysdeps/sparc/sparc32/sparcv9/fpu/multiarch/s_fdim.c @@ -29,4 +29,4 @@ weak_alias (__fdim, fdim) # define __fdim __fdim_generic #endif -#include <math/s_fdim.c> +#include <ldbl-opt/s_fdim.c>