tag 604717 pending kthxbye On Thu, Dec 16, 2010 at 02:12:54 -0500, Ivan Jager wrote:
> Ok, after reading these FAQ entries, I am more convinnced this is > the right solution. > > >Q: Can you please port the diet libc to FreeBSD/Solaris/Windows? > >A: No. > > > >Q: Can I compile or use the diet libc with a compiler that is not gcc? > >A: Compile: no. Use: yes. > > So worrying about what *BSD/Solaris do would be pointless. > > All this patch does is remove some underscores so that endian.h > checks __sparcv9 like is done in longlong.h. I only tested with gcc, > but this should work with the sun compiler too, if it's even > possible to use the sun compiler on linux. > > Unlike reverting patch 0013, this should work even when compiling > without -Os. > > I was initially hesitant to give this bug a very high severity, > since it very indirectly breaks the system, but I suppose I need to > do that so #603882 can be fixed. I did try recompiling util-vserver > with this patched dietlibc-dev and it works now. > Thanks, I've applied a similar patch, adding defined(__arch64__) as alternative since that seems to be defined by gcc -m64 on Debian/sparc, whereas __sparcv9 isn't, so hopefully this will fix sparc and not break sparc64. I'll upload the NMU in a minute, can you check afterwards that 603882 goes away? Gerrit, please find the NMU diff attached. Cheers, Julien
diff -u dietlibc-0.32/debian/changelog dietlibc-0.32/debian/changelog --- dietlibc-0.32/debian/changelog +++ dietlibc-0.32/debian/changelog @@ -1,3 +1,12 @@ +dietlibc (0.32-5.1) unstable; urgency=high + + * Non-maintainer upload. + * Fix sparc64 detection, based on a patch by Ivan Jager (closes: #604717). + Don't use defined(__sparc_v9__) to detect 64bit sparc, use + defined(__sparcv9) || defined(__arch64__) instead. + + -- Julien Cristau <jcris...@debian.org> Mon, 27 Dec 2010 13:09:27 +0100 + dietlibc (0.32-5) unstable; urgency=medium * debian/diff/0013-mips-divdi3.c-fix-include-path-to-longlong.h.diff: only in patch2: unchanged: --- dietlibc-0.32.orig/debian/diff/0014-sparc_v9-does-not-imply-arch64.diff +++ dietlibc-0.32/debian/diff/0014-sparc_v9-does-not-imply-arch64.diff @@ -0,0 +1,12 @@ +diff -ru dietlibc-0.32.orig//include/endian.h dietlibc-0.32/include/endian.h +--- dietlibc-0.32.orig//include/endian.h 2005-10-04 13:47:03.000000000 -0400 ++++ dietlibc-0.32/include/endian.h 2010-12-14 15:12:24.000000000 -0500 +@@ -39,7 +39,7 @@ + # define __LONG_LONG_PAIR(HI, LO) HI, LO + #endif + +-#if defined(__alpha__) || defined(__mips64__) || defined(__sparc_v9__) || defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) ++#if defined(__alpha__) || defined(__mips64__) || defined(__sparcv9) || defined(__x86_64__) || defined(__ia64__) || defined(__powerpc64__) || defined(__s390x__) || defined(__arch64__) + #define __WORDSIZE 64 + #endif +
signature.asc
Description: Digital signature
