Message ID | lg9f99$e01$1@ger.gmane.org |
---|---|
State | New |
Headers | show |
On Tue, 18 Mar 2014, Stefan Liebler wrote: > I fixed the header as mentioned. The tests pass on s390/s390x. > Unifying s390/s390-32/bits/wordsize.h and s390/s390-64/wordsize.h to > s390/bits/wordsize.h leads to a build error: I suppose there must be some non-obvious sysdeps directory ordering issue, so another bits/wordsize.h gets found if you unify those headers? > 2014-03-18 Stefan Liebler <stli@linux.vnet.ibm.com> > > [BZ #16712] > * sysdeps/s390/s390-32/bits/wordsize.h > (__WORDSIZE32_SIZE_ULONG): New define. > * sysdeps/s390/s390-64/bits/wordsize.h > (__WORDSIZE32_SIZE_ULONG): Likewise. > * sysdeps/generic/stdint.h (SIZE_MAX): > Define as UL if __WORDSIZE32_SIZE_ULONG. OK. I believe there's a previous approval of mine for (part of) a patch of yours <https://sourceware.org/ml/libc-alpha/2014-02/msg00819.html> that hasn't been committed.
On 03/18/2014 03:11 PM, Joseph S. Myers wrote: > On Tue, 18 Mar 2014, Stefan Liebler wrote: > >> I fixed the header as mentioned. The tests pass on s390/s390x. >> Unifying s390/s390-32/bits/wordsize.h and s390/s390-64/wordsize.h to >> s390/bits/wordsize.h leads to a build error: > > I suppose there must be some non-obvious sysdeps directory ordering issue, > so another bits/wordsize.h gets found if you unify those headers? yes that´s right. The used one is sysdeps/wordsize-32/bits/wordsize.h (on s390), which is the next include-dir specified by gcc invocation: -Isysdeps/s390/s390-32 -Isysdeps/wordsize-32 -Inptl/sysdeps/s390 -Isysdeps/s390 The other header-files in sysdeps/s390/bits/ are not available in -Isysdeps/wordsize-32 -Inptl/sysdeps/s390, so there it´s no problem. Is it possible to change the directory ordering? > >> 2014-03-18 Stefan Liebler <stli@linux.vnet.ibm.com> >> >> [BZ #16712] >> * sysdeps/s390/s390-32/bits/wordsize.h >> (__WORDSIZE32_SIZE_ULONG): New define. >> * sysdeps/s390/s390-64/bits/wordsize.h >> (__WORDSIZE32_SIZE_ULONG): Likewise. >> * sysdeps/generic/stdint.h (SIZE_MAX): >> Define as UL if __WORDSIZE32_SIZE_ULONG. > > OK. > > I believe there's a previous approval of mine for (part of) a patch of > yours <https://sourceware.org/ml/libc-alpha/2014-02/msg00819.html> that > hasn't been committed. > Thanks for the hint. I´ll forward the part of the patch (posix/Makefile: before-compile += testcases.h ptestcases.h) to Andreas Krebbel, so he can commit it. Bye
The commit of these patches appears to have omitted to add the numbers of the fixed bugs to NEWS. In general, when checking in a patch that fixes a bug in Bugzilla, you need to add the bug number to NEWS first, then close the bug in Bugzilla afterwards; please complete both steps.
diff --git a/sysdeps/generic/stdint.h b/sysdeps/generic/stdint.h index 4660748..f5d9556 100644 --- a/sysdeps/generic/stdint.h +++ b/sysdeps/generic/stdint.h @@ -260,7 +260,11 @@ typedef unsigned long long int uintmax_t; # if __WORDSIZE == 64 # define SIZE_MAX (18446744073709551615UL) # else -# define SIZE_MAX (4294967295U) +# ifdef __WORDSIZE32_SIZE_ULONG +# define SIZE_MAX (4294967295UL) +# else +# define SIZE_MAX (4294967295U) +# endif # endif /* Limits of `wchar_t'. */ diff --git a/sysdeps/s390/s390-32/bits/wordsize.h b/sysdeps/s390/s390-32/bits/wordsize.h index b416612..da791fa 100644 --- a/sysdeps/s390/s390-32/bits/wordsize.h +++ b/sysdeps/s390/s390-32/bits/wordsize.h @@ -4,6 +4,7 @@ # define __WORDSIZE 64 #else # define __WORDSIZE 32 +# define __WORDSIZE32_SIZE_ULONG 1 #endif #if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL diff --git a/sysdeps/s390/s390-64/bits/wordsize.h b/sysdeps/s390/s390-64/bits/wordsize.h index b416612..da791fa 100644 --- a/sysdeps/s390/s390-64/bits/wordsize.h +++ b/sysdeps/s390/s390-64/bits/wordsize.h @@ -4,6 +4,7 @@ # define __WORDSIZE 64 #else # define __WORDSIZE 32 +# define __WORDSIZE32_SIZE_ULONG 1 #endif #if !defined __NO_LONG_DOUBLE_MATH && !defined __LONG_DOUBLE_MATH_OPTIONAL