patches/uClibc/0.9.28.3/150-mips-asm.h.patch
author "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
Thu Jul 28 22:09:31 2011 +0200 (2011-07-28)
changeset 2573 424fa2092ace
parent 6 4267d95819bd
permissions -rw-r--r--
scripts/libc: do not build add-ons by default

Currently, no --enable-add-ons option is passed to libc configure when
"$(do_libc_add_ons_list ,)" is empty, which makes configure automatically search
for present add-ons. In that case, all present add-ons are built, although
no add-on was selected by the user in the config. Moreover, this can make the
configure fail if some non-standard add-ons like eglibc-localedef are present.

This behavior also leads to an inconsistency from a user point of view between
the following cases:
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS="none" in the config,
which makes "$(do_libc_add_ons_list ,)" return "", so all present add-ons
are built.
- LIBC_ADDONS_LIST="", LIBC_GLIBC_USE_PORTS=n and THREADS!="none" in the
config, which makes "$(do_libc_add_ons_list ,)" return the add-on supporting
the chosen threading implementation, e.g. "nptl", so only this add-on is
built.

This patch disables the building of all add-ons in that case.

It is still possible to build all present add-ons by adding --enable-add-ons to
LIBC_GLIBC_EXTRA_CONFIG_ARRAY.

Signed-off-by: "Benoît THÉBAUDEAU" <benoit.thebaudeau@advansee.com>
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