aboutsummaryrefslogtreecommitdiffstats
path: root/main/librtlsdr/0001-Fix-inline-functions-to-use-static-inline.patch
diff options
context:
space:
mode:
authorMilan P. Stanić <mps@arvanta.net>2020-04-29 11:11:21 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2020-04-29 10:27:30 +0000
commit31500a595ec2eaf7c542003a49f52cd404ae3d96 (patch)
tree8dff11d0baad2fd55d79c05e99c7f486753f28f4 /main/librtlsdr/0001-Fix-inline-functions-to-use-static-inline.patch
parent073f0e76c33f1c6abd0f760c8d1abd512cb76f28 (diff)
downloadaports-31500a595ec2eaf7c542003a49f52cd404ae3d96.tar.bz2
aports-31500a595ec2eaf7c542003a49f52cd404ae3d96.tar.xz
main/librtlsdr: move from testing
it is needed to enable radio source in rng-tools 6.10
Diffstat (limited to 'main/librtlsdr/0001-Fix-inline-functions-to-use-static-inline.patch')
-rw-r--r--main/librtlsdr/0001-Fix-inline-functions-to-use-static-inline.patch65
1 files changed, 65 insertions, 0 deletions
diff --git a/main/librtlsdr/0001-Fix-inline-functions-to-use-static-inline.patch b/main/librtlsdr/0001-Fix-inline-functions-to-use-static-inline.patch
new file mode 100644
index 0000000000..527d25a3cd
--- /dev/null
+++ b/main/librtlsdr/0001-Fix-inline-functions-to-use-static-inline.patch
@@ -0,0 +1,65 @@
+From 9047eef701f50d8bc4748233a31d65a0519ed86c Mon Sep 17 00:00:00 2001
+From: David Woodhouse <dwmw2@infradead.org>
+Date: Thu, 28 Jun 2018 16:43:24 +0100
+Subject: [PATCH] Fix inline functions to use 'static inline'
+
+With just 'inline', if the compiler decides not to inline them, it isn't
+required to emit them at all. For some targets with -Os that is causing
+build failures, see https://gcc.gnu.org/bugzilla/show_bug.cgi?id=86360.
+
+Perhaps we might consider using '__attribute__((always_inline))' for
+GCC builds, but 'static inline' is a good start.
+
+Signed-off-by: Steve Markgraf <steve@steve-m.de>
+---
+ src/rtl_adsb.c | 8 ++++----
+ src/rtl_power.c | 2 +-
+ 2 files changed, 5 insertions(+), 5 deletions(-)
+
+diff --git a/src/rtl_adsb.c b/src/rtl_adsb.c
+index 9087de4..7aea8dd 100644
+--- a/src/rtl_adsb.c
++++ b/src/rtl_adsb.c
+@@ -183,7 +183,7 @@ int magnitute(uint8_t *buf, int len)
+ return len/2;
+ }
+
+-inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d)
++static inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d)
+ /* takes 4 consecutive real samples, return 0 or 1, BADSAMPLE on error */
+ {
+ int bit, bit_p;
+@@ -224,17 +224,17 @@ inline uint16_t single_manchester(uint16_t a, uint16_t b, uint16_t c, uint16_t d
+ return BADSAMPLE;
+ }
+
+-inline uint16_t min16(uint16_t a, uint16_t b)
++static inline uint16_t min16(uint16_t a, uint16_t b)
+ {
+ return a<b ? a : b;
+ }
+
+-inline uint16_t max16(uint16_t a, uint16_t b)
++static inline uint16_t max16(uint16_t a, uint16_t b)
+ {
+ return a>b ? a : b;
+ }
+
+-inline int preamble(uint16_t *buf, int i)
++static inline int preamble(uint16_t *buf, int i)
+ /* returns 0/1 for preamble at index i */
+ {
+ int i2;
+diff --git a/src/rtl_power.c b/src/rtl_power.c
+index 00f4d9f..625d818 100644
+--- a/src/rtl_power.c
++++ b/src/rtl_power.c
+@@ -250,7 +250,7 @@ void sine_table(int size)
+ }
+ }
+
+-inline int16_t FIX_MPY(int16_t a, int16_t b)
++static inline int16_t FIX_MPY(int16_t a, int16_t b)
+ /* fixed point multiply and scale */
+ {
+ int c = ((int)a * (int)b) >> 14;