Attachment 166106 Details for Bug 206615 – armv6 fix

[patch] armv6 fix

lang_ocaml.patch (text/plain), 2.99 KB, created by Mikael Urankar on 2016-01-25 16:17:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2016-01-25 16:17:20 UTC

Size: 2.99 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 407160)
>+++ Makefile	(working copy)
>@@ -98,8 +98,8 @@
> 
> OCAML_ARCH=	${ARCH:S/x86_64/amd64/:S/powerpc/power/:S/armv6/arm/}
> 
>-.if defined(NO_PROFILE) || ${OCAML_ARCH:Mpower} || ${OCAML_ARCH:Mamd64} \
>-	|| ${OCAML_ARCH:Marm}
>+.if defined(NO_PROFILE) || ${OCAML_ARCH:Mpower} || ${OCAML_ARCH:Mamd64}
>+
> PLIST_SUB+=	PROF="@comment "
> .else
> PLIST_SUB+=	PROF=""
>Index: files/patch-configure
>===================================================================
>--- files/patch-configure	(revision 407160)
>+++ files/patch-configure	(working copy)
>@@ -114,7 +114,7 @@
>    *,freebsd)      as="${TOOLPREF}as"
>                    aspp="${TOOLPREF}cc -c";;
>    amd64,*|arm,*|arm64,*|i386,*|power,bsd*|sparc,*)
>-@@ -955,6 +961,7 @@ case "$arch,$system" in
>+@@ -955,9 +961,11 @@ case "$arch,$system" in
>      case "$nativecc" in gcc*) ;; *) cc_profile='-xpg';; esac;;
>    amd64,linux) profiling='prof';;
>    amd64,openbsd) profiling='prof';;
>@@ -122,7 +122,11 @@
>    amd64,freebsd) profiling='prof';;
>    amd64,netbsd) profiling='prof';;
>    amd64,gnu) profiling='prof';;
>-@@ -1415,6 +1422,8 @@ if test "$pthread_wanted" = "yes"; then
>++  arm,freebsd) profiling='prof';;
>+   arm,linux*) profiling='prof';;
>+   power,elf) profiling='prof';;
>+   power,bsd*) profiling='prof';;
>+@@ -1415,6 +1423,8 @@ if test "$pthread_wanted" = "yes"; then
>    case "$target" in
>      *-*-solaris*)  pthread_link="-lpthread -lposix4"
>                     pthread_caml_link="-cclib -lpthread -cclib -lposix4";;
>@@ -131,7 +135,7 @@
>      *-*-freebsd*)  pthread_link="-pthread"
>                     pthread_caml_link="-cclib -pthread";;
>      *-*-openbsd*)  pthread_link="-pthread"
>-@@ -1431,7 +1440,7 @@ if test "$pthread_wanted" = "yes"; then
>+@@ -1431,7 +1441,7 @@ if test "$pthread_wanted" = "yes"; then
>      bytecccompopts="$bytecccompopts -D_REENTRANT"
>      nativecccompopts="$nativecccompopts -D_REENTRANT"
>      case "$target" in
>@@ -140,7 +144,7 @@
>            bytecccompopts="$bytecccompopts -D_THREAD_SAFE"
>            nativecccompopts="$nativecccompopts -D_THREAD_SAFE";;
>        *-*-openbsd*)
>-@@ -1601,6 +1610,7 @@ if test "$x11_include" = "not found"; th
>+@@ -1601,6 +1611,7 @@ if test "$x11_include" = "not found"; th
>        else
>          x11_libs="-L$dir"
>          case "$target" in
>@@ -148,7 +152,7 @@
>            *-kfreebsd*-gnu) x11_link="-L$dir -lX11";;
>            *-*-*bsd*) x11_link="-R$dir -L$dir -lX11";;
>            *) x11_link="-L$dir -lX11";;
>-@@ -1644,10 +1654,10 @@ echo "X11_LINK=$x11_link" >> Makefile
>+@@ -1644,10 +1655,10 @@ echo "X11_LINK=$x11_link" >> Makefile
>  # Look for BFD library
>  
>  if sh ./hasgot -DPACKAGE=ocaml -i bfd.h && \
>@@ -161,7 +165,7 @@
>  else
>    wrn "BFD library not found, 'objinfo' will be unable to display info on .cmxs files."
>    echo "LIBBFD_LINK=" >> Makefile
>-@@ -1686,12 +1696,6 @@ if $no_naked_pointers; then
>+@@ -1686,12 +1697,6 @@ if $no_naked_pointers; then
>    echo "#define NO_NAKED_POINTERS" >> m.h
>  fi
>

Actions: View | Diff

Attachments on bug 206615: 166106 | 166107