On Wed, Jun 5, 2013 at 2:26 AM, Richard Sandiford < rsand...@linux.vnet.ibm.com> wrote:
> The main change is to use MCJIT rather than the old JIT, which will never > be supported for System z. The endianness part is by example since the > patch was tested on a glibc system. > > Signed-off-by: Richard Sandiford <rsand...@linux.vnet.ibm.com> > --- > src/gallium/auxiliary/gallivm/lp_bld_init.c | 2 +- > src/gallium/include/pipe/p_config.h | 6 +++++- > 2 files changed, 6 insertions(+), 2 deletions(-) > > diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c > b/src/gallium/auxiliary/gallivm/lp_bld_init.c > index 050eba7..f0dc8cb 100644 > --- a/src/gallium/auxiliary/gallivm/lp_bld_init.c > +++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c > @@ -49,7 +49,7 @@ > * - MC-JIT supports limited OSes (MacOSX and Linux) > * - standard JIT in LLVM 3.1, with backports > */ > -#if defined(PIPE_ARCH_PPC_64) > +#if defined(PIPE_ARCH_PPC_64) || defined(PIPE_ARCH_S390) > # define USE_MCJIT 1 > # define HAVE_AVX 0 > #elif HAVE_LLVM >= 0x0302 || (HAVE_LLVM == 0x0301 && > defined(HAVE_JIT_AVX_SUPPORT)) > diff --git a/src/gallium/include/pipe/p_config.h > b/src/gallium/include/pipe/p_config.h > index 9a09cee..6b51160 100644 > --- a/src/gallium/include/pipe/p_config.h > +++ b/src/gallium/include/pipe/p_config.h > @@ -110,6 +110,10 @@ > #endif > #endif > > +#if defined(__s390x__) > +#define PIPE_ARCH_S390 > +#endif > + > > /* > * Endian detection. > @@ -146,7 +150,7 @@ > > #if defined(PIPE_ARCH_X86) || defined(PIPE_ARCH_X86_64) > #define PIPE_ARCH_LITTLE_ENDIAN > -#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) > +#elif defined(PIPE_ARCH_PPC) || defined(PIPE_ARCH_PPC_64) || > defined(PIPE_ARCH_S390) > #define PIPE_ARCH_BIG_ENDIAN > #endif > > > Looks good to me. I'll push this in a bit. -Brian
_______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org http://lists.freedesktop.org/mailman/listinfo/mesa-dev
