Fix build on 32-bit Solaris when the assembler is 64-bit by default.

2 files changed, 21 insertions, 19 deletions

diff --git a/lang/ocaml/distinfo b/lang/ocaml/distinfo
index dbf7f9fe8be..1a364fe7e2e 100644
--- a/lang/ocaml/distinfo
+++ b/lang/ocaml/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.67 2012/12/18 12:02:10 jperkin Exp $
+$NetBSD: distinfo,v 1.68 2013/01/25 14:49:38 jperkin Exp $
 
 SHA1 (ocaml-4.00.1.tar.bz2) = 10b8a4d0b88d20b003e3dd719f2ac9434e6a1042
 RMD160 (ocaml-4.00.1.tar.bz2) = db28f57b463af90650b877af0baf44eb226b0a79
@@ -11,7 +11,7 @@ SHA1 (patch-asmrun_signals_osdep.h) = cc7131ef020563ae28c1fddbe8fe634174f73826
 SHA1 (patch-bytecomp_bytelink.ml) = 051044bc6f534d3f197d40e6d527e5224a1f166a
 SHA1 (patch-byterun_Makefile) = 9681ce78c78879d29d9c58f35278a14e6cb18e96
 SHA1 (patch-camlp4_man_Makefile) = c3a5dc09a2cc15d969c4e074be7da98a979f7db4
-SHA1 (patch-configure) = 91fe01716545e62c92b4ff54d0a1d15f62b209fc
+SHA1 (patch-configure) = 042784bf8d3561aafe62259ea9a0ed5f392b5c95
 SHA1 (patch-debugger_Makefile.shared) = 583fa88caf965164aa3b638dda4c2a6e8878bdf9
 SHA1 (patch-man_Makefile) = 3f52dd1fcbde53399852a6490d5f27fc7c1c98e5
 SHA1 (patch-ocamldoc_Makefile) = d09c5f779dc1da9317d1c6e5eb4b251a9af45562
diff --git a/lang/ocaml/patches/patch-configure b/lang/ocaml/patches/patch-configure
index 2fc2412265d..3525e4233e6 100644
--- a/lang/ocaml/patches/patch-configure
+++ b/lang/ocaml/patches/patch-configure
@@ -1,10 +1,10 @@
-$NetBSD: patch-configure,v 1.3 2012/12/18 12:02:10 jperkin Exp $
+$NetBSD: patch-configure,v 1.4 2013/01/25 14:49:38 jperkin Exp $
 
 Several configure changes to work on and detect NetBSD (and some other OSes)
 
 --- configure.orig	2012-06-26 15:33:50.000000000 +0000
-+++ configure	2012-12-18 11:46:04.156290592 +0000
-@@ -537,7 +537,7 @@
++++ configure
+@@ -537,7 +537,7 @@ if test $withsharedlibs = "yes"; then
        mksharedlib="$flexlink"
        mkmaindll="$flexlink -maindll"
        shared_libraries_supported=true;;
@@ -13,7 +13,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
        sharedcccompopts="-fPIC"
        mksharedlib="$bytecc -shared"
        bytecclinkopts="$bytecclinkopts -Wl,-E"
-@@ -633,7 +633,7 @@
+@@ -633,7 +633,7 @@ if test $withsharedlibs = "yes"; then
      x86_64-*-linux*)              natdynlink=true;;
      i[3456]86-*-darwin[89].*)     natdynlink=true;;
      i[3456]86-*-darwin*)
@@ -22,7 +22,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
          natdynlink=true
        fi;;
      x86_64-*-darwin*)             natdynlink=true;;
-@@ -647,6 +647,8 @@
+@@ -647,6 +647,8 @@ if test $withsharedlibs = "yes"; then
      x86_64-*-openbsd*)            natdynlink=true;;
      i[345]86-*-netbsd*)           natdynlink=true;;
      x86_64-*-netbsd*)             natdynlink=true;;
@@ -31,7 +31,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
      i386-*-gnu0.3)                natdynlink=true;;
      arm*-*-linux*)                natdynlink=true;;
    esac
-@@ -672,6 +674,7 @@
+@@ -672,6 +674,7 @@ case "$host" in
    sparc*-*-gnu*)                arch=sparc; system=gnu;;
    i[3456]86-*-linux*)           arch=i386; system=linux_`sh ./runtest elf.c`;;
    i[3456]86-*-*bsd*)            arch=i386; system=bsd_`sh ./runtest elf.c`;;
