diff options
author | Khem Raj <raj.khem@gmail.com> | 2015-09-07 08:25:19 +0000 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-09-12 22:48:40 +0100 |
commit | 5b97579165f59878298941a937b81b8cfc8fc248 (patch) | |
tree | dd0392c24a29d1617cf58fb1608a35da10e6afc2 /meta/recipes-multimedia/alsa | |
parent | 3d8fd2f0ec1778aa36cb95194c474e57dae455e4 (diff) | |
download | poky-5b97579165f59878298941a937b81b8cfc8fc248.tar.gz |
alsa-tools: Fix compiling with clang
Fixed a linking error occurring when building with clang, where a
function reference is emitted but function is not since its marked as
inline, making it static inline gives better opportunity to compiler to
compile it
(From OE-Core rev: 890fa3d0e71f951993252f5b94e2211b4b06670e)
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-multimedia/alsa')
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-tools/0001-as10k1-Make-output_tram_line-static-inline.patch | 31 | ||||
-rw-r--r-- | meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb | 1 |
2 files changed, 32 insertions, 0 deletions
diff --git a/meta/recipes-multimedia/alsa/alsa-tools/0001-as10k1-Make-output_tram_line-static-inline.patch b/meta/recipes-multimedia/alsa/alsa-tools/0001-as10k1-Make-output_tram_line-static-inline.patch new file mode 100644 index 0000000000..d049a30d2c --- /dev/null +++ b/meta/recipes-multimedia/alsa/alsa-tools/0001-as10k1-Make-output_tram_line-static-inline.patch | |||
@@ -0,0 +1,31 @@ | |||
1 | From 1e5926df74a35fe2cd90bc59f5264a8715c94048 Mon Sep 17 00:00:00 2001 | ||
2 | From: Khem Raj <raj.khem@gmail.com> | ||
3 | Date: Mon, 7 Sep 2015 08:16:59 +0000 | ||
4 | Subject: [PATCH] as10k1: Make output_tram_line() static inline | ||
5 | |||
6 | The function is not used in any other file, its better to make it static | ||
7 | inline so compiler has a better chance of optimizing here | ||
8 | |||
9 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | ||
10 | --- | ||
11 | Upstream-Status: Pending | ||
12 | |||
13 | as10k1/as10k1.c | 2 +- | ||
14 | 1 file changed, 1 insertion(+), 1 deletion(-) | ||
15 | |||
16 | diff --git a/as10k1/as10k1.c b/as10k1/as10k1.c | ||
17 | index 96af0c3..d0766fd 100644 | ||
18 | --- a/as10k1/as10k1.c | ||
19 | +++ b/as10k1/as10k1.c | ||
20 | @@ -366,7 +366,7 @@ void as_exit(const char *message) | ||
21 | exit(1); | ||
22 | } | ||
23 | |||
24 | -inline void output_tram_line( struct list_head *line_head, int type){ | ||
25 | +static inline void output_tram_line( struct list_head *line_head, int type){ | ||
26 | |||
27 | struct tram *tram_sym; | ||
28 | struct list_head *entry; | ||
29 | -- | ||
30 | 2.5.1 | ||
31 | |||
diff --git a/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb b/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb index b5b9cc49c8..fdf396e3f3 100644 --- a/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb +++ b/meta/recipes-multimedia/alsa/alsa-tools_1.0.29.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "ftp://ftp.alsa-project.org/pub/tools/${BP}.tar.bz2 \ | |||
13 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \ | 13 | ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', \ |
14 | 'file://makefile_no_gtk.patch', d)} \ | 14 | 'file://makefile_no_gtk.patch', d)} \ |
15 | file://gitcompile_hdajacksensetest \ | 15 | file://gitcompile_hdajacksensetest \ |
16 | file://0001-as10k1-Make-output_tram_line-static-inline.patch \ | ||
16 | " | 17 | " |
17 | 18 | ||
18 | SRC_URI[md5sum] = "f339a3cd24f748c9d007bdff0e98775b" | 19 | SRC_URI[md5sum] = "f339a3cd24f748c9d007bdff0e98775b" |