Branch b1_6

b=16437
i=cliff.white, brian

Enable the '-m64' flag for powerpc64 patchless build.

diff --git a/build/autoconf/lustre-build-linux.m4 b/build/autoconf/lustre-build-linux.m4
index 9ce393e..ad29811 100644 (file)
--- a/build/autoconf/lustre-build-linux.m4
+++ b/build/autoconf/lustre-build-linux.m4
@@ -462,9 +462,6 @@ AC_DEFUN([LB_PROG_LINUX],
 LB_LINUX_ARCH
 LB_LINUX_SYMVERFILE
 
-if test $LINUX_ARCH == "powerpc64"; then
-       CFLAGS="$CFLAGS -m64"
-fi
 
 LB_LINUX_CONFIG([MODULES],[],[
        AC_MSG_ERROR([module support is required to build Lustre kernel modules.])

diff --git a/build/autoconf/lustre-build.m4 b/build/autoconf/lustre-build.m4
index 5ccadc6..51780bc 100644 (file)
--- a/build/autoconf/lustre-build.m4
+++ b/build/autoconf/lustre-build.m4
@@ -593,6 +593,12 @@ if test $ac_cv_sizeof_unsigned_long_long != 8 ; then
         AC_MSG_ERROR([** we assume that sizeof(long long) == 8.  Tell phil@clusterfs.com])
 fi
 
+if test $target_cpu == "powerpc64"; then
+       AC_MSG_WARN([set compiler with -m64])
+       CFLAGS="$CFLAGS -m64"
+       CC="$CC -m64"
+fi
+
 CPPFLAGS="-I\$(top_builddir)/$LIBCFS_INCLUDE_DIR -I\$(top_srcdir)/$LIBCFS_INCLUDE_DIR-I\$(top_builddir)/lnet/include -I\$(top_srcdir)/lnet/include -I\$(top_builddir)/lustre/include -I\$(top_srcdir)/lustre/include $CPPFLAGS"
 
 LLCPPFLAGS="-D__arch_lib__ -D_LARGEFILE64_SOURCE=1"

diff --git a/libsysio/configure.in b/libsysio/configure.in
index a0e77f3..2aedbf1 100644 (file)
--- a/libsysio/configure.in
+++ b/libsysio/configure.in
@@ -1,6 +1,6 @@
 AC_INIT(libsysio, 1.2)
 
-AC_CANONICAL_HOST
+AC_CANONICAL_SYSTEM
 
 case "$host_os" in
   aix*)
@@ -22,6 +22,11 @@ AC_HEADER_STDC
 AC_HEADER_STAT
 AC_HEADER_TIME
 
+if test ${target_cpu} == "powerpc64"; then
+       AC_MSG_WARN([set compiler with -m64])
+       CC="$CC -m64"
+fi
+
 have_lib_dir=yes;
 AC_ARG_WITH(lib-dir,
   AC_HELP_STRING([--with-lib-dir=<sysio lib build directory>],