Mercurialcrosstool-ng / file revision
summary | shortlog | changelog | graph | tags | branches | files | changeset | file | latest | revisions | annotate | diff | raw | help
patches/glibc/2.7/240-sh-lowlevellock-asm.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
branch1.11
changeset 2465 5f98b7a90fbc
permissions -rw-r--r--
complibs/ppl: fix 0.11-0.11.2 to compile with --disable-shared

PPL 0.11 (through 0.11.2) had a small bug where it still tried to build
and test its Java interface even when shared libraries are disabled.
Since that's exactly what ct-ng does, it explodes.

This is the patch from the PPL authors (see final link below).

More information can be found in these messages/threads:

Anthony's initial report and analysis with Yann:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00046.html

Ron Flory hit the same problem:
http://www.cygwin.com/ml/crossgcc/2011-05/msg00054.html

Anthony's report to the ppl-devel list:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017450.html

Roberto's reply with a link to the fix in the PPL git repo:
http://www.cs.unipr.it/pipermail/ppl-devel/2011-May/017455.html

Signed-Off-By: Anthony Foiani <anthony.foiani@gmail.com>
(transplanted from 139b85d70b623e51f7585e7c64ecb8c6a6cf4567) 
     1 --- glibc-2.7/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S.orig	2007-08-03 16:44:15.000000000 +0100

     2 +++ glibc-2.7/nptl/sysdeps/unix/sysv/linux/sh/lowlevellock.S	2008-08-19 21:08:19.000000000 +0100

     3 @@ -76,7 +76,7 @@

     4  	add	tmp2, tmp 	; \

     5  	mov.l	@tmp, tmp2	; \

     6  	bra	98f		; \

     7 -	 mov	#FUTEX_PRIVATE_FLAG, tmp

     8 +	 mov	#FUTEX_PRIVATE_FLAG, tmp ; \

     9  99:	.word	PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \

    10  98:	extu.b	tmp, tmp	; \

    11  	xor	tmp, reg	; \

    12 @@ -88,7 +88,7 @@

    13  	add	tmp2, tmp 	; \

    14  	mov.l	@tmp, tmp2	; \

    15  	bra	98f		; \

    16 -	 mov	#FUTEX_PRIVATE_FLAG, tmp

    17 +	 mov	#FUTEX_PRIVATE_FLAG, tmp ; \

    18  99:	.word	PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \

    19  98:	extu.b	tmp, tmp	; \

    20  	xor	tmp, reg	; \

    21 @@ -96,13 +96,13 @@

    22  	mov	#FUTEX_WAIT, tmp ; \

    23  	or	tmp, reg

    24  # endif

    25 -# define LOAD_FUTEX_WAKE(reg,tmp) \

    26 +# define LOAD_FUTEX_WAKE(reg,tmp,tmp2) \

    27  	stc	gbr, tmp	; \

    28  	mov.w	99f, tmp2	; \

    29  	add	tmp2, tmp 	; \

    30  	mov.l	@tmp, tmp2	; \

    31  	bra	98f		; \

    32 -	 mov	#FUTEX_PRIVATE_FLAG, tmp

    33 +	 mov	#FUTEX_PRIVATE_FLAG, tmp ; \

    34  99:	.word	PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \

    35  98:	extu.b	tmp, tmp	; \

    36  	xor	tmp, reg	; \

    37 --- glibc-2.7/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S.orig	2007-08-03 16:44:57.000000000 +0100

    38 +++ glibc-2.7/nptl/sysdeps/unix/sysv/linux/sh/lowlevelrobustlock.S	2008-08-19 21:08:22.000000000 +0100

    39 @@ -42,7 +42,7 @@

    40  	add	tmp2, tmp 	; \

    41  	mov.l	@tmp, tmp2	; \

    42  	bra	98f		; \

    43 -	 mov	#FUTEX_PRIVATE_FLAG, tmp

    44 +	 mov	#FUTEX_PRIVATE_FLAG, tmp ; \

    45  99:	.word	PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \

    46  98:	extu.b	tmp, tmp	; \

    47  	xor	tmp, reg	; \

    48 @@ -54,7 +54,7 @@

    49  	add	tmp2, tmp 	; \

    50  	mov.l	@tmp, tmp2	; \

    51  	bra	98f		; \

    52 -	 mov	#FUTEX_PRIVATE_FLAG, tmp

    53 +	 mov	#FUTEX_PRIVATE_FLAG, tmp ; \

    54  99:	.word	PRIVATE_FUTEX - TLS_PRE_TCB_SIZE ; \

    55  98:	extu.b	tmp, tmp	; \

    56  	xor	tmp, reg	; \
crosstool-ng