rpms/kexec-tools
7
0
Fork 0
Code Issues Pull Requests Releases Activity

ppc/ppc64: compile purgatory with gcc option msoft-float

Browse Source 
Resolves: bz831015

add below patch from vivek for upstream.
commit d40badaa2553c44d0585df335ad7e1c465f8ced1
Author: Vivek Goyal <vgoyal@redhat.com>
Date:   Fri Jun 8 09:43:15 2012 -0400

    ppc/ppc64: Compile purgatory code with gcc option -msoft-float

Verified-by: Lingzhu Xiang <lxiang@redhat.com>
Acked-by: Cong Wang <amwang@redhat.com>
This commit is contained in:
Dave Young 2012-06-12 13:03:14 +08:00
parent db95ae35e8
commit 65e3922d80
2 changed files with 45 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
kexec-tools-2.0.3-ppc-ppc64-compile-purgatory-code-with-gcc-option-msoft-float.patch Normal file
View File

@ -0,0 +1,43 @@
From: Vivek Goyal <vgoyal@redhat.com>
Recently we faced an issue on power7 machine where kernel hanged in purgatory.
Some investigation revealed that gcc is generating hardware FPU instructions.
I have been told we can't use it at this point of time and as kernel is
compiled with -msoft-float for ppc/ppc64, so should be purgatory (as it runs
inside kernel context).
Thanks to Jakub Jelinek and Lingzhu Xiang for debugging and coming up with
a fix for this issue.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Tested-by: Lingzhu Xiang <lxiang@redhat.com>
Tested-by: Suzuki K. Poulose <suzuki@in.ibm.com>
---
purgatory/arch/ppc/Makefile | 2 ++
purgatory/arch/ppc64/Makefile | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
Index: kexec-tools/purgatory/arch/ppc64/Makefile
===================================================================
--- kexec-tools.orig/purgatory/arch/ppc64/Makefile 2012-02-20 14:45:25.000000000 -0500
+++ kexec-tools/purgatory/arch/ppc64/Makefile 2012-06-06 16:19:09.000696306 -0400
@@ -9,7 +9,7 @@ ppc64_PURGATORY_SRCS += purgatory/arch/p
ppc64_PURGATORY_SRCS += purgatory/arch/ppc64/crashdump_backup.c
ppc64_PURGATORY_SRCS += purgatory/arch/ppc64/misc.S
-ppc64_PURGATORY_EXTRA_CFLAGS += -m64 -mcall-aixdesc
+ppc64_PURGATORY_EXTRA_CFLAGS += -m64 -mcall-aixdesc -msoft-float
ppc64_PURGATORY_EXTRA_ASFLAGS += -m64 -mcall-aixdesc
ppc64_PURGATORY_EXTRA_LDFLAGS += -melf64ppc
Index: kexec-tools/purgatory/arch/ppc/Makefile
===================================================================
--- kexec-tools.orig/purgatory/arch/ppc/Makefile 2011-03-18 17:09:38.000000000 -0400
+++ kexec-tools/purgatory/arch/ppc/Makefile 2012-06-06 16:33:50.444406235 -0400
@@ -7,6 +7,8 @@ ppc_PURGATORY_SRCS += purgatory/arch/ppc
ppc_PURGATORY_SRCS += purgatory/arch/ppc/purgatory-ppc.c
ppc_PURGATORY_SRCS += purgatory/arch/ppc/console-ppc.c
+ppc_PURGATORY_EXTRA_CFLAGS += -msoft-float
+
dist += purgatory/arch/ppc/Makefile $(ppc_PURGATORY_SRCS) \
purgatory/arch/ppc/purgatory-ppc.h purgatory/arch/ppc/ppc_asm.h

2
kexec-tools.spec
View File

@ -62,6 +62,7 @@ Obsoletes: diskdumputils netdump
#
# Patches 301 through 400 are meant for ppc64 kexec-tools enablement
#
Patch301: kexec-tools-2.0.3-ppc-ppc64-compile-purgatory-code-with-gcc-option-msoft-float.patch
#
# Patches 401 through 500 are meant for s390 kexec-tools enablement
@ -89,6 +90,7 @@ mkdir -p -m755 kcp
tar -z -x -v -f %{SOURCE9}
%patch301 -p1
%patch601 -p1
tar -z -x -v -f %{SOURCE13}