patches/uClibc/0.9.28.3/150-mips-asm.h.patch
author Anthony Foiani <anthony.foiani@gmail.com>
Thu May 19 23:09:43 2011 +0200 (2011-05-19)
branch1.11
changeset 2465 5f98b7a90fbc
parent 6 4267d95819bd
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)
yann@1
     1
diff -dur uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/clone.S uClibc-0.9.28.1/libc/sysdeps/linux/mips/clone.S
yann@1
     2
--- uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/clone.S	2007-02-07 11:18:12.000000000 +0100
yann@1
     3
+++ uClibc-0.9.28.1/libc/sysdeps/linux/mips/clone.S	2007-02-07 10:41:34.000000000 +0100
yann@1
     4
@@ -24,7 +24,7 @@
yann@1
     5
 #include <sys/regdef.h>
yann@1
     6
 #define _ERRNO_H	1
yann@1
     7
 #include <bits/errno.h>
yann@1
     8
-#include <asm/asm.h>
yann@1
     9
+#include <sys/asm.h>
yann@1
    10
 
yann@1
    11
 /* int clone(int (*fn)(void *arg), void *child_stack, int flags, void *arg) */
yann@1
    12
 
yann@1
    13
diff -dur uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/pipe.S uClibc-0.9.28.1/libc/sysdeps/linux/mips/pipe.S
yann@1
    14
--- uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/pipe.S	2007-02-07 11:18:12.000000000 +0100
yann@1
    15
+++ uClibc-0.9.28.1/libc/sysdeps/linux/mips/pipe.S	2007-02-07 11:16:52.000000000 +0100
yann@1
    16
@@ -3,9 +3,9 @@
yann@1
    17
 /*see uClibc's sh/pipe.c and glibc-2.2.4's mips/pipe.S */
yann@1
    18
 
yann@1
    19
 #include <features.h>
yann@1
    20
-#include <asm/asm.h>
yann@1
    21
+#include <sys/asm.h>
yann@1
    22
 #include <asm/unistd.h>
yann@1
    23
-#include <asm/regdef.h>
yann@1
    24
+#include <sys/regdef.h>
yann@1
    25
 
yann@1
    26
         .globl  pipe
yann@1
    27
         .ent    pipe, 0
yann@1
    28
diff -dur uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/syscall.S uClibc-0.9.28.1/libc/sysdeps/linux/mips/syscall.S
yann@1
    29
--- uClibc-0.9.28.1.orig/libc/sysdeps/linux/mips/syscall.S	2007-02-07 11:18:12.000000000 +0100
yann@1
    30
+++ uClibc-0.9.28.1/libc/sysdeps/linux/mips/syscall.S	2007-02-07 11:17:03.000000000 +0100
yann@1
    31
@@ -17,8 +17,8 @@
yann@1
    32
    02111-1307 USA.  */
yann@1
    33
 
yann@1
    34
 #include <features.h>
yann@1
    35
-#include <asm/asm.h>
yann@1
    36
-#include <asm/regdef.h>
yann@1
    37
+#include <sys/asm.h>
yann@1
    38
+#include <sys/regdef.h>
yann@1
    39
 
yann@1
    40
 #ifdef __PIC__
yann@1
    41
 	.option pic2