summaryrefslogtreecommitdiff
path: root/arch/parisc
diff options
context:
space:
mode:
authorJohn David Anglin <dave.anglin@bell.net>2014-09-22 20:54:50 -0400
committerJiri Slaby <jslaby@suse.cz>2014-10-13 15:41:32 +0200
commit4a472616d226281c8e6b26d0457ebae8fe8135a4 (patch)
tree4da94b306036cd10b19047368161e3a0b18db5be /arch/parisc
parent11dbe17a1d27cb81e06c52e631de8bc2b17c5e5c (diff)
parisc: Only use -mfast-indirect-calls option for 32-bit kernel builds
commit d26a7730b5874a5fa6779c62f4ad7c5065a94723 upstream. In spite of what the GCC manual says, the -mfast-indirect-calls has never been supported in the 64-bit parisc compiler. Indirect calls have always been done using function descriptors irrespective of the -mfast-indirect-calls option. Recently, it was noticed that a function descriptor was always requested when the -mfast-indirect-calls option was specified. This caused problems when the option was used in application code and doesn't make any sense because the whole point of the option is to avoid using a function descriptor for indirect calls. Fixing this broke 64-bit kernel builds. I will fix GCC but for now we need the attached change. This results in the same kernel code as before. Signed-off-by: John David Anglin <dave.anglin@bell.net> Signed-off-by: Helge Deller <deller@gmx.de> Signed-off-by: Jiri Slaby <jslaby@suse.cz>
Diffstat (limited to 'arch/parisc')
-rw-r--r--arch/parisc/Makefile7
1 files changed, 6 insertions, 1 deletions
diff --git a/arch/parisc/Makefile b/arch/parisc/Makefile
index e02f665f804a..ceadda990f22 100644
--- a/arch/parisc/Makefile
+++ b/arch/parisc/Makefile
@@ -48,7 +48,12 @@ cflags-y := -pipe
# These flags should be implied by an hppa-linux configuration, but they
# are not in gcc 3.2.
-cflags-y += -mno-space-regs -mfast-indirect-calls
+cflags-y += -mno-space-regs
+
+# -mfast-indirect-calls is only relevant for 32-bit kernels.
+ifndef CONFIG_64BIT
+cflags-y += -mfast-indirect-calls
+endif
# Currently we save and restore fpregs on all kernel entry/interruption paths.
# If that gets optimized, we might need to disable the use of fpregs in the