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>
yann@1625
     1
2009-05-15  Aurelien Jarno  <aurelien@aurel32.net>
yann@1625
     2
yann@1625
     3
	* sysdeps/unix/sysv/linux/alpha/getdents64.c: Adjust include path.
yann@1625
     4
	* sysdeps/unix/sysv/linux/alpha/nptl/fork.c: Likewise.
yann@1625
     5
	* sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c: Likewise.
yann@1625
     6
	* sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c: Likewise.
yann@1625
     7
	* sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c: Likewise.
yann@1625
     8
	* sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c: Likewise.
yann@1625
     9
	* sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c: Likewise.
yann@1625
    10
	* sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c: Likewise.
yann@1625
    11
	* sysdeps/unix/sysv/linux/alpha/sysconf.c: Likewise.
yann@1625
    12
yann@1625
    13
 ports/sysdeps/unix/sysv/linux/alpha/getdents64.c          |    2 +-
yann@1625
    14
 ports/sysdeps/unix/sysv/linux/alpha/nptl/fork.c           |    2 +-
yann@1625
    15
 ports/sysdeps/unix/sysv/linux/alpha/nptl/sem_post.c       |    2 +-
yann@1625
    16
 ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_create.c   |    2 +-
yann@1625
    17
 ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_delete.c   |    2 +-
yann@1625
    18
 ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_getoverr.c |    2 +-
yann@1625
    19
 ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_gettime.c  |    2 +-
yann@1625
    20
 ports/sysdeps/unix/sysv/linux/alpha/nptl/timer_settime.c  |    2 +-
yann@1625
    21
 ports/sysdeps/unix/sysv/linux/alpha/sysconf.c             |    2 +-
yann@1625
    22
 9 files changed, 9 insertions(+), 9 deletions(-)
yann@1625
    23
yann@1625
    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
yann@1625
    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
yann@1625
    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
yann@1625
    27
@@ -1 +1 @@
yann@1625
    28
-#include "../getdents64.c"
yann@1625
    29
+#include <sysdeps/unix/sysv/linux/getdents64.c>
yann@1625
    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
yann@1625
    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
yann@1625
    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
yann@1625
    33
@@ -27,4 +27,4 @@
yann@1625
    34
 		  CLONE_CHILD_SETTID | CLONE_CHILD_CLEARTID | SIGCHLD,	\
yann@1625
    35
 		  NULL, NULL, &THREAD_SELF->tid, NULL)
yann@1625
    36
 
yann@1625
    37
-#include "../fork.c"
yann@1625
    38
+#include <sysdeps/unix/sysv/linux/fork.c>
yann@1625
    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
yann@1625
    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
yann@1625
    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
yann@1625
    42
@@ -2,4 +2,4 @@
yann@1625
    43
    the acquire/release semantics of atomic_exchange_and_add.  And even if
yann@1625
    44
    we don't do this, we should be using atomic_full_barrier or otherwise.  */
yann@1625
    45
 #define __lll_rel_instr  "mb"
yann@1625
    46
-#include "../sem_post.c"
yann@1625
    47
+#include <nptl/sysdeps/unix/sysv/linux/sem_post.c>
yann@1625
    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
yann@1625
    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
yann@1625
    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
yann@1625
    51
@@ -1 +1 @@
yann@1625
    52
-#include "../x86_64/timer_create.c"
yann@1625
    53
+#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_create.c>
yann@1625
    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
yann@1625
    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
yann@1625
    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
yann@1625
    57
@@ -1 +1 @@
yann@1625
    58
-#include "../x86_64/timer_delete.c"
yann@1625
    59
+#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_delete.c>
yann@1625
    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
yann@1625
    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
yann@1625
    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
yann@1625
    63
@@ -1 +1 @@
yann@1625
    64
-#include "../x86_64/timer_getoverr.c"
yann@1625
    65
+#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_getoverr.c>
yann@1625
    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
yann@1625
    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
yann@1625
    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
yann@1625
    69
@@ -1 +1 @@
yann@1625
    70
-#include "../x86_64/timer_gettime.c"
yann@1625
    71
+#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_gettime.c>
yann@1625
    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
yann@1625
    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
yann@1625
    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
yann@1625
    75
@@ -1 +1 @@
yann@1625
    76
-#include "../x86_64/timer_settime.c"
yann@1625
    77
+#include <nptl/sysdeps/unix/sysv/linux/x86_64/timer_settime.c>
yann@1625
    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
yann@1625
    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
yann@1625
    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
yann@1625
    81
@@ -149,4 +149,4 @@
yann@1625
    82
 /* Now the generic Linux version.  */
yann@1625
    83
 #undef __sysconf
yann@1625
    84
 #define __sysconf static linux_sysconf
yann@1625
    85
-#include "../sysconf.c"
yann@1625
    86
+#include <sysdeps/unix/sysv/linux/sysconf.c>
yann@1625
    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
yann@1625
    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
yann@1625
    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
yann@1625
    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
yann@1625
    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
yann@1625
    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
yann@1625
    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
yann@1625
    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
yann@1625
    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