Changeset View
Changeset View
Standalone View
Standalone View
head/lang/ghc/files/patch-ppc64
| Show First 20 Lines • Show All 405 Lines • ▼ Show 20 Lines | + ArchPPC64_ELFv2 -> | ||||
| -- two gigabytes, so loading a non-negative32 bit address | -- two gigabytes, so loading a non-negative32 bit address | ||||
| --- rts/StgCRun.c.orig 2019-04-07 21:39:58.000000000 +0200 | --- rts/StgCRun.c.orig 2019-04-07 21:39:58.000000000 +0200 | ||||
| +++ rts/StgCRun.c 2019-07-06 08:57:54.735161000 +0200 | +++ rts/StgCRun.c 2019-07-06 08:57:54.735161000 +0200 | ||||
| @@ -747,9 +747,8 @@ StgRunIsImplementedInAssembler(void) | @@ -747,9 +747,8 @@ StgRunIsImplementedInAssembler(void) | ||||
| Everything is in assembler, so we don't have to deal with GCC... | Everything is in assembler, so we don't have to deal with GCC... | ||||
| -------------------------------------------------------------------------- */ | -------------------------------------------------------------------------- */ | ||||
| -#if defined(powerpc64_HOST_ARCH) | -#if defined(powerpc64_HOST_ARCH) | ||||
| +#if defined(ELF_V1) | +#if defined(_CALL_ELF) && (_CALL_ELF == 1) | ||||
| -#if defined(linux_HOST_OS) | -#if defined(linux_HOST_OS) | ||||
| static void GNUC3_ATTRIBUTE(used) | static void GNUC3_ATTRIBUTE(used) | ||||
| StgRunIsImplementedInAssembler(void) | StgRunIsImplementedInAssembler(void) | ||||
| { | { | ||||
| @@ -871,13 +870,9 @@ StgRunIsImplementedInAssembler(void) | @@ -871,13 +870,9 @@ StgRunIsImplementedInAssembler(void) | ||||
| : : "i"(RESERVED_C_STACK_BYTES+304 /*stack frame size*/)); | : : "i"(RESERVED_C_STACK_BYTES+304 /*stack frame size*/)); | ||||
| } | } | ||||
| -#else // linux_HOST_OS | -#else // linux_HOST_OS | ||||
| -#error Only Linux support for power64 right now. | -#error Only Linux support for power64 right now. | ||||
| #endif | #endif | ||||
| -#endif | -#endif | ||||
| - | - | ||||
| -#if defined(powerpc64le_HOST_ARCH) | -#if defined(powerpc64le_HOST_ARCH) | ||||
| +#if defined(ELF_V2) | +#if defined(_CALL_ELF) && (_CALL_ELF == 2) | ||||
| /* ----------------------------------------------------------------------------- | /* ----------------------------------------------------------------------------- | ||||
| PowerPC 64 little endian architecture | PowerPC 64 little endian architecture | ||||
| --- rts/StgCRunAsm.S.orig 2018-06-12 22:33:31.000000000 +0200 | --- rts/StgCRunAsm.S.orig 2018-06-12 22:33:31.000000000 +0200 | ||||
| +++ rts/StgCRunAsm.S 2019-07-06 13:29:26.837367000 +0200 | +++ rts/StgCRunAsm.S 2019-07-06 13:29:26.837367000 +0200 | ||||
| @@ -1,8 +1,7 @@ | @@ -1,8 +1,7 @@ | ||||
| #include "ghcconfig.h" | #include "ghcconfig.h" | ||||
| #include "rts/Constants.h" | #include "rts/Constants.h" | ||||
| Show All 26 Lines | |||||