patches/uClibc/0.9.28.3/150-mips-asm.h.patch
author "Bryan Hundven" <bryanhundven@gmail.com>
Thu Mar 01 15:23:49 2012 -0800 (2012-03-01)
changeset 2909 28ac8fbd9e6a
parent 6 4267d95819bd
permissions -rw-r--r--
libg/eglibc: add updated eglibc 2.15

Includes a patch to remove __builtin_expect test:

In eglibc-2.15, the build breaks in configure while testing
for the existance of __builtin_expect. It fails with newer
versions of gcc.

This patch is a modification of an upstream change in glibc
mainline (to be 2.16) to fix the following error:

[CFG ] checking for __builtin_expect... no
[ERROR] configure: error: support for __builtin_expect needed

http://sourceware.org/git/?p=glibc.git;a=commit;h=3857022a761ea7251f8e5c0e45d382ebc3e34cf9

Signed-off-by: Bryan Hundven <bryanhundven@gmail.com>
[yann.morin.1998@free.fr: coalesce both patches into a single changeset]
Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr>
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