patches/glibc/ports-2.10.1/510-alpha-fix-includes.patch
author Johannes Stezenbach <js@sig21.net>
Thu Jul 29 19:47:16 2010 +0200 (2010-07-29)
changeset 2045 fdaa6c7f6dea
permissions -rw-r--r--
cc/gcc: add option to compile against static libstdc++, for gcc-4.4 and newer

Idea and know-how taken from CodeSourcery build script.

Normal build:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb77f3000)
libstdc++.so.6 => /usr/lib/libstdc++.so.6 (0xb76e8000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb75a1000)
libm.so.6 => /lib/i686/cmov/libm.so.6 (0xb757a000)
/lib/ld-linux.so.2 (0xb77f4000)
libgcc_s.so.1 => /lib/libgcc_s.so.1 (0xb755c000)

CC_STATIC_LIBSTDCXX=y:
$ ldd arm-unknown-linux-uclibcgnueabi-gcc
linux-gate.so.1 => (0xb7843000)
libc.so.6 => /lib/i686/cmov/libc.so.6 (0xb76e6000)
/lib/ld-linux.so.2 (0xb7844000)

I made CC_STATIC_LIBSTDCXX default=y since I think
it is always desirable.

Signed-off-by: Johannes Stezenbach <js@sig21.net>
     1 2009-05-15  Aurelien Jarno  <aurelien@aurel32.net>
     2 
     3 	* sysdeps/unix/sysv/linux/alpha/getdents64.c: Adjust include path.
     4 	* sysdeps/unix/sysv/linux/alpha/nptl/fork.c: Likewise.
     5 	* sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c: Likewise.
     6 	* sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c: Likewise.
     7 	* sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c: Likewise.
     8 	* sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c: Likewise.
     9 	* sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c: Likewise.
    10 	* sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c: Likewise.
    11 	* sysdeps/unix/sysv/linux/alpha/sysconf.c: Likewise.
    12 
    13  ports/sysdeps/unix/sysv/linux/alpha/getdents64.c          |    2 +-
    14  ports/sysdeps/unix/sysv/linux/alpha/nptl/fork.c           |    2 +-
    15  ports/sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c       |    2 +-
    16  ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c   |    2 +-
    17  ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c   |    2 +-
    18  ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c |    2 +-
    19  ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c  |    2 +-
    20  ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c  |    2 +-
    21  ports/sysdeps/unix/sysv/linux/alpha/sysconf.c             |    2 +-
    22  9 files changed, 9 insertions(+), 9 deletions(-)
    23 
    24 diff -durN glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/getdents64.c glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/getdents64.c
    25 --- glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/getdents64.c	2009-05-16 10:36:20.000000000 +0200
    26 +++ glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/getdents64.c	2009-11-13 00:51:08.000000000 +0100
    27 @@ -1 +1 @@
    28 -#include "../getdents64.c"
    29 +#include <sysdeps/unix/sysv/linux/getdents64.c>
    30 diff -durN glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/fork.c glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/fork.c
    31 --- glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/fork.c	2009-05-16 10:36:20.000000000 +0200
    32 +++ glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/fork.c	2009-11-13 00:51:08.000000000 +0100
    33 @@ -27,4 +27,4 @@
    34  		  CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD,	\
    35  		  NULL, NULL, &THREAD_SELF->tid, NULL)
    36  
    37 -#include "../fork.c"
    38 +#include <sysdeps/unix/sysv/linux/fork.c>
    39 diff -durN glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c
    40 --- glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c	2009-05-16 10:36:20.000000000 +0200
    41 +++ glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c	2009-11-13 00:51:08.000000000 +0100
    42 @@ -2,4 +2,4 @@
    43     the acquire/release semantics of atomic_exchange_and_add.  And even if
    44     we don't do this, we should be using atomic_full_barrier or otherwise.  */
    45  #define __lll_rel_instr  "mb"
    46 -#include "../sem_post.c"
    47 +#include <nptl/sysdeps/unix/sysv/linux/sem_post.c>
    48 diff -durN glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c
    49 --- glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c	2009-05-16 10:36:20.000000000 +0200
    50 +++ glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c	2009-11-13 00:51:08.000000000 +0100
    51 @@ -1 +1 @@
    52 -#include "../x86_64/timer_create.c"
    53 +#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c>
    54 diff -durN glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c
    55 --- glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c	2009-05-16 10:36:20.000000000 +0200
    56 +++ glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c	2009-11-13 00:51:08.000000000 +0100
    57 @@ -1 +1 @@
    58 -#include "../x86_64/timer_delete.c"
    59 +#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c>
    60 diff -durN glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c
    61 --- glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c	2009-05-16 10:36:20.000000000 +0200
    62 +++ glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c	2009-11-13 00:51:08.000000000 +0100
    63 @@ -1 +1 @@
    64 -#include "../x86_64/timer_getoverr.c"
    65 +#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c>
    66 diff -durN glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c
    67 --- glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c	2009-05-16 10:36:20.000000000 +0200
    68 +++ glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c	2009-11-13 00:51:08.000000000 +0100
    69 @@ -1 +1 @@
    70 -#include "../x86_64/timer_gettime.c"
    71 +#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c>
    72 diff -durN glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c
    73 --- glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c	2009-05-16 10:36:20.000000000 +0200
    74 +++ glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c	2009-11-13 00:51:08.000000000 +0100
    75 @@ -1 +1 @@
    76 -#include "../x86_64/timer_settime.c"
    77 +#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c>
    78 diff -durN glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/sysconf.c glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/sysconf.c
    79 --- glibc-2.10.1.orig/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/sysconf.c	2009-05-16 10:36:20.000000000 +0200
    80 +++ glibc-2.10.1/glibc-ports-2.10.1/sysdeps/unix/sysv/linux/alpha/sysconf.c	2009-11-13 00:51:08.000000000 +0100
    81 @@ -149,4 +149,4 @@
    82  /* Now the generic Linux version.  */
    83  #undef __sysconf
    84  #define __sysconf static linux_sysconf
    85 -#include "../sysconf.c"
    86 +#include <sysdeps/unix/sysv/linux/sysconf.c>
    87 diff -durN glibc-2.10.1.orig/ports/sysdeps/unix/sysv/linux/alpha/getdents64.c glibc-2.10.1/ports/sysdeps/unix/sysv/linux/alpha/getdents64.c
    88 diff -durN glibc-2.10.1.orig/ports/sysdeps/unix/sysv/linux/alpha/nptl/fork.c glibc-2.10.1/ports/sysdeps/unix/sysv/linux/alpha/nptl/fork.c
    89 diff -durN glibc-2.10.1.orig/ports/sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c glibc-2.10.1/ports/sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c
    90 diff -durN glibc-2.10.1.orig/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c glibc-2.10.1/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c
    91 diff -durN glibc-2.10.1.orig/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c glibc-2.10.1/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c
    92 diff -durN glibc-2.10.1.orig/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c glibc-2.10.1/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c
    93 diff -durN glibc-2.10.1.orig/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c glibc-2.10.1/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c
    94 diff -durN glibc-2.10.1.orig/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c glibc-2.10.1/ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c
    95 diff -durN glibc-2.10.1.orig/ports/sysdeps/unix/sysv/linux/alpha/sysconf.c glibc-2.10.1/ports/sysdeps/unix/sysv/linux/alpha/sysconf.c