diff options
| author | Greg Ungerer <gerg@uclinux.org> | 2011-06-02 16:07:33 +1000 |
|---|---|---|
| committer | Greg Ungerer <gerg@uclinux.org> | 2011-06-14 11:42:29 +1000 |
| commit | 734c3ce3bd4d51c932893b9f6d32b9ded31acdff (patch) | |
| tree | 05e4d44e3828c8620595674341236e71c4f86e7e /arch/m68k/kernel | |
| parent | 62356725987fa44bbebeb656b2a0d8c803e32ef2 (diff) | |
| download | blackbird-op-linux-734c3ce3bd4d51c932893b9f6d32b9ded31acdff.tar.gz blackbird-op-linux-734c3ce3bd4d51c932893b9f6d32b9ded31acdff.zip | |
m68k: use kernel processor defines for conditional optimizations
Older m68k-linux compilers will include pre-defined symbols that
confuse what processor it is being targeted for. For example gcc-4.1.2
will pre-define __mc68020__ even if you specify the target processor
as -m68000 on the gcc command line. Newer versions of gcc have this
corrected.
In a few places the m68k code uses defined(__mc68020__) for optimizations
that include instructions that are specific to the CPU 68020 and above.
When compiling with older compilers this will be true even when we have
selected to compile for the older 68000 processors.
Switch to using the kernel processor defines, CONFIG_M68020 and friends.
Signed-off-by: Greg Ungerer <gerg@uclinux.org>
Diffstat (limited to 'arch/m68k/kernel')
| -rw-r--r-- | arch/m68k/kernel/m68k_ksyms.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/m68k/kernel/m68k_ksyms.c b/arch/m68k/kernel/m68k_ksyms.c index 33f82769547c..1b7a14d1a000 100644 --- a/arch/m68k/kernel/m68k_ksyms.c +++ b/arch/m68k/kernel/m68k_ksyms.c @@ -14,8 +14,7 @@ EXPORT_SYMBOL(__ashrdi3); EXPORT_SYMBOL(__lshrdi3); EXPORT_SYMBOL(__muldi3); -#if !defined(__mc68020__) && !defined(__mc68030__) && \ - !defined(__mc68040__) && !defined(__mc68060__) && !defined(__mcpu32__) +#if defined(CONFIG_M68000) || defined(CONFIG_COLDFIRE) /* * Simpler 68k and ColdFire parts also need a few other gcc functions. */ |
