diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-03-18 02:05:06 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-08-16 22:40:53 +0100 |
commit | cb7368c110553dcb972480abc4a59b975677f7df (patch) | |
tree | 2ffd1b35c59f320e2141bc3016ca1777ffa4d412 /meta/recipes-core/glibc/glibc/0020-eglibc-Help-bootstrap-cross-toolchain.patch | |
parent | 0183d7c4067fdf171a4420477e965dca58f6d7d3 (diff) | |
download | poky-cb7368c110553dcb972480abc4a59b975677f7df.tar.gz |
glibc: Upgrade 2.21 -> 2.22
- git'ify the OE patches
- add_resource_h_to_wait_h.patch - dropped, we do not support that old
perf anymore
- mips-rld-map-check.patch - Dropped because binutils is fixed for it
see https://sourceware.org/ml/binutils/2011-12/msg00112.html
- initgroups_keys.patch - Folded into
0026-eglibc-Forward-port-eglibc-options-groups-support.patch
Change-Id: Ib8e731b212f52b8ff12e2180babbc19970fb1ef1
(From OE-Core rev: 6ea08396dbb628140fd3289fc9fb19df97914326)
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Ross Burton <ross.burton@intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-core/glibc/glibc/0020-eglibc-Help-bootstrap-cross-toolchain.patch')
-rw-r--r-- | meta/recipes-core/glibc/glibc/0020-eglibc-Help-bootstrap-cross-toolchain.patch | 100 |
1 files changed, 100 insertions, 0 deletions
diff --git a/meta/recipes-core/glibc/glibc/0020-eglibc-Help-bootstrap-cross-toolchain.patch b/meta/recipes-core/glibc/glibc/0020-eglibc-Help-bootstrap-cross-toolchain.patch new file mode 100644 index 0000000000..df93094543 --- /dev/null +++ b/meta/recipes-core/glibc/glibc/0020-eglibc-Help-bootstrap-cross-toolchain.patch | |||
@@ -0,0 +1,100 @@ | |||
1 | From 8fe0d29488b376011cdaaa462d557ffc0b31fb63 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Wed, 18 Mar 2015 00:49:28 +0000 | ||
4 | Subject: [PATCH 20/27] eglibc: Help bootstrap cross toolchain | ||
5 | |||
6 | Taken from EGLIBC, r1484 + r1525 | ||
7 | |||
8 | 2007-02-20 Jim Blandy <jimb@codesourcery.com> | ||
9 | |||
10 | * Makefile (install-headers): Preserve old behavior: depend on | ||
11 | $(inst_includedir)/gnu/stubs.h only if install-bootstrap-headers | ||
12 | is set; otherwise, place gnu/stubs.h on the 'install-others' list. | ||
13 | |||
14 | 2007-02-16 Jim Blandy <jimb@codesourcery.com> | ||
15 | |||
16 | * Makefile: Amend make install-headers to install everything | ||
17 | necessary for building a cross-compiler. Install gnu/stubs.h as | ||
18 | part of 'install-headers', not 'install-others'. | ||
19 | If install-bootstrap-headers is 'yes', install a dummy copy of | ||
20 | gnu/stubs.h, instead of computing the real thing. | ||
21 | * include/stubs-bootstrap.h: New file. | ||
22 | |||
23 | Upstream-Status: Pending | ||
24 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
25 | --- | ||
26 | Makefile | 22 +++++++++++++++++++++- | ||
27 | include/stubs-bootstrap.h | 12 ++++++++++++ | ||
28 | 2 files changed, 33 insertions(+), 1 deletion(-) | ||
29 | create mode 100644 include/stubs-bootstrap.h | ||
30 | |||
31 | diff --git a/Makefile b/Makefile | ||
32 | index f906391..e4e149e 100644 | ||
33 | --- a/Makefile | ||
34 | +++ b/Makefile | ||
35 | @@ -69,9 +69,18 @@ subdir-dirs = include | ||
36 | vpath %.h $(subdir-dirs) | ||
37 | |||
38 | # What to install. | ||
39 | -install-others = $(inst_includedir)/gnu/stubs.h | ||
40 | install-bin-script = | ||
41 | |||
42 | +# If we're bootstrapping, install a dummy gnu/stubs.h along with the | ||
43 | +# other headers, so 'make install-headers' produces a useable include | ||
44 | +# tree. Otherwise, install gnu/stubs.h later, after the rest of the | ||
45 | +# build is done. | ||
46 | +ifeq ($(install-bootstrap-headers),yes) | ||
47 | +install-headers: $(inst_includedir)/gnu/stubs.h | ||
48 | +else | ||
49 | +install-others = $(inst_includedir)/gnu/stubs.h | ||
50 | +endif | ||
51 | + | ||
52 | ifeq (yes,$(build-shared)) | ||
53 | headers += gnu/lib-names.h | ||
54 | endif | ||
55 | @@ -151,6 +160,16 @@ others: $(common-objpfx)testrun.sh | ||
56 | |||
57 | subdir-stubs := $(foreach dir,$(subdirs),$(common-objpfx)$(dir)/stubs) | ||
58 | |||
59 | +# gnu/stubs.h depends (via the subdir 'stubs' targets) on all the .o | ||
60 | +# files in EGLIBC. For bootstrapping a GCC/EGLIBC pair, an empty | ||
61 | +# gnu/stubs.h is good enough. | ||
62 | +ifeq ($(install-bootstrap-headers),yes) | ||
63 | +$(inst_includedir)/gnu/stubs.h: include/stubs-bootstrap.h $(+force) | ||
64 | + $(make-target-directory) | ||
65 | + $(INSTALL_DATA) $< $@ | ||
66 | + | ||
67 | +installed-stubs = | ||
68 | +else | ||
69 | ifndef abi-variants | ||
70 | installed-stubs = $(inst_includedir)/gnu/stubs.h | ||
71 | else | ||
72 | @@ -177,6 +196,7 @@ $(inst_includedir)/gnu/stubs.h: $(+force) | ||
73 | |||
74 | install-others-nosubdir: $(installed-stubs) | ||
75 | endif | ||
76 | +endif | ||
77 | |||
78 | |||
79 | # Since stubs.h is never needed when building the library, we simplify the | ||
80 | diff --git a/include/stubs-bootstrap.h b/include/stubs-bootstrap.h | ||
81 | new file mode 100644 | ||
82 | index 0000000..1d2b669 | ||
83 | --- /dev/null | ||
84 | +++ b/include/stubs-bootstrap.h | ||
85 | @@ -0,0 +1,12 @@ | ||
86 | +/* Placeholder stubs.h file for bootstrapping. | ||
87 | + | ||
88 | + When bootstrapping a GCC/EGLIBC pair, GCC requires that the EGLIBC | ||
89 | + headers be installed, but we can't fully build EGLIBC without that | ||
90 | + GCC. So we run the command: | ||
91 | + | ||
92 | + make install-headers install-bootstrap-headers=yes | ||
93 | + | ||
94 | + to install the headers GCC needs, but avoid building certain | ||
95 | + difficult headers. The <gnu/stubs.h> header depends, via the | ||
96 | + EGLIBC subdir 'stubs' make targets, on every .o file in EGLIBC, but | ||
97 | + an empty stubs.h like this will do fine for GCC. */ | ||
98 | -- | ||
99 | 2.1.4 | ||
100 | |||