Attachment 875956 Details for Bug 1077767 – ocaml.ppc64.bytecode.patch

[patch] ocaml.ppc64.bytecode.patch

ocaml.ppc64.bytecode.patch (text/plain), 5.01 KB, created by Michel Normand on 2014-03-18 14:26:09 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Michel Normand

Created: 2014-03-18 14:26:09 UTC

Size: 5.01 KB

patch

obsolete

>From 4e5895e5f6053cd67154b245b7ff34c9c21d794e Mon Sep 17 00:00:00 2001
>From: Michel Normand <normand@linux.vnet.ibm.com>
>Date: Tue, 18 Mar 2014 09:38:32 -0400
>Subject: [PATCH] add ppc64le archi with bytecode compiler
>
>this is a first step without native compiler support.
>
>Note also two changes in spec file
>where some files are generated even without native_compiler.
>* ocamloptp
>* man3 files
>
>Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
>
>diff --git a/0100-ppc64le-support.patch b/0100-ppc64le-support.patch
>new file mode 100644
>index 0000000..31bf81d
>--- /dev/null
>+++ b/0100-ppc64le-support.patch
>@@ -0,0 +1,57 @@
>+From 7ef9ce3a9e31149949201f126742143b6e20f2d7 Mon Sep 17 00:00:00 2001
>+From: Michel Normand <normand@linux.vnet.ibm.com>
>+Date: Tue, 18 Mar 2014 09:15:47 -0400
>+Subject: [PATCH] add ppc64le archi
>+
>+first step is to support bytecode compiler
>+
>+Signed-off-by: Michel Normand <normand@linux.vnet.ibm.com>
>+
>+diff --git a/config/gnu/config.guess b/config/gnu/config.guess
>+index 8152efd..db6d2fd 100755
>+--- a/config/gnu/config.guess
>++++ b/config/gnu/config.guess
>+@@ -967,6 +967,9 @@ EOF
>+     ppc64:Linux:*:*)
>+ 	echo powerpc64-unknown-linux-gnu
>+ 	exit ;;
>++    ppc64le:Linux:*:*)
>++	echo powerpc64le-unknown-linux-gnu
>++	exit ;;
>+     ppc:Linux:*:*)
>+ 	echo powerpc-unknown-linux-gnu
>+ 	exit ;;
>+diff --git a/configure b/configure
>+index 9b02664..ff33895 100755
>+--- a/configure
>++++ b/configure
>+@@ -695,6 +695,7 @@ case "$host" in
>+                                 fi;;
>+   i[3456]86-*-gnu*)             arch=i386; system=gnu;;
>+   powerpc64-*-linux*)           arch=power64; model=ppc64; system=elf;;
>++  powerpc64le-*-linux*)         arch=power64le; model=ppc64le; system=elf;;
>+   powerpc*-*-linux*)            arch=power; model=ppc; system=elf;;
>+   powerpc-*-netbsd*)            arch=power; model=ppc; system=elf;;
>+   powerpc-*-openbsd*)           arch=power; model=ppc; system=bsd_elf;;
>+@@ -720,10 +721,11 @@ esac
>+ # Some platforms exist both in 32-bit and 64-bit variants, not distinguished
>+ # by $host.  Turn off native code compilation on platforms where 64-bit mode
>+ # is not supported.  (PR#4441)
>++# temporarily disable native-code for ppc64le
>+ 
>+ if $arch64; then
>+   case "$arch,$model" in
>+-    sparc,default|power,ppc)
>++    sparc,default|power,ppc|power64le,ppc64le)
>+       arch=none; model=default; system=unknown;;
>+   esac
>+ fi
>+@@ -779,6 +781,8 @@ case "$arch,$model,$system" in
>+                     aspp='gcc -c';;
>+   power64,*,elf)    as='as -u -m ppc64'
>+                     aspp='gcc -c';;
>++  power64le,*,elf)  as='as -u -m ppc64'
>++                    aspp='gcc -c';;
>+   power,*,rhapsody) as="as -arch $model"
>+                     aspp="$bytecc -c";;
>+   sparc,*,solaris)  as='as'
>diff --git a/ocaml.spec b/ocaml.spec
>index bd92a6d..5f436d2 100644
>--- a/ocaml.spec
>+++ b/ocaml.spec
>@@ -42,6 +42,9 @@ Patch0009:      0009-Port-to-the-ARM-64-bits-AArch64-architecture-experim.patch
> Patch0010:      0010-Updated-with-latest-versions-from-FSF.patch
> Patch0011:      0011-Disable-ocamldoc-and-camlp4opt-aarch64-only.patch
> 
>+# ppc64le patches
>+Patch9999:	0100-ppc64le-support.patch
>+
> BuildRequires:  ncurses-devel
> BuildRequires:  gdbm-devel
> BuildRequires:  tcl-devel
>@@ -76,7 +79,7 @@ Provides:       ocaml(compiler) = %{version}
> 
> # We can compile OCaml on just about anything, but the native code
> # backend is only available on a subset of architectures.
>-ExclusiveArch:  aarch64 alpha %{arm} ia64 %{ix86} x86_64 ppc ppc64 sparc sparcv9
>+ExclusiveArch:  aarch64 alpha %{arm} ia64 %{ix86} x86_64 ppc ppc64 sparc sparcv9 ppc64le
> 
> %ifarch aarch64 %{arm} %{ix86} ppc ppc64 sparc sparcv9 x86_64
> %global native_compiler 1
>@@ -261,7 +264,9 @@ git am %{_sourcedir}/0009-Port-to-the-ARM-64-bits-AArch64-architecture-experim.p
> git am %{_sourcedir}/0010-Updated-with-latest-versions-from-FSF.patch </dev/null
> git am %{_sourcedir}/0011-Disable-ocamldoc-and-camlp4opt-aarch64-only.patch </dev/null
> %endif
>-
>+%ifarch ppc64le
>+git am %{_sourcedir}/0100-ppc64le-support.patch </dev/null
>+%endif
> 
> %build
> # make -jN (N > 1) breaks the build.  Therefore we cannot use
>@@ -271,7 +276,7 @@ unset MAKEFLAGS
> # For ppc64 we need a larger stack than default to compile some files
> # because the stages in the OCaml compiler are not mutually tail
> # recursive.
>-%ifarch ppc64
>+%ifarch ppc64 ppc64le
> ulimit -a
> ulimit -Hs 65536
> ulimit -Ss 65536
>@@ -384,8 +389,8 @@ fi
> %if %{native_compiler}
> %{_bindir}/ocamlopt
> %{_bindir}/ocamlopt.opt
>-%{_bindir}/ocamloptp
> %endif
>+%{_bindir}/ocamloptp
> #%{_bindir}/ocamlplugininfo
> %{_bindir}/ocamlprof
> %{_bindir}/ocamlyacc
>@@ -534,9 +539,9 @@ fi
> %files docs
> %doc refman.pdf htmlman
> %{_infodir}/*
>-%if %{native_compiler}
>+#%if %{native_compiler}
> %{_mandir}/man3/*
>-%endif
>+#%endif
> 
> 
> %files emacs
>@@ -560,6 +565,8 @@ fi
> 
> 
> %changelog
>+* Tue Mar 18 2014 Michel Normand normand@linux.vnet.ibm.com
>+- add ppc64le archi but only with bytecode
> * Wed Jan  8 2014 Richard W.M. Jones <rjones@redhat.com> - 4.01.0-8
> - Don't use ifarch around Patch lines, as it means the patch files
>   don't get included in the spec file.

Actions: View | Diff

Attachments on bug 1077767: 875956 | 884551 | 884552