diff options
author | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-17 08:36:09 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2024-01-19 00:16:41 +0000 |
commit | 776b1aab1255bee956ba3ad00f0df041a0e53773 (patch) | |
tree | 9fa3bd8d6f71bfd26ed0356aefd868fb63358276 /meta/recipes-devtools | |
parent | 3742a45c0ecd1559f9724c36faf637b4c41b0d54 (diff) | |
download | poky-776b1aab1255bee956ba3ad00f0df041a0e53773.tar.gz |
libtool: Update prefixmap and clang patches to match upstream submission
The patches were submitted upstream and adjusted after discussion. Update to match
the changes requested.
(From OE-Core rev: d7644baaf99b5593b356c395b232088436ae2e30)
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-devtools')
2 files changed, 38 insertions, 24 deletions
diff --git a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch index 0285c143d2..0dcf963dcc 100644 --- a/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch +++ b/meta/recipes-devtools/libtool/libtool/0001-ltmain.in-Parse-additional-clang-options.patch | |||
@@ -1,21 +1,26 @@ | |||
1 | From: Khem Raj <raj.khem@gmail.com> | 1 | ltmain.in: Parse additional clang options |
2 | Subject: [PATCH] ltmain.in: Parse additional clang options | ||
3 | 2 | ||
4 | clang uses -rtlib and --unwindlib to select proper compiler runtime in | 3 | clang uses -rtlib and --unwindlib to select proper compiler |
5 | some cases. There fore pass these options to linker when found in | 4 | runtime in some cases. Therefore pass these options to linker when found in |
6 | ldflags | 5 | ldflags |
7 | 6 | ||
8 | Upstream-Status: Pending | 7 | * build-aux/ltmain.in: Handle clang linker options |
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | 8 | ||
11 | Index: libtool-2.4.7/build-aux/ltmain.in | 9 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
12 | =================================================================== | 10 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2024-01/msg00110.html] |
13 | --- libtool-2.4.7.orig/build-aux/ltmain.in | 11 | |
14 | +++ libtool-2.4.7/build-aux/ltmain.in | 12 | --- |
15 | @@ -5420,10 +5420,12 @@ func_mode_link () | 13 | build-aux/ltmain.in | 4 +++- |
14 | 1 file changed, 3 insertions(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in | ||
17 | index 037f009..ba5c816 100644 | ||
18 | --- a/build-aux/ltmain.in | ||
19 | +++ b/build-aux/ltmain.in | ||
20 | @@ -5414,10 +5414,12 @@ func_mode_link () | ||
16 | # -fsanitize=* Clang/GCC memory and address sanitizer | 21 | # -fsanitize=* Clang/GCC memory and address sanitizer |
17 | # -fuse-ld=* Linker select flags for GCC | 22 | # -fuse-ld=* Linker select flags for GCC |
18 | # -f*-prefix-map* needed for lto linking | 23 | # -f{file|debug|macro|profile}-prefix-map* needed for lto linking |
19 | + # -rtlib=* select c runtime lib with clang | 24 | + # -rtlib=* select c runtime lib with clang |
20 | + # --unwindlib=* select unwinder library with clang | 25 | + # --unwindlib=* select unwinder library with clang |
21 | # -Wa,* Pass flags directly to the assembler | 26 | # -Wa,* Pass flags directly to the assembler |
@@ -23,6 +28,6 @@ Index: libtool-2.4.7/build-aux/ltmain.in | |||
23 | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ | 28 | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ |
24 | - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ | 29 | - -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ |
25 | + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-rtlib=*|--unwindlib=*| \ | 30 | + -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*|-rtlib=*|--unwindlib=*| \ |
26 | -specs=*|-fsanitize=*|-fuse-ld=*|-f*-prefix-map*|-Wa,*) | 31 | -specs=*|-fsanitize=*|-fuse-ld=*|-ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*|-fprofile-prefix-map=*|-Wa,*) |
27 | func_quote_arg pretty "$arg" | 32 | func_quote_arg pretty "$arg" |
28 | arg=$func_quote_arg_result | 33 | arg=$func_quote_arg_result |
diff --git a/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch b/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch index 4945533bad..c0627795b4 100644 --- a/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch +++ b/meta/recipes-devtools/libtool/libtool/0011-ltmain.in-Handle-prefix-map-compiler-options-correct.patch | |||
@@ -1,28 +1,37 @@ | |||
1 | From: Richard Purdie <richard.purdie@linuxfoundation.org> | 1 | ltmain.in: Handle prefix-map compiler options correctly |
2 | Subject: [PATCH 11/12] ltmain.in: Handle prefix-map compiler options correctly | 2 | |
3 | If lto is enabled, we need the prefix-map variables to be passed to the linker | ||
4 | to correctly link the objects using correctly mapped paths. | ||
3 | 5 | ||
4 | If lto is enabled, we need the prefix-map variables to be passed to the linker. | ||
5 | Add these to the list of options libtool passes through. | 6 | Add these to the list of options libtool passes through. |
6 | 7 | ||
8 | * build-aux/ltmain.in: Handle prefix-map compiler options | ||
9 | |||
7 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> | 10 | Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> |
8 | 11 | ||
9 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00019.html] | 12 | https://lists.gnu.org/archive/html/libtool-patches/2021-10/msg00019.html |
13 | https://lists.gnu.org/archive/html/libtool-patches/2024-01/msg00066.html | ||
14 | Upstream-Status: Submitted [https://lists.gnu.org/archive/html/libtool-patches/2024-01/msg00109.html] | ||
15 | |||
16 | --- | ||
17 | build-aux/ltmain.in | 3 ++- | ||
18 | 1 file changed, 2 insertions(+), 1 deletion(-) | ||
10 | 19 | ||
11 | Index: libtool-2.4.7/build-aux/ltmain.in | 20 | diff --git a/build-aux/ltmain.in b/build-aux/ltmain.in |
12 | =================================================================== | 21 | index 0a50f5b..037f009 100644 |
13 | --- libtool-2.4.7.orig/build-aux/ltmain.in | 22 | --- a/build-aux/ltmain.in |
14 | +++ libtool-2.4.7/build-aux/ltmain.in | 23 | +++ b/build-aux/ltmain.in |
15 | @@ -5419,11 +5419,12 @@ func_mode_link () | 24 | @@ -5413,11 +5413,12 @@ func_mode_link () |
16 | # -stdlib=* select c++ std lib with clang | 25 | # -stdlib=* select c++ std lib with clang |
17 | # -fsanitize=* Clang/GCC memory and address sanitizer | 26 | # -fsanitize=* Clang/GCC memory and address sanitizer |
18 | # -fuse-ld=* Linker select flags for GCC | 27 | # -fuse-ld=* Linker select flags for GCC |
19 | + # -f*-prefix-map* needed for lto linking | 28 | + # -f{file|debug|macro|profile}-prefix-map* needed for lto linking |
20 | # -Wa,* Pass flags directly to the assembler | 29 | # -Wa,* Pass flags directly to the assembler |
21 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ | 30 | -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \ |
22 | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ | 31 | -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \ |
23 | -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ | 32 | -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \ |
24 | - -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*) | 33 | - -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*) |
25 | + -specs=*|-fsanitize=*|-fuse-ld=*|-f*-prefix-map*|-Wa,*) | 34 | + -specs=*|-fsanitize=*|-fuse-ld=*|-ffile-prefix-map=*|-fdebug-prefix-map=*|-fmacro-prefix-map=*|-fprofile-prefix-map=*|-Wa,*) |
26 | func_quote_arg pretty "$arg" | 35 | func_quote_arg pretty "$arg" |
27 | arg=$func_quote_arg_result | 36 | arg=$func_quote_arg_result |
28 | func_append compile_command " $arg" | 37 | func_append compile_command " $arg" |