Update stressapptest to 1.0.3.
* /dev/shm support to allow >1.4G memory usage for 32 bit app.
* Some arm support.
* x86 SSE support.
diff --git a/configure b/configure
index eda792f..59d076e 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.61 for stressapptest 1.0.2_autoconf.
+# Generated by GNU Autoconf 2.61 for stressapptest 1.0.3_autoconf.
#
# Report bugs to <opensource@google.com>.
#
@@ -574,8 +574,8 @@
# Identity of this package.
PACKAGE_NAME='stressapptest'
PACKAGE_TARNAME='stressapptest'
-PACKAGE_VERSION='1.0.2_autoconf'
-PACKAGE_STRING='stressapptest 1.0.2_autoconf'
+PACKAGE_VERSION='1.0.3_autoconf'
+PACKAGE_STRING='stressapptest 1.0.3_autoconf'
PACKAGE_BUGREPORT='opensource@google.com'
ac_unique_file="src/"
@@ -1228,7 +1228,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures stressapptest 1.0.2_autoconf to adapt to many kinds of systems.
+\`configure' configures stressapptest 1.0.3_autoconf to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1299,7 +1299,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of stressapptest 1.0.2_autoconf:";;
+ short | recursive ) echo "Configuration of stressapptest 1.0.3_autoconf:";;
esac
cat <<\_ACEOF
@@ -1385,7 +1385,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-stressapptest configure 1.0.2_autoconf
+stressapptest configure 1.0.3_autoconf
generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
@@ -1399,7 +1399,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by stressapptest $as_me 1.0.2_autoconf, which was
+It was created by stressapptest $as_me 1.0.3_autoconf, which was
generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -1959,70 +1959,82 @@
NONENONEs,x,x, &&
program_prefix=${target_alias}-
case x"$target_cpu" in
-"xx86_64")
+ "xx86_64")
cat >>confdefs.h <<\_ACEOF
#define STRESSAPPTEST_CPU_X86_64
_ACEOF
-;;
-"xi686")
+ ;;
+ "xi686")
cat >>confdefs.h <<\_ACEOF
#define STRESSAPPTEST_CPU_I686
_ACEOF
-;;
-"xpowerpc")
+ ;;
+ "xpowerpc")
cat >>confdefs.h <<\_ACEOF
#define STRESSAPPTEST_CPU_PPC
_ACEOF
-;;
+ ;;
+ "xarmv7a")
+
+cat >>confdefs.h <<\_ACEOF
+#define STRESSAPPTEST_CPU_ARMV7A
+_ACEOF
+
+ ;;
+ *)
+ { { echo "$as_me:$LINENO: error: $target_cpu is not supported! Try x86_64, i686, powerpc, or armv7a" >&5
+echo "$as_me: error: $target_cpu is not supported! Try x86_64, i686, powerpc, or armv7a" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
esac
_os=`uname`
## The following allows like systems to share settings. This is not meant to
## imply that these OS are the same thing. From OpenOffice dmake configure.in
case "$_os" in
- "Linux")
- OS_VERSION=linux
+ "Linux")
+ OS_VERSION=linux
cat >>confdefs.h <<\_ACEOF
#define STRESSAPPTEST_OS_LINUX
_ACEOF
- ;;
- "Darwin")
- OS_VERSION=macosx
+ ;;
+ "Darwin")
+ OS_VERSION=macosx
cat >>confdefs.h <<\_ACEOF
#define STRESSAPPTEST_OS_DARWIN
_ACEOF
- ;;
- "FreeBSD")
- OS_VERSION=bsd
+ ;;
+ "FreeBSD")
+ OS_VERSION=bsd
cat >>confdefs.h <<\_ACEOF
#define STRESSAPPTEST_OS_BSD
_ACEOF
- ;;
- "NetBSD")
- OS_VERSION=bsd
+ ;;
+ "NetBSD")
+ OS_VERSION=bsd
cat >>confdefs.h <<\_ACEOF
#define STRESSAPPTEST_OS_BSD
_ACEOF
- ;;
- *)
- { { echo "$as_me:$LINENO: error: $_os operating system is not suitable to build dmake!" >&5
+ ;;
+ *)
+ { { echo "$as_me:$LINENO: error: $_os operating system is not suitable to build dmake!" >&5
echo "$as_me: error: $_os operating system is not suitable to build dmake!" >&2;}
{ (exit 1); exit 1; }; }
- ;;
+ ;;
esac
am__api_version='1.10'
@@ -2331,7 +2343,7 @@
# Define the identity of the package.
PACKAGE='stressapptest'
- VERSION='1.0.2_autoconf'
+ VERSION='1.0.3_autoconf'
cat >>confdefs.h <<_ACEOF
@@ -4074,7 +4086,7 @@
#Default cxxflags
CXXFLAGS="$CXXFLAGS -DCHECKOPTS"
-CXXFLAGS="$CXXFLAGS -Wreturn-type -Wunused -Wuninitialized -Wall"
+CXXFLAGS="$CXXFLAGS -Wreturn-type -Wunused -Wuninitialized -Wall -Wno-psabi"
CXXFLAGS="$CXXFLAGS -O3 -funroll-all-loops -funroll-loops -DNDEBUG"
# Checks for header files.
@@ -6015,10 +6027,17 @@
fi
+
+# These are the libraries stressapptest requires to build.
+# We'll check that they work, and fail otherwise.
+# In the future we may provide for testing alternate
+# arguments, but that's not necessary now.
+LIBS="$LIBS -static -lrt -pthread -laio"
+
# Checking for pthreads
pthread_arg="not_available"
-{ echo "$as_me:$LINENO: checking which argument is required to compile pthreads" >&5
-echo $ECHO_N "checking which argument is required to compile pthreads... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking if pthreads is supported" >&5
+echo $ECHO_N "checking if pthreads is supported... $ECHO_C" >&6; }
pthread_header="#include<pthread.h>"
pthread_body="pthread_create(0,0,0,0)"
@@ -6068,79 +6087,20 @@
conftest$ac_exeext conftest.$ac_ext
if test x"$pthread_arg" = x"not_available"; then
- # At first, only -pthread was tested, but this is the place
- # to add extra pthread flags if someone can test them
- bkp_LDFLAGS="$LDFLAGS"
- for altheader in -pthread; do
- LDFLAGS="$bkp_LDFLAGS $altheader"
- cat >conftest.$ac_ext <<_ACEOF
-/* confdefs.h. */
-_ACEOF
-cat confdefs.h >>conftest.$ac_ext
-cat >>conftest.$ac_ext <<_ACEOF
-/* end confdefs.h. */
-$pthread_header
-int
-main ()
-{
-$pthread_body
- ;
- return 0;
-}
-_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } && {
- test -z "$ac_c_werror_flag" ||
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
- pthread_arg="$altheader"
-else
- echo "$as_me: failed program was:" >&5
-sed 's/^/| /' conftest.$ac_ext >&5
-
-
-fi
-
-rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$bkp_LDFLAGS"
- done
-fi
-
-if test x"$pthread_arg" = x"not_available"; then
- { { echo "$as_me:$LINENO: error: Cannot find a proper pthread library
+ { { echo "$as_me:$LINENO: error: Cannot find a proper pthread library
See \`config.log' for more details." >&5
echo "$as_me: error: Cannot find a proper pthread library
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
- if test x"$pthread_arg" = x; then
- { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
- else
- { echo "$as_me:$LINENO: result: $pthread_arg" >&5
-echo "${ECHO_T}$pthread_arg" >&6; }
- fi
- LDFLAGS="$LDFLAGS $pthread_arg"
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
fi
# Checking for libaio
libaio_arg="not_available"
-{ echo "$as_me:$LINENO: checking which argument is required to compile libaio" >&5
-echo $ECHO_N "checking which argument is required to compile libaio... $ECHO_C" >&6; }
+{ echo "$as_me:$LINENO: checking if libaio is supported" >&5
+echo $ECHO_N "checking if libaio is supported... $ECHO_C" >&6; }
libaio_header="#include<libaio.h>"
libaio_body="io_submit(0,0,0)"
@@ -6190,20 +6150,35 @@
conftest$ac_exeext conftest.$ac_ext
if test x"$libaio_arg" = x"not_available"; then
- bkp_LDFLAGS="$LDFLAGS"
- for altheader in -laio; do
- LDFLAGS="$bkp_LDFLAGS $altheader"
- cat >conftest.$ac_ext <<_ACEOF
+ { { echo "$as_me:$LINENO: error: Cannot find libaio library, please install libaio-dev
+See \`config.log' for more details." >&5
+echo "$as_me: error: Cannot find libaio library, please install libaio-dev
+See \`config.log' for more details." >&2;}
+ { (exit 1); exit 1; }; }
+else
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+fi
+
+# Checking for librt
+librt_arg="not_available"
+{ echo "$as_me:$LINENO: checking if librt is supported" >&5
+echo $ECHO_N "checking if librt is supported... $ECHO_C" >&6; }
+
+librt_header="#include<sys/shm.h>"
+librt_body="shm_open(0, 0, 0)"
+# Check if compile with no extra argument
+cat >conftest.$ac_ext <<_ACEOF
/* confdefs.h. */
_ACEOF
cat confdefs.h >>conftest.$ac_ext
cat >>conftest.$ac_ext <<_ACEOF
/* end confdefs.h. */
-$libaio_header
+$librt_header
int
main ()
{
-$libaio_body
+$librt_body
;
return 0;
}
@@ -6226,7 +6201,7 @@
test ! -s conftest.err
} && test -s conftest$ac_exeext &&
$as_test_x conftest$ac_exeext; then
- libaio_arg="$altheader"
+ librt_arg=""
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -6236,27 +6211,19 @@
rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
- LDFLAGS="$bkp_LDFLAGS"
- done
-fi
-if test x"$libaio_arg" = x"not_available"; then
- { { echo "$as_me:$LINENO: error: Cannot find libaio library, please install libaio-dev
+if test x"$librt_arg" = x"not_available"; then
+ { { echo "$as_me:$LINENO: error: Cannot find librt library
See \`config.log' for more details." >&5
-echo "$as_me: error: Cannot find libaio library, please install libaio-dev
+echo "$as_me: error: Cannot find librt library
See \`config.log' for more details." >&2;}
{ (exit 1); exit 1; }; }
else
- if test x"$libaio_arg" = x; then
- { echo "$as_me:$LINENO: result: none" >&5
-echo "${ECHO_T}none" >&6; }
- else
- { echo "$as_me:$LINENO: result: $libaio_arg" >&5
-echo "${ECHO_T}$libaio_arg" >&6; }
- fi
- LDFLAGS="$LDFLAGS $libaio_arg"
+ { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
fi
+
# Checks for library functions.
{ echo "$as_me:$LINENO: checking whether closedir returns void" >&5
echo $ECHO_N "checking whether closedir returns void... $ECHO_C" >&6; }
@@ -7662,7 +7629,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by stressapptest $as_me 1.0.2_autoconf, which was
+This file was extended by stressapptest $as_me 1.0.3_autoconf, which was
generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -7715,7 +7682,7 @@
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-stressapptest config.status 1.0.2_autoconf
+stressapptest config.status 1.0.3_autoconf
configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"