diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-20 23:38:39 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2015-11-20 23:38:39 +0000 |
commit | 53d94f89e86ef262c9f76fa2aba93ffae9995717 (patch) | |
tree | b836556e8d9c11435c231e80febe78fa86b9f902 /package/boot/uboot-omap/patches/430-use-weak-in-main.patch | |
parent | 605621fc3f2ebebca800dbcd360cd02f994f43ad (diff) | |
download | upstream-53d94f89e86ef262c9f76fa2aba93ffae9995717.tar.gz upstream-53d94f89e86ef262c9f76fa2aba93ffae9995717.tar.bz2 upstream-53d94f89e86ef262c9f76fa2aba93ffae9995717.zip |
uboot-omap: fix build with gcc-5
This fixes some problems with gcc-5.
Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
SVN-Revision: 47539
Diffstat (limited to 'package/boot/uboot-omap/patches/430-use-weak-in-main.patch')
-rw-r--r-- | package/boot/uboot-omap/patches/430-use-weak-in-main.patch | 27 |
1 files changed, 27 insertions, 0 deletions
diff --git a/package/boot/uboot-omap/patches/430-use-weak-in-main.patch b/package/boot/uboot-omap/patches/430-use-weak-in-main.patch new file mode 100644 index 0000000000..07c197fc17 --- /dev/null +++ b/package/boot/uboot-omap/patches/430-use-weak-in-main.patch @@ -0,0 +1,27 @@ +From: Jeroen Hofstee <jeroen@myspectrum.nl> +Date: Thu, 26 Jun 2014 18:18:31 +0000 (+0200) +Subject: common: main.c: make show_boot_progress __weak +X-Git-Tag: v2014.10-rc1~130 +X-Git-Url: http://git.denx.de/?p=u-boot.git;a=commitdiff_plain;h=3422299dc28fa8257677d03cc1253e3c9bf17e9f + +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> +--- + +--- a/common/main.c ++++ b/common/main.c +@@ -27,8 +27,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) {} + + #define MAX_DELAY_STOP_STR 32 + |