summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMasahiro Yamada <yamada.m@jp.panasonic.com>2014-09-04 02:40:59 +0900
committerTom Rini <trini@ti.com>2014-09-16 12:23:57 -0400
commit2d5db193ee8675def3b683ed0f3c6df439a15486 (patch)
treea6c0edfaad3b3ef8531b6a50520071121d21b89e
parentfb8ffd7cfc68b3dc44e182356a207d784cb30b34 (diff)
downloadtalos-obmc-uboot-2d5db193ee8675def3b683ed0f3c6df439a15486.tar.gz
talos-obmc-uboot-2d5db193ee8675def3b683ed0f3c6df439a15486.zip
standalone: use GCC_VERSION defined in compiler-gcc.h
Now GCC_VERSION is defined in include/linux/compiler-gcc.h (with a little different definition). Use it and delete the one in examples/standlone/stub.c. This should work on Clang too because __GNUC__, __GNUC_MINOR__, __GNUC_PATCHLEVEL__ are also defined on Clang. Signed-off-by: Masahiro Yamada <yamada.m@jp.panasonic.com> Cc: Jeroen Hofstee <jeroen@myspectrum.nl>
-rw-r--r--examples/standalone/stubs.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/examples/standalone/stubs.c b/examples/standalone/stubs.c
index c5c025dab3..0bf690e73d 100644
--- a/examples/standalone/stubs.c
+++ b/examples/standalone/stubs.c
@@ -1,9 +1,6 @@
#include <common.h>
#include <exports.h>
-
-#ifndef GCC_VERSION
-#define GCC_VERSION (__GNUC__ * 1000 + __GNUC_MINOR__)
-#endif /* GCC_VERSION */
+#include <linux/compiler.h>
#if defined(CONFIG_X86)
/*
@@ -237,7 +234,7 @@ gd_t *global_data;
* implementation. On the other hand, asm() statements with
* arguments can be used only inside the functions (gcc limitation)
*/
-#if GCC_VERSION < 3004
+#if GCC_VERSION < 30400
static
#endif /* GCC_VERSION */
void __attribute__((unused)) dummy(void)
OpenPOWER on IntegriCloud