@@ -39,7 +39,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    i[3456]86-*-nextstep*)        arch=i386; system=nextstep;;
    i[3456]86-*-solaris*)         if $arch64; then
                                    arch=amd64; system=solaris
-@@ -680,6 +683,7 @@
+@@ -680,6 +683,7 @@ case "$host" in
                                  fi;;
    i[3456]86-*-beos*)            arch=i386; system=beos;;
    i[3456]86-*-cygwin*)          arch=i386; system=cygwin;;
@@ -47,7 +47,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    i[3456]86-*-darwin*)          if $arch64; then
                                    arch=amd64; system=macosx
                                  else
-@@ -691,6 +695,7 @@
+@@ -691,6 +695,7 @@ case "$host" in
    powerpc-*-rhapsody*)          arch=power; model=ppc; system=rhapsody;;
    powerpc-*-darwin*)            arch=power; system=rhapsody
                                  if $arch64; then model=ppc64; else model=ppc; fi;;
@@ -55,7 +55,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    arm*-*-linux-gnueabihf)       arch=arm; system=linux_eabihf;;
    armv7*-*-linux-gnueabi)       arch=arm; model=armv7; system=linux_eabi;;
    armv6t2*-*-linux-gnueabi)     arch=arm; model=armv6t2; system=linux_eabi;;
-@@ -702,6 +707,8 @@
+@@ -702,6 +707,8 @@ case "$host" in
    x86_64-*-gnu*)                arch=amd64; system=gnu;;
    x86_64-*-freebsd*)            arch=amd64; system=freebsd;;
    x86_64-*-netbsd*)             arch=amd64; system=netbsd;;
@@ -64,7 +64,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    x86_64-*-openbsd*)            arch=amd64; system=openbsd;;
    x86_64-*-darwin*)             arch=amd64; system=macosx;;
  esac
-@@ -736,7 +743,7 @@
+@@ -736,7 +743,7 @@ case "$arch,$nativecc,$system,$host_type
                         if $arch64; then partialld="ld -r -arch ppc64"; fi;;
    *,gcc*,cygwin,*)     nativecccompopts="$gcc_warnings -U_WIN32";;
    amd64,gcc*,macosx,*) partialld="ld -r -arch x86_64";;
@@ -73,16 +73,18 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    *,gcc*,*,*)          nativecccompopts="$gcc_warnings";;
  esac
  
-@@ -752,7 +759,7 @@
+@@ -751,8 +758,8 @@ case "$arch,$model,$system" in
+                     aspp='gcc -c';;
    arm,*,*)          as='as';
                      aspp='gcc -c';;
-   i386,*,solaris)   as='as'
+-  i386,*,solaris)   as='as'
 -                    aspp='/usr/ccs/bin/as -P';;
++  i386,*,solaris)   as='as --32'
 +                    aspp='gcc -traditional -c';;
    i386,*,*)         as='as'
                      aspp='gcc -c';;
    power,*,elf)      as='as -u -m ppc'
-@@ -786,6 +793,8 @@
+@@ -786,6 +793,8 @@ case "$arch,$model,$system" in
    amd64,*,linux) profiling='prof';;
    amd64,*,gnu) profiling='prof';;
    arm,*,linux*) profiling='prof';;
@@ -91,7 +93,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
    *) profiling='noprof';;
  esac
  
-@@ -1244,6 +1253,8 @@
+@@ -1244,6 +1253,8 @@ fi
  x11_include="not found"
  x11_link="not found"
  
@@ -100,7 +102,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
  if test -z "$x11_include_dir" -a -z "$x11_lib_dir"; then
    if pkg-config --exists x11 2>/dev/null; then
      x11_include=`pkg-config --cflags x11`
-@@ -1290,6 +1301,7 @@
+@@ -1290,6 +1301,7 @@ if test "$x11_include" = "not found"; th
      /usr/XFree86/include/X11  \
                                \
      /usr/include              \
@@ -108,7 +110,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
      /usr/local/include        \
      /usr/unsupported/include  \
      /usr/athena/include       \
-@@ -1347,6 +1359,7 @@
+@@ -1347,6 +1359,7 @@ if test "$x11_include" = "not found"; th
                            \
      /usr/lib64            \
      /usr/lib              \
@@ -116,7 +118,7 @@ Several configure changes to work on and detect NetBSD (and some other OSes)
      /usr/local/lib        \
      /usr/unsupported/lib  \
      /usr/athena/lib       \
-@@ -1368,18 +1381,16 @@
+@@ -1368,18 +1381,16 @@ if test "$x11_include" = "not found"; th
        if test $dir = /usr/lib; then
          x11_link="-lX11"
        else