Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
0d2e140
)
compile code with -m64 flag produce wrong object file for ppc32.
author
shadow
<shadow>
Tue, 6 May 2008 18:05:25 +0000
(18:05 +0000)
committer
shadow
<shadow>
Tue, 6 May 2008 18:05:25 +0000
(18:05 +0000)
b=15278
i=johann
i=deen
build/autoconf/lustre-build-linux.m4
patch
|
blob
|
history
build/autoconf/lustre-build.m4
patch
|
blob
|
history
lustre/ChangeLog
patch
|
blob
|
history
lustre/autoconf/lustre-core.m4
patch
|
blob
|
history
diff --git
a/build/autoconf/lustre-build-linux.m4
b/build/autoconf/lustre-build-linux.m4
index
193c6c7
..
e47efd8
100644
(file)
--- a/
build/autoconf/lustre-build-linux.m4
+++ b/
build/autoconf/lustre-build-linux.m4
@@
-445,6
+445,11
@@
fi
#
AC_DEFUN([LB_PROG_LINUX],
[LB_LINUX_PATH
#
AC_DEFUN([LB_PROG_LINUX],
[LB_LINUX_PATH
+LB_LINUX_ARCH
+
+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.])
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
cf9ad64
..
47be784
100644
(file)
--- a/
build/autoconf/lustre-build.m4
+++ b/
build/autoconf/lustre-build.m4
@@
-542,23
+542,6
@@
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
AC_MSG_ERROR([** we assume that sizeof(long long) == 8. Tell phil@clusterfs.com])
fi
-# FIXME
-AC_CHECK_DECL([__i386__], [], [
-
-if test x$enable_bgl != xyes; then
-AC_MSG_CHECKING([if $CC accepts -m64])
-CC_save="$CC"
-CC="$CC -m64"
-AC_TRY_COMPILE([],[],[
- AC_MSG_RESULT([yes])
-],[
- AC_MSG_RESULT([no])
- CC="$CC_save"
-])
-fi
-
-])
-
CPPFLAGS="-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"
CPPFLAGS="-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/lustre/ChangeLog
b/lustre/ChangeLog
index
90f1ce5
..
d4d157f
100644
(file)
--- a/
lustre/ChangeLog
+++ b/
lustre/ChangeLog
@@
-13,6
+13,11
@@
tbd Sun Microsystems, Inc.
removed cwd "./" (refer to Bugzilla 14399).
Severity : normal
removed cwd "./" (refer to Bugzilla 14399).
Severity : normal
+Bugzilla : 15278
+Description: fix build on ppc32
+Details : compile code with -m64 flag produce wrong object file for ppc32.
+
+Severity : normal
Bugzilla : 12191
Description: add message levels for liblustreapi
Bugzilla : 12191
Description: add message levels for liblustreapi
diff --git
a/lustre/autoconf/lustre-core.m4
b/lustre/autoconf/lustre-core.m4
index
a5b4ab3
..
f893099
100644
(file)
--- a/
lustre/autoconf/lustre-core.m4
+++ b/
lustre/autoconf/lustre-core.m4
@@
-1231,8
+1231,7
@@
AC_DEFINE(HAVE___D_MOVE, 1,
# matter what symbol is exported, the kernel #defines node_to_cpumask
# to the appropriate function and that's what we use.
AC_DEFUN([LC_EXPORT_NODE_TO_CPUMASK],
# matter what symbol is exported, the kernel #defines node_to_cpumask
# to the appropriate function and that's what we use.
AC_DEFUN([LC_EXPORT_NODE_TO_CPUMASK],
- [LB_LINUX_ARCH
- LB_CHECK_SYMBOL_EXPORT([node_to_cpumask],
+ [LB_CHECK_SYMBOL_EXPORT([node_to_cpumask],
[arch/$LINUX_ARCH/mm/numa.c],
[AC_DEFINE(HAVE_NODE_TO_CPUMASK, 1,
[node_to_cpumask is exported by
[arch/$LINUX_ARCH/mm/numa.c],
[AC_DEFINE(HAVE_NODE_TO_CPUMASK, 1,
[node_to_cpumask is exported by