aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-lantiq/patches/0046-no_weak_alias.patch
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2015-12-11 15:08:34 +0000
committerJohn Crispin <blogic@openwrt.org>2015-12-11 15:08:34 +0000
commitde9b443207c2428c91d0ad75494e8e6941d762ac (patch)
tree871a1a0ec1ad6e53c83cd89903145b107074ef2f /package/boot/uboot-lantiq/patches/0046-no_weak_alias.patch
parent257b5055dc80dabbbe91cd890a093fa6535e21f3 (diff)
downloadmaster-187ad058-de9b443207c2428c91d0ad75494e8e6941d762ac.tar.gz
master-187ad058-de9b443207c2428c91d0ad75494e8e6941d762ac.tar.bz2
master-187ad058-de9b443207c2428c91d0ad75494e8e6941d762ac.zip
uboot-lantiq: fix build with gcc5
Signed-off-by: Mathias Kresin <openwrt@kresin.me> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@47863 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/boot/uboot-lantiq/patches/0046-no_weak_alias.patch')
-rw-r--r--package/boot/uboot-lantiq/patches/0046-no_weak_alias.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/package/boot/uboot-lantiq/patches/0046-no_weak_alias.patch b/package/boot/uboot-lantiq/patches/0046-no_weak_alias.patch
new file mode 100644
index 0000000000..4701ab1d24
--- /dev/null
+++ b/package/boot/uboot-lantiq/patches/0046-no_weak_alias.patch
@@ -0,0 +1,28 @@
+From 3422299dc28fa8257677d03cc1253e3c9bf17e9f Mon Sep 17 00:00:00 2001
+From: Jeroen Hofstee <jeroen@myspectrum.nl>
+Date: Thu, 26 Jun 2014 20:18:31 +0200
+Subject: [PATCH] common: main.c: make show_boot_progress __weak
+
+This not only looks a bit better it also prevents a
+warning with W=1 (no previous prototype).
+
+Signed-off-by: Jeroen Hofstee <jeroen@myspectrum.nl>
+Acked-by: Simon Glass <sjg@chromium.org>
+---
+ common/main.c | 3 +--
+ 1 file changed, 1 insertion(+), 2 deletions(-)
+
+diff --git a/common/main.c b/common/main.c
+index 32618f1..2979fbe 100644
+--- a/common/main.c
++++ b/common/main.c
+@@ -17,8 +17,7 @@ DECLARE_GLOBAL_DATA_PTR;
+ /*
+ * Board-specific Platform code can reimplement show_boot_progress () if needed
+ */
+-void inline __show_boot_progress (int val) {}
+-void show_boot_progress (int val) __attribute__((weak, alias("__show_boot_progress")));
++__weak void show_boot_progress(int val) {}
+
+ static void modem_init(void)
+ {