diff --git a/.gitignore b/.gitignore
index 0acff3188ddfe7dccaebc5e963d353482b380d38..a7a8c79a10bd7655faf8017b8939920efe735fa4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -49,6 +49,7 @@ libtool
Makefile
Makefile.in
stamp-h1
+test-driver
# Compiled languages (C,C++,Fortran,...)
*.o
diff --git a/Makefile.am b/Makefile.am
index cd0f9dd4263ca2a92e5ad09f12a46f361e135606..0baa2db6e9283fd6a0901199102f9f4709914683 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -8,14 +8,17 @@ if BUILD_S_OMP
SUBDIRS += sPuReMD
DIST_SUBDIRS += sPuReMD
endif
+
if BUILD_MPI
SUBDIRS += PuReMD
DIST_SUBDIRS += PuReMD
endif
+
if BUILD_GPU
SUBDIRS += PuReMD-GPU
DIST_SUBDIRS += PuReMD-GPU
endif
+
if BUILD_MPI_GPU
SUBDIRS += PG-PuReMD
DIST_SUBDIRS += PG-PuReMD
diff --git a/configure.ac b/configure.ac
index 91b08a149c43fdcde22b43462ab99638a787352d..8b38548f4ab4e67a170ad2a3974bde4f949eb191 100644
--- a/configure.ac
+++ b/configure.ac
@@ -118,7 +118,7 @@ AC_ARG_ENABLE([timing],
[enable timing measurements and reporting @<:@default: no@:>@])],
[timing_enabled=${enableval}], [timing_enabled=no]
)
-if test "x$timing_enabled" = "xyes"
+if test "x${timing_enabled}" = "xyes"
then
export BUILD_TIMING="yes"
fi
@@ -128,7 +128,7 @@ AC_ARG_WITH([superlu-mt],
[enable usage of SuperLU MT for QEq preconditioner computation @<:@default: no@:>@])],
[package_superlu_mt=${withval}], [package_superlu_mt=no])
-if test "x$package_superlu_mt" != "xno"
+if test "x${package_superlu_mt}" != "xno"
then
export BUILD_SUPERLU_MT="${package_superlu_mt}"
fi
diff --git a/ltmain.sh b/ltmain.sh
index 63ae69dc6fecaf83c52fba2ad334f4b1369fb1cd..0f0a2da3f9dd10627626bf9725b332d95f314393 100644
--- a/ltmain.sh
+++ b/ltmain.sh
@@ -1,9 +1,12 @@
+#! /bin/sh
+## DO NOT EDIT - This file generated from ./build-aux/ltmain.in
+## by inline-source v2014-01-03.01
-# libtool (GNU libtool) 2.4.2
+# libtool (GNU libtool) 2.4.6
+# Provide generalized library-building support services.
# Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
-# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# Copyright (C) 1996-2015 Free Software Foundation, Inc.
# This is free software; see the source for copying conditions. There is NO
# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
@@ -23,881 +26,2112 @@
# General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html,
-# or obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
-# Usage: $progname [OPTION]... [MODE-ARG]...
-#
-# Provide generalized library-building support services.
-#
-# --config show all configuration variables
-# --debug enable verbose shell tracing
-# -n, --dry-run display commands without modifying any files
-# --features display basic configuration information and exit
-# --mode=MODE use operation mode MODE
-# --preserve-dup-deps don't remove duplicate dependency libraries
-# --quiet, --silent don't print informational messages
-# --no-quiet, --no-silent
-# print informational messages (default)
-# --no-warn don't display warning messages
-# --tag=TAG use configuration variables from tag TAG
-# -v, --verbose print more informational messages than default
-# --no-verbose don't print the extra informational messages
-# --version print version information
-# -h, --help, --help-all print short, long, or detailed help message
-#
-# MODE must be one of the following:
-#
-# clean remove files from the build directory
-# compile compile a source file into a libtool object
-# execute automatically set library path, then run a program
-# finish complete the installation of libtool libraries
-# install install libraries or executables
-# link create a library or an executable
-# uninstall remove libraries from an installed directory
-#
-# MODE-ARGS vary depending on the MODE. When passed as first option,
-# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
-# Try `$progname --help --mode=MODE' for a more detailed description of MODE.
-#
-# When reporting a bug, please describe a test case to reproduce it and
-# include the following information:
-#
-# host-triplet: $host
-# shell: $SHELL
-# compiler: $LTCC
-# compiler flags: $LTCFLAGS
-# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2
-# automake: $automake_version
-# autoconf: $autoconf_version
-#
-# Report bugs to <bug-libtool@gnu.org>.
-# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
-# General help using GNU software: <http://www.gnu.org/gethelp/>.
PROGRAM=libtool
PACKAGE=libtool
-VERSION=2.4.2
-TIMESTAMP=""
-package_revision=1.3337
+VERSION=2.4.6
+package_revision=2.4.6
-# Be Bourne compatible
-if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Run './libtool --help' for help with using this script from the
+# command line.
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# After configure completes, it has a better idea of some of the
+# shell tools we need than the defaults used by the functions shared
+# with bootstrap, so set those here where they can still be over-
+# ridden by the user, but otherwise take precedence.
+
+: ${AUTOCONF="autoconf"}
+: ${AUTOMAKE="automake"}
+
+
+## -------------------------- ##
+## Source external libraries. ##
+## -------------------------- ##
+
+# Much of our low-level functionality needs to be sourced from external
+# libraries, which are installed to $pkgauxdir.
+
+# Set a version string for this script.
+scriptversion=2015-01-20.17; # UTC
+
+# General shell script boiler plate, and helper functions.
+# Written by Gary V. Vaughan, 2004
+
+# Copyright (C) 2004-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+
+# As a special exception to the GNU General Public License, if you distribute
+# this file as part of a program or library that is built using GNU Libtool,
+# you may include this file under the same distribution terms that you use
+# for the rest of that program.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNES FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# Evaluate this file near the top of your script to gain access to
+# the functions and variables defined here:
+#
+# . `echo "$0" | ${SED-sed} 's|[^/]*$||'`/build-aux/funclib.sh
+#
+# If you need to override any of the default environment variable
+# settings, do that before evaluating this file.
+
+
+## -------------------- ##
+## Shell normalisation. ##
+## -------------------- ##
+
+# Some shells need a little help to be as Bourne compatible as possible.
+# Before doing anything else, make sure all that help has been provided!
+
+DUALCASE=1; export DUALCASE # for MKS sh
+if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then :
emulate sh
NULLCMD=:
- # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
+ # Pre-4.2 versions of Zsh do word splitting on ${1+"$@"}, which
# is contrary to our usage. Disable this feature.
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ case `(set -o) 2>/dev/null` in *posix*) set -o posix ;; esac
fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
-
-# A function that is used when there is no print builtin or printf.
-func_fallback_echo ()
-{
- eval 'cat <<_LTECHO_EOF
-$1
-_LTECHO_EOF'
-}
-# NLS nuisances: We save the old values to restore during execute mode.
-lt_user_locale=
-lt_safe_locale=
-for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
+# NLS nuisances: We save the old values in case they are required later.
+_G_user_locale=
+_G_safe_locale=
+for _G_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
do
- eval "if test \"\${$lt_var+set}\" = set; then
- save_$lt_var=\$$lt_var
- $lt_var=C
- export $lt_var
- lt_user_locale=\"$lt_var=\\\$save_\$lt_var; \$lt_user_locale\"
- lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
+ eval "if test set = \"\${$_G_var+set}\"; then
+ save_$_G_var=\$$_G_var
+ $_G_var=C
+ export $_G_var
+ _G_user_locale=\"$_G_var=\\\$save_\$_G_var; \$_G_user_locale\"
+ _G_safe_locale=\"$_G_var=C; \$_G_safe_locale\"
fi"
done
-LC_ALL=C
-LANGUAGE=C
-export LANGUAGE LC_ALL
-$lt_unset CDPATH
+# CDPATH.
+(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+# Make sure IFS has a sensible default
+sp=' '
+nl='
+'
+IFS="$sp $nl"
+
+# There are apparently some retarded systems that use ';' as a PATH separator!
+if test "${PATH_SEPARATOR+set}" != set; then
+ PATH_SEPARATOR=:
+ (PATH='/bin;/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 && {
+ (PATH='/bin:/bin'; FPATH=$PATH; sh -c :) >/dev/null 2>&1 ||
+ PATH_SEPARATOR=';'
+ }
+fi
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
+## ------------------------- ##
+## Locate command utilities. ##
+## ------------------------- ##
+
+
+# func_executable_p FILE
+# ----------------------
+# Check that FILE is an executable regular file.
+func_executable_p ()
+{
+ test -f "$1" && test -x "$1"
+}
+
+
+# func_path_progs PROGS_LIST CHECK_FUNC [PATH]
+# --------------------------------------------
+# Search for either a program that responds to --version with output
+# containing "GNU", or else returned by CHECK_FUNC otherwise, by
+# trying all the directories in PATH with each of the elements of
+# PROGS_LIST.
+#
+# CHECK_FUNC should accept the path to a candidate program, and
+# set $func_check_prog_result if it truncates its output less than
+# $_G_path_prog_max characters.
+func_path_progs ()
+{
+ _G_progs_list=$1
+ _G_check_func=$2
+ _G_PATH=${3-"$PATH"}
+
+ _G_path_prog_max=0
+ _G_path_prog_found=false
+ _G_save_IFS=$IFS; IFS=${PATH_SEPARATOR-:}
+ for _G_dir in $_G_PATH; do
+ IFS=$_G_save_IFS
+ test -z "$_G_dir" && _G_dir=.
+ for _G_prog_name in $_G_progs_list; do
+ for _exeext in '' .EXE; do
+ _G_path_prog=$_G_dir/$_G_prog_name$_exeext
+ func_executable_p "$_G_path_prog" || continue
+ case `"$_G_path_prog" --version 2>&1` in
+ *GNU*) func_path_progs_result=$_G_path_prog _G_path_prog_found=: ;;
+ *) $_G_check_func $_G_path_prog
+ func_path_progs_result=$func_check_prog_result
+ ;;
+ esac
+ $_G_path_prog_found && break 3
+ done
+ done
+ done
+ IFS=$_G_save_IFS
+ test -z "$func_path_progs_result" && {
+ echo "no acceptable sed could be found in \$PATH" >&2
+ exit 1
+ }
+}
+
+
+# We want to be able to use the functions in this file before configure
+# has figured out where the best binaries are kept, which means we have
+# to search for them ourselves - except when the results are already set
+# where we skip the searches.
+
+# Unless the user overrides by setting SED, search the path for either GNU
+# sed, or the sed that truncates its output the least.
+test -z "$SED" && {
+ _G_sed_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
+ for _G_i in 1 2 3 4 5 6 7; do
+ _G_sed_script=$_G_sed_script$nl$_G_sed_script
+ done
+ echo "$_G_sed_script" 2>/dev/null | sed 99q >conftest.sed
+ _G_sed_script=
+
+ func_check_prog_sed ()
+ {
+ _G_path_prog=$1
+
+ _G_count=0
+ printf 0123456789 >conftest.in
+ while :
+ do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo '' >> conftest.nl
+ "$_G_path_prog" -f conftest.sed <conftest.nl >conftest.out 2>/dev/null || break
+ diff conftest.out conftest.nl >/dev/null 2>&1 || break
+ _G_count=`expr $_G_count + 1`
+ if test "$_G_count" -gt "$_G_path_prog_max"; then
+ # Best one so far, save it but keep looking for a better one
+ func_check_prog_result=$_G_path_prog
+ _G_path_prog_max=$_G_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test 10 -lt "$_G_count" && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out
+ }
+
+ func_path_progs "sed gsed" func_check_prog_sed $PATH:/usr/xpg4/bin
+ rm -f conftest.sed
+ SED=$func_path_progs_result
+}
+
+
+# Unless the user overrides by setting GREP, search the path for either GNU
+# grep, or the grep that truncates its output the least.
+test -z "$GREP" && {
+ func_check_prog_grep ()
+ {
+ _G_path_prog=$1
+
+ _G_count=0
+ _G_path_prog_max=0
+ printf 0123456789 >conftest.in
+ while :
+ do
+ cat conftest.in conftest.in >conftest.tmp
+ mv conftest.tmp conftest.in
+ cp conftest.in conftest.nl
+ echo 'GREP' >> conftest.nl
+ "$_G_path_prog" -e 'GREP$' -e '-(cannot match)-' <conftest.nl >conftest.out 2>/dev/null || break
+ diff conftest.out conftest.nl >/dev/null 2>&1 || break
+ _G_count=`expr $_G_count + 1`
+ if test "$_G_count" -gt "$_G_path_prog_max"; then
+ # Best one so far, save it but keep looking for a better one
+ func_check_prog_result=$_G_path_prog
+ _G_path_prog_max=$_G_count
+ fi
+ # 10*(2^10) chars as input seems more than enough
+ test 10 -lt "$_G_count" && break
+ done
+ rm -f conftest.in conftest.tmp conftest.nl conftest.out
+ }
+
+ func_path_progs "grep ggrep" func_check_prog_grep $PATH:/usr/xpg4/bin
+ GREP=$func_path_progs_result
+}
+
+
+## ------------------------------- ##
+## User overridable command paths. ##
+## ------------------------------- ##
+
+# All uppercase variable names are used for environment variables. These
+# variables can be overridden by the user before calling a script that
+# uses them if a suitable command of that name is not already available
+# in the command search PATH.
: ${CP="cp -f"}
-test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
+: ${ECHO="printf %s\n"}
+: ${EGREP="$GREP -E"}
+: ${FGREP="$GREP -F"}
+: ${LN_S="ln -s"}
: ${MAKE="make"}
: ${MKDIR="mkdir"}
: ${MV="mv -f"}
: ${RM="rm -f"}
: ${SHELL="${CONFIG_SHELL-/bin/sh}"}
-: ${Xsed="$SED -e 1s/^X//"}
-
-# Global variables:
-EXIT_SUCCESS=0
-EXIT_FAILURE=1
-EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
-EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
-
-exit_status=$EXIT_SUCCESS
-
-# Make sure IFS has a sensible default
-lt_nl='
-'
-IFS=" $lt_nl"
-dirname="s,/[^/]*$,,"
-basename="s,^.*/,,"
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE. If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
- func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
-} # func_dirname may be replaced by extended shell implementation
+## -------------------- ##
+## Useful sed snippets. ##
+## -------------------- ##
+sed_dirname='s|/[^/]*$||'
+sed_basename='s|^.*/||'
-# func_basename file
-func_basename ()
-{
- func_basename_result=`$ECHO "${1}" | $SED "$basename"`
-} # func_basename may be replaced by extended shell implementation
+# Sed substitution that helps us do robust quoting. It backslashifies
+# metacharacters that are still active within double-quoted strings.
+sed_quote_subst='s|\([`"$\\]\)|\\\1|g'
+# Same as above, but do not quote variable references.
+sed_double_quote_subst='s/\(["`\\]\)/\\\1/g'
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-# dirname: Compute the dirname of FILE. If nonempty,
-# add APPEND to the result, otherwise set result
-# to NONDIR_REPLACEMENT.
-# value returned in "$func_dirname_result"
-# basename: Compute filename of FILE.
-# value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
- # Extract subdirectory from the argument.
- func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
- if test "X$func_dirname_result" = "X${1}"; then
- func_dirname_result="${3}"
- else
- func_dirname_result="$func_dirname_result${2}"
- fi
- func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
-} # func_dirname_and_basename may be replaced by extended shell implementation
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s|[].[^$\\*\/]|\\&|g'
+# Sed substitution that converts a w32 file name or path
+# that contains forward slashes, into one that contains
+# (escaped) backslashes. A very naive implementation.
+sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
+# Re-'\' parameter expansions in output of sed_double_quote_subst that
+# were '\'-ed in input to the same. If an odd number of '\' preceded a
+# '$' in input to sed_double_quote_subst, that '$' was protected from
+# expansion. Since each input '\' is now two '\'s, look for any number
+# of runs of four '\'s followed by two '\'s and then a '$'. '\' that '$'.
+_G_bs='\\'
+_G_bs2='\\\\'
+_G_bs4='\\\\\\\\'
+_G_dollar='\$'
+sed_double_backslash="\
+ s/$_G_bs4/&\\
+/g
+ s/^$_G_bs2$_G_dollar/$_G_bs&/
+ s/\\([^$_G_bs]\\)$_G_bs2$_G_dollar/\\1$_G_bs2$_G_bs$_G_dollar/g
+ s/\n//g"
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
- esac
-} # func_stripname may be replaced by extended shell implementation
+## ----------------- ##
+## Global variables. ##
+## ----------------- ##
-# These SED scripts presuppose an absolute path with a trailing slash.
-pathcar='s,^/\([^/]*\).*$,\1,'
-pathcdr='s,^/[^/]*,,'
-removedotparts=':dotsl
- s@/\./@/@g
- t dotsl
- s,/\.$,/,'
-collapseslashes='s@/\{1,\}@/@g'
-finalslash='s,/*$,/,'
+# Except for the global variables explicitly listed below, the following
+# functions in the '^func_' namespace, and the '^require_' namespace
+# variables initialised in the 'Resource management' section, sourcing
+# this file will not pollute your global namespace with anything
+# else. There's no portable way to scope variables in Bourne shell
+# though, so actually running these functions will sometimes place
+# results into a variable named after the function, and often use
+# temporary variables in the '^_G_' namespace. If you are careful to
+# avoid using those namespaces casually in your sourcing script, things
+# should continue to work as you expect. And, of course, you can freely
+# overwrite any of the functions or variables defined here before
+# calling anything to customize them.
-# func_normal_abspath PATH
-# Remove doubled-up and trailing slashes, "." path components,
-# and cancel out any ".." path components in PATH after making
-# it an absolute path.
-# value returned in "$func_normal_abspath_result"
-func_normal_abspath ()
-{
- # Start from root dir and reassemble the path.
- func_normal_abspath_result=
- func_normal_abspath_tpath=$1
- func_normal_abspath_altnamespace=
- case $func_normal_abspath_tpath in
- "")
- # Empty path, that just means $cwd.
- func_stripname '' '/' "`pwd`"
- func_normal_abspath_result=$func_stripname_result
- return
- ;;
- # The next three entries are used to spot a run of precisely
- # two leading slashes without using negated character classes;
- # we take advantage of case's first-match behaviour.
- ///*)
- # Unusual form of absolute path, do nothing.
- ;;
- //*)
- # Not necessarily an ordinary path; POSIX reserves leading '//'
- # and for example Cygwin uses it to access remote file shares
- # over CIFS/SMB, so we conserve a leading double slash if found.
- func_normal_abspath_altnamespace=/
- ;;
- /*)
- # Absolute path, do nothing.
- ;;
- *)
- # Relative path, prepend $cwd.
- func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
- ;;
- esac
- # Cancel out all the simple stuff to save iterations. We also want
- # the path to end with a slash for ease of parsing, so make sure
- # there is one (and only one) here.
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
- while :; do
- # Processed it all yet?
- if test "$func_normal_abspath_tpath" = / ; then
- # If we ascended to the root using ".." the result may be empty now.
- if test -z "$func_normal_abspath_result" ; then
- func_normal_abspath_result=/
- fi
- break
- fi
- func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$pathcar"`
- func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
- -e "$pathcdr"`
- # Figure out what to do with it
- case $func_normal_abspath_tcomponent in
- "")
- # Trailing empty path component, ignore it.
- ;;
- ..)
- # Parent dir; strip last assembled component from result.
- func_dirname "$func_normal_abspath_result"
- func_normal_abspath_result=$func_dirname_result
- ;;
- *)
- # Actual path component, append it.
- func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
- ;;
- esac
- done
- # Restore leading double-slash if one was found on entry.
- func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
-}
+EXIT_SUCCESS=0
+EXIT_FAILURE=1
+EXIT_MISMATCH=63 # $? = 63 is used to indicate version mismatch to missing.
+EXIT_SKIP=77 # $? = 77 is used to indicate a skipped test to automake.
-# func_relative_path SRCDIR DSTDIR
-# generates a relative path from SRCDIR to DSTDIR, with a trailing
-# slash if non-empty, suitable for immediately appending a filename
-# without needing to append a separator.
-# value returned in "$func_relative_path_result"
-func_relative_path ()
-{
- func_relative_path_result=
- func_normal_abspath "$1"
- func_relative_path_tlibdir=$func_normal_abspath_result
- func_normal_abspath "$2"
- func_relative_path_tbindir=$func_normal_abspath_result
-
- # Ascend the tree starting from libdir
- while :; do
- # check if we have found a prefix of bindir
- case $func_relative_path_tbindir in
- $func_relative_path_tlibdir)
- # found an exact match
- func_relative_path_tcancelled=
- break
- ;;
- $func_relative_path_tlibdir*)
- # found a matching prefix
- func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
- func_relative_path_tcancelled=$func_stripname_result
- if test -z "$func_relative_path_result"; then
- func_relative_path_result=.
- fi
- break
- ;;
- *)
- func_dirname $func_relative_path_tlibdir
- func_relative_path_tlibdir=${func_dirname_result}
- if test "x$func_relative_path_tlibdir" = x ; then
- # Have to descend all the way to the root!
- func_relative_path_result=../$func_relative_path_result
- func_relative_path_tcancelled=$func_relative_path_tbindir
- break
- fi
- func_relative_path_result=../$func_relative_path_result
- ;;
- esac
- done
+# Allow overriding, eg assuming that you follow the convention of
+# putting '$debug_cmd' at the start of all your functions, you can get
+# bash to show function call trace with:
+#
+# debug_cmd='eval echo "${FUNCNAME[0]} $*" >&2' bash your-script-name
+debug_cmd=${debug_cmd-":"}
+exit_cmd=:
- # Now calculate path; take care to avoid doubling-up slashes.
- func_stripname '' '/' "$func_relative_path_result"
- func_relative_path_result=$func_stripname_result
- func_stripname '/' '/' "$func_relative_path_tcancelled"
- if test "x$func_stripname_result" != x ; then
- func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
- fi
+# By convention, finish your script with:
+#
+# exit $exit_status
+#
+# so that you can set exit_status to non-zero if you want to indicate
+# something went wrong during execution without actually bailing out at
+# the point of failure.
+exit_status=$EXIT_SUCCESS
- # Normalisation. If bindir is libdir, return empty string,
- # else relative path ending with a slash; either way, target
- # file name can be directly appended.
- if test ! -z "$func_relative_path_result"; then
- func_stripname './' '' "$func_relative_path_result/"
- func_relative_path_result=$func_stripname_result
- fi
-}
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath=$0
-# The name of this program:
-func_dirname_and_basename "$progpath"
-progname=$func_basename_result
+# The name of this program.
+progname=`$ECHO "$progpath" |$SED "$sed_basename"`
-# Make sure we have an absolute path for reexecution:
+# Make sure we have an absolute progpath for reexecution:
case $progpath in
[\\/]*|[A-Za-z]:\\*) ;;
*[\\/]*)
- progdir=$func_dirname_result
+ progdir=`$ECHO "$progpath" |$SED "$sed_dirname"`
progdir=`cd "$progdir" && pwd`
- progpath="$progdir/$progname"
+ progpath=$progdir/$progname
;;
*)
- save_IFS="$IFS"
+ _G_IFS=$IFS
IFS=${PATH_SEPARATOR-:}
for progdir in $PATH; do
- IFS="$save_IFS"
+ IFS=$_G_IFS
test -x "$progdir/$progname" && break
done
- IFS="$save_IFS"
+ IFS=$_G_IFS
test -n "$progdir" || progdir=`pwd`
- progpath="$progdir/$progname"
+ progpath=$progdir/$progname
;;
esac
-# Sed substitution that helps us do robust quoting. It backslashifies
-# metacharacters that are still active within double-quoted strings.
-Xsed="${SED}"' -e 1s/^X//'
-sed_quote_subst='s/\([`"$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-# Sed substitution that turns a string into a regex matching for the
-# string literally.
-sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+## ----------------- ##
+## Standard options. ##
+## ----------------- ##
-# Sed substitution that converts a w32 file name or path
-# which contains forward slashes, into one that contains
-# (escaped) backslashes. A very naive implementation.
-lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-
-# Re-`\' parameter expansions in output of double_quote_subst that were
-# `\'-ed in input to the same. If an odd number of `\' preceded a '$'
-# in input to double_quote_subst, that '$' was protected from expansion.
-# Since each input `\' is now two `\'s, look for any number of runs of
-# four `\'s followed by two `\'s and then a '$'. `\' that '$'.
-bs='\\'
-bs2='\\\\'
-bs4='\\\\\\\\'
-dollar='\$'
-sed_double_backslash="\
- s/$bs4/&\\
-/g
- s/^$bs2$dollar/$bs&/
- s/\\([^$bs]\\)$bs2$dollar/\\1$bs2$bs$dollar/g
- s/\n//g"
+# The following options affect the operation of the functions defined
+# below, and should be set appropriately depending on run-time para-
+# meters passed on the command line.
-# Standard options:
opt_dry_run=false
-opt_help=false
opt_quiet=false
opt_verbose=false
-opt_warning=:
-# func_echo arg...
-# Echo program name prefixed message, along with the current mode
-# name if it has been set yet.
-func_echo ()
-{
- $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
-}
+# Categories 'all' and 'none' are always available. Append any others
+# you will pass as the first argument to func_warning from your own
+# code.
+warning_categories=
-# func_verbose arg...
-# Echo program name prefixed message in verbose mode only.
-func_verbose ()
-{
- $opt_verbose && func_echo ${1+"$@"}
+# By default, display warnings according to 'opt_warning_types'. Set
+# 'warning_func' to ':' to elide all warnings, or func_fatal_error to
+# treat the next displayed warning as a fatal error.
+warning_func=func_warn_and_continue
- # A bug in bash halts the script if the last line of a function
- # fails when set -e is in force, so we need another command to
- # work around that:
- :
-}
+# Set to 'all' to display all warnings, 'none' to suppress all
+# warnings, or a space delimited list of some subset of
+# 'warning_categories' to display only the listed warnings.
+opt_warning_types=all
-# func_echo_all arg...
-# Invoke $ECHO with all args, space-separated.
-func_echo_all ()
-{
- $ECHO "$*"
-}
-# func_error arg...
-# Echo program name prefixed message to standard error.
-func_error ()
-{
- $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
-}
+## -------------------- ##
+## Resource management. ##
+## -------------------- ##
-# func_warning arg...
-# Echo program name prefixed warning message to standard error.
-func_warning ()
-{
- $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
+# This section contains definitions for functions that each ensure a
+# particular resource (a file, or a non-empty configuration variable for
+# example) is available, and if appropriate to extract default values
+# from pertinent package files. Call them using their associated
+# 'require_*' variable to ensure that they are executed, at most, once.
+#
+# It's entirely deliberate that calling these functions can set
+# variables that don't obey the namespace limitations obeyed by the rest
+# of this file, in order that that they be as useful as possible to
+# callers.
- # bash bug again:
- :
-}
-# func_fatal_error arg...
-# Echo program name prefixed message to standard error, and exit.
-func_fatal_error ()
+# require_term_colors
+# -------------------
+# Allow display of bold text on terminals that support it.
+require_term_colors=func_require_term_colors
+func_require_term_colors ()
{
- func_error ${1+"$@"}
- exit $EXIT_FAILURE
-}
+ $debug_cmd
+
+ test -t 1 && {
+ # COLORTERM and USE_ANSI_COLORS environment variables take
+ # precedence, because most terminfo databases neglect to describe
+ # whether color sequences are supported.
+ test -n "${COLORTERM+set}" && : ${USE_ANSI_COLORS="1"}
+
+ if test 1 = "$USE_ANSI_COLORS"; then
+ # Standard ANSI escape sequences
+ tc_reset='[0m'
+ tc_bold='[1m'; tc_standout='[7m'
+ tc_red='[31m'; tc_green='[32m'
+ tc_blue='[34m'; tc_cyan='[36m'
+ else
+ # Otherwise trust the terminfo database after all.
+ test -n "`tput sgr0 2>/dev/null`" && {
+ tc_reset=`tput sgr0`
+ test -n "`tput bold 2>/dev/null`" && tc_bold=`tput bold`
+ tc_standout=$tc_bold
+ test -n "`tput smso 2>/dev/null`" && tc_standout=`tput smso`
+ test -n "`tput setaf 1 2>/dev/null`" && tc_red=`tput setaf 1`
+ test -n "`tput setaf 2 2>/dev/null`" && tc_green=`tput setaf 2`
+ test -n "`tput setaf 4 2>/dev/null`" && tc_blue=`tput setaf 4`
+ test -n "`tput setaf 5 2>/dev/null`" && tc_cyan=`tput setaf 5`
+ }
+ fi
+ }
-# func_fatal_help arg...
-# Echo program name prefixed message to standard error, followed by
-# a help hint, and exit.
-func_fatal_help ()
-{
- func_error ${1+"$@"}
- func_fatal_error "$help"
+ require_term_colors=:
}
-help="Try \`$progname --help' for more information." ## default
-# func_grep expression filename
+## ----------------- ##
+## Function library. ##
+## ----------------- ##
+
+# This section contains a variety of useful functions to call in your
+# scripts. Take note of the portable wrappers for features provided by
+# some modern shells, which will fall back to slower equivalents on
+# less featureful shells.
+
+
+# func_append VAR VALUE
+# ---------------------
+# Append VALUE onto the existing contents of VAR.
+
+ # We should try to minimise forks, especially on Windows where they are
+ # unreasonably slow, so skip the feature probes when bash or zsh are
+ # being used:
+ if test set = "${BASH_VERSION+set}${ZSH_VERSION+set}"; then
+ : ${_G_HAVE_ARITH_OP="yes"}
+ : ${_G_HAVE_XSI_OPS="yes"}
+ # The += operator was introduced in bash 3.1
+ case $BASH_VERSION in
+ [12].* | 3.0 | 3.0*) ;;
+ *)
+ : ${_G_HAVE_PLUSEQ_OP="yes"}
+ ;;
+ esac
+ fi
+
+ # _G_HAVE_PLUSEQ_OP
+ # Can be empty, in which case the shell is probed, "yes" if += is
+ # useable or anything else if it does not work.
+ test -z "$_G_HAVE_PLUSEQ_OP" \
+ && (eval 'x=a; x+=" b"; test "a b" = "$x"') 2>/dev/null \
+ && _G_HAVE_PLUSEQ_OP=yes
+
+if test yes = "$_G_HAVE_PLUSEQ_OP"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_append ()
+ {
+ $debug_cmd
+
+ eval "$1+=\$2"
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_append ()
+ {
+ $debug_cmd
+
+ eval "$1=\$$1\$2"
+ }
+fi
+
+
+# func_append_quoted VAR VALUE
+# ----------------------------
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+if test yes = "$_G_HAVE_PLUSEQ_OP"; then
+ eval 'func_append_quoted ()
+ {
+ $debug_cmd
+
+ func_quote_for_eval "$2"
+ eval "$1+=\\ \$func_quote_for_eval_result"
+ }'
+else
+ func_append_quoted ()
+ {
+ $debug_cmd
+
+ func_quote_for_eval "$2"
+ eval "$1=\$$1\\ \$func_quote_for_eval_result"
+ }
+fi
+
+
+# func_append_uniq VAR VALUE
+# --------------------------
+# Append unique VALUE onto the existing contents of VAR, assuming
+# entries are delimited by the first character of VALUE. For example:
+#
+# func_append_uniq options " --another-option option-argument"
+#
+# will only append to $options if " --another-option option-argument "
+# is not already present somewhere in $options already (note spaces at
+# each end implied by leading space in second argument).
+func_append_uniq ()
+{
+ $debug_cmd
+
+ eval _G_current_value='`$ECHO $'$1'`'
+ _G_delim=`expr "$2" : '\(.\)'`
+
+ case $_G_delim$_G_current_value$_G_delim in
+ *"$2$_G_delim"*) ;;
+ *) func_append "$@" ;;
+ esac
+}
+
+
+# func_arith TERM...
+# ------------------
+# Set func_arith_result to the result of evaluating TERMs.
+ test -z "$_G_HAVE_ARITH_OP" \
+ && (eval 'test 2 = $(( 1 + 1 ))') 2>/dev/null \
+ && _G_HAVE_ARITH_OP=yes
+
+if test yes = "$_G_HAVE_ARITH_OP"; then
+ eval 'func_arith ()
+ {
+ $debug_cmd
+
+ func_arith_result=$(( $* ))
+ }'
+else
+ func_arith ()
+ {
+ $debug_cmd
+
+ func_arith_result=`expr "$@"`
+ }
+fi
+
+
+# func_basename FILE
+# ------------------
+# Set func_basename_result to FILE with everything up to and including
+# the last / stripped.
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ # If this shell supports suffix pattern removal, then use it to avoid
+ # forking. Hide the definitions single quotes in case the shell chokes
+ # on unsupported syntax...
+ _b='func_basename_result=${1##*/}'
+ _d='case $1 in
+ */*) func_dirname_result=${1%/*}$2 ;;
+ * ) func_dirname_result=$3 ;;
+ esac'
+
+else
+ # ...otherwise fall back to using sed.
+ _b='func_basename_result=`$ECHO "$1" |$SED "$sed_basename"`'
+ _d='func_dirname_result=`$ECHO "$1" |$SED "$sed_dirname"`
+ if test "X$func_dirname_result" = "X$1"; then
+ func_dirname_result=$3
+ else
+ func_append func_dirname_result "$2"
+ fi'
+fi
+
+eval 'func_basename ()
+{
+ $debug_cmd
+
+ '"$_b"'
+}'
+
+
+# func_dirname FILE APPEND NONDIR_REPLACEMENT
+# -------------------------------------------
+# Compute the dirname of FILE. If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+eval 'func_dirname ()
+{
+ $debug_cmd
+
+ '"$_d"'
+}'
+
+
+# func_dirname_and_basename FILE APPEND NONDIR_REPLACEMENT
+# --------------------------------------------------------
+# Perform func_basename and func_dirname in a single function
+# call:
+# dirname: Compute the dirname of FILE. If nonempty,
+# add APPEND to the result, otherwise set result
+# to NONDIR_REPLACEMENT.
+# value returned in "$func_dirname_result"
+# basename: Compute filename of FILE.
+# value retuned in "$func_basename_result"
+# For efficiency, we do not delegate to the functions above but instead
+# duplicate the functionality here.
+eval 'func_dirname_and_basename ()
+{
+ $debug_cmd
+
+ '"$_b"'
+ '"$_d"'
+}'
+
+
+# func_echo ARG...
+# ----------------
+# Echo program name prefixed message.
+func_echo ()
+{
+ $debug_cmd
+
+ _G_message=$*
+
+ func_echo_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_IFS
+ $ECHO "$progname: $_G_line"
+ done
+ IFS=$func_echo_IFS
+}
+
+
+# func_echo_all ARG...
+# --------------------
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+ $ECHO "$*"
+}
+
+
+# func_echo_infix_1 INFIX ARG...
+# ------------------------------
+# Echo program name, followed by INFIX on the first line, with any
+# additional lines not showing INFIX.
+func_echo_infix_1 ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ _G_infix=$1; shift
+ _G_indent=$_G_infix
+ _G_prefix="$progname: $_G_infix: "
+ _G_message=$*
+
+ # Strip color escape sequences before counting printable length
+ for _G_tc in "$tc_reset" "$tc_bold" "$tc_standout" "$tc_red" "$tc_green" "$tc_blue" "$tc_cyan"
+ do
+ test -n "$_G_tc" && {
+ _G_esc_tc=`$ECHO "$_G_tc" | $SED "$sed_make_literal_regex"`
+ _G_indent=`$ECHO "$_G_indent" | $SED "s|$_G_esc_tc||g"`
+ }
+ done
+ _G_indent="$progname: "`echo "$_G_indent" | $SED 's|.| |g'`" " ## exclude from sc_prohibit_nested_quotes
+
+ func_echo_infix_1_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_infix_1_IFS
+ $ECHO "$_G_prefix$tc_bold$_G_line$tc_reset" >&2
+ _G_prefix=$_G_indent
+ done
+ IFS=$func_echo_infix_1_IFS
+}
+
+
+# func_error ARG...
+# -----------------
+# Echo program name prefixed message to standard error.
+func_error ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ func_echo_infix_1 " $tc_standout${tc_red}error$tc_reset" "$*" >&2
+}
+
+
+# func_fatal_error ARG...
+# -----------------------
+# Echo program name prefixed message to standard error, and exit.
+func_fatal_error ()
+{
+ $debug_cmd
+
+ func_error "$*"
+ exit $EXIT_FAILURE
+}
+
+
+# func_grep EXPRESSION FILENAME
+# -----------------------------
# Check whether EXPRESSION matches any line of FILENAME, without output.
func_grep ()
{
+ $debug_cmd
+
$GREP "$1" "$2" >/dev/null 2>&1
}
-# func_mkdir_p directory-path
+# func_len STRING
+# ---------------
+# Set func_len_result to the length of STRING. STRING may not
+# start with a hyphen.
+ test -z "$_G_HAVE_XSI_OPS" \
+ && (eval 'x=a/b/c;
+ test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+ && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_len ()
+ {
+ $debug_cmd
+
+ func_len_result=${#1}
+ }'
+else
+ func_len ()
+ {
+ $debug_cmd
+
+ func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
+ }
+fi
+
+
+# func_mkdir_p DIRECTORY-PATH
+# ---------------------------
# Make sure the entire path to DIRECTORY-PATH is available.
func_mkdir_p ()
{
- my_directory_path="$1"
- my_dir_list=
+ $debug_cmd
- if test -n "$my_directory_path" && test "$opt_dry_run" != ":"; then
+ _G_directory_path=$1
+ _G_dir_list=
- # Protect directory names starting with `-'
- case $my_directory_path in
- -*) my_directory_path="./$my_directory_path" ;;
+ if test -n "$_G_directory_path" && test : != "$opt_dry_run"; then
+
+ # Protect directory names starting with '-'
+ case $_G_directory_path in
+ -*) _G_directory_path=./$_G_directory_path ;;
esac
# While some portion of DIR does not yet exist...
- while test ! -d "$my_directory_path"; do
+ while test ! -d "$_G_directory_path"; do
# ...make a list in topmost first order. Use a colon delimited
# list incase some portion of path contains whitespace.
- my_dir_list="$my_directory_path:$my_dir_list"
+ _G_dir_list=$_G_directory_path:$_G_dir_list
# If the last portion added has no slash in it, the list is done
- case $my_directory_path in */*) ;; *) break ;; esac
+ case $_G_directory_path in */*) ;; *) break ;; esac
# ...otherwise throw away the child directory and loop
- my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
+ _G_directory_path=`$ECHO "$_G_directory_path" | $SED -e "$sed_dirname"`
done
- my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
+ _G_dir_list=`$ECHO "$_G_dir_list" | $SED 's|:*$||'`
- save_mkdir_p_IFS="$IFS"; IFS=':'
- for my_dir in $my_dir_list; do
- IFS="$save_mkdir_p_IFS"
- # mkdir can fail with a `File exist' error if two processes
+ func_mkdir_p_IFS=$IFS; IFS=:
+ for _G_dir in $_G_dir_list; do
+ IFS=$func_mkdir_p_IFS
+ # mkdir can fail with a 'File exist' error if two processes
# try to create one of the directories concurrently. Don't
# stop in that case!
- $MKDIR "$my_dir" 2>/dev/null || :
+ $MKDIR "$_G_dir" 2>/dev/null || :
done
- IFS="$save_mkdir_p_IFS"
+ IFS=$func_mkdir_p_IFS
# Bail out if we (or some other process) failed to create a directory.
- test -d "$my_directory_path" || \
- func_fatal_error "Failed to create \`$1'"
+ test -d "$_G_directory_path" || \
+ func_fatal_error "Failed to create '$1'"
fi
}
-# func_mktempdir [string]
+# func_mktempdir [BASENAME]
+# -------------------------
# Make a temporary directory that won't clash with other running
# libtool processes, and avoids race conditions if possible. If
-# given, STRING is the basename for that directory.
+# given, BASENAME is the basename for that directory.
func_mktempdir ()
{
- my_template="${TMPDIR-/tmp}/${1-$progname}"
+ $debug_cmd
+
+ _G_template=${TMPDIR-/tmp}/${1-$progname}
- if test "$opt_dry_run" = ":"; then
+ if test : = "$opt_dry_run"; then
# Return a directory name, but don't create it in dry-run mode
- my_tmpdir="${my_template}-$$"
+ _G_tmpdir=$_G_template-$$
else
# If mktemp works, use that first and foremost
- my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
+ _G_tmpdir=`mktemp -d "$_G_template-XXXXXXXX" 2>/dev/null`
- if test ! -d "$my_tmpdir"; then
+ if test ! -d "$_G_tmpdir"; then
# Failing that, at least try and use $RANDOM to avoid a race
- my_tmpdir="${my_template}-${RANDOM-0}$$"
+ _G_tmpdir=$_G_template-${RANDOM-0}$$
- save_mktempdir_umask=`umask`
+ func_mktempdir_umask=`umask`
umask 0077
- $MKDIR "$my_tmpdir"
- umask $save_mktempdir_umask
+ $MKDIR "$_G_tmpdir"
+ umask $func_mktempdir_umask
fi
# If we're not in dry-run mode, bomb out on failure
- test -d "$my_tmpdir" || \
- func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
+ test -d "$_G_tmpdir" || \
+ func_fatal_error "cannot create temporary directory '$_G_tmpdir'"
+ fi
+
+ $ECHO "$_G_tmpdir"
+}
+
+
+# func_normal_abspath PATH
+# ------------------------
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+func_normal_abspath ()
+{
+ $debug_cmd
+
+ # These SED scripts presuppose an absolute path with a trailing slash.
+ _G_pathcar='s|^/\([^/]*\).*$|\1|'
+ _G_pathcdr='s|^/[^/]*||'
+ _G_removedotparts=':dotsl
+ s|/\./|/|g
+ t dotsl
+ s|/\.$|/|'
+ _G_collapseslashes='s|/\{1,\}|/|g'
+ _G_finalslash='s|/*$|/|'
+
+ # Start from root dir and reassemble the path.
+ func_normal_abspath_result=
+ func_normal_abspath_tpath=$1
+ func_normal_abspath_altnamespace=
+ case $func_normal_abspath_tpath in
+ "")
+ # Empty path, that just means $cwd.
+ func_stripname '' '/' "`pwd`"
+ func_normal_abspath_result=$func_stripname_result
+ return
+ ;;
+ # The next three entries are used to spot a run of precisely
+ # two leading slashes without using negated character classes;
+ # we take advantage of case's first-match behaviour.
+ ///*)
+ # Unusual form of absolute path, do nothing.
+ ;;
+ //*)
+ # Not necessarily an ordinary path; POSIX reserves leading '//'
+ # and for example Cygwin uses it to access remote file shares
+ # over CIFS/SMB, so we conserve a leading double slash if found.
+ func_normal_abspath_altnamespace=/
+ ;;
+ /*)
+ # Absolute path, do nothing.
+ ;;
+ *)
+ # Relative path, prepend $cwd.
+ func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+ ;;
+ esac
+
+ # Cancel out all the simple stuff to save iterations. We also want
+ # the path to end with a slash for ease of parsing, so make sure
+ # there is one (and only one) here.
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_removedotparts" -e "$_G_collapseslashes" -e "$_G_finalslash"`
+ while :; do
+ # Processed it all yet?
+ if test / = "$func_normal_abspath_tpath"; then
+ # If we ascended to the root using ".." the result may be empty now.
+ if test -z "$func_normal_abspath_result"; then
+ func_normal_abspath_result=/
+ fi
+ break
+ fi
+ func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_pathcar"`
+ func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+ -e "$_G_pathcdr"`
+ # Figure out what to do with it
+ case $func_normal_abspath_tcomponent in
+ "")
+ # Trailing empty path component, ignore it.
+ ;;
+ ..)
+ # Parent dir; strip last assembled component from result.
+ func_dirname "$func_normal_abspath_result"
+ func_normal_abspath_result=$func_dirname_result
+ ;;
+ *)
+ # Actual path component, append it.
+ func_append func_normal_abspath_result "/$func_normal_abspath_tcomponent"
+ ;;
+ esac
+ done
+ # Restore leading double-slash if one was found on entry.
+ func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
+}
+
+
+# func_notquiet ARG...
+# --------------------
+# Echo program name prefixed message only when not in quiet mode.
+func_notquiet ()
+{
+ $debug_cmd
+
+ $opt_quiet || func_echo ${1+"$@"}
+
+ # A bug in bash halts the script if the last line of a function
+ # fails when set -e is in force, so we need another command to
+ # work around that:
+ :
+}
+
+
+# func_relative_path SRCDIR DSTDIR
+# --------------------------------
+# Set func_relative_path_result to the relative path from SRCDIR to DSTDIR.
+func_relative_path ()
+{
+ $debug_cmd
+
+ func_relative_path_result=
+ func_normal_abspath "$1"
+ func_relative_path_tlibdir=$func_normal_abspath_result
+ func_normal_abspath "$2"
+ func_relative_path_tbindir=$func_normal_abspath_result
+
+ # Ascend the tree starting from libdir
+ while :; do
+ # check if we have found a prefix of bindir
+ case $func_relative_path_tbindir in
+ $func_relative_path_tlibdir)
+ # found an exact match
+ func_relative_path_tcancelled=
+ break
+ ;;
+ $func_relative_path_tlibdir*)
+ # found a matching prefix
+ func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+ func_relative_path_tcancelled=$func_stripname_result
+ if test -z "$func_relative_path_result"; then
+ func_relative_path_result=.
+ fi
+ break
+ ;;
+ *)
+ func_dirname $func_relative_path_tlibdir
+ func_relative_path_tlibdir=$func_dirname_result
+ if test -z "$func_relative_path_tlibdir"; then
+ # Have to descend all the way to the root!
+ func_relative_path_result=../$func_relative_path_result
+ func_relative_path_tcancelled=$func_relative_path_tbindir
+ break
+ fi
+ func_relative_path_result=../$func_relative_path_result
+ ;;
+ esac
+ done
+
+ # Now calculate path; take care to avoid doubling-up slashes.
+ func_stripname '' '/' "$func_relative_path_result"
+ func_relative_path_result=$func_stripname_result
+ func_stripname '/' '/' "$func_relative_path_tcancelled"
+ if test -n "$func_stripname_result"; then
+ func_append func_relative_path_result "/$func_stripname_result"
+ fi
+
+ # Normalisation. If bindir is libdir, return '.' else relative path.
+ if test -n "$func_relative_path_result"; then
+ func_stripname './' '' "$func_relative_path_result"
+ func_relative_path_result=$func_stripname_result
fi
- $ECHO "$my_tmpdir"
+ test -n "$func_relative_path_result" || func_relative_path_result=.
+
+ :
+}
+
+
+# func_quote_for_eval ARG...
+# --------------------------
+# Aesthetically quote ARGs to be evaled later.
+# This function returns two values:
+# i) func_quote_for_eval_result
+# double-quoted, suitable for a subsequent eval
+# ii) func_quote_for_eval_unquoted_result
+# has all characters that are still active within double
+# quotes backslashified.
+func_quote_for_eval ()
+{
+ $debug_cmd
+
+ func_quote_for_eval_unquoted_result=
+ func_quote_for_eval_result=
+ while test 0 -lt $#; do
+ case $1 in
+ *[\\\`\"\$]*)
+ _G_unquoted_arg=`printf '%s\n' "$1" |$SED "$sed_quote_subst"` ;;
+ *)
+ _G_unquoted_arg=$1 ;;
+ esac
+ if test -n "$func_quote_for_eval_unquoted_result"; then
+ func_append func_quote_for_eval_unquoted_result " $_G_unquoted_arg"
+ else
+ func_append func_quote_for_eval_unquoted_result "$_G_unquoted_arg"
+ fi
+
+ case $_G_unquoted_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting, command substitution and variable expansion
+ # for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ _G_quoted_arg=\"$_G_unquoted_arg\"
+ ;;
+ *)
+ _G_quoted_arg=$_G_unquoted_arg
+ ;;
+ esac
+
+ if test -n "$func_quote_for_eval_result"; then
+ func_append func_quote_for_eval_result " $_G_quoted_arg"
+ else
+ func_append func_quote_for_eval_result "$_G_quoted_arg"
+ fi
+ shift
+ done
+}
+
+
+# func_quote_for_expand ARG
+# -------------------------
+# Aesthetically quote ARG to be evaled later; same as above,
+# but do not quote variable references.
+func_quote_for_expand ()
+{
+ $debug_cmd
+
+ case $1 in
+ *[\\\`\"]*)
+ _G_arg=`$ECHO "$1" | $SED \
+ -e "$sed_double_quote_subst" -e "$sed_double_backslash"` ;;
+ *)
+ _G_arg=$1 ;;
+ esac
+
+ case $_G_arg in
+ # Double-quote args containing shell metacharacters to delay
+ # word splitting and command substitution for a subsequent eval.
+ # Many Bourne shells cannot handle close brackets correctly
+ # in scan sets, so we specify it separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ _G_arg=\"$_G_arg\"
+ ;;
+ esac
+
+ func_quote_for_expand_result=$_G_arg
+}
+
+
+# func_stripname PREFIX SUFFIX NAME
+# ---------------------------------
+# strip PREFIX and SUFFIX from NAME, and store in func_stripname_result.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_stripname ()
+ {
+ $debug_cmd
+
+ # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+ # positional parameters, so assign one to ordinary variable first.
+ func_stripname_result=$3
+ func_stripname_result=${func_stripname_result#"$1"}
+ func_stripname_result=${func_stripname_result%"$2"}
+ }'
+else
+ func_stripname ()
+ {
+ $debug_cmd
+
+ case $2 in
+ .*) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%\\\\$2\$%%"`;;
+ *) func_stripname_result=`$ECHO "$3" | $SED -e "s%^$1%%" -e "s%$2\$%%"`;;
+ esac
+ }
+fi
+
+
+# func_show_eval CMD [FAIL_EXP]
+# -----------------------------
+# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it.
+func_show_eval ()
+{
+ $debug_cmd
+
+ _G_cmd=$1
+ _G_fail_exp=${2-':'}
+
+ func_quote_for_expand "$_G_cmd"
+ eval "func_notquiet $func_quote_for_expand_result"
+
+ $opt_dry_run || {
+ eval "$_G_cmd"
+ _G_status=$?
+ if test 0 -ne "$_G_status"; then
+ eval "(exit $_G_status); $_G_fail_exp"
+ fi
+ }
+}
+
+
+# func_show_eval_locale CMD [FAIL_EXP]
+# ------------------------------------
+# Unless opt_quiet is true, then output CMD. Then, if opt_dryrun is
+# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
+# is given, then evaluate it. Use the saved locale for evaluation.
+func_show_eval_locale ()
+{
+ $debug_cmd
+
+ _G_cmd=$1
+ _G_fail_exp=${2-':'}
+
+ $opt_quiet || {
+ func_quote_for_expand "$_G_cmd"
+ eval "func_echo $func_quote_for_expand_result"
+ }
+
+ $opt_dry_run || {
+ eval "$_G_user_locale
+ $_G_cmd"
+ _G_status=$?
+ eval "$_G_safe_locale"
+ if test 0 -ne "$_G_status"; then
+ eval "(exit $_G_status); $_G_fail_exp"
+ fi
+ }
+}
+
+
+# func_tr_sh
+# ----------
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result. All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+ $debug_cmd
+
+ case $1 in
+ [0-9]* | *[!a-zA-Z0-9_]*)
+ func_tr_sh_result=`$ECHO "$1" | $SED -e 's/^\([0-9]\)/_\1/' -e 's/[^a-zA-Z0-9_]/_/g'`
+ ;;
+ * )
+ func_tr_sh_result=$1
+ ;;
+ esac
+}
+
+
+# func_verbose ARG...
+# -------------------
+# Echo program name prefixed message in verbose mode only.
+func_verbose ()
+{
+ $debug_cmd
+
+ $opt_verbose && func_echo "$*"
+
+ :
+}
+
+
+# func_warn_and_continue ARG...
+# -----------------------------
+# Echo program name prefixed warning message to standard error.
+func_warn_and_continue ()
+{
+ $debug_cmd
+
+ $require_term_colors
+
+ func_echo_infix_1 "${tc_red}warning$tc_reset" "$*" >&2
+}
+
+
+# func_warning CATEGORY ARG...
+# ----------------------------
+# Echo program name prefixed warning message to standard error. Warning
+# messages can be filtered according to CATEGORY, where this function
+# elides messages where CATEGORY is not listed in the global variable
+# 'opt_warning_types'.
+func_warning ()
+{
+ $debug_cmd
+
+ # CATEGORY must be in the warning_categories list!
+ case " $warning_categories " in
+ *" $1 "*) ;;
+ *) func_internal_error "invalid warning category '$1'" ;;
+ esac
+
+ _G_category=$1
+ shift
+
+ case " $opt_warning_types " in
+ *" $_G_category "*) $warning_func ${1+"$@"} ;;
+ esac
+}
+
+
+# func_sort_ver VER1 VER2
+# -----------------------
+# 'sort -V' is not generally available.
+# Note this deviates from the version comparison in automake
+# in that it treats 1.5 < 1.5.0, and treats 1.4.4a < 1.4-p3a
+# but this should suffice as we won't be specifying old
+# version formats or redundant trailing .0 in bootstrap.conf.
+# If we did want full compatibility then we should probably
+# use m4_version_compare from autoconf.
+func_sort_ver ()
+{
+ $debug_cmd
+
+ printf '%s\n%s\n' "$1" "$2" \
+ | sort -t. -k 1,1n -k 2,2n -k 3,3n -k 4,4n -k 5,5n -k 6,6n -k 7,7n -k 8,8n -k 9,9n
+}
+
+# func_lt_ver PREV CURR
+# ---------------------
+# Return true if PREV and CURR are in the correct order according to
+# func_sort_ver, otherwise false. Use it like this:
+#
+# func_lt_ver "$prev_ver" "$proposed_ver" || func_fatal_error "..."
+func_lt_ver ()
+{
+ $debug_cmd
+
+ test "x$1" = x`func_sort_ver "$1" "$2" | $SED 1q`
+}
+
+
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
+#! /bin/sh
+
+# Set a version string for this script.
+scriptversion=2014-01-07.03; # UTC
+
+# A portable, pluggable option parser for Bourne shell.
+# Written by Gary V. Vaughan, 2010
+
+# Copyright (C) 2010-2015 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+# Please report bugs or propose patches to gary@gnu.org.
+
+
+## ------ ##
+## Usage. ##
+## ------ ##
+
+# This file is a library for parsing options in your shell scripts along
+# with assorted other useful supporting features that you can make use
+# of too.
+#
+# For the simplest scripts you might need only:
+#
+# #!/bin/sh
+# . relative/path/to/funclib.sh
+# . relative/path/to/options-parser
+# scriptversion=1.0
+# func_options ${1+"$@"}
+# eval set dummy "$func_options_result"; shift
+# ...rest of your script...
+#
+# In order for the '--version' option to work, you will need to have a
+# suitably formatted comment like the one at the top of this file
+# starting with '# Written by ' and ending with '# warranty; '.
+#
+# For '-h' and '--help' to work, you will also need a one line
+# description of your script's purpose in a comment directly above the
+# '# Written by ' line, like the one at the top of this file.
+#
+# The default options also support '--debug', which will turn on shell
+# execution tracing (see the comment above debug_cmd below for another
+# use), and '--verbose' and the func_verbose function to allow your script
+# to display verbose messages only when your user has specified
+# '--verbose'.
+#
+# After sourcing this file, you can plug processing for additional
+# options by amending the variables from the 'Configuration' section
+# below, and following the instructions in the 'Option parsing'
+# section further down.
+
+## -------------- ##
+## Configuration. ##
+## -------------- ##
+
+# You should override these variables in your script after sourcing this
+# file so that they reflect the customisations you have added to the
+# option parser.
+
+# The usage line for option parsing errors and the start of '-h' and
+# '--help' output messages. You can embed shell variables for delayed
+# expansion at the time the message is displayed, but you will need to
+# quote other shell meta-characters carefully to prevent them being
+# expanded when the contents are evaled.
+usage='$progpath [OPTION]...'
+
+# Short help message in response to '-h' and '--help'. Add to this or
+# override it after sourcing this library to reflect the full set of
+# options your script accepts.
+usage_message="\
+ --debug enable verbose shell tracing
+ -W, --warnings=CATEGORY
+ report the warnings falling in CATEGORY [all]
+ -v, --verbose verbosely report processing
+ --version print version information and exit
+ -h, --help print short or long help message and exit
+"
+
+# Additional text appended to 'usage_message' in response to '--help'.
+long_help_message="
+Warning categories include:
+ 'all' show all warnings
+ 'none' turn off all the warnings
+ 'error' warnings are treated as fatal errors"
+
+# Help message printed before fatal option parsing errors.
+fatal_help="Try '\$progname --help' for more information."
+
+
+
+## ------------------------- ##
+## Hook function management. ##
+## ------------------------- ##
+
+# This section contains functions for adding, removing, and running hooks
+# to the main code. A hook is just a named list of of function, that can
+# be run in order later on.
+
+# func_hookable FUNC_NAME
+# -----------------------
+# Declare that FUNC_NAME will run hooks added with
+# 'func_add_hook FUNC_NAME ...'.
+func_hookable ()
+{
+ $debug_cmd
+
+ func_append hookable_fns " $1"
+}
+
+
+# func_add_hook FUNC_NAME HOOK_FUNC
+# ---------------------------------
+# Request that FUNC_NAME call HOOK_FUNC before it returns. FUNC_NAME must
+# first have been declared "hookable" by a call to 'func_hookable'.
+func_add_hook ()
+{
+ $debug_cmd
+
+ case " $hookable_fns " in
+ *" $1 "*) ;;
+ *) func_fatal_error "'$1' does not accept hook functions." ;;
+ esac
+
+ eval func_append ${1}_hooks '" $2"'
+}
+
+
+# func_remove_hook FUNC_NAME HOOK_FUNC
+# ------------------------------------
+# Remove HOOK_FUNC from the list of functions called by FUNC_NAME.
+func_remove_hook ()
+{
+ $debug_cmd
+
+ eval ${1}_hooks='`$ECHO "\$'$1'_hooks" |$SED "s| '$2'||"`'
+}
+
+
+# func_run_hooks FUNC_NAME [ARG]...
+# ---------------------------------
+# Run all hook functions registered to FUNC_NAME.
+# It is assumed that the list of hook functions contains nothing more
+# than a whitespace-delimited list of legal shell function names, and
+# no effort is wasted trying to catch shell meta-characters or preserve
+# whitespace.
+func_run_hooks ()
+{
+ $debug_cmd
+
+ case " $hookable_fns " in
+ *" $1 "*) ;;
+ *) func_fatal_error "'$1' does not support hook funcions.n" ;;
+ esac
+
+ eval _G_hook_fns=\$$1_hooks; shift
+
+ for _G_hook in $_G_hook_fns; do
+ eval $_G_hook '"$@"'
+
+ # store returned options list back into positional
+ # parameters for next 'cmd' execution.
+ eval _G_hook_result=\$${_G_hook}_result
+ eval set dummy "$_G_hook_result"; shift
+ done
+
+ func_quote_for_eval ${1+"$@"}
+ func_run_hooks_result=$func_quote_for_eval_result
+}
+
+
+
+## --------------- ##
+## Option parsing. ##
+## --------------- ##
+
+# In order to add your own option parsing hooks, you must accept the
+# full positional parameter list in your hook function, remove any
+# options that you action, and then pass back the remaining unprocessed
+# options in '<hooked_function_name>_result', escaped suitably for
+# 'eval'. Like this:
+#
+# my_options_prep ()
+# {
+# $debug_cmd
+#
+# # Extend the existing usage message.
+# usage_message=$usage_message'
+# -s, --silent don'\''t print informational messages
+# '
+#
+# func_quote_for_eval ${1+"$@"}
+# my_options_prep_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_options_prep my_options_prep
+#
+#
+# my_silent_option ()
+# {
+# $debug_cmd
+#
+# # Note that for efficiency, we parse as many options as we can
+# # recognise in a loop before passing the remainder back to the
+# # caller on the first unrecognised argument we encounter.
+# while test $# -gt 0; do
+# opt=$1; shift
+# case $opt in
+# --silent|-s) opt_silent=: ;;
+# # Separate non-argument short options:
+# -s*) func_split_short_opt "$_G_opt"
+# set dummy "$func_split_short_opt_name" \
+# "-$func_split_short_opt_arg" ${1+"$@"}
+# shift
+# ;;
+# *) set dummy "$_G_opt" "$*"; shift; break ;;
+# esac
+# done
+#
+# func_quote_for_eval ${1+"$@"}
+# my_silent_option_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_parse_options my_silent_option
+#
+#
+# my_option_validation ()
+# {
+# $debug_cmd
+#
+# $opt_silent && $opt_verbose && func_fatal_help "\
+# '--silent' and '--verbose' options are mutually exclusive."
+#
+# func_quote_for_eval ${1+"$@"}
+# my_option_validation_result=$func_quote_for_eval_result
+# }
+# func_add_hook func_validate_options my_option_validation
+#
+# You'll alse need to manually amend $usage_message to reflect the extra
+# options you parse. It's preferable to append if you can, so that
+# multiple option parsing hooks can be added safely.
+
+
+# func_options [ARG]...
+# ---------------------
+# All the functions called inside func_options are hookable. See the
+# individual implementations for details.
+func_hookable func_options
+func_options ()
+{
+ $debug_cmd
+
+ func_options_prep ${1+"$@"}
+ eval func_parse_options \
+ ${func_options_prep_result+"$func_options_prep_result"}
+ eval func_validate_options \
+ ${func_parse_options_result+"$func_parse_options_result"}
+
+ eval func_run_hooks func_options \
+ ${func_validate_options_result+"$func_validate_options_result"}
+
+ # save modified positional parameters for caller
+ func_options_result=$func_run_hooks_result
}
-# func_quote_for_eval arg
-# Aesthetically quote ARG to be evaled later.
-# This function returns two values: FUNC_QUOTE_FOR_EVAL_RESULT
-# is double-quoted, suitable for a subsequent eval, whereas
-# FUNC_QUOTE_FOR_EVAL_UNQUOTED_RESULT has merely all characters
-# which are still active within double quotes backslashified.
-func_quote_for_eval ()
+# func_options_prep [ARG]...
+# --------------------------
+# All initialisations required before starting the option parse loop.
+# Note that when calling hook functions, we pass through the list of
+# positional parameters. If a hook function modifies that list, and
+# needs to propogate that back to rest of this script, then the complete
+# modified list must be put in 'func_run_hooks_result' before
+# returning.
+func_hookable func_options_prep
+func_options_prep ()
{
- case $1 in
- *[\\\`\"\$]*)
- func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
- *)
- func_quote_for_eval_unquoted_result="$1" ;;
- esac
+ $debug_cmd
- case $func_quote_for_eval_unquoted_result in
- # Double-quote args containing shell metacharacters to delay
- # word splitting, command substitution and and variable
- # expansion for a subsequent eval.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- func_quote_for_eval_result="\"$func_quote_for_eval_unquoted_result\""
- ;;
- *)
- func_quote_for_eval_result="$func_quote_for_eval_unquoted_result"
- esac
+ # Option defaults:
+ opt_verbose=false
+ opt_warning_types=
+
+ func_run_hooks func_options_prep ${1+"$@"}
+
+ # save modified positional parameters for caller
+ func_options_prep_result=$func_run_hooks_result
}
-# func_quote_for_expand arg
-# Aesthetically quote ARG to be evaled later; same as above,
-# but do not quote variable references.
-func_quote_for_expand ()
+# func_parse_options [ARG]...
+# ---------------------------
+# The main option parsing loop.
+func_hookable func_parse_options
+func_parse_options ()
{
- case $1 in
- *[\\\`\"]*)
- my_arg=`$ECHO "$1" | $SED \
- -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
- *)
- my_arg="$1" ;;
- esac
+ $debug_cmd
- case $my_arg in
- # Double-quote args containing shell metacharacters to delay
- # word splitting and command substitution for a subsequent eval.
- # Many Bourne shells cannot handle close brackets correctly
- # in scan sets, so we specify it separately.
- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
- my_arg="\"$my_arg\""
- ;;
- esac
+ func_parse_options_result=
- func_quote_for_expand_result="$my_arg"
-}
+ # this just eases exit handling
+ while test $# -gt 0; do
+ # Defer to hook functions for initial option parsing, so they
+ # get priority in the event of reusing an option name.
+ func_run_hooks func_parse_options ${1+"$@"}
+ # Adjust func_parse_options positional parameters to match
+ eval set dummy "$func_run_hooks_result"; shift
-# func_show_eval cmd [fail_exp]
-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
-# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it.
-func_show_eval ()
-{
- my_cmd="$1"
- my_fail_exp="${2-:}"
+ # Break out of the loop if we already parsed every option.
+ test $# -gt 0 || break
- ${opt_silent-false} || {
- func_quote_for_expand "$my_cmd"
- eval "func_echo $func_quote_for_expand_result"
- }
+ _G_opt=$1
+ shift
+ case $_G_opt in
+ --debug|-x) debug_cmd='set -x'
+ func_echo "enabling shell trace mode"
+ $debug_cmd
+ ;;
+
+ --no-warnings|--no-warning|--no-warn)
+ set dummy --warnings none ${1+"$@"}
+ shift
+ ;;
- if ${opt_dry_run-false}; then :; else
- eval "$my_cmd"
- my_status=$?
- if test "$my_status" -eq 0; then :; else
- eval "(exit $my_status); $my_fail_exp"
- fi
- fi
+ --warnings|--warning|-W)
+ test $# = 0 && func_missing_arg $_G_opt && break
+ case " $warning_categories $1" in
+ *" $1 "*)
+ # trailing space prevents matching last $1 above
+ func_append_uniq opt_warning_types " $1"
+ ;;
+ *all)
+ opt_warning_types=$warning_categories
+ ;;
+ *none)
+ opt_warning_types=none
+ warning_func=:
+ ;;
+ *error)
+ opt_warning_types=$warning_categories
+ warning_func=func_fatal_error
+ ;;
+ *)
+ func_fatal_error \
+ "unsupported warning category: '$1'"
+ ;;
+ esac
+ shift
+ ;;
+
+ --verbose|-v) opt_verbose=: ;;
+ --version) func_version ;;
+ -\?|-h) func_usage ;;
+ --help) func_help ;;
+
+ # Separate optargs to long options (plugins may need this):
+ --*=*) func_split_equals "$_G_opt"
+ set dummy "$func_split_equals_lhs" \
+ "$func_split_equals_rhs" ${1+"$@"}
+ shift
+ ;;
+
+ # Separate optargs to short options:
+ -W*)
+ func_split_short_opt "$_G_opt"
+ set dummy "$func_split_short_opt_name" \
+ "$func_split_short_opt_arg" ${1+"$@"}
+ shift
+ ;;
+
+ # Separate non-argument short options:
+ -\?*|-h*|-v*|-x*)
+ func_split_short_opt "$_G_opt"
+ set dummy "$func_split_short_opt_name" \
+ "-$func_split_short_opt_arg" ${1+"$@"}
+ shift
+ ;;
+
+ --) break ;;
+ -*) func_fatal_help "unrecognised option: '$_G_opt'" ;;
+ *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+ esac
+ done
+
+ # save modified positional parameters for caller
+ func_quote_for_eval ${1+"$@"}
+ func_parse_options_result=$func_quote_for_eval_result
}
-# func_show_eval_locale cmd [fail_exp]
-# Unless opt_silent is true, then output CMD. Then, if opt_dryrun is
-# not true, evaluate CMD. If the evaluation of CMD fails, and FAIL_EXP
-# is given, then evaluate it. Use the saved locale for evaluation.
-func_show_eval_locale ()
+# func_validate_options [ARG]...
+# ------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+func_hookable func_validate_options
+func_validate_options ()
{
- my_cmd="$1"
- my_fail_exp="${2-:}"
+ $debug_cmd
- ${opt_silent-false} || {
- func_quote_for_expand "$my_cmd"
- eval "func_echo $func_quote_for_expand_result"
- }
+ # Display all warnings if -W was not given.
+ test -n "$opt_warning_types" || opt_warning_types=" $warning_categories"
- if ${opt_dry_run-false}; then :; else
- eval "$lt_user_locale
- $my_cmd"
- my_status=$?
- eval "$lt_safe_locale"
- if test "$my_status" -eq 0; then :; else
- eval "(exit $my_status); $my_fail_exp"
- fi
- fi
-}
+ func_run_hooks func_validate_options ${1+"$@"}
-# func_tr_sh
-# Turn $1 into a string suitable for a shell variable name.
-# Result is stored in $func_tr_sh_result. All characters
-# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
-# if $1 begins with a digit, a '_' is prepended as well.
-func_tr_sh ()
-{
- case $1 in
- [0-9]* | *[!a-zA-Z0-9_]*)
- func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
- ;;
- * )
- func_tr_sh_result=$1
- ;;
- esac
+ # Bail if the options were screwed!
+ $exit_cmd $EXIT_FAILURE
+
+ # save modified positional parameters for caller
+ func_validate_options_result=$func_run_hooks_result
}
-# func_version
-# Echo version message to standard output and exit.
-func_version ()
-{
- $opt_debug
- $SED -n '/(C)/!b go
- :more
- /\./!{
- N
- s/\n# / /
- b more
- }
- :go
- /^# '$PROGRAM' (GNU /,/# warranty; / {
- s/^# //
- s/^# *$//
- s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
- p
- }' < "$progpath"
- exit $?
-}
+## ----------------- ##
+## Helper functions. ##
+## ----------------- ##
-# func_usage
-# Echo short help message to standard output and exit.
-func_usage ()
+# This section contains the helper functions used by the rest of the
+# hookable option parser framework in ascii-betical order.
+
+
+# func_fatal_help ARG...
+# ----------------------
+# Echo program name prefixed message to standard error, followed by
+# a help hint, and exit.
+func_fatal_help ()
{
- $opt_debug
+ $debug_cmd
- $SED -n '/^# Usage:/,/^# *.*--help/ {
- s/^# //
- s/^# *$//
- s/\$progname/'$progname'/
- p
- }' < "$progpath"
- echo
- $ECHO "run \`$progname --help | more' for full usage"
- exit $?
+ eval \$ECHO \""Usage: $usage"\"
+ eval \$ECHO \""$fatal_help"\"
+ func_error ${1+"$@"}
+ exit $EXIT_FAILURE
}
-# func_help [NOEXIT]
-# Echo long help message to standard output and exit,
-# unless 'noexit' is passed as argument.
+
+# func_help
+# ---------
+# Echo long help message to standard output and exit.
func_help ()
{
- $opt_debug
-
- $SED -n '/^# Usage:/,/# Report bugs to/ {
- :print
- s/^# //
- s/^# *$//
- s*\$progname*'$progname'*
- s*\$host*'"$host"'*
- s*\$SHELL*'"$SHELL"'*
- s*\$LTCC*'"$LTCC"'*
- s*\$LTCFLAGS*'"$LTCFLAGS"'*
- s*\$LD*'"$LD"'*
- s/\$with_gnu_ld/'"$with_gnu_ld"'/
- s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
- s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
- p
- d
- }
- /^# .* home page:/b print
- /^# General help using/b print
- ' < "$progpath"
- ret=$?
- if test -z "$1"; then
- exit $ret
- fi
+ $debug_cmd
+
+ func_usage_message
+ $ECHO "$long_help_message"
+ exit 0
}
-# func_missing_arg argname
+
+# func_missing_arg ARGNAME
+# ------------------------
# Echo program name prefixed message to standard error and set global
# exit_cmd.
func_missing_arg ()
{
- $opt_debug
+ $debug_cmd
- func_error "missing argument for $1."
+ func_error "Missing argument for '$1'."
exit_cmd=exit
}
-# func_split_short_opt shortopt
+# func_split_equals STRING
+# ------------------------
+# Set func_split_equals_lhs and func_split_equals_rhs shell variables after
+# splitting STRING at the '=' sign.
+test -z "$_G_HAVE_XSI_OPS" \
+ && (eval 'x=a/b/c;
+ test 5aa/bb/cc = "${#x}${x%%/*}${x%/*}${x#*/}${x##*/}"') 2>/dev/null \
+ && _G_HAVE_XSI_OPS=yes
+
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_split_equals ()
+ {
+ $debug_cmd
+
+ func_split_equals_lhs=${1%%=*}
+ func_split_equals_rhs=${1#*=}
+ test "x$func_split_equals_lhs" = "x$1" \
+ && func_split_equals_rhs=
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_split_equals ()
+ {
+ $debug_cmd
+
+ func_split_equals_lhs=`expr "x$1" : 'x\([^=]*\)'`
+ func_split_equals_rhs=
+ test "x$func_split_equals_lhs" = "x$1" \
+ || func_split_equals_rhs=`expr "x$1" : 'x[^=]*=\(.*\)$'`
+ }
+fi #func_split_equals
+
+
+# func_split_short_opt SHORTOPT
+# -----------------------------
# Set func_split_short_opt_name and func_split_short_opt_arg shell
# variables after splitting SHORTOPT after the 2nd character.
-func_split_short_opt ()
+if test yes = "$_G_HAVE_XSI_OPS"
+then
+ # This is an XSI compatible shell, allowing a faster implementation...
+ eval 'func_split_short_opt ()
+ {
+ $debug_cmd
+
+ func_split_short_opt_arg=${1#??}
+ func_split_short_opt_name=${1%"$func_split_short_opt_arg"}
+ }'
+else
+ # ...otherwise fall back to using expr, which is often a shell builtin.
+ func_split_short_opt ()
+ {
+ $debug_cmd
+
+ func_split_short_opt_name=`expr "x$1" : 'x-\(.\)'`
+ func_split_short_opt_arg=`expr "x$1" : 'x-.\(.*\)$'`
+ }
+fi #func_split_short_opt
+
+
+# func_usage
+# ----------
+# Echo short help message to standard output and exit.
+func_usage ()
{
- my_sed_short_opt='1s/^\(..\).*$/\1/;q'
- my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+ $debug_cmd
- func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
- func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
-} # func_split_short_opt may be replaced by extended shell implementation
+ func_usage_message
+ $ECHO "Run '$progname --help |${PAGER-more}' for full usage"
+ exit 0
+}
-# func_split_long_opt longopt
-# Set func_split_long_opt_name and func_split_long_opt_arg shell
-# variables after splitting LONGOPT at the `=' sign.
-func_split_long_opt ()
+# func_usage_message
+# ------------------
+# Echo short help message to standard output.
+func_usage_message ()
{
- my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
- my_sed_long_arg='1s/^--[^=]*=//'
+ $debug_cmd
- func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
- func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
-} # func_split_long_opt may be replaced by extended shell implementation
+ eval \$ECHO \""Usage: $usage"\"
+ echo
+ $SED -n 's|^# ||
+ /^Written by/{
+ x;p;x
+ }
+ h
+ /^Written by/q' < "$progpath"
+ echo
+ eval \$ECHO \""$usage_message"\"
+}
-exit_cmd=:
+# func_version
+# ------------
+# Echo version message to standard output and exit.
+func_version ()
+{
+ $debug_cmd
+ printf '%s\n' "$progname $scriptversion"
+ $SED -n '
+ /(C)/!b go
+ :more
+ /\./!{
+ N
+ s|\n# | |
+ b more
+ }
+ :go
+ /^# Written by /,/# warranty; / {
+ s|^# ||
+ s|^# *$||
+ s|\((C)\)[ 0-9,-]*[ ,-]\([1-9][0-9]* \)|\1 \2|
+ p
+ }
+ /^# Written by / {
+ s|^# ||
+ p
+ }
+ /^warranty; /q' < "$progpath"
+ exit $?
+}
-magic="%%%MAGIC variable%%%"
-magic_exe="%%%MAGIC EXE variable%%%"
+# Local variables:
+# mode: shell-script
+# sh-indentation: 2
+# eval: (add-hook 'before-save-hook 'time-stamp)
+# time-stamp-pattern: "10/scriptversion=%:y-%02m-%02d.%02H; # UTC"
+# time-stamp-time-zone: "UTC"
+# End:
-# Global variables.
-nonopt=
-preserve_args=
-lo2o="s/\\.lo\$/.${objext}/"
-o2lo="s/\\.${objext}\$/.lo/"
-extracted_archives=
-extracted_serial=0
+# Set a version string.
+scriptversion='(GNU libtool) 2.4.6'
-# If this variable is set in any of the actions, the command in it
-# will be execed at the end. This prevents here-documents from being
-# left over by shells.
-exec_cmd=
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
+# func_echo ARG...
+# ----------------
+# Libtool also displays the current mode in messages, so override
+# funclib.sh func_echo with this custom definition.
+func_echo ()
{
- eval "${1}=\$${1}\${2}"
-} # func_append may be replaced by extended shell implementation
+ $debug_cmd
-# func_append_quoted var value
-# Quote VALUE and append to the end of shell variable VAR, separated
-# by a space.
-func_append_quoted ()
-{
- func_quote_for_eval "${2}"
- eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
-} # func_append_quoted may be replaced by extended shell implementation
+ _G_message=$*
+ func_echo_IFS=$IFS
+ IFS=$nl
+ for _G_line in $_G_message; do
+ IFS=$func_echo_IFS
+ $ECHO "$progname${opt_mode+: $opt_mode}: $_G_line"
+ done
+ IFS=$func_echo_IFS
+}
-# func_arith arithmetic-term...
-func_arith ()
+
+# func_warning ARG...
+# -------------------
+# Libtool warnings are not categorized, so override funclib.sh
+# func_warning with this simpler definition.
+func_warning ()
{
- func_arith_result=`expr "${@}"`
-} # func_arith may be replaced by extended shell implementation
+ $debug_cmd
+ $warning_func ${1+"$@"}
+}
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
- func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
-} # func_len may be replaced by extended shell implementation
+## ---------------- ##
+## Options parsing. ##
+## ---------------- ##
+
+# Hook in the functions to make sure our own options are parsed during
+# the option parsing loop.
+
+usage='$progpath [OPTION]... [MODE-ARG]...'
+
+# Short help message in response to '-h'.
+usage_message="Options:
+ --config show all configuration variables
+ --debug enable verbose shell tracing
+ -n, --dry-run display commands without modifying any files
+ --features display basic configuration information and exit
+ --mode=MODE use operation mode MODE
+ --no-warnings equivalent to '-Wnone'
+ --preserve-dup-deps don't remove duplicate dependency libraries
+ --quiet, --silent don't print informational messages
+ --tag=TAG use configuration variables from tag TAG
+ -v, --verbose print more informational messages than default
+ --version print version information
+ -W, --warnings=CATEGORY report the warnings falling in CATEGORY [all]
+ -h, --help, --help-all print short, long, or detailed help message
+"
-# func_lo2o object
-func_lo2o ()
+# Additional text appended to 'usage_message' in response to '--help'.
+func_help ()
{
- func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
-} # func_lo2o may be replaced by extended shell implementation
+ $debug_cmd
+
+ func_usage_message
+ $ECHO "$long_help_message
+
+MODE must be one of the following:
+
+ clean remove files from the build directory
+ compile compile a source file into a libtool object
+ execute automatically set library path, then run a program
+ finish complete the installation of libtool libraries
+ install install libraries or executables
+ link create a library or an executable
+ uninstall remove libraries from an installed directory
+
+MODE-ARGS vary depending on the MODE. When passed as first option,
+'--mode=MODE' may be abbreviated as 'MODE' or a unique abbreviation of that.
+Try '$progname --help --mode=MODE' for a more detailed description of MODE.
+
+When reporting a bug, please describe a test case to reproduce it and
+include the following information:
+
+ host-triplet: $host
+ shell: $SHELL
+ compiler: $LTCC
+ compiler flags: $LTCFLAGS
+ linker: $LD (gnu? $with_gnu_ld)
+ version: $progname (GNU libtool) 2.4.6
+ automake: `($AUTOMAKE --version) 2>/dev/null |$SED 1q`
+ autoconf: `($AUTOCONF --version) 2>/dev/null |$SED 1q`
+
+Report bugs to <bug-libtool@gnu.org>.
+GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+General help using GNU software: <http://www.gnu.org/gethelp/>."
+ exit 0
+}
-# func_xform libobj-or-source
-func_xform ()
-{
- func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
-} # func_xform may be replaced by extended shell implementation
+# func_lo2o OBJECT-NAME
+# ---------------------
+# Transform OBJECT-NAME from a '.lo' suffix to the platform specific
+# object suffix.
+
+lo2o=s/\\.lo\$/.$objext/
+o2lo=s/\\.$objext\$/.lo/
+
+if test yes = "$_G_HAVE_XSI_OPS"; then
+ eval 'func_lo2o ()
+ {
+ case $1 in
+ *.lo) func_lo2o_result=${1%.lo}.$objext ;;
+ * ) func_lo2o_result=$1 ;;
+ esac
+ }'
+
+ # func_xform LIBOBJ-OR-SOURCE
+ # ---------------------------
+ # Transform LIBOBJ-OR-SOURCE from a '.o' or '.c' (or otherwise)
+ # suffix to a '.lo' libtool-object suffix.
+ eval 'func_xform ()
+ {
+ func_xform_result=${1%.*}.lo
+ }'
+else
+ # ...otherwise fall back to using sed.
+ func_lo2o ()
+ {
+ func_lo2o_result=`$ECHO "$1" | $SED "$lo2o"`
+ }
+
+ func_xform ()
+ {
+ func_xform_result=`$ECHO "$1" | $SED 's|\.[^.]*$|.lo|'`
+ }
+fi
-# func_fatal_configuration arg...
+# func_fatal_configuration ARG...
+# -------------------------------
# Echo program name prefixed message to standard error, followed by
# a configuration failure hint, and exit.
func_fatal_configuration ()
{
- func_error ${1+"$@"}
- func_error "See the $PACKAGE documentation for more information."
- func_fatal_error "Fatal configuration error."
+ func__fatal_error ${1+"$@"} \
+ "See the $PACKAGE documentation for more information." \
+ "Fatal configuration error."
}
# func_config
+# -----------
# Display the configuration for all the tags in this script.
func_config ()
{
@@ -915,17 +2149,19 @@ func_config ()
exit $?
}
+
# func_features
+# -------------
# Display the features supported by this script.
func_features ()
{
echo "host: $host"
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
echo "enable shared libraries"
else
echo "disable shared libraries"
fi
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
echo "enable static libraries"
else
echo "disable static libraries"
@@ -934,314 +2170,350 @@ func_features ()
exit $?
}
-# func_enable_tag tagname
+
+# func_enable_tag TAGNAME
+# -----------------------
# Verify that TAGNAME is valid, and either flag an error and exit, or
# enable the TAGNAME tag. We also add TAGNAME to the global $taglist
# variable here.
func_enable_tag ()
{
- # Global variable:
- tagname="$1"
+ # Global variable:
+ tagname=$1
- re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
- re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
- sed_extractcf="/$re_begincf/,/$re_endcf/p"
+ re_begincf="^# ### BEGIN LIBTOOL TAG CONFIG: $tagname\$"
+ re_endcf="^# ### END LIBTOOL TAG CONFIG: $tagname\$"
+ sed_extractcf=/$re_begincf/,/$re_endcf/p
- # Validate tagname.
- case $tagname in
- *[!-_A-Za-z0-9,/]*)
- func_fatal_error "invalid tag name: $tagname"
- ;;
- esac
+ # Validate tagname.
+ case $tagname in
+ *[!-_A-Za-z0-9,/]*)
+ func_fatal_error "invalid tag name: $tagname"
+ ;;
+ esac
- # Don't test for the "default" C tag, as we know it's
- # there but not specially marked.
- case $tagname in
- CC) ;;
+ # Don't test for the "default" C tag, as we know it's
+ # there but not specially marked.
+ case $tagname in
+ CC) ;;
*)
- if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
- taglist="$taglist $tagname"
-
- # Evaluate the configuration. Be careful to quote the path
- # and the sed script, to avoid splitting on whitespace, but
- # also don't use non-portable quotes within backquotes within
- # quotes we have to do it in 2 steps:
- extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
- eval "$extractedcf"
- else
- func_error "ignoring unknown tag $tagname"
- fi
- ;;
- esac
+ if $GREP "$re_begincf" "$progpath" >/dev/null 2>&1; then
+ taglist="$taglist $tagname"
+
+ # Evaluate the configuration. Be careful to quote the path
+ # and the sed script, to avoid splitting on whitespace, but
+ # also don't use non-portable quotes within backquotes within
+ # quotes we have to do it in 2 steps:
+ extractedcf=`$SED -n -e "$sed_extractcf" < "$progpath"`
+ eval "$extractedcf"
+ else
+ func_error "ignoring unknown tag $tagname"
+ fi
+ ;;
+ esac
}
+
# func_check_version_match
+# ------------------------
# Ensure that we are using m4 macros, and libtool script from the same
# release of libtool.
func_check_version_match ()
{
- if test "$package_revision" != "$macro_revision"; then
- if test "$VERSION" != "$macro_version"; then
- if test -z "$macro_version"; then
- cat >&2 <<_LT_EOF
+ if test "$package_revision" != "$macro_revision"; then
+ if test "$VERSION" != "$macro_version"; then
+ if test -z "$macro_version"; then
+ cat >&2 <<_LT_EOF
$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
$progname: definition of this LT_INIT comes from an older release.
$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
$progname: and run autoconf again.
_LT_EOF
- else
- cat >&2 <<_LT_EOF
+ else
+ cat >&2 <<_LT_EOF
$progname: Version mismatch error. This is $PACKAGE $VERSION, but the
$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
$progname: and run autoconf again.
_LT_EOF
- fi
- else
- cat >&2 <<_LT_EOF
+ fi
+ else
+ cat >&2 <<_LT_EOF
$progname: Version mismatch error. This is $PACKAGE $VERSION, revision $package_revision,
$progname: but the definition of this LT_INIT comes from revision $macro_revision.
$progname: You should recreate aclocal.m4 with macros from revision $package_revision
$progname: of $PACKAGE $VERSION and run autoconf again.
_LT_EOF
- fi
+ fi
- exit $EXIT_MISMATCH
- fi
+ exit $EXIT_MISMATCH
+ fi
}
-# Shorthand for --mode=foo, only valid as the first argument
-case $1 in
-clean|clea|cle|cl)
- shift; set dummy --mode clean ${1+"$@"}; shift
- ;;
-compile|compil|compi|comp|com|co|c)
- shift; set dummy --mode compile ${1+"$@"}; shift
- ;;
-execute|execut|execu|exec|exe|ex|e)
- shift; set dummy --mode execute ${1+"$@"}; shift
- ;;
-finish|finis|fini|fin|fi|f)
- shift; set dummy --mode finish ${1+"$@"}; shift
- ;;
-install|instal|insta|inst|ins|in|i)
- shift; set dummy --mode install ${1+"$@"}; shift
- ;;
-link|lin|li|l)
- shift; set dummy --mode link ${1+"$@"}; shift
- ;;
-uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
- shift; set dummy --mode uninstall ${1+"$@"}; shift
- ;;
-esac
+# libtool_options_prep [ARG]...
+# -----------------------------
+# Preparation for options parsed by libtool.
+libtool_options_prep ()
+{
+ $debug_mode
+ # Option defaults:
+ opt_config=false
+ opt_dlopen=
+ opt_dry_run=false
+ opt_help=false
+ opt_mode=
+ opt_preserve_dup_deps=false
+ opt_quiet=false
+ nonopt=
+ preserve_args=
-# Option defaults:
-opt_debug=:
-opt_dry_run=false
-opt_config=false
-opt_preserve_dup_deps=false
-opt_features=false
-opt_finish=false
-opt_help=false
-opt_help_all=false
-opt_silent=:
-opt_warning=:
-opt_verbose=:
-opt_silent=false
-opt_verbose=false
+ # Shorthand for --mode=foo, only valid as the first argument
+ case $1 in
+ clean|clea|cle|cl)
+ shift; set dummy --mode clean ${1+"$@"}; shift
+ ;;
+ compile|compil|compi|comp|com|co|c)
+ shift; set dummy --mode compile ${1+"$@"}; shift
+ ;;
+ execute|execut|execu|exec|exe|ex|e)
+ shift; set dummy --mode execute ${1+"$@"}; shift
+ ;;
+ finish|finis|fini|fin|fi|f)
+ shift; set dummy --mode finish ${1+"$@"}; shift
+ ;;
+ install|instal|insta|inst|ins|in|i)
+ shift; set dummy --mode install ${1+"$@"}; shift
+ ;;
+ link|lin|li|l)
+ shift; set dummy --mode link ${1+"$@"}; shift
+ ;;
+ uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+ shift; set dummy --mode uninstall ${1+"$@"}; shift
+ ;;
+ esac
+
+ # Pass back the list of options.
+ func_quote_for_eval ${1+"$@"}
+ libtool_options_prep_result=$func_quote_for_eval_result
+}
+func_add_hook func_options_prep libtool_options_prep
-# Parse options once, thoroughly. This comes as soon as possible in the
-# script to make things like `--version' happen as quickly as we can.
+# libtool_parse_options [ARG]...
+# ---------------------------------
+# Provide handling for libtool specific options.
+libtool_parse_options ()
{
- # this just eases exit handling
- while test $# -gt 0; do
- opt="$1"
- shift
- case $opt in
- --debug|-x) opt_debug='set -x'
- func_echo "enabling shell trace mode"
- $opt_debug
- ;;
- --dry-run|--dryrun|-n)
- opt_dry_run=:
- ;;
- --config)
- opt_config=:
-func_config
- ;;
- --dlopen|-dlopen)
- optarg="$1"
- opt_dlopen="${opt_dlopen+$opt_dlopen
-}$optarg"
- shift
- ;;
- --preserve-dup-deps)
- opt_preserve_dup_deps=:
- ;;
- --features)
- opt_features=:
-func_features
- ;;
- --finish)
- opt_finish=:
-set dummy --mode finish ${1+"$@"}; shift
- ;;
- --help)
- opt_help=:
- ;;
- --help-all)
- opt_help_all=:
-opt_help=': help-all'
- ;;
- --mode)
- test $# = 0 && func_missing_arg $opt && break
- optarg="$1"
- opt_mode="$optarg"
-case $optarg in
- # Valid mode arguments:
- clean|compile|execute|finish|install|link|relink|uninstall) ;;
-
- # Catch anything else as an error
- *) func_error "invalid argument for $opt"
- exit_cmd=exit
- break
- ;;
-esac
- shift
- ;;
- --no-silent|--no-quiet)
- opt_silent=false
-func_append preserve_args " $opt"
- ;;
- --no-warning|--no-warn)
- opt_warning=false
-func_append preserve_args " $opt"
- ;;
- --no-verbose)
- opt_verbose=false
-func_append preserve_args " $opt"
- ;;
- --silent|--quiet)
- opt_silent=:
-func_append preserve_args " $opt"
- opt_verbose=false
- ;;
- --verbose|-v)
- opt_verbose=:
-func_append preserve_args " $opt"
-opt_silent=false
- ;;
- --tag)
- test $# = 0 && func_missing_arg $opt && break
- optarg="$1"
- opt_tag="$optarg"
-func_append preserve_args " $opt $optarg"
-func_enable_tag "$optarg"
- shift
- ;;
-
- -\?|-h) func_usage ;;
- --help) func_help ;;
- --version) func_version ;;
-
- # Separate optargs to long options:
- --*=*)
- func_split_long_opt "$opt"
- set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
- shift
- ;;
-
- # Separate non-argument short options:
- -\?*|-h*|-n*|-v*)
- func_split_short_opt "$opt"
- set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
- shift
- ;;
-
- --) break ;;
- -*) func_fatal_help "unrecognized option \`$opt'" ;;
- *) set dummy "$opt" ${1+"$@"}; shift; break ;;
- esac
- done
+ $debug_cmd
- # Validate options:
+ # Perform our own loop to consume as many options as possible in
+ # each iteration.
+ while test $# -gt 0; do
+ _G_opt=$1
+ shift
+ case $_G_opt in
+ --dry-run|--dryrun|-n)
+ opt_dry_run=:
+ ;;
+
+ --config) func_config ;;
+
+ --dlopen|-dlopen)
+ opt_dlopen="${opt_dlopen+$opt_dlopen
+}$1"
+ shift
+ ;;
+
+ --preserve-dup-deps)
+ opt_preserve_dup_deps=: ;;
+
+ --features) func_features ;;
+
+ --finish) set dummy --mode finish ${1+"$@"}; shift ;;
+
+ --help) opt_help=: ;;
+
+ --help-all) opt_help=': help-all' ;;
+
+ --mode) test $# = 0 && func_missing_arg $_G_opt && break
+ opt_mode=$1
+ case $1 in
+ # Valid mode arguments:
+ clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+ # Catch anything else as an error
+ *) func_error "invalid argument for $_G_opt"
+ exit_cmd=exit
+ break
+ ;;
+ esac
+ shift
+ ;;
+
+ --no-silent|--no-quiet)
+ opt_quiet=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --no-warnings|--no-warning|--no-warn)
+ opt_warning=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --no-verbose)
+ opt_verbose=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --silent|--quiet)
+ opt_quiet=:
+ opt_verbose=false
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ --tag) test $# = 0 && func_missing_arg $_G_opt && break
+ opt_tag=$1
+ func_append preserve_args " $_G_opt $1"
+ func_enable_tag "$1"
+ shift
+ ;;
+
+ --verbose|-v) opt_quiet=false
+ opt_verbose=:
+ func_append preserve_args " $_G_opt"
+ ;;
+
+ # An option not handled by this hook function:
+ *) set dummy "$_G_opt" ${1+"$@"}; shift; break ;;
+ esac
+ done
- # save first non-option argument
- if test "$#" -gt 0; then
- nonopt="$opt"
- shift
- fi
- # preserve --debug
- test "$opt_debug" = : || func_append preserve_args " --debug"
+ # save modified positional parameters for caller
+ func_quote_for_eval ${1+"$@"}
+ libtool_parse_options_result=$func_quote_for_eval_result
+}
+func_add_hook func_parse_options libtool_parse_options
- case $host in
- *cygwin* | *mingw* | *pw32* | *cegcc*)
- # don't eliminate duplications in $postdeps and $predeps
- opt_duplicate_compiler_generated_deps=:
- ;;
- *)
- opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
- ;;
- esac
- $opt_help || {
- # Sanity checks first:
- func_check_version_match
- if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
- func_fatal_configuration "not configured to build any kind of library"
+# libtool_validate_options [ARG]...
+# ---------------------------------
+# Perform any sanity checks on option settings and/or unconsumed
+# arguments.
+libtool_validate_options ()
+{
+ # save first non-option argument
+ if test 0 -lt $#; then
+ nonopt=$1
+ shift
fi
- # Darwin sucks
- eval std_shrext=\"$shrext_cmds\"
+ # preserve --debug
+ test : = "$debug_cmd" || func_append preserve_args " --debug"
- # Only execute mode is allowed to have -dlopen flags.
- if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
- func_error "unrecognized option \`-dlopen'"
- $ECHO "$help" 1>&2
- exit $EXIT_FAILURE
- fi
+ case $host in
+ # Solaris2 added to fix http://debbugs.gnu.org/cgi/bugreport.cgi?bug=16452
+ # see also: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=59788
+ *cygwin* | *mingw* | *pw32* | *cegcc* | *solaris2* | *os2*)
+ # don't eliminate duplications in $postdeps and $predeps
+ opt_duplicate_compiler_generated_deps=:
+ ;;
+ *)
+ opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
+ ;;
+ esac
- # Change the help message to a mode-specific one.
- generic_help="$help"
- help="Try \`$progname --help --mode=$opt_mode' for more information."
- }
+ $opt_help || {
+ # Sanity checks first:
+ func_check_version_match
+
+ test yes != "$build_libtool_libs" \
+ && test yes != "$build_old_libs" \
+ && func_fatal_configuration "not configured to build any kind of library"
+
+ # Darwin sucks
+ eval std_shrext=\"$shrext_cmds\"
+
+ # Only execute mode is allowed to have -dlopen flags.
+ if test -n "$opt_dlopen" && test execute != "$opt_mode"; then
+ func_error "unrecognized option '-dlopen'"
+ $ECHO "$help" 1>&2
+ exit $EXIT_FAILURE
+ fi
+ # Change the help message to a mode-specific one.
+ generic_help=$help
+ help="Try '$progname --help --mode=$opt_mode' for more information."
+ }
- # Bail if the options were screwed
- $exit_cmd $EXIT_FAILURE
+ # Pass back the unparsed argument list
+ func_quote_for_eval ${1+"$@"}
+ libtool_validate_options_result=$func_quote_for_eval_result
}
+func_add_hook func_validate_options libtool_validate_options
+# Process options as early as possible so that --help and --version
+# can return quickly.
+func_options ${1+"$@"}
+eval set dummy "$func_options_result"; shift
+
## ----------- ##
## Main. ##
## ----------- ##
+magic='%%%MAGIC variable%%%'
+magic_exe='%%%MAGIC EXE variable%%%'
+
+# Global variables.
+extracted_archives=
+extracted_serial=0
+
+# If this variable is set in any of the actions, the command in it
+# will be execed at the end. This prevents here-documents from being
+# left over by shells.
+exec_cmd=
+
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+ eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
+# func_generated_by_libtool
+# True iff stdin has been generated by Libtool. This function is only
+# a basic sanity check; it will hardly flush out determined imposters.
+func_generated_by_libtool_p ()
+{
+ $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+}
+
# func_lalib_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
# This function is only a basic sanity check; it will hardly flush out
# determined imposters.
func_lalib_p ()
{
test -f "$1" &&
- $SED -e 4q "$1" 2>/dev/null \
- | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
+ $SED -e 4q "$1" 2>/dev/null | func_generated_by_libtool_p
}
# func_lalib_unsafe_p file
-# True iff FILE is a libtool `.la' library or `.lo' object file.
+# True iff FILE is a libtool '.la' library or '.lo' object file.
# This function implements the same check as func_lalib_p without
# resorting to external programs. To this end, it redirects stdin and
# closes it afterwards, without saving the original file descriptor.
# As a safety measure, use it only where a negative result would be
-# fatal anyway. Works if `file' does not exist.
+# fatal anyway. Works if 'file' does not exist.
func_lalib_unsafe_p ()
{
lalib_p=no
@@ -1249,13 +2521,13 @@ func_lalib_unsafe_p ()
for lalib_p_l in 1 2 3 4
do
read lalib_p_line
- case "$lalib_p_line" in
+ case $lalib_p_line in
\#\ Generated\ by\ *$PACKAGE* ) lalib_p=yes; break;;
esac
done
exec 0<&5 5<&-
fi
- test "$lalib_p" = yes
+ test yes = "$lalib_p"
}
# func_ltwrapper_script_p file
@@ -1264,7 +2536,8 @@ func_lalib_unsafe_p ()
# determined imposters.
func_ltwrapper_script_p ()
{
- func_lalib_p "$1"
+ test -f "$1" &&
+ $lt_truncate_bin < "$1" 2>/dev/null | func_generated_by_libtool_p
}
# func_ltwrapper_executable_p file
@@ -1289,7 +2562,7 @@ func_ltwrapper_scriptname ()
{
func_dirname_and_basename "$1" "" "."
func_stripname '' '.exe' "$func_basename_result"
- func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
+ func_ltwrapper_scriptname_result=$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper
}
# func_ltwrapper_p file
@@ -1308,11 +2581,13 @@ func_ltwrapper_p ()
# FAIL_CMD may read-access the current command in variable CMD!
func_execute_cmds ()
{
- $opt_debug
+ $debug_cmd
+
save_ifs=$IFS; IFS='~'
for cmd in $1; do
- IFS=$save_ifs
+ IFS=$sp$nl
eval cmd=\"$cmd\"
+ IFS=$save_ifs
func_show_eval "$cmd" "${2-:}"
done
IFS=$save_ifs
@@ -1324,10 +2599,11 @@ func_execute_cmds ()
# Note that it is not necessary on cygwin/mingw to append a dot to
# FILE even if both FILE and FILE.exe exist: automatic-append-.exe
# behavior happens only for exec(3), not for open(2)! Also, sourcing
-# `FILE.' does not work on cygwin managed mounts.
+# 'FILE.' does not work on cygwin managed mounts.
func_source ()
{
- $opt_debug
+ $debug_cmd
+
case $1 in
*/* | *\\*) . "$1" ;;
*) . "./$1" ;;
@@ -1354,10 +2630,10 @@ func_resolve_sysroot ()
# store the result into func_replace_sysroot_result.
func_replace_sysroot ()
{
- case "$lt_sysroot:$1" in
+ case $lt_sysroot:$1 in
?*:"$lt_sysroot"*)
func_stripname "$lt_sysroot" '' "$1"
- func_replace_sysroot_result="=$func_stripname_result"
+ func_replace_sysroot_result='='$func_stripname_result
;;
*)
# Including no sysroot.
@@ -1374,7 +2650,8 @@ func_replace_sysroot ()
# arg is usually of the form 'gcc ...'
func_infer_tag ()
{
- $opt_debug
+ $debug_cmd
+
if test -n "$available_tags" && test -z "$tagname"; then
CC_quoted=
for arg in $CC; do
@@ -1393,7 +2670,7 @@ func_infer_tag ()
for z in $available_tags; do
if $GREP "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
# Evaluate the configuration.
- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
+ eval "`$SED -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
CC_quoted=
for arg in $CC; do
# Double-quote args containing other shell metacharacters.
@@ -1418,7 +2695,7 @@ func_infer_tag ()
# line option must be used.
if test -z "$tagname"; then
func_echo "unable to infer tagged configuration"
- func_fatal_error "specify a tag with \`--tag'"
+ func_fatal_error "specify a tag with '--tag'"
# else
# func_verbose "using $tagname tagged configuration"
fi
@@ -1434,15 +2711,15 @@ func_infer_tag ()
# but don't create it if we're doing a dry run.
func_write_libtool_object ()
{
- write_libobj=${1}
- if test "$build_libtool_libs" = yes; then
- write_lobj=\'${2}\'
+ write_libobj=$1
+ if test yes = "$build_libtool_libs"; then
+ write_lobj=\'$2\'
else
write_lobj=none
fi
- if test "$build_old_libs" = yes; then
- write_oldobj=\'${3}\'
+ if test yes = "$build_old_libs"; then
+ write_oldobj=\'$3\'
else
write_oldobj=none
fi
@@ -1450,7 +2727,7 @@ func_write_libtool_object ()
$opt_dry_run || {
cat >${write_libobj}T <<EOF
# $write_libobj - a libtool object file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
@@ -1462,7 +2739,7 @@ pic_object=$write_lobj
non_pic_object=$write_oldobj
EOF
- $MV "${write_libobj}T" "${write_libobj}"
+ $MV "${write_libobj}T" "$write_libobj"
}
}
@@ -1482,8 +2759,9 @@ EOF
# be empty on error (or when ARG is empty)
func_convert_core_file_wine_to_w32 ()
{
- $opt_debug
- func_convert_core_file_wine_to_w32_result="$1"
+ $debug_cmd
+
+ func_convert_core_file_wine_to_w32_result=$1
if test -n "$1"; then
# Unfortunately, winepath does not exit with a non-zero error code, so we
# are forced to check the contents of stdout. On the other hand, if the
@@ -1491,9 +2769,9 @@ func_convert_core_file_wine_to_w32 ()
# *an error message* to stdout. So we must check for both error code of
# zero AND non-empty stdout, which explains the odd construction:
func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
- if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+ if test "$?" -eq 0 && test -n "$func_convert_core_file_wine_to_w32_tmp"; then
func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
- $SED -e "$lt_sed_naive_backslashify"`
+ $SED -e "$sed_naive_backslashify"`
else
func_convert_core_file_wine_to_w32_result=
fi
@@ -1514,18 +2792,19 @@ func_convert_core_file_wine_to_w32 ()
# are convertible, then the result may be empty.
func_convert_core_path_wine_to_w32 ()
{
- $opt_debug
+ $debug_cmd
+
# unfortunately, winepath doesn't convert paths, only file names
- func_convert_core_path_wine_to_w32_result=""
+ func_convert_core_path_wine_to_w32_result=
if test -n "$1"; then
oldIFS=$IFS
IFS=:
for func_convert_core_path_wine_to_w32_f in $1; do
IFS=$oldIFS
func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
- if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+ if test -n "$func_convert_core_file_wine_to_w32_result"; then
if test -z "$func_convert_core_path_wine_to_w32_result"; then
- func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+ func_convert_core_path_wine_to_w32_result=$func_convert_core_file_wine_to_w32_result
else
func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
fi
@@ -1554,7 +2833,8 @@ func_convert_core_path_wine_to_w32 ()
# environment variable; do not put it in $PATH.
func_cygpath ()
{
- $opt_debug
+ $debug_cmd
+
if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
if test "$?" -ne 0; then
@@ -1563,7 +2843,7 @@ func_cygpath ()
fi
else
func_cygpath_result=
- func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+ func_error "LT_CYGPATH is empty or specifies non-existent file: '$LT_CYGPATH'"
fi
}
#end: func_cygpath
@@ -1574,10 +2854,11 @@ func_cygpath ()
# result in func_convert_core_msys_to_w32_result.
func_convert_core_msys_to_w32 ()
{
- $opt_debug
+ $debug_cmd
+
# awkward: cmd appends spaces to result
func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
- $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+ $SED -e 's/[ ]*$//' -e "$sed_naive_backslashify"`
}
#end: func_convert_core_msys_to_w32
@@ -1588,13 +2869,14 @@ func_convert_core_msys_to_w32 ()
# func_to_host_file_result to ARG1).
func_convert_file_check ()
{
- $opt_debug
- if test -z "$2" && test -n "$1" ; then
+ $debug_cmd
+
+ if test -z "$2" && test -n "$1"; then
func_error "Could not determine host file name corresponding to"
- func_error " \`$1'"
+ func_error " '$1'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback:
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
fi
}
# end func_convert_file_check
@@ -1606,10 +2888,11 @@ func_convert_file_check ()
# func_to_host_file_result to a simplistic fallback value (see below).
func_convert_path_check ()
{
- $opt_debug
+ $debug_cmd
+
if test -z "$4" && test -n "$3"; then
func_error "Could not determine the host path corresponding to"
- func_error " \`$3'"
+ func_error " '$3'"
func_error "Continuing, but uninstalled executables may not work."
# Fallback. This is a deliberately simplistic "conversion" and
# should not be "improved". See libtool.info.
@@ -1618,7 +2901,7 @@ func_convert_path_check ()
func_to_host_path_result=`echo "$3" |
$SED -e "$lt_replace_pathsep_chars"`
else
- func_to_host_path_result="$3"
+ func_to_host_path_result=$3
fi
fi
}
@@ -1630,9 +2913,10 @@ func_convert_path_check ()
# and appending REPL if ORIG matches BACKPAT.
func_convert_path_front_back_pathsep ()
{
- $opt_debug
+ $debug_cmd
+
case $4 in
- $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+ $1 ) func_to_host_path_result=$3$func_to_host_path_result
;;
esac
case $4 in
@@ -1646,7 +2930,7 @@ func_convert_path_front_back_pathsep ()
##################################################
# $build to $host FILE NAME CONVERSION FUNCTIONS #
##################################################
-# invoked via `$to_host_file_cmd ARG'
+# invoked via '$to_host_file_cmd ARG'
#
# In each case, ARG is the path to be converted from $build to $host format.
# Result will be available in $func_to_host_file_result.
@@ -1657,7 +2941,8 @@ func_convert_path_front_back_pathsep ()
# in func_to_host_file_result.
func_to_host_file ()
{
- $opt_debug
+ $debug_cmd
+
$to_host_file_cmd "$1"
}
# end func_to_host_file
@@ -1669,7 +2954,8 @@ func_to_host_file ()
# in (the comma separated) LAZY, no conversion takes place.
func_to_tool_file ()
{
- $opt_debug
+ $debug_cmd
+
case ,$2, in
*,"$to_tool_file_cmd",*)
func_to_tool_file_result=$1
@@ -1687,7 +2973,7 @@ func_to_tool_file ()
# Copy ARG to func_to_host_file_result.
func_convert_file_noop ()
{
- func_to_host_file_result="$1"
+ func_to_host_file_result=$1
}
# end func_convert_file_noop
@@ -1698,11 +2984,12 @@ func_convert_file_noop ()
# func_to_host_file_result.
func_convert_file_msys_to_w32 ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_msys_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+ func_to_host_file_result=$func_convert_core_msys_to_w32_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1714,8 +3001,9 @@ func_convert_file_msys_to_w32 ()
# func_to_host_file_result.
func_convert_file_cygwin_to_w32 ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
# because $build is cygwin, we call "the" cygpath in $PATH; no need to use
# LT_CYGPATH in this case.
@@ -1731,11 +3019,12 @@ func_convert_file_cygwin_to_w32 ()
# and a working winepath. Returns result in func_to_host_file_result.
func_convert_file_nix_to_w32 ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_file_wine_to_w32 "$1"
- func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+ func_to_host_file_result=$func_convert_core_file_wine_to_w32_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1747,12 +3036,13 @@ func_convert_file_nix_to_w32 ()
# Returns result in func_to_host_file_result.
func_convert_file_msys_to_cygwin ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
func_convert_core_msys_to_w32 "$1"
func_cygpath -u "$func_convert_core_msys_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
+ func_to_host_file_result=$func_cygpath_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1765,13 +3055,14 @@ func_convert_file_msys_to_cygwin ()
# in func_to_host_file_result.
func_convert_file_nix_to_cygwin ()
{
- $opt_debug
- func_to_host_file_result="$1"
+ $debug_cmd
+
+ func_to_host_file_result=$1
if test -n "$1"; then
# convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
func_convert_core_file_wine_to_w32 "$1"
func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
- func_to_host_file_result="$func_cygpath_result"
+ func_to_host_file_result=$func_cygpath_result
fi
func_convert_file_check "$1" "$func_to_host_file_result"
}
@@ -1781,7 +3072,7 @@ func_convert_file_nix_to_cygwin ()
#############################################
# $build to $host PATH CONVERSION FUNCTIONS #
#############################################
-# invoked via `$to_host_path_cmd ARG'
+# invoked via '$to_host_path_cmd ARG'
#
# In each case, ARG is the path to be converted from $build to $host format.
# The result will be available in $func_to_host_path_result.
@@ -1805,10 +3096,11 @@ func_convert_file_nix_to_cygwin ()
to_host_path_cmd=
func_init_to_host_path_cmd ()
{
- $opt_debug
+ $debug_cmd
+
if test -z "$to_host_path_cmd"; then
func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
- to_host_path_cmd="func_convert_path_${func_stripname_result}"
+ to_host_path_cmd=func_convert_path_$func_stripname_result
fi
}
@@ -1818,7 +3110,8 @@ func_init_to_host_path_cmd ()
# in func_to_host_path_result.
func_to_host_path ()
{
- $opt_debug
+ $debug_cmd
+
func_init_to_host_path_cmd
$to_host_path_cmd "$1"
}
@@ -1829,7 +3122,7 @@ func_to_host_path ()
# Copy ARG to func_to_host_path_result.
func_convert_path_noop ()
{
- func_to_host_path_result="$1"
+ func_to_host_path_result=$1
}
# end func_convert_path_noop
@@ -1840,8 +3133,9 @@ func_convert_path_noop ()
# func_to_host_path_result.
func_convert_path_msys_to_w32 ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# Remove leading and trailing path separator characters from ARG. MSYS
# behavior is inconsistent here; cygpath turns them into '.;' and ';.';
@@ -1849,7 +3143,7 @@ func_convert_path_msys_to_w32 ()
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+ func_to_host_path_result=$func_convert_core_msys_to_w32_result
func_convert_path_check : ";" \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1863,8 +3157,9 @@ func_convert_path_msys_to_w32 ()
# func_to_host_file_result.
func_convert_path_cygwin_to_w32 ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
@@ -1883,14 +3178,15 @@ func_convert_path_cygwin_to_w32 ()
# a working winepath. Returns result in func_to_host_file_result.
func_convert_path_nix_to_w32 ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
- func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+ func_to_host_path_result=$func_convert_core_path_wine_to_w32_result
func_convert_path_check : ";" \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
@@ -1904,15 +3200,16 @@ func_convert_path_nix_to_w32 ()
# Returns result in func_to_host_file_result.
func_convert_path_msys_to_cygwin ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# See func_convert_path_msys_to_w32:
func_stripname : : "$1"
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
+ func_to_host_path_result=$func_cygpath_result
func_convert_path_check : : \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1927,8 +3224,9 @@ func_convert_path_msys_to_cygwin ()
# func_to_host_file_result.
func_convert_path_nix_to_cygwin ()
{
- $opt_debug
- func_to_host_path_result="$1"
+ $debug_cmd
+
+ func_to_host_path_result=$1
if test -n "$1"; then
# Remove leading and trailing path separator characters from
# ARG. msys behavior is inconsistent here, cygpath turns them
@@ -1937,7 +3235,7 @@ func_convert_path_nix_to_cygwin ()
func_to_host_path_tmp1=$func_stripname_result
func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
- func_to_host_path_result="$func_cygpath_result"
+ func_to_host_path_result=$func_cygpath_result
func_convert_path_check : : \
"$func_to_host_path_tmp1" "$func_to_host_path_result"
func_convert_path_front_back_pathsep ":*" "*:" : "$1"
@@ -1946,13 +3244,31 @@ func_convert_path_nix_to_cygwin ()
# end func_convert_path_nix_to_cygwin
+# func_dll_def_p FILE
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with _LT_DLL_DEF_P in libtool.m4
+func_dll_def_p ()
+{
+ $debug_cmd
+
+ func_dll_def_p_tmp=`$SED -n \
+ -e 's/^[ ]*//' \
+ -e '/^\(;.*\)*$/d' \
+ -e 's/^\(EXPORTS\|LIBRARY\)\([ ].*\)*$/DEF/p' \
+ -e q \
+ "$1"`
+ test DEF = "$func_dll_def_p_tmp"
+}
+
+
# func_mode_compile arg...
func_mode_compile ()
{
- $opt_debug
+ $debug_cmd
+
# Get the compilation command and the source file.
base_compile=
- srcfile="$nonopt" # always keep a non-empty value in "srcfile"
+ srcfile=$nonopt # always keep a non-empty value in "srcfile"
suppress_opt=yes
suppress_output=
arg_mode=normal
@@ -1965,12 +3281,12 @@ func_mode_compile ()
case $arg_mode in
arg )
# do not "continue". Instead, add this to base_compile
- lastarg="$arg"
+ lastarg=$arg
arg_mode=normal
;;
target )
- libobj="$arg"
+ libobj=$arg
arg_mode=normal
continue
;;
@@ -1980,7 +3296,7 @@ func_mode_compile ()
case $arg in
-o)
test -n "$libobj" && \
- func_fatal_error "you cannot specify \`-o' more than once"
+ func_fatal_error "you cannot specify '-o' more than once"
arg_mode=target
continue
;;
@@ -2009,12 +3325,12 @@ func_mode_compile ()
func_stripname '-Wc,' '' "$arg"
args=$func_stripname_result
lastarg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for arg in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_append_quoted lastarg "$arg"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$lastarg"
lastarg=$func_stripname_result
@@ -2027,8 +3343,8 @@ func_mode_compile ()
# Accept the current argument as the source file.
# The previous "srcfile" becomes the current argument.
#
- lastarg="$srcfile"
- srcfile="$arg"
+ lastarg=$srcfile
+ srcfile=$arg
;;
esac # case $arg
;;
@@ -2043,13 +3359,13 @@ func_mode_compile ()
func_fatal_error "you must specify an argument for -Xcompile"
;;
target)
- func_fatal_error "you must specify a target with \`-o'"
+ func_fatal_error "you must specify a target with '-o'"
;;
*)
# Get the name of the library object.
test -z "$libobj" && {
func_basename "$srcfile"
- libobj="$func_basename_result"
+ libobj=$func_basename_result
}
;;
esac
@@ -2069,7 +3385,7 @@ func_mode_compile ()
case $libobj in
*.lo) func_lo2o "$libobj"; obj=$func_lo2o_result ;;
*)
- func_fatal_error "cannot determine name of library object from \`$libobj'"
+ func_fatal_error "cannot determine name of library object from '$libobj'"
;;
esac
@@ -2078,8 +3394,8 @@ func_mode_compile ()
for arg in $later; do
case $arg in
-shared)
- test "$build_libtool_libs" != yes && \
- func_fatal_configuration "can not build a shared library"
+ test yes = "$build_libtool_libs" \
+ || func_fatal_configuration "cannot build a shared library"
build_old_libs=no
continue
;;
@@ -2105,17 +3421,17 @@ func_mode_compile ()
func_quote_for_eval "$libobj"
test "X$libobj" != "X$func_quote_for_eval_result" \
&& $ECHO "X$libobj" | $GREP '[]~#^*{};<>?"'"'"' &()|`$[]' \
- && func_warning "libobj name \`$libobj' may not contain shell special characters."
+ && func_warning "libobj name '$libobj' may not contain shell special characters."
func_dirname_and_basename "$obj" "/" ""
- objname="$func_basename_result"
- xdir="$func_dirname_result"
- lobj=${xdir}$objdir/$objname
+ objname=$func_basename_result
+ xdir=$func_dirname_result
+ lobj=$xdir$objdir/$objname
test -z "$base_compile" && \
func_fatal_help "you must specify a compilation command"
# Delete any leftover library objects.
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
removelist="$obj $lobj $libobj ${libobj}T"
else
removelist="$lobj $libobj ${libobj}T"
@@ -2127,16 +3443,16 @@ func_mode_compile ()
pic_mode=default
;;
esac
- if test "$pic_mode" = no && test "$deplibs_check_method" != pass_all; then
+ if test no = "$pic_mode" && test pass_all != "$deplibs_check_method"; then
# non-PIC code in shared libraries is not supported
pic_mode=default
fi
# Calculate the filename of the output object if compiler does
# not support -o with -c
- if test "$compiler_c_o" = no; then
- output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
- lockfile="$output_obj.lock"
+ if test no = "$compiler_c_o"; then
+ output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.$objext
+ lockfile=$output_obj.lock
else
output_obj=
need_locks=no
@@ -2145,12 +3461,12 @@ func_mode_compile ()
# Lock this critical section if it is needed
# We use this script file to make the link, it avoids creating a new file
- if test "$need_locks" = yes; then
+ if test yes = "$need_locks"; then
until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
func_echo "Waiting for $lockfile to be removed"
sleep 2
done
- elif test "$need_locks" = warn; then
+ elif test warn = "$need_locks"; then
if test -f "$lockfile"; then
$ECHO "\
*** ERROR, $lockfile exists and contains:
@@ -2158,7 +3474,7 @@ func_mode_compile ()
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2180,11 +3496,11 @@ compiler."
qsrcfile=$func_quote_for_eval_result
# Only build a PIC object if we are building libtool libraries.
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
# Without this assignment, base_compile gets emptied.
fbsd_hideous_sh_bug=$base_compile
- if test "$pic_mode" != no; then
+ if test no != "$pic_mode"; then
command="$base_compile $qsrcfile $pic_flag"
else
# Don't build PIC code
@@ -2201,7 +3517,7 @@ compiler."
func_show_eval_locale "$command" \
'test -n "$output_obj" && $RM $removelist; exit $EXIT_FAILURE'
- if test "$need_locks" = warn &&
+ if test warn = "$need_locks" &&
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
$ECHO "\
*** ERROR, $lockfile contains:
@@ -2212,7 +3528,7 @@ $srcfile
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2228,20 +3544,20 @@ compiler."
fi
# Allow error messages only from the first compilation.
- if test "$suppress_opt" = yes; then
+ if test yes = "$suppress_opt"; then
suppress_output=' >/dev/null 2>&1'
fi
fi
# Only build a position-dependent object if we build old libraries.
- if test "$build_old_libs" = yes; then
- if test "$pic_mode" != yes; then
+ if test yes = "$build_old_libs"; then
+ if test yes != "$pic_mode"; then
# Don't build PIC code
command="$base_compile $qsrcfile$pie_flag"
else
command="$base_compile $qsrcfile $pic_flag"
fi
- if test "$compiler_c_o" = yes; then
+ if test yes = "$compiler_c_o"; then
func_append command " -o $obj"
fi
@@ -2250,7 +3566,7 @@ compiler."
func_show_eval_locale "$command" \
'$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
- if test "$need_locks" = warn &&
+ if test warn = "$need_locks" &&
test "X`cat $lockfile 2>/dev/null`" != "X$srcfile"; then
$ECHO "\
*** ERROR, $lockfile contains:
@@ -2261,7 +3577,7 @@ $srcfile
This indicates that another process is trying to use the same
temporary object file, and libtool could not work around it because
-your compiler does not support \`-c' and \`-o' together. If you
+your compiler does not support '-c' and '-o' together. If you
repeat this compilation, it may succeed, by chance, but you had better
avoid parallel builds (make -j) in this platform, or get a better
compiler."
@@ -2281,7 +3597,7 @@ compiler."
func_write_libtool_object "$libobj" "$objdir/$objname" "$objname"
# Unlock the critical section if it was locked
- if test "$need_locks" != no; then
+ if test no != "$need_locks"; then
removelist=$lockfile
$RM "$lockfile"
fi
@@ -2291,7 +3607,7 @@ compiler."
}
$opt_help || {
- test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
+ test compile = "$opt_mode" && func_mode_compile ${1+"$@"}
}
func_mode_help ()
@@ -2311,7 +3627,7 @@ func_mode_help ()
Remove files from the build directory.
RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed
to RM.
If FILE is a libtool library, object or program, all the files associated
@@ -2330,16 +3646,16 @@ This mode accepts the following additional options:
-no-suppress do not suppress compiler output for multiple passes
-prefer-pic try to build PIC objects only
-prefer-non-pic try to build non-PIC objects only
- -shared do not build a \`.o' file suitable for static linking
- -static only build a \`.o' file suitable for static linking
+ -shared do not build a '.o' file suitable for static linking
+ -static only build a '.o' file suitable for static linking
-Wc,FLAG pass FLAG directly to the compiler
-COMPILE-COMMAND is a command to be used in creating a \`standard' object file
+COMPILE-COMMAND is a command to be used in creating a 'standard' object file
from the given SOURCEFILE.
The output file name is determined by removing the directory component from
-SOURCEFILE, then substituting the C source code suffix \`.c' with the
-library object suffix, \`.lo'."
+SOURCEFILE, then substituting the C source code suffix '.c' with the
+library object suffix, '.lo'."
;;
execute)
@@ -2352,7 +3668,7 @@ This mode accepts the following additional options:
-dlopen FILE add the directory containing FILE to the library path
-This mode sets the library path environment variable according to \`-dlopen'
+This mode sets the library path environment variable according to '-dlopen'
flags.
If any of the ARGS are libtool executable wrappers, then they are translated
@@ -2371,7 +3687,7 @@ Complete the installation of libtool libraries.
Each LIBDIR is a directory that contains libtool libraries.
The commands that this mode executes may require superuser privileges. Use
-the \`--dry-run' option if you just want to see what would be executed."
+the '--dry-run' option if you just want to see what would be executed."
;;
install)
@@ -2381,7 +3697,7 @@ the \`--dry-run' option if you just want to see what would be executed."
Install executables or libraries.
INSTALL-COMMAND is the installation command. The first component should be
-either the \`install' or \`cp' program.
+either the 'install' or 'cp' program.
The following components of INSTALL-COMMAND are treated specially:
@@ -2407,7 +3723,7 @@ The following components of LINK-COMMAND are treated specially:
-avoid-version do not add a version suffix if possible
-bindir BINDIR specify path to binaries directory (for systems where
libraries must be found in the PATH setting at runtime)
- -dlopen FILE \`-dlpreopen' FILE if it cannot be dlopened at runtime
+ -dlopen FILE '-dlpreopen' FILE if it cannot be dlopened at runtime
-dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
-export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
-export-symbols SYMFILE
@@ -2421,7 +3737,8 @@ The following components of LINK-COMMAND are treated specially:
-no-install link a not-installable executable
-no-undefined declare that a library does not refer to external symbols
-o OUTPUT-FILE create OUTPUT-FILE from the specified objects
- -objectlist FILE Use a list of object files found in FILE to specify objects
+ -objectlist FILE use a list of object files found in FILE to specify objects
+ -os2dllname NAME force a short DLL name on OS/2 (no effect on other OSes)
-precious-files-regex REGEX
don't remove output files matching REGEX
-release RELEASE specify package release information
@@ -2441,20 +3758,20 @@ The following components of LINK-COMMAND are treated specially:
-Xlinker FLAG pass linker-specific FLAG directly to the linker
-XCClinker FLAG pass link-specific FLAG to the compiler driver (CC)
-All other options (arguments beginning with \`-') are ignored.
+All other options (arguments beginning with '-') are ignored.
-Every other argument is treated as a filename. Files ending in \`.la' are
+Every other argument is treated as a filename. Files ending in '.la' are
treated as uninstalled libtool libraries, other files are standard or library
object files.
-If the OUTPUT-FILE ends in \`.la', then a libtool library is created,
-only library objects (\`.lo' files) may be specified, and \`-rpath' is
+If the OUTPUT-FILE ends in '.la', then a libtool library is created,
+only library objects ('.lo' files) may be specified, and '-rpath' is
required, except when creating a convenience library.
-If OUTPUT-FILE ends in \`.a' or \`.lib', then a standard library is created
-using \`ar' and \`ranlib', or on Windows using \`lib'.
+If OUTPUT-FILE ends in '.a' or '.lib', then a standard library is created
+using 'ar' and 'ranlib', or on Windows using 'lib'.
-If OUTPUT-FILE ends in \`.lo' or \`.${objext}', then a reloadable object file
+If OUTPUT-FILE ends in '.lo' or '.$objext', then a reloadable object file
is created, otherwise an executable program is created."
;;
@@ -2465,7 +3782,7 @@ is created, otherwise an executable program is created."
Remove libraries from an installation directory.
RM is the name of the program to use to delete files associated with each FILE
-(typically \`/bin/rm'). RM-OPTIONS are options (such as \`-f') to be passed
+(typically '/bin/rm'). RM-OPTIONS are options (such as '-f') to be passed
to RM.
If FILE is a libtool library, all the files associated with it are deleted.
@@ -2473,17 +3790,17 @@ Otherwise, only FILE itself is deleted using RM."
;;
*)
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode '$opt_mode'"
;;
esac
echo
- $ECHO "Try \`$progname --help' for more information about other modes."
+ $ECHO "Try '$progname --help' for more information about other modes."
}
# Now that we've collected a possible --mode arg, show help if necessary
if $opt_help; then
- if test "$opt_help" = :; then
+ if test : = "$opt_help"; then
func_mode_help
else
{
@@ -2491,7 +3808,7 @@ if $opt_help; then
for opt_mode in compile link execute install finish uninstall clean; do
func_mode_help
done
- } | sed -n '1p; 2,$s/^Usage:/ or: /p'
+ } | $SED -n '1p; 2,$s/^Usage:/ or: /p'
{
func_help noexit
for opt_mode in compile link execute install finish uninstall clean; do
@@ -2499,7 +3816,7 @@ if $opt_help; then
func_mode_help
done
} |
- sed '1d
+ $SED '1d
/^When reporting/,/^Report/{
H
d
@@ -2516,16 +3833,17 @@ fi
# func_mode_execute arg...
func_mode_execute ()
{
- $opt_debug
+ $debug_cmd
+
# The first argument is the command name.
- cmd="$nonopt"
+ cmd=$nonopt
test -z "$cmd" && \
func_fatal_help "you must specify a COMMAND"
# Handle -dlopen flags immediately.
for file in $opt_dlopen; do
test -f "$file" \
- || func_fatal_help "\`$file' is not a file"
+ || func_fatal_help "'$file' is not a file"
dir=
case $file in
@@ -2535,7 +3853,7 @@ func_mode_execute ()
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
- || func_fatal_help "\`$lib' is not a valid libtool archive"
+ || func_fatal_help "'$lib' is not a valid libtool archive"
# Read the libtool library.
dlname=
@@ -2546,18 +3864,18 @@ func_mode_execute ()
if test -z "$dlname"; then
# Warn if it was a shared library.
test -n "$library_names" && \
- func_warning "\`$file' was not linked with \`-export-dynamic'"
+ func_warning "'$file' was not linked with '-export-dynamic'"
continue
fi
func_dirname "$file" "" "."
- dir="$func_dirname_result"
+ dir=$func_dirname_result
if test -f "$dir/$objdir/$dlname"; then
func_append dir "/$objdir"
else
if test ! -f "$dir/$dlname"; then
- func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
+ func_fatal_error "cannot find '$dlname' in '$dir' or '$dir/$objdir'"
fi
fi
;;
@@ -2565,18 +3883,18 @@ func_mode_execute ()
*.lo)
# Just add the directory containing the .lo file.
func_dirname "$file" "" "."
- dir="$func_dirname_result"
+ dir=$func_dirname_result
;;
*)
- func_warning "\`-dlopen' is ignored for non-libtool libraries and objects"
+ func_warning "'-dlopen' is ignored for non-libtool libraries and objects"
continue
;;
esac
# Get the absolute pathname.
absdir=`cd "$dir" && pwd`
- test -n "$absdir" && dir="$absdir"
+ test -n "$absdir" && dir=$absdir
# Now add the directory to shlibpath_var.
if eval "test -z \"\$$shlibpath_var\""; then
@@ -2588,7 +3906,7 @@ func_mode_execute ()
# This variable tells wrapper scripts just to set shlibpath_var
# rather than running their programs.
- libtool_execute_magic="$magic"
+ libtool_execute_magic=$magic
# Check if any of the arguments is a wrapper script.
args=
@@ -2601,12 +3919,12 @@ func_mode_execute ()
if func_ltwrapper_script_p "$file"; then
func_source "$file"
# Transform arg to wrapped name.
- file="$progdir/$program"
+ file=$progdir/$program
elif func_ltwrapper_executable_p "$file"; then
func_ltwrapper_scriptname "$file"
func_source "$func_ltwrapper_scriptname_result"
# Transform arg to wrapped name.
- file="$progdir/$program"
+ file=$progdir/$program
fi
;;
esac
@@ -2614,7 +3932,15 @@ func_mode_execute ()
func_append_quoted args "$file"
done
- if test "X$opt_dry_run" = Xfalse; then
+ if $opt_dry_run; then
+ # Display what would be done.
+ if test -n "$shlibpath_var"; then
+ eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
+ echo "export $shlibpath_var"
+ fi
+ $ECHO "$cmd$args"
+ exit $EXIT_SUCCESS
+ else
if test -n "$shlibpath_var"; then
# Export the shlibpath_var.
eval "export $shlibpath_var"
@@ -2631,25 +3957,18 @@ func_mode_execute ()
done
# Now prepare to actually exec the command.
- exec_cmd="\$cmd$args"
- else
- # Display what would be done.
- if test -n "$shlibpath_var"; then
- eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
- echo "export $shlibpath_var"
- fi
- $ECHO "$cmd$args"
- exit $EXIT_SUCCESS
+ exec_cmd=\$cmd$args
fi
}
-test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+test execute = "$opt_mode" && func_mode_execute ${1+"$@"}
# func_mode_finish arg...
func_mode_finish ()
{
- $opt_debug
+ $debug_cmd
+
libs=
libdirs=
admincmds=
@@ -2663,11 +3982,11 @@ func_mode_finish ()
if func_lalib_unsafe_p "$opt"; then
func_append libs " $opt"
else
- func_warning "\`$opt' is not a valid libtool archive"
+ func_warning "'$opt' is not a valid libtool archive"
fi
else
- func_fatal_error "invalid argument \`$opt'"
+ func_fatal_error "invalid argument '$opt'"
fi
done
@@ -2682,12 +4001,12 @@ func_mode_finish ()
# Remove sysroot references
if $opt_dry_run; then
for lib in $libs; do
- echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+ echo "removing references to $lt_sysroot and '=' prefixes from $lib"
done
else
tmpdir=`func_mktempdir`
for lib in $libs; do
- sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+ $SED -e "$sysroot_cmd s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
> $tmpdir/tmp-la
mv -f $tmpdir/tmp-la $lib
done
@@ -2712,7 +4031,7 @@ func_mode_finish ()
fi
# Exit here if they wanted silent mode.
- $opt_silent && exit $EXIT_SUCCESS
+ $opt_quiet && exit $EXIT_SUCCESS
if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
echo "----------------------------------------------------------------------"
@@ -2723,27 +4042,27 @@ func_mode_finish ()
echo
echo "If you ever happen to want to link against installed libraries"
echo "in a given directory, LIBDIR, you must either use libtool, and"
- echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+ echo "specify the full pathname of the library, or use the '-LLIBDIR'"
echo "flag during linking and do at least one of the following:"
if test -n "$shlibpath_var"; then
- echo " - add LIBDIR to the \`$shlibpath_var' environment variable"
+ echo " - add LIBDIR to the '$shlibpath_var' environment variable"
echo " during execution"
fi
if test -n "$runpath_var"; then
- echo " - add LIBDIR to the \`$runpath_var' environment variable"
+ echo " - add LIBDIR to the '$runpath_var' environment variable"
echo " during linking"
fi
if test -n "$hardcode_libdir_flag_spec"; then
libdir=LIBDIR
eval flag=\"$hardcode_libdir_flag_spec\"
- $ECHO " - use the \`$flag' linker flag"
+ $ECHO " - use the '$flag' linker flag"
fi
if test -n "$admincmds"; then
$ECHO " - have your system administrator run these commands:$admincmds"
fi
if test -f /etc/ld.so.conf; then
- echo " - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+ echo " - have your system administrator add LIBDIR to '/etc/ld.so.conf'"
fi
echo
@@ -2762,18 +4081,20 @@ func_mode_finish ()
exit $EXIT_SUCCESS
}
-test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
+test finish = "$opt_mode" && func_mode_finish ${1+"$@"}
# func_mode_install arg...
func_mode_install ()
{
- $opt_debug
+ $debug_cmd
+
# There may be an optional sh(1) argument at the beginning of
# install_prog (especially on Windows NT).
- if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ if test "$SHELL" = "$nonopt" || test /bin/sh = "$nonopt" ||
# Allow the use of GNU shtool's install command.
- case $nonopt in *shtool*) :;; *) false;; esac; then
+ case $nonopt in *shtool*) :;; *) false;; esac
+ then
# Aesthetically quote it.
func_quote_for_eval "$nonopt"
install_prog="$func_quote_for_eval_result "
@@ -2800,7 +4121,7 @@ func_mode_install ()
opts=
prev=
install_type=
- isdir=no
+ isdir=false
stripme=
no_mode=:
for arg
@@ -2813,7 +4134,7 @@ func_mode_install ()
fi
case $arg in
- -d) isdir=yes ;;
+ -d) isdir=: ;;
-f)
if $install_cp; then :; else
prev=$arg
@@ -2831,7 +4152,7 @@ func_mode_install ()
*)
# If the previous option needed an argument, then skip it.
if test -n "$prev"; then
- if test "x$prev" = x-m && test -n "$install_override_mode"; then
+ if test X-m = "X$prev" && test -n "$install_override_mode"; then
arg2=$install_override_mode
no_mode=false
fi
@@ -2856,7 +4177,7 @@ func_mode_install ()
func_fatal_help "you must specify an install program"
test -n "$prev" && \
- func_fatal_help "the \`$prev' option requires an argument"
+ func_fatal_help "the '$prev' option requires an argument"
if test -n "$install_override_mode" && $no_mode; then
if $install_cp; then :; else
@@ -2878,19 +4199,19 @@ func_mode_install ()
dest=$func_stripname_result
# Check to see that the destination is a directory.
- test -d "$dest" && isdir=yes
- if test "$isdir" = yes; then
- destdir="$dest"
+ test -d "$dest" && isdir=:
+ if $isdir; then
+ destdir=$dest
destname=
else
func_dirname_and_basename "$dest" "" "."
- destdir="$func_dirname_result"
- destname="$func_basename_result"
+ destdir=$func_dirname_result
+ destname=$func_basename_result
# Not a directory, so check to see that there is only one file specified.
set dummy $files; shift
test "$#" -gt 1 && \
- func_fatal_help "\`$dest' is not a directory"
+ func_fatal_help "'$dest' is not a directory"
fi
case $destdir in
[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -2899,7 +4220,7 @@ func_mode_install ()
case $file in
*.lo) ;;
*)
- func_fatal_help "\`$destdir' must be an absolute directory name"
+ func_fatal_help "'$destdir' must be an absolute directory name"
;;
esac
done
@@ -2908,7 +4229,7 @@ func_mode_install ()
# This variable tells wrapper scripts just to set variables rather
# than running their programs.
- libtool_install_magic="$magic"
+ libtool_install_magic=$magic
staticlibs=
future_libdirs=
@@ -2928,7 +4249,7 @@ func_mode_install ()
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$file" \
- || func_fatal_help "\`$file' is not a valid libtool archive"
+ || func_fatal_help "'$file' is not a valid libtool archive"
library_names=
old_library=
@@ -2950,7 +4271,7 @@ func_mode_install ()
fi
func_dirname "$file" "/" ""
- dir="$func_dirname_result"
+ dir=$func_dirname_result
func_append dir "$objdir"
if test -n "$relink_command"; then
@@ -2964,7 +4285,7 @@ func_mode_install ()
# are installed into $libdir/../bin (currently, that works fine)
# but it's something to keep an eye on.
test "$inst_prefix_dir" = "$destdir" && \
- func_fatal_error "error: cannot install \`$file' to a directory not ending in $libdir"
+ func_fatal_error "error: cannot install '$file' to a directory not ending in $libdir"
if test -n "$inst_prefix_dir"; then
# Stick the inst_prefix_dir data into the link command.
@@ -2973,29 +4294,36 @@ func_mode_install ()
relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
fi
- func_warning "relinking \`$file'"
+ func_warning "relinking '$file'"
func_show_eval "$relink_command" \
- 'func_fatal_error "error: relink \`$file'\'' with the above command before installing it"'
+ 'func_fatal_error "error: relink '\''$file'\'' with the above command before installing it"'
fi
# See the names of the shared library.
set dummy $library_names; shift
if test -n "$1"; then
- realname="$1"
+ realname=$1
shift
- srcname="$realname"
- test -n "$relink_command" && srcname="$realname"T
+ srcname=$realname
+ test -n "$relink_command" && srcname=${realname}T
# Install the shared library and build the symlinks.
func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
'exit $?'
- tstripme="$stripme"
+ tstripme=$stripme
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
case $realname in
*.dll.a)
- tstripme=""
+ tstripme=
+ ;;
+ esac
+ ;;
+ os2*)
+ case $realname in
+ *_dll.a)
+ tstripme=
;;
esac
;;
@@ -3006,7 +4334,7 @@ func_mode_install ()
if test "$#" -gt 0; then
# Delete the old symlinks, and create new ones.
- # Try `ln -sf' first, because the `ln' binary might depend on
+ # Try 'ln -sf' first, because the 'ln' binary might depend on
# the symlink we replace! Solaris /bin/ln does not understand -f,
# so we also need to try rm && ln -s.
for linkname
@@ -3017,14 +4345,14 @@ func_mode_install ()
fi
# Do each command in the postinstall commands.
- lib="$destdir/$realname"
+ lib=$destdir/$realname
func_execute_cmds "$postinstall_cmds" 'exit $?'
fi
# Install the pseudo-library for information purposes.
func_basename "$file"
- name="$func_basename_result"
- instname="$dir/$name"i
+ name=$func_basename_result
+ instname=$dir/${name}i
func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
# Maybe install the static library, too.
@@ -3036,11 +4364,11 @@ func_mode_install ()
# Figure out destination file name, if it wasn't already specified.
if test -n "$destname"; then
- destfile="$destdir/$destname"
+ destfile=$destdir/$destname
else
func_basename "$file"
- destfile="$func_basename_result"
- destfile="$destdir/$destfile"
+ destfile=$func_basename_result
+ destfile=$destdir/$destfile
fi
# Deduce the name of the destination old-style object file.
@@ -3050,11 +4378,11 @@ func_mode_install ()
staticdest=$func_lo2o_result
;;
*.$objext)
- staticdest="$destfile"
+ staticdest=$destfile
destfile=
;;
*)
- func_fatal_help "cannot copy a libtool object to \`$destfile'"
+ func_fatal_help "cannot copy a libtool object to '$destfile'"
;;
esac
@@ -3063,7 +4391,7 @@ func_mode_install ()
func_show_eval "$install_prog $file $destfile" 'exit $?'
# Install the old object if enabled.
- if test "$build_old_libs" = yes; then
+ if test yes = "$build_old_libs"; then
# Deduce the name of the old-style object file.
func_lo2o "$file"
staticobj=$func_lo2o_result
@@ -3075,23 +4403,23 @@ func_mode_install ()
*)
# Figure out destination file name, if it wasn't already specified.
if test -n "$destname"; then
- destfile="$destdir/$destname"
+ destfile=$destdir/$destname
else
func_basename "$file"
- destfile="$func_basename_result"
- destfile="$destdir/$destfile"
+ destfile=$func_basename_result
+ destfile=$destdir/$destfile
fi
# If the file is missing, and there is a .exe on the end, strip it
# because it is most likely a libtool script we actually want to
# install
- stripped_ext=""
+ stripped_ext=
case $file in
*.exe)
if test ! -f "$file"; then
func_stripname '' '.exe' "$file"
file=$func_stripname_result
- stripped_ext=".exe"
+ stripped_ext=.exe
fi
;;
esac
@@ -3119,19 +4447,19 @@ func_mode_install ()
# Check the variables that should have been set.
test -z "$generated_by_libtool_version" && \
- func_fatal_error "invalid libtool wrapper script \`$wrapper'"
+ func_fatal_error "invalid libtool wrapper script '$wrapper'"
- finalize=yes
+ finalize=:
for lib in $notinst_deplibs; do
# Check to see that each library is installed.
libdir=
if test -f "$lib"; then
func_source "$lib"
fi
- libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
+ libfile=$libdir/`$ECHO "$lib" | $SED 's%^.*/%%g'`
if test -n "$libdir" && test ! -f "$libfile"; then
- func_warning "\`$lib' has not been installed in \`$libdir'"
- finalize=no
+ func_warning "'$lib' has not been installed in '$libdir'"
+ finalize=false
fi
done
@@ -3139,29 +4467,29 @@ func_mode_install ()
func_source "$wrapper"
outputname=
- if test "$fast_install" = no && test -n "$relink_command"; then
+ if test no = "$fast_install" && test -n "$relink_command"; then
$opt_dry_run || {
- if test "$finalize" = yes; then
+ if $finalize; then
tmpdir=`func_mktempdir`
func_basename "$file$stripped_ext"
- file="$func_basename_result"
- outputname="$tmpdir/$file"
+ file=$func_basename_result
+ outputname=$tmpdir/$file
# Replace the output file specification.
relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
- $opt_silent || {
+ $opt_quiet || {
func_quote_for_expand "$relink_command"
eval "func_echo $func_quote_for_expand_result"
}
if eval "$relink_command"; then :
else
- func_error "error: relink \`$file' with the above command before installing it"
+ func_error "error: relink '$file' with the above command before installing it"
$opt_dry_run || ${RM}r "$tmpdir"
continue
fi
- file="$outputname"
+ file=$outputname
else
- func_warning "cannot relink \`$file'"
+ func_warning "cannot relink '$file'"
fi
}
else
@@ -3198,10 +4526,10 @@ func_mode_install ()
for file in $staticlibs; do
func_basename "$file"
- name="$func_basename_result"
+ name=$func_basename_result
# Set up the ranlib parameters.
- oldlib="$destdir/$name"
+ oldlib=$destdir/$name
func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
tool_oldlib=$func_to_tool_file_result
@@ -3216,18 +4544,18 @@ func_mode_install ()
done
test -n "$future_libdirs" && \
- func_warning "remember to run \`$progname --finish$future_libdirs'"
+ func_warning "remember to run '$progname --finish$future_libdirs'"
if test -n "$current_libdirs"; then
# Maybe just do a dry run.
$opt_dry_run && current_libdirs=" -n$current_libdirs"
- exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ exec_cmd='$SHELL "$progpath" $preserve_args --finish$current_libdirs'
else
exit $EXIT_SUCCESS
fi
}
-test "$opt_mode" = install && func_mode_install ${1+"$@"}
+test install = "$opt_mode" && func_mode_install ${1+"$@"}
# func_generate_dlsyms outputname originator pic_p
@@ -3235,16 +4563,17 @@ test "$opt_mode" = install && func_mode_install ${1+"$@"}
# a dlpreopen symbol table.
func_generate_dlsyms ()
{
- $opt_debug
- my_outputname="$1"
- my_originator="$2"
- my_pic_p="${3-no}"
- my_prefix=`$ECHO "$my_originator" | sed 's%[^a-zA-Z0-9]%_%g'`
+ $debug_cmd
+
+ my_outputname=$1
+ my_originator=$2
+ my_pic_p=${3-false}
+ my_prefix=`$ECHO "$my_originator" | $SED 's%[^a-zA-Z0-9]%_%g'`
my_dlsyms=
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
if test -n "$NM" && test -n "$global_symbol_pipe"; then
- my_dlsyms="${my_outputname}S.c"
+ my_dlsyms=${my_outputname}S.c
else
func_error "not configured to extract global symbols from dlpreopened files"
fi
@@ -3255,7 +4584,7 @@ func_generate_dlsyms ()
"") ;;
*.c)
# Discover the nlist of each of the dlfiles.
- nlist="$output_objdir/${my_outputname}.nm"
+ nlist=$output_objdir/$my_outputname.nm
func_show_eval "$RM $nlist ${nlist}S ${nlist}T"
@@ -3263,34 +4592,36 @@ func_generate_dlsyms ()
func_verbose "creating $output_objdir/$my_dlsyms"
$opt_dry_run || $ECHO > "$output_objdir/$my_dlsyms" "\
-/* $my_dlsyms - symbol resolution table for \`$my_outputname' dlsym emulation. */
-/* Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION */
+/* $my_dlsyms - symbol resolution table for '$my_outputname' dlsym emulation. */
+/* Generated by $PROGRAM (GNU $PACKAGE) $VERSION */
#ifdef __cplusplus
extern \"C\" {
#endif
-#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#if defined __GNUC__ && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
#endif
/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
relocations are performed -- see ld's documentation on pseudo-relocs. */
# define LT_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
/* This system does not cope well with relocations in const data. */
# define LT_DLSYM_CONST
#else
# define LT_DLSYM_CONST const
#endif
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
/* External symbol declarations for the compiler. */\
"
- if test "$dlself" = yes; then
- func_verbose "generating symbol list for \`$output'"
+ if test yes = "$dlself"; then
+ func_verbose "generating symbol list for '$output'"
$opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
@@ -3298,7 +4629,7 @@ extern \"C\" {
progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
for progfile in $progfiles; do
func_to_tool_file "$progfile" func_convert_file_msys_to_w32
- func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+ func_verbose "extracting global C symbols from '$func_to_tool_file_result'"
$opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
done
@@ -3318,10 +4649,10 @@ extern \"C\" {
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
- export_symbols="$output_objdir/$outputname.exp"
+ export_symbols=$output_objdir/$outputname.exp
$opt_dry_run || {
$RM $export_symbols
- eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
+ eval "$SED -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
case $host in
*cygwin* | *mingw* | *cegcc* )
eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
@@ -3331,7 +4662,7 @@ extern \"C\" {
}
else
$opt_dry_run || {
- eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
+ eval "$SED -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
eval '$MV "$nlist"T "$nlist"'
case $host in
@@ -3345,22 +4676,22 @@ extern \"C\" {
fi
for dlprefile in $dlprefiles; do
- func_verbose "extracting global C symbols from \`$dlprefile'"
+ func_verbose "extracting global C symbols from '$dlprefile'"
func_basename "$dlprefile"
- name="$func_basename_result"
+ name=$func_basename_result
case $host in
*cygwin* | *mingw* | *cegcc* )
# if an import library, we need to obtain dlname
if func_win32_import_lib_p "$dlprefile"; then
func_tr_sh "$dlprefile"
eval "curr_lafile=\$libfile_$func_tr_sh_result"
- dlprefile_dlbasename=""
+ dlprefile_dlbasename=
if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
# Use subshell, to avoid clobbering current variable values
dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
- if test -n "$dlprefile_dlname" ; then
+ if test -n "$dlprefile_dlname"; then
func_basename "$dlprefile_dlname"
- dlprefile_dlbasename="$func_basename_result"
+ dlprefile_dlbasename=$func_basename_result
else
# no lafile. user explicitly requested -dlpreopen <import library>.
$sharedlib_from_linklib_cmd "$dlprefile"
@@ -3368,7 +4699,7 @@ extern \"C\" {
fi
fi
$opt_dry_run || {
- if test -n "$dlprefile_dlbasename" ; then
+ if test -n "$dlprefile_dlbasename"; then
eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
else
func_warning "Could not compute DLL name from $name"
@@ -3424,6 +4755,11 @@ extern \"C\" {
echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
fi
+ func_show_eval '$RM "${nlist}I"'
+ if test -n "$global_symbol_to_import"; then
+ eval "$global_symbol_to_import"' < "$nlist"S > "$nlist"I'
+ fi
+
echo >> "$output_objdir/$my_dlsyms" "\
/* The mapping between symbol names and symbols. */
@@ -3432,11 +4768,30 @@ typedef struct {
void *address;
} lt_dlsymlist;
extern LT_DLSYM_CONST lt_dlsymlist
-lt_${my_prefix}_LTX_preloaded_symbols[];
+lt_${my_prefix}_LTX_preloaded_symbols[];\
+"
+
+ if test -s "$nlist"I; then
+ echo >> "$output_objdir/$my_dlsyms" "\
+static void lt_syminit(void)
+{
+ LT_DLSYM_CONST lt_dlsymlist *symbol = lt_${my_prefix}_LTX_preloaded_symbols;
+ for (; symbol->name; ++symbol)
+ {"
+ $SED 's/.*/ if (STREQ (symbol->name, \"&\")) symbol->address = (void *) \&&;/' < "$nlist"I >> "$output_objdir/$my_dlsyms"
+ echo >> "$output_objdir/$my_dlsyms" "\
+ }
+}"
+ fi
+ echo >> "$output_objdir/$my_dlsyms" "\
LT_DLSYM_CONST lt_dlsymlist
lt_${my_prefix}_LTX_preloaded_symbols[] =
-{\
- { \"$my_originator\", (void *) 0 },"
+{ {\"$my_originator\", (void *) 0},"
+
+ if test -s "$nlist"I; then
+ echo >> "$output_objdir/$my_dlsyms" "\
+ {\"@INIT@\", (void *) <_syminit},"
+ fi
case $need_lib_prefix in
no)
@@ -3478,9 +4833,7 @@ static const void *lt_preloaded_setup() {
*-*-hpux*)
pic_flag_for_symtable=" $pic_flag" ;;
*)
- if test "X$my_pic_p" != Xno; then
- pic_flag_for_symtable=" $pic_flag"
- fi
+ $my_pic_p && pic_flag_for_symtable=" $pic_flag"
;;
esac
;;
@@ -3497,10 +4850,10 @@ static const void *lt_preloaded_setup() {
func_show_eval '(cd $output_objdir && $LTCC$symtab_cflags -c$no_builtin_flag$pic_flag_for_symtable "$my_dlsyms")' 'exit $?'
# Clean up the generated files.
- func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T"'
+ func_show_eval '$RM "$output_objdir/$my_dlsyms" "$nlist" "${nlist}S" "${nlist}T" "${nlist}I"'
# Transform the symbol file into the correct name.
- symfileobj="$output_objdir/${my_outputname}S.$objext"
+ symfileobj=$output_objdir/${my_outputname}S.$objext
case $host in
*cygwin* | *mingw* | *cegcc* )
if test -f "$output_objdir/$my_outputname.def"; then
@@ -3518,7 +4871,7 @@ static const void *lt_preloaded_setup() {
esac
;;
*)
- func_fatal_error "unknown suffix for \`$my_dlsyms'"
+ func_fatal_error "unknown suffix for '$my_dlsyms'"
;;
esac
else
@@ -3532,6 +4885,32 @@ static const void *lt_preloaded_setup() {
fi
}
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+ $debug_cmd
+
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+ test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+ $debug_cmd
+
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+ test -n "$func_cygming_ms_implib_tmp"
+}
+
# func_win32_libid arg
# return the library type of file 'arg'
#
@@ -3541,8 +4920,9 @@ static const void *lt_preloaded_setup() {
# Despite the name, also deal with 64 bit binaries.
func_win32_libid ()
{
- $opt_debug
- win32_libid_type="unknown"
+ $debug_cmd
+
+ win32_libid_type=unknown
win32_fileres=`file -L $1 2>/dev/null`
case $win32_fileres in
*ar\ archive\ import\ library*) # definitely import
@@ -3552,16 +4932,29 @@ func_win32_libid ()
# Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
$EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
- $SED -n -e '
+ case $nm_interface in
+ "MS dumpbin")
+ if func_cygming_ms_implib_p "$1" ||
+ func_cygming_gnu_implib_p "$1"
+ then
+ win32_nmres=import
+ else
+ win32_nmres=
+ fi
+ ;;
+ *)
+ func_to_tool_file "$1" func_convert_file_msys_to_w32
+ win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
+ $SED -n -e '
1,100{
/ I /{
- s,.*,import,
+ s|.*|import|
p
q
}
}'`
+ ;;
+ esac
case $win32_nmres in
import*) win32_libid_type="x86 archive import";;
*) win32_libid_type="x86 archive static";;
@@ -3593,7 +4986,8 @@ func_win32_libid ()
# $sharedlib_from_linklib_result
func_cygming_dll_for_implib ()
{
- $opt_debug
+ $debug_cmd
+
sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
}
@@ -3610,7 +5004,8 @@ func_cygming_dll_for_implib ()
# specified import library.
func_cygming_dll_for_implib_fallback_core ()
{
- $opt_debug
+ $debug_cmd
+
match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
$OBJDUMP -s --section "$1" "$2" 2>/dev/null |
$SED '/^Contents of section '"$match_literal"':/{
@@ -3646,8 +5041,8 @@ func_cygming_dll_for_implib_fallback_core ()
/./p' |
# we now have a list, one entry per line, of the stringified
# contents of the appropriate section of all members of the
- # archive which possess that section. Heuristic: eliminate
- # all those which have a first or second character that is
+ # archive that possess that section. Heuristic: eliminate
+ # all those that have a first or second character that is
# a '.' (that is, objdump's representation of an unprintable
# character.) This should work for all archives with less than
# 0x302f exports -- but will fail for DLLs whose name actually
@@ -3658,30 +5053,6 @@ func_cygming_dll_for_implib_fallback_core ()
$SED -e '/^\./d;/^.\./d;q'
}
-# func_cygming_gnu_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is a GNU/binutils-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_gnu_implib_p ()
-{
- $opt_debug
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
- test -n "$func_cygming_gnu_implib_tmp"
-}
-
-# func_cygming_ms_implib_p ARG
-# This predicate returns with zero status (TRUE) if
-# ARG is an MS-style import library. Returns
-# with nonzero status (FALSE) otherwise.
-func_cygming_ms_implib_p ()
-{
- $opt_debug
- func_to_tool_file "$1" func_convert_file_msys_to_w32
- func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
- test -n "$func_cygming_ms_implib_tmp"
-}
-
# func_cygming_dll_for_implib_fallback ARG
# Platform-specific function to extract the
# name of the DLL associated with the specified
@@ -3695,16 +5066,17 @@ func_cygming_ms_implib_p ()
# $sharedlib_from_linklib_result
func_cygming_dll_for_implib_fallback ()
{
- $opt_debug
- if func_cygming_gnu_implib_p "$1" ; then
+ $debug_cmd
+
+ if func_cygming_gnu_implib_p "$1"; then
# binutils import library
sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
- elif func_cygming_ms_implib_p "$1" ; then
+ elif func_cygming_ms_implib_p "$1"; then
# ms-generated import library
sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
else
# unknown
- sharedlib_from_linklib_result=""
+ sharedlib_from_linklib_result=
fi
}
@@ -3712,10 +5084,11 @@ func_cygming_dll_for_implib_fallback ()
# func_extract_an_archive dir oldlib
func_extract_an_archive ()
{
- $opt_debug
- f_ex_an_ar_dir="$1"; shift
- f_ex_an_ar_oldlib="$1"
- if test "$lock_old_archive_extraction" = yes; then
+ $debug_cmd
+
+ f_ex_an_ar_dir=$1; shift
+ f_ex_an_ar_oldlib=$1
+ if test yes = "$lock_old_archive_extraction"; then
lockfile=$f_ex_an_ar_oldlib.lock
until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
func_echo "Waiting for $lockfile to be removed"
@@ -3724,7 +5097,7 @@ func_extract_an_archive ()
fi
func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
'stat=$?; rm -f "$lockfile"; exit $stat'
- if test "$lock_old_archive_extraction" = yes; then
+ if test yes = "$lock_old_archive_extraction"; then
$opt_dry_run || rm -f "$lockfile"
fi
if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
@@ -3738,22 +5111,23 @@ func_extract_an_archive ()
# func_extract_archives gentop oldlib ...
func_extract_archives ()
{
- $opt_debug
- my_gentop="$1"; shift
+ $debug_cmd
+
+ my_gentop=$1; shift
my_oldlibs=${1+"$@"}
- my_oldobjs=""
- my_xlib=""
- my_xabs=""
- my_xdir=""
+ my_oldobjs=
+ my_xlib=
+ my_xabs=
+ my_xdir=
for my_xlib in $my_oldlibs; do
# Extract the objects.
case $my_xlib in
- [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) my_xabs=$my_xlib ;;
*) my_xabs=`pwd`"/$my_xlib" ;;
esac
func_basename "$my_xlib"
- my_xlib="$func_basename_result"
+ my_xlib=$func_basename_result
my_xlib_u=$my_xlib
while :; do
case " $extracted_archives " in
@@ -3765,7 +5139,7 @@ func_extract_archives ()
esac
done
extracted_archives="$extracted_archives $my_xlib_u"
- my_xdir="$my_gentop/$my_xlib_u"
+ my_xdir=$my_gentop/$my_xlib_u
func_mkdir_p "$my_xdir"
@@ -3778,22 +5152,23 @@ func_extract_archives ()
cd $my_xdir || exit $?
darwin_archive=$my_xabs
darwin_curdir=`pwd`
- darwin_base_archive=`basename "$darwin_archive"`
+ func_basename "$darwin_archive"
+ darwin_base_archive=$func_basename_result
darwin_arches=`$LIPO -info "$darwin_archive" 2>/dev/null | $GREP Architectures 2>/dev/null || true`
if test -n "$darwin_arches"; then
darwin_arches=`$ECHO "$darwin_arches" | $SED -e 's/.*are://'`
darwin_arch=
func_verbose "$darwin_base_archive has multiple architectures $darwin_arches"
- for darwin_arch in $darwin_arches ; do
- func_mkdir_p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- $LIPO -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
- cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
- func_extract_an_archive "`pwd`" "${darwin_base_archive}"
+ for darwin_arch in $darwin_arches; do
+ func_mkdir_p "unfat-$$/$darwin_base_archive-$darwin_arch"
+ $LIPO -thin $darwin_arch -output "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive" "$darwin_archive"
+ cd "unfat-$$/$darwin_base_archive-$darwin_arch"
+ func_extract_an_archive "`pwd`" "$darwin_base_archive"
cd "$darwin_curdir"
- $RM "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
+ $RM "unfat-$$/$darwin_base_archive-$darwin_arch/$darwin_base_archive"
done # $darwin_arches
## Okay now we've a bunch of thin objects, gotta fatten them up :)
- darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$basename" | sort -u`
+ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print | $SED -e "$sed_basename" | sort -u`
darwin_file=
darwin_files=
for darwin_file in $darwin_filelist; do
@@ -3815,7 +5190,7 @@ func_extract_archives ()
my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
done
- func_extract_archives_result="$my_oldobjs"
+ func_extract_archives_result=$my_oldobjs
}
@@ -3830,7 +5205,7 @@ func_extract_archives ()
#
# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
# variable will take. If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
+# will assume that the directory where it is stored is
# the $objdir directory. This is a cygwin/mingw-specific
# behavior.
func_emit_wrapper ()
@@ -3841,7 +5216,7 @@ func_emit_wrapper ()
#! $SHELL
# $output - temporary wrapper script for $objdir/$outputname
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# The $output program cannot be directly executed until all the libtool
# libraries that it depends on are installed.
@@ -3898,9 +5273,9 @@ _LTECHO_EOF'
# Very basic option parsing. These options are (a) specific to
# the libtool wrapper, (b) are identical between the wrapper
-# /script/ and the wrapper /executable/ which is used only on
+# /script/ and the wrapper /executable/ that is used only on
# windows platforms, and (c) all begin with the string "--lt-"
-# (application programs are unlikely to have options which match
+# (application programs are unlikely to have options that match
# this pattern).
#
# There are only two supported options: --lt-debug and
@@ -3933,7 +5308,7 @@ func_parse_lt_options ()
# Print the debug banner immediately:
if test -n \"\$lt_option_debug\"; then
- echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+ echo \"$outputname:$output:\$LINENO: libtool wrapper (GNU $PACKAGE) $VERSION\" 1>&2
fi
}
@@ -3944,7 +5319,7 @@ func_lt_dump_args ()
lt_dump_args_N=1;
for lt_arg
do
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[\$lt_dump_args_N]: \$lt_arg\"
lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
done
}
@@ -3958,7 +5333,7 @@ func_exec_program_core ()
*-*-mingw | *-*-os2* | *-cegcc*)
$ECHO "\
if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir\\\\\$program\" 1>&2
func_lt_dump_args \${1+\"\$@\"} 1>&2
fi
exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
@@ -3968,7 +5343,7 @@ func_exec_program_core ()
*)
$ECHO "\
if test -n \"\$lt_option_debug\"; then
- \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+ \$ECHO \"$outputname:$output:\$LINENO: newargv[0]: \$progdir/\$program\" 1>&2
func_lt_dump_args \${1+\"\$@\"} 1>&2
fi
exec \"\$progdir/\$program\" \${1+\"\$@\"}
@@ -4043,13 +5418,13 @@ func_exec_program ()
test -n \"\$absdir\" && thisdir=\"\$absdir\"
"
- if test "$fast_install" = yes; then
+ if test yes = "$fast_install"; then
$ECHO "\
program=lt-'$outputname'$exeext
progdir=\"\$thisdir/$objdir\"
if test ! -f \"\$progdir/\$program\" ||
- { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | ${SED} 1q\`; \\
+ { file=\`ls -1dt \"\$progdir/\$program\" \"\$progdir/../\$program\" 2>/dev/null | $SED 1q\`; \\
test \"X\$file\" != \"X\$progdir/\$program\"; }; then
file=\"\$\$-\$program\"
@@ -4066,7 +5441,7 @@ func_exec_program ()
if test -n \"\$relink_command\"; then
if relink_command_output=\`eval \$relink_command 2>&1\`; then :
else
- $ECHO \"\$relink_command_output\" >&2
+ \$ECHO \"\$relink_command_output\" >&2
$RM \"\$progdir/\$file\"
exit 1
fi
@@ -4101,7 +5476,7 @@ func_exec_program ()
fi
# Export our shlibpath_var if we have one.
- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
$ECHO "\
# Add our own library path to $shlibpath_var
$shlibpath_var=\"$temp_rpath\$$shlibpath_var\"
@@ -4121,7 +5496,7 @@ func_exec_program ()
fi
else
# The program doesn't exist.
- \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+ \$ECHO \"\$0: error: '\$progdir/\$program' does not exist\" 1>&2
\$ECHO \"This script is just a wrapper for \$program.\" 1>&2
\$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
exit 1
@@ -4140,7 +5515,7 @@ func_emit_cwrapperexe_src ()
cat <<EOF
/* $cwrappersource - temporary wrapper executable for $objdir/$outputname
- Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+ Generated by $PROGRAM (GNU $PACKAGE) $VERSION
The $output program cannot be directly executed until all the libtool
libraries that it depends on are installed.
@@ -4175,47 +5550,45 @@ EOF
#include <fcntl.h>
#include <sys/stat.h>
+#define STREQ(s1, s2) (strcmp ((s1), (s2)) == 0)
+
/* declarations of non-ANSI functions */
-#if defined(__MINGW32__)
+#if defined __MINGW32__
# ifdef __STRICT_ANSI__
int _putenv (const char *);
# endif
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
# ifdef __STRICT_ANSI__
char *realpath (const char *, char *);
int putenv (char *);
int setenv (const char *, const char *, int);
# endif
-/* #elif defined (other platforms) ... */
+/* #elif defined other_platform || defined ... */
#endif
/* portability defines, excluding path handling macros */
-#if defined(_MSC_VER)
+#if defined _MSC_VER
# define setmode _setmode
# define stat _stat
# define chmod _chmod
# define getcwd _getcwd
# define putenv _putenv
# define S_IXUSR _S_IEXEC
-# ifndef _INTPTR_T_DEFINED
-# define _INTPTR_T_DEFINED
-# define intptr_t int
-# endif
-#elif defined(__MINGW32__)
+#elif defined __MINGW32__
# define setmode _setmode
# define stat _stat
# define chmod _chmod
# define getcwd _getcwd
# define putenv _putenv
-#elif defined(__CYGWIN__)
+#elif defined __CYGWIN__
# define HAVE_SETENV
# define FOPEN_WB "wb"
-/* #elif defined (other platforms) ... */
+/* #elif defined other platforms ... */
#endif
-#if defined(PATH_MAX)
+#if defined PATH_MAX
# define LT_PATHMAX PATH_MAX
-#elif defined(MAXPATHLEN)
+#elif defined MAXPATHLEN
# define LT_PATHMAX MAXPATHLEN
#else
# define LT_PATHMAX 1024
@@ -4234,8 +5607,8 @@ int setenv (const char *, const char *, int);
# define PATH_SEPARATOR ':'
#endif
-#if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
- defined (__OS2__)
+#if defined _WIN32 || defined __MSDOS__ || defined __DJGPP__ || \
+ defined __OS2__
# define HAVE_DOS_BASED_FILE_SYSTEM
# define FOPEN_WB "wb"
# ifndef DIR_SEPARATOR_2
@@ -4268,10 +5641,10 @@ int setenv (const char *, const char *, int);
#define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
#define XFREE(stale) do { \
- if (stale) { free ((void *) stale); stale = 0; } \
+ if (stale) { free (stale); stale = 0; } \
} while (0)
-#if defined(LT_DEBUGWRAPPER)
+#if defined LT_DEBUGWRAPPER
static int lt_debug = 1;
#else
static int lt_debug = 0;
@@ -4300,11 +5673,16 @@ void lt_dump_script (FILE *f);
EOF
cat <<EOF
-volatile const char * MAGIC_EXE = "$magic_exe";
+#if __GNUC__ < 4 || (__GNUC__ == 4 && __GNUC_MINOR__ < 5)
+# define externally_visible volatile
+#else
+# define externally_visible __attribute__((externally_visible)) volatile
+#endif
+externally_visible const char * MAGIC_EXE = "$magic_exe";
const char * LIB_PATH_VARNAME = "$shlibpath_var";
EOF
- if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
+ if test yes = "$shlibpath_overrides_runpath" && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
func_to_host_path "$temp_rpath"
cat <<EOF
const char * LIB_PATH_VALUE = "$func_to_host_path_result";
@@ -4328,7 +5706,7 @@ const char * EXE_PATH_VALUE = "";
EOF
fi
- if test "$fast_install" = yes; then
+ if test yes = "$fast_install"; then
cat <<EOF
const char * TARGET_PROGRAM_NAME = "lt-$outputname"; /* hopefully, no .exe */
EOF
@@ -4357,12 +5735,12 @@ main (int argc, char *argv[])
char *actual_cwrapper_name;
char *target_name;
char *lt_argv_zero;
- intptr_t rval = 127;
+ int rval = 127;
int i;
program_name = (char *) xstrdup (base_name (argv[0]));
- newargz = XMALLOC (char *, argc + 1);
+ newargz = XMALLOC (char *, (size_t) argc + 1);
/* very simple arg parsing; don't want to rely on getopt
* also, copy all non cwrapper options to newargz, except
@@ -4371,10 +5749,10 @@ main (int argc, char *argv[])
newargc=0;
for (i = 1; i < argc; i++)
{
- if (strcmp (argv[i], dumpscript_opt) == 0)
+ if (STREQ (argv[i], dumpscript_opt))
{
EOF
- case "$host" in
+ case $host in
*mingw* | *cygwin* )
# make stdout use "unix" line endings
echo " setmode(1,_O_BINARY);"
@@ -4385,12 +5763,12 @@ EOF
lt_dump_script (stdout);
return 0;
}
- if (strcmp (argv[i], debug_opt) == 0)
+ if (STREQ (argv[i], debug_opt))
{
lt_debug = 1;
continue;
}
- if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+ if (STREQ (argv[i], ltwrapper_option_prefix))
{
/* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
namespace, but it is not one of the ones we know about and
@@ -4413,7 +5791,7 @@ EOF
EOF
cat <<EOF
/* The GNU banner must be the first non-error debug message */
- lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+ lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE) $VERSION\n");
EOF
cat <<"EOF"
lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
@@ -4524,7 +5902,7 @@ EOF
cat <<"EOF"
/* execv doesn't actually work on mingw as expected on unix */
newargz = prepare_spawn (newargz);
- rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
+ rval = (int) _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
if (rval == -1)
{
/* failed to start process */
@@ -4569,7 +5947,7 @@ base_name (const char *name)
{
const char *base;
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
/* Skip over the disk name in MSDOS pathnames. */
if (isalpha ((unsigned char) name[0]) && name[1] == ':')
name += 2;
@@ -4628,7 +6006,7 @@ find_executable (const char *wrapper)
const char *p_next;
/* static buffer for getcwd */
char tmp[LT_PATHMAX + 1];
- int tmp_len;
+ size_t tmp_len;
char *concat_name;
lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
@@ -4638,7 +6016,7 @@ find_executable (const char *wrapper)
return NULL;
/* Absolute path? */
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
if (isalpha ((unsigned char) wrapper[0]) && wrapper[1] == ':')
{
concat_name = xstrdup (wrapper);
@@ -4656,7 +6034,7 @@ find_executable (const char *wrapper)
return concat_name;
XFREE (concat_name);
}
-#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+#if defined HAVE_DOS_BASED_FILE_SYSTEM
}
#endif
@@ -4679,7 +6057,7 @@ find_executable (const char *wrapper)
for (q = p; *q; q++)
if (IS_PATH_SEPARATOR (*q))
break;
- p_len = q - p;
+ p_len = (size_t) (q - p);
p_next = (*q == '\0' ? q : q + 1);
if (p_len == 0)
{
@@ -4798,7 +6176,7 @@ strendzap (char *str, const char *pat)
if (patlen <= len)
{
str += len - patlen;
- if (strcmp (str, pat) == 0)
+ if (STREQ (str, pat))
*str = '\0';
}
return str;
@@ -4863,7 +6241,7 @@ lt_setenv (const char *name, const char *value)
char *str = xstrdup (value);
setenv (name, str, 1);
#else
- int len = strlen (name) + 1 + strlen (value) + 1;
+ size_t len = strlen (name) + 1 + strlen (value) + 1;
char *str = XMALLOC (char, len);
sprintf (str, "%s=%s", name, value);
if (putenv (str) != EXIT_SUCCESS)
@@ -4880,8 +6258,8 @@ lt_extend_str (const char *orig_value, const char *add, int to_end)
char *new_value;
if (orig_value && *orig_value)
{
- int orig_value_len = strlen (orig_value);
- int add_len = strlen (add);
+ size_t orig_value_len = strlen (orig_value);
+ size_t add_len = strlen (add);
new_value = XMALLOC (char, add_len + orig_value_len + 1);
if (to_end)
{
@@ -4912,10 +6290,10 @@ lt_update_exe_path (const char *name, const char *value)
{
char *new_value = lt_extend_str (getenv (name), value, 0);
/* some systems can't cope with a ':'-terminated path #' */
- int len = strlen (new_value);
- while (((len = strlen (new_value)) > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
+ size_t len = strlen (new_value);
+ while ((len > 0) && IS_PATH_SEPARATOR (new_value[len-1]))
{
- new_value[len-1] = '\0';
+ new_value[--len] = '\0';
}
lt_setenv (name, new_value);
XFREE (new_value);
@@ -5082,27 +6460,47 @@ EOF
# True if ARG is an import lib, as indicated by $file_magic_cmd
func_win32_import_lib_p ()
{
- $opt_debug
+ $debug_cmd
+
case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
*import*) : ;;
*) false ;;
esac
}
+# func_suncc_cstd_abi
+# !!ONLY CALL THIS FOR SUN CC AFTER $compile_command IS FULLY EXPANDED!!
+# Several compiler flags select an ABI that is incompatible with the
+# Cstd library. Avoid specifying it if any are in CXXFLAGS.
+func_suncc_cstd_abi ()
+{
+ $debug_cmd
+
+ case " $compile_command " in
+ *" -compat=g "*|*\ -std=c++[0-9][0-9]\ *|*" -library=stdcxx4 "*|*" -library=stlport4 "*)
+ suncc_use_cstd_abi=no
+ ;;
+ *)
+ suncc_use_cstd_abi=yes
+ ;;
+ esac
+}
+
# func_mode_link arg...
func_mode_link ()
{
- $opt_debug
+ $debug_cmd
+
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
# It is impossible to link a dll without this setting, and
# we shouldn't force the makefile maintainer to figure out
- # which system we are compiling for in order to pass an extra
+ # what system we are compiling for in order to pass an extra
# flag for every libtool invocation.
# allow_undefined=no
# FIXME: Unfortunately, there are problems with the above when trying
- # to make a dll which has undefined symbols, in which case not
+ # to make a dll that has undefined symbols, in which case not
# even a static library is built. For now, we need to specify
# -no-undefined on the libtool link line when we can be certain
# that all symbols are satisfied, otherwise we get a static library.
@@ -5146,10 +6544,11 @@ func_mode_link ()
module=no
no_install=no
objs=
+ os2dllname=
non_pic_objects=
precious_files_regex=
prefer_static_libs=no
- preload=no
+ preload=false
prev=
prevarg=
release=
@@ -5161,7 +6560,7 @@ func_mode_link ()
vinfo=
vinfo_number=no
weak_libs=
- single_module="${wl}-single_module"
+ single_module=$wl-single_module
func_infer_tag $base_compile
# We need to know -static, to get the right output filenames.
@@ -5169,15 +6568,15 @@ func_mode_link ()
do
case $arg in
-shared)
- test "$build_libtool_libs" != yes && \
- func_fatal_configuration "can not build a shared library"
+ test yes != "$build_libtool_libs" \
+ && func_fatal_configuration "cannot build a shared library"
build_old_libs=no
break
;;
-all-static | -static | -static-libtool-libs)
case $arg in
-all-static)
- if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ if test yes = "$build_libtool_libs" && test -z "$link_static_flag"; then
func_warning "complete static linking is impossible in this configuration"
fi
if test -n "$link_static_flag"; then
@@ -5210,7 +6609,7 @@ func_mode_link ()
# Go through the arguments, transforming them on the way.
while test "$#" -gt 0; do
- arg="$1"
+ arg=$1
shift
func_quote_for_eval "$arg"
qarg=$func_quote_for_eval_unquoted_result
@@ -5227,21 +6626,21 @@ func_mode_link ()
case $prev in
bindir)
- bindir="$arg"
+ bindir=$arg
prev=
continue
;;
dlfiles|dlprefiles)
- if test "$preload" = no; then
+ $preload || {
# Add the symbol object into the linking commands.
func_append compile_command " @SYMFILE@"
func_append finalize_command " @SYMFILE@"
- preload=yes
- fi
+ preload=:
+ }
case $arg in
*.la | *.lo) ;; # We handle these cases below.
force)
- if test "$dlself" = no; then
+ if test no = "$dlself"; then
dlself=needless
export_dynamic=yes
fi
@@ -5249,9 +6648,9 @@ func_mode_link ()
continue
;;
self)
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
dlself=yes
- elif test "$prev" = dlfiles && test "$dlopen_self" != yes; then
+ elif test dlfiles = "$prev" && test yes != "$dlopen_self"; then
dlself=yes
else
dlself=needless
@@ -5261,7 +6660,7 @@ func_mode_link ()
continue
;;
*)
- if test "$prev" = dlfiles; then
+ if test dlfiles = "$prev"; then
func_append dlfiles " $arg"
else
func_append dlprefiles " $arg"
@@ -5272,14 +6671,14 @@ func_mode_link ()
esac
;;
expsyms)
- export_symbols="$arg"
+ export_symbols=$arg
test -f "$arg" \
- || func_fatal_error "symbol file \`$arg' does not exist"
+ || func_fatal_error "symbol file '$arg' does not exist"
prev=
continue
;;
expsyms_regex)
- export_symbols_regex="$arg"
+ export_symbols_regex=$arg
prev=
continue
;;
@@ -5297,7 +6696,13 @@ func_mode_link ()
continue
;;
inst_prefix)
- inst_prefix_dir="$arg"
+ inst_prefix_dir=$arg
+ prev=
+ continue
+ ;;
+ mllvm)
+ # Clang does not use LLVM to link, so we can simply discard any
+ # '-mllvm $arg' options when doing the link step.
prev=
continue
;;
@@ -5321,21 +6726,21 @@ func_mode_link ()
if test -z "$pic_object" ||
test -z "$non_pic_object" ||
- test "$pic_object" = none &&
- test "$non_pic_object" = none; then
- func_fatal_error "cannot find name of object for \`$arg'"
+ test none = "$pic_object" &&
+ test none = "$non_pic_object"; then
+ func_fatal_error "cannot find name of object for '$arg'"
fi
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
- if test "$pic_object" != none; then
+ if test none != "$pic_object"; then
# Prepend the subdirectory the object is found in.
- pic_object="$xdir$pic_object"
+ pic_object=$xdir$pic_object
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ if test dlfiles = "$prev"; then
+ if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
func_append dlfiles " $pic_object"
prev=
continue
@@ -5346,7 +6751,7 @@ func_mode_link ()
fi
# CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
# Preload the old-style object.
func_append dlprefiles " $pic_object"
prev=
@@ -5354,23 +6759,23 @@ func_mode_link ()
# A PIC object.
func_append libobjs " $pic_object"
- arg="$pic_object"
+ arg=$pic_object
fi
# Non-PIC object.
- if test "$non_pic_object" != none; then
+ if test none != "$non_pic_object"; then
# Prepend the subdirectory the object is found in.
- non_pic_object="$xdir$non_pic_object"
+ non_pic_object=$xdir$non_pic_object
# A standard non-PIC object
func_append non_pic_objects " $non_pic_object"
- if test -z "$pic_object" || test "$pic_object" = none ; then
- arg="$non_pic_object"
+ if test -z "$pic_object" || test none = "$pic_object"; then
+ arg=$non_pic_object
fi
else
# If the PIC object exists, use it instead.
# $xdir was prepended to $pic_object above.
- non_pic_object="$pic_object"
+ non_pic_object=$pic_object
func_append non_pic_objects " $non_pic_object"
fi
else
@@ -5378,7 +6783,7 @@ func_mode_link ()
if $opt_dry_run; then
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
func_lo2o "$arg"
pic_object=$xdir$objdir/$func_lo2o_result
@@ -5386,24 +6791,29 @@ func_mode_link ()
func_append libobjs " $pic_object"
func_append non_pic_objects " $non_pic_object"
else
- func_fatal_error "\`$arg' is not a valid libtool object"
+ func_fatal_error "'$arg' is not a valid libtool object"
fi
fi
done
else
- func_fatal_error "link input file \`$arg' does not exist"
+ func_fatal_error "link input file '$arg' does not exist"
fi
arg=$save_arg
prev=
continue
;;
+ os2dllname)
+ os2dllname=$arg
+ prev=
+ continue
+ ;;
precious_regex)
- precious_files_regex="$arg"
+ precious_files_regex=$arg
prev=
continue
;;
release)
- release="-$arg"
+ release=-$arg
prev=
continue
;;
@@ -5415,7 +6825,7 @@ func_mode_link ()
func_fatal_error "only absolute run-paths are allowed"
;;
esac
- if test "$prev" = rpath; then
+ if test rpath = "$prev"; then
case "$rpath " in
*" $arg "*) ;;
*) func_append rpath " $arg" ;;
@@ -5430,7 +6840,7 @@ func_mode_link ()
continue
;;
shrext)
- shrext_cmds="$arg"
+ shrext_cmds=$arg
prev=
continue
;;
@@ -5470,7 +6880,7 @@ func_mode_link ()
esac
fi # test -n "$prev"
- prevarg="$arg"
+ prevarg=$arg
case $arg in
-all-static)
@@ -5484,7 +6894,7 @@ func_mode_link ()
-allow-undefined)
# FIXME: remove this flag sometime in the future.
- func_fatal_error "\`-allow-undefined' must not be used because it is the default"
+ func_fatal_error "'-allow-undefined' must not be used because it is the default"
;;
-avoid-version)
@@ -5516,7 +6926,7 @@ func_mode_link ()
if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
func_fatal_error "more than one -exported-symbols argument is not allowed"
fi
- if test "X$arg" = "X-export-symbols"; then
+ if test X-export-symbols = "X$arg"; then
prev=expsyms
else
prev=expsyms_regex
@@ -5550,9 +6960,9 @@ func_mode_link ()
func_stripname "-L" '' "$arg"
if test -z "$func_stripname_result"; then
if test "$#" -gt 0; then
- func_fatal_error "require no space between \`-L' and \`$1'"
+ func_fatal_error "require no space between '-L' and '$1'"
else
- func_fatal_error "need path for \`-L' option"
+ func_fatal_error "need path for '-L' option"
fi
fi
func_resolve_sysroot "$func_stripname_result"
@@ -5563,8 +6973,8 @@ func_mode_link ()
*)
absdir=`cd "$dir" && pwd`
test -z "$absdir" && \
- func_fatal_error "cannot determine absolute directory name of \`$dir'"
- dir="$absdir"
+ func_fatal_error "cannot determine absolute directory name of '$dir'"
+ dir=$absdir
;;
esac
case "$deplibs " in
@@ -5599,7 +7009,7 @@ func_mode_link ()
;;
-l*)
- if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ if test X-lc = "X$arg" || test X-lm = "X$arg"; then
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
# These systems don't actually have a C or math library (as such)
@@ -5607,11 +7017,11 @@ func_mode_link ()
;;
*-*-os2*)
# These systems don't actually have a C library (as such)
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
# Do not include libc due to us having libc/libc_r.
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
*-*-rhapsody* | *-*-darwin1.[012])
# Rhapsody C and math libraries are in the System framework
@@ -5620,16 +7030,16 @@ func_mode_link ()
;;
*-*-sco3.2v5* | *-*-sco5v6*)
# Causes problems with __ctype
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
*-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
# Compiler inserts libc in the correct place for threads to work
- test "X$arg" = "X-lc" && continue
+ test X-lc = "X$arg" && continue
;;
esac
- elif test "X$arg" = "X-lc_r"; then
+ elif test X-lc_r = "X$arg"; then
case $host in
- *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly* | *-*-bitrig*)
# Do not include libc_r directly, use -pthread flag.
continue
;;
@@ -5639,6 +7049,11 @@ func_mode_link ()
continue
;;
+ -mllvm)
+ prev=mllvm
+ continue
+ ;;
+
-module)
module=yes
continue
@@ -5668,7 +7083,7 @@ func_mode_link ()
;;
-multi_module)
- single_module="${wl}-multi_module"
+ single_module=$wl-multi_module
continue
;;
@@ -5682,8 +7097,8 @@ func_mode_link ()
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin* | *-cegcc*)
# The PATH hackery in wrapper scripts is required on Windows
# and Darwin in order for the loader to find any dlls it needs.
- func_warning "\`-no-install' is ignored for $host"
- func_warning "assuming \`-no-fast-install' instead"
+ func_warning "'-no-install' is ignored for $host"
+ func_warning "assuming '-no-fast-install' instead"
fast_install=no
;;
*) no_install=yes ;;
@@ -5701,6 +7116,11 @@ func_mode_link ()
continue
;;
+ -os2dllname)
+ prev=os2dllname
+ continue
+ ;;
+
-o) prev=output ;;
-precious-files-regex)
@@ -5788,14 +7208,14 @@ func_mode_link ()
func_stripname '-Wc,' '' "$arg"
args=$func_stripname_result
arg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for flag in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_quote_for_eval "$flag"
func_append arg " $func_quote_for_eval_result"
func_append compiler_flags " $func_quote_for_eval_result"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$arg"
arg=$func_stripname_result
;;
@@ -5804,15 +7224,15 @@ func_mode_link ()
func_stripname '-Wl,' '' "$arg"
args=$func_stripname_result
arg=
- save_ifs="$IFS"; IFS=','
+ save_ifs=$IFS; IFS=,
for flag in $args; do
- IFS="$save_ifs"
+ IFS=$save_ifs
func_quote_for_eval "$flag"
func_append arg " $wl$func_quote_for_eval_result"
func_append compiler_flags " $wl$func_quote_for_eval_result"
func_append linker_flags " $func_quote_for_eval_result"
done
- IFS="$save_ifs"
+ IFS=$save_ifs
func_stripname ' ' '' "$arg"
arg=$func_stripname_result
;;
@@ -5835,7 +7255,7 @@ func_mode_link ()
# -msg_* for osf cc
-msg_*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
# Flags to be passed through unchanged, with rationale:
@@ -5847,25 +7267,46 @@ func_mode_link ()
# -m*, -t[45]*, -txscale* architecture-specific flags for GCC
# -F/path path to uninstalled frameworks, gcc on darwin
# -p, -pg, --coverage, -fprofile-* profiling flags for GCC
+ # -fstack-protector* stack protector flags for GCC
# @file GCC response files
# -tp=* Portland pgcc target processor selection
# --sysroot=* for sysroot support
- # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -O*, -g*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
+ # -stdlib=* select c++ std lib with clang
-64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
- -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
+ -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
func_append compile_command " $arg"
func_append finalize_command " $arg"
func_append compiler_flags " $arg"
continue
;;
+ -Z*)
+ if test os2 = "`expr $host : '.*\(os2\)'`"; then
+ # OS/2 uses -Zxxx to specify OS/2-specific options
+ compiler_flags="$compiler_flags $arg"
+ func_append compile_command " $arg"
+ func_append finalize_command " $arg"
+ case $arg in
+ -Zlinker | -Zstack)
+ prev=xcompiler
+ ;;
+ esac
+ continue
+ else
+ # Otherwise treat like 'Some other compiler flag' below
+ func_quote_for_eval "$arg"
+ arg=$func_quote_for_eval_result
+ fi
+ ;;
+
# Some other compiler flag.
-* | +*)
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
*.$objext)
@@ -5886,21 +7327,21 @@ func_mode_link ()
if test -z "$pic_object" ||
test -z "$non_pic_object" ||
- test "$pic_object" = none &&
- test "$non_pic_object" = none; then
- func_fatal_error "cannot find name of object for \`$arg'"
+ test none = "$pic_object" &&
+ test none = "$non_pic_object"; then
+ func_fatal_error "cannot find name of object for '$arg'"
fi
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
- if test "$pic_object" != none; then
+ test none = "$pic_object" || {
# Prepend the subdirectory the object is found in.
- pic_object="$xdir$pic_object"
+ pic_object=$xdir$pic_object
- if test "$prev" = dlfiles; then
- if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
+ if test dlfiles = "$prev"; then
+ if test yes = "$build_libtool_libs" && test yes = "$dlopen_support"; then
func_append dlfiles " $pic_object"
prev=
continue
@@ -5911,7 +7352,7 @@ func_mode_link ()
fi
# CHECK ME: I think I busted this. -Ossama
- if test "$prev" = dlprefiles; then
+ if test dlprefiles = "$prev"; then
# Preload the old-style object.
func_append dlprefiles " $pic_object"
prev=
@@ -5919,23 +7360,23 @@ func_mode_link ()
# A PIC object.
func_append libobjs " $pic_object"
- arg="$pic_object"
- fi
+ arg=$pic_object
+ }
# Non-PIC object.
- if test "$non_pic_object" != none; then
+ if test none != "$non_pic_object"; then
# Prepend the subdirectory the object is found in.
- non_pic_object="$xdir$non_pic_object"
+ non_pic_object=$xdir$non_pic_object
# A standard non-PIC object
func_append non_pic_objects " $non_pic_object"
- if test -z "$pic_object" || test "$pic_object" = none ; then
- arg="$non_pic_object"
+ if test -z "$pic_object" || test none = "$pic_object"; then
+ arg=$non_pic_object
fi
else
# If the PIC object exists, use it instead.
# $xdir was prepended to $pic_object above.
- non_pic_object="$pic_object"
+ non_pic_object=$pic_object
func_append non_pic_objects " $non_pic_object"
fi
else
@@ -5943,7 +7384,7 @@ func_mode_link ()
if $opt_dry_run; then
# Extract subdirectory from the argument.
func_dirname "$arg" "/" ""
- xdir="$func_dirname_result"
+ xdir=$func_dirname_result
func_lo2o "$arg"
pic_object=$xdir$objdir/$func_lo2o_result
@@ -5951,7 +7392,7 @@ func_mode_link ()
func_append libobjs " $pic_object"
func_append non_pic_objects " $non_pic_object"
else
- func_fatal_error "\`$arg' is not a valid libtool object"
+ func_fatal_error "'$arg' is not a valid libtool object"
fi
fi
;;
@@ -5967,11 +7408,11 @@ func_mode_link ()
# A libtool-controlled library.
func_resolve_sysroot "$arg"
- if test "$prev" = dlfiles; then
+ if test dlfiles = "$prev"; then
# This library was specified with -dlopen.
func_append dlfiles " $func_resolve_sysroot_result"
prev=
- elif test "$prev" = dlprefiles; then
+ elif test dlprefiles = "$prev"; then
# The library was specified with -dlpreopen.
func_append dlprefiles " $func_resolve_sysroot_result"
prev=
@@ -5986,7 +7427,7 @@ func_mode_link ()
# Unknown arguments in both finalize_command and compile_command need
# to be aesthetically quoted because they are evaled later.
func_quote_for_eval "$arg"
- arg="$func_quote_for_eval_result"
+ arg=$func_quote_for_eval_result
;;
esac # arg
@@ -5998,9 +7439,9 @@ func_mode_link ()
done # argument parsing loop
test -n "$prev" && \
- func_fatal_help "the \`$prevarg' option requires an argument"
+ func_fatal_help "the '$prevarg' option requires an argument"
- if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+ if test yes = "$export_dynamic" && test -n "$export_dynamic_flag_spec"; then
eval arg=\"$export_dynamic_flag_spec\"
func_append compile_command " $arg"
func_append finalize_command " $arg"
@@ -6009,20 +7450,23 @@ func_mode_link ()
oldlibs=
# calculate the name of the file, without its directory
func_basename "$output"
- outputname="$func_basename_result"
- libobjs_save="$libobjs"
+ outputname=$func_basename_result
+ libobjs_save=$libobjs
if test -n "$shlibpath_var"; then
# get the directories listed in $shlibpath_var
- eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
+ eval shlib_search_path=\`\$ECHO \"\$$shlibpath_var\" \| \$SED \'s/:/ /g\'\`
else
shlib_search_path=
fi
eval sys_lib_search_path=\"$sys_lib_search_path_spec\"
eval sys_lib_dlsearch_path=\"$sys_lib_dlsearch_path_spec\"
+ # Definition is injected by LT_CONFIG during libtool generation.
+ func_munge_path_list sys_lib_dlsearch_path "$LT_SYS_LIBRARY_PATH"
+
func_dirname "$output" "/" ""
- output_objdir="$func_dirname_result$objdir"
+ output_objdir=$func_dirname_result$objdir
func_to_tool_file "$output_objdir/"
tool_output_objdir=$func_to_tool_file_result
# Create the object directory.
@@ -6045,7 +7489,7 @@ func_mode_link ()
# Find all interdependent deplibs by searching for libraries
# that are linked more than once (e.g. -la -lb -la)
for deplib in $deplibs; do
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
@@ -6053,7 +7497,7 @@ func_mode_link ()
func_append libs " $deplib"
done
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
libs="$predeps $libs $compiler_lib_search_path $postdeps"
# Compute libraries that are listed more than once in $predeps
@@ -6085,7 +7529,7 @@ func_mode_link ()
case $file in
*.la) ;;
*)
- func_fatal_help "libraries can \`-dlopen' only libtool libraries: $file"
+ func_fatal_help "libraries can '-dlopen' only libtool libraries: $file"
;;
esac
done
@@ -6093,7 +7537,7 @@ func_mode_link ()
prog)
compile_deplibs=
finalize_deplibs=
- alldeplibs=no
+ alldeplibs=false
newdlfiles=
newdlprefiles=
passes="conv scan dlopen dlpreopen link"
@@ -6105,29 +7549,29 @@ func_mode_link ()
for pass in $passes; do
# The preopen pass in lib mode reverses $deplibs; put it back here
# so that -L comes before libs that need it for instance...
- if test "$linkmode,$pass" = "lib,link"; then
+ if test lib,link = "$linkmode,$pass"; then
## FIXME: Find the place where the list is rebuilt in the wrong
## order, and fix it there properly
tmp_deplibs=
for deplib in $deplibs; do
tmp_deplibs="$deplib $tmp_deplibs"
done
- deplibs="$tmp_deplibs"
+ deplibs=$tmp_deplibs
fi
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan"; then
- libs="$deplibs"
+ if test lib,link = "$linkmode,$pass" ||
+ test prog,scan = "$linkmode,$pass"; then
+ libs=$deplibs
deplibs=
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
case $pass in
- dlopen) libs="$dlfiles" ;;
- dlpreopen) libs="$dlprefiles" ;;
+ dlopen) libs=$dlfiles ;;
+ dlpreopen) libs=$dlprefiles ;;
link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
esac
fi
- if test "$linkmode,$pass" = "lib,dlpreopen"; then
+ if test lib,dlpreopen = "$linkmode,$pass"; then
# Collect and forward deplibs of preopened libtool libs
for lib in $dlprefiles; do
# Ignore non-libtool-libs
@@ -6148,26 +7592,26 @@ func_mode_link ()
esac
done
done
- libs="$dlprefiles"
+ libs=$dlprefiles
fi
- if test "$pass" = dlopen; then
+ if test dlopen = "$pass"; then
# Collect dlpreopened libraries
- save_deplibs="$deplibs"
+ save_deplibs=$deplibs
deplibs=
fi
for deplib in $libs; do
lib=
- found=no
+ found=false
case $deplib in
-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
|-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
func_append compiler_flags " $deplib"
- if test "$linkmode" = lib ; then
+ if test lib = "$linkmode"; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
* ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6177,13 +7621,13 @@ func_mode_link ()
continue
;;
-l*)
- if test "$linkmode" != lib && test "$linkmode" != prog; then
- func_warning "\`-l' is ignored for archives/objects"
+ if test lib != "$linkmode" && test prog != "$linkmode"; then
+ func_warning "'-l' is ignored for archives/objects"
continue
fi
func_stripname '-l' '' "$deplib"
name=$func_stripname_result
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
searchdirs="$newlib_search_path $lib_search_path $compiler_lib_search_dirs $sys_lib_search_path $shlib_search_path"
else
searchdirs="$newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path"
@@ -6191,31 +7635,22 @@ func_mode_link ()
for searchdir in $searchdirs; do
for search_ext in .la $std_shrext .so .a; do
# Search the libtool library
- lib="$searchdir/lib${name}${search_ext}"
+ lib=$searchdir/lib$name$search_ext
if test -f "$lib"; then
- if test "$search_ext" = ".la"; then
- found=yes
+ if test .la = "$search_ext"; then
+ found=:
else
- found=no
+ found=false
fi
break 2
fi
done
done
- if test "$found" != yes; then
- # deplib doesn't seem to be a libtool library
- if test "$linkmode,$pass" = "prog,link"; then
- compile_deplibs="$deplib $compile_deplibs"
- finalize_deplibs="$deplib $finalize_deplibs"
- else
- deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
- fi
- continue
- else # deplib is a libtool library
+ if $found; then
+ # deplib is a libtool library
# If $allow_libtool_libs_with_static_runtimes && $deplib is a stdlib,
# We need to do some special things here, and not later.
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $deplib "*)
if func_lalib_p "$lib"; then
@@ -6223,19 +7658,19 @@ func_mode_link ()
old_library=
func_source "$lib"
for l in $old_library $library_names; do
- ll="$l"
+ ll=$l
done
- if test "X$ll" = "X$old_library" ; then # only static version available
- found=no
+ if test "X$ll" = "X$old_library"; then # only static version available
+ found=false
func_dirname "$lib" "" "."
- ladir="$func_dirname_result"
+ ladir=$func_dirname_result
lib=$ladir/$old_library
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
- test "$linkmode" = lib && newdependency_libs="$deplib $newdependency_libs"
+ test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
fi
continue
fi
@@ -6244,15 +7679,25 @@ func_mode_link ()
*) ;;
esac
fi
+ else
+ # deplib doesn't seem to be a libtool library
+ if test prog,link = "$linkmode,$pass"; then
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ else
+ deplibs="$deplib $deplibs"
+ test lib = "$linkmode" && newdependency_libs="$deplib $newdependency_libs"
+ fi
+ continue
fi
;; # -l
*.ltframework)
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
compile_deplibs="$deplib $compile_deplibs"
finalize_deplibs="$deplib $finalize_deplibs"
else
deplibs="$deplib $deplibs"
- if test "$linkmode" = lib ; then
+ if test lib = "$linkmode"; then
case "$new_inherited_linker_flags " in
*" $deplib "*) ;;
* ) func_append new_inherited_linker_flags " $deplib" ;;
@@ -6265,18 +7710,18 @@ func_mode_link ()
case $linkmode in
lib)
deplibs="$deplib $deplibs"
- test "$pass" = conv && continue
+ test conv = "$pass" && continue
newdependency_libs="$deplib $newdependency_libs"
func_stripname '-L' '' "$deplib"
func_resolve_sysroot "$func_stripname_result"
func_append newlib_search_path " $func_resolve_sysroot_result"
;;
prog)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
continue
fi
- if test "$pass" = scan; then
+ if test scan = "$pass"; then
deplibs="$deplib $deplibs"
else
compile_deplibs="$deplib $compile_deplibs"
@@ -6287,13 +7732,13 @@ func_mode_link ()
func_append newlib_search_path " $func_resolve_sysroot_result"
;;
*)
- func_warning "\`-L' is ignored for archives/objects"
+ func_warning "'-L' is ignored for archives/objects"
;;
esac # linkmode
continue
;; # -L
-R*)
- if test "$pass" = link; then
+ if test link = "$pass"; then
func_stripname '-R' '' "$deplib"
func_resolve_sysroot "$func_stripname_result"
dir=$func_resolve_sysroot_result
@@ -6311,7 +7756,7 @@ func_mode_link ()
lib=$func_resolve_sysroot_result
;;
*.$libext)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
continue
fi
@@ -6322,21 +7767,26 @@ func_mode_link ()
case " $dlpreconveniencelibs " in
*" $deplib "*) ;;
*)
- valid_a_lib=no
+ valid_a_lib=false
case $deplibs_check_method in
match_pattern*)
set dummy $deplibs_check_method; shift
match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
| $EGREP "$match_pattern_regex" > /dev/null; then
- valid_a_lib=yes
+ valid_a_lib=:
fi
;;
pass_all)
- valid_a_lib=yes
+ valid_a_lib=:
;;
esac
- if test "$valid_a_lib" != yes; then
+ if $valid_a_lib; then
+ echo
+ $ECHO "*** Warning: Linking the shared library $output against the"
+ $ECHO "*** static library $deplib is not portable!"
+ deplibs="$deplib $deplibs"
+ else
echo
$ECHO "*** Warning: Trying to link with static lib archive $deplib."
echo "*** I have the capability to make that library automatically link in when"
@@ -6344,18 +7794,13 @@ func_mode_link ()
echo "*** shared version of the library, which you do not appear to have"
echo "*** because the file extensions .$libext of this argument makes me believe"
echo "*** that it is just a static archive that I should not use here."
- else
- echo
- $ECHO "*** Warning: Linking the shared library $output against the"
- $ECHO "*** static library $deplib is not portable!"
- deplibs="$deplib $deplibs"
fi
;;
esac
continue
;;
prog)
- if test "$pass" != link; then
+ if test link != "$pass"; then
deplibs="$deplib $deplibs"
else
compile_deplibs="$deplib $compile_deplibs"
@@ -6366,10 +7811,10 @@ func_mode_link ()
esac # linkmode
;; # *.$libext
*.lo | *.$objext)
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
deplibs="$deplib $deplibs"
- elif test "$linkmode" = prog; then
- if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
+ elif test prog = "$linkmode"; then
+ if test dlpreopen = "$pass" || test yes != "$dlopen_support" || test no = "$build_libtool_libs"; then
# If there is no dlopen support or we're linking statically,
# we need to preload.
func_append newdlprefiles " $deplib"
@@ -6382,22 +7827,20 @@ func_mode_link ()
continue
;;
%DEPLIBS%)
- alldeplibs=yes
+ alldeplibs=:
continue
;;
esac # case $deplib
- if test "$found" = yes || test -f "$lib"; then :
- else
- func_fatal_error "cannot find the library \`$lib' or unhandled argument \`$deplib'"
- fi
+ $found || test -f "$lib" \
+ || func_fatal_error "cannot find the library '$lib' or unhandled argument '$deplib'"
# Check to see that this really is a libtool archive.
func_lalib_unsafe_p "$lib" \
- || func_fatal_error "\`$lib' is not a valid libtool archive"
+ || func_fatal_error "'$lib' is not a valid libtool archive"
func_dirname "$lib" "" "."
- ladir="$func_dirname_result"
+ ladir=$func_dirname_result
dlname=
dlopen=
@@ -6427,30 +7870,30 @@ func_mode_link ()
done
fi
dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
- if test "$linkmode,$pass" = "lib,link" ||
- test "$linkmode,$pass" = "prog,scan" ||
- { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+ if test lib,link = "$linkmode,$pass" ||
+ test prog,scan = "$linkmode,$pass" ||
+ { test prog != "$linkmode" && test lib != "$linkmode"; }; then
test -n "$dlopen" && func_append dlfiles " $dlopen"
test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
fi
- if test "$pass" = conv; then
+ if test conv = "$pass"; then
# Only check for convenience libraries
deplibs="$lib $deplibs"
if test -z "$libdir"; then
if test -z "$old_library"; then
- func_fatal_error "cannot find name of link library for \`$lib'"
+ func_fatal_error "cannot find name of link library for '$lib'"
fi
# It is a libtool convenience library, so add in its objects.
func_append convenience " $ladir/$objdir/$old_library"
func_append old_convenience " $ladir/$objdir/$old_library"
- elif test "$linkmode" != prog && test "$linkmode" != lib; then
- func_fatal_error "\`$lib' is not a convenience library"
+ elif test prog != "$linkmode" && test lib != "$linkmode"; then
+ func_fatal_error "'$lib' is not a convenience library"
fi
tmp_libs=
for deplib in $dependency_libs; do
deplibs="$deplib $deplibs"
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
@@ -6464,26 +7907,26 @@ func_mode_link ()
# Get the name of the library we link against.
linklib=
if test -n "$old_library" &&
- { test "$prefer_static_libs" = yes ||
- test "$prefer_static_libs,$installed" = "built,no"; }; then
+ { test yes = "$prefer_static_libs" ||
+ test built,no = "$prefer_static_libs,$installed"; }; then
linklib=$old_library
else
for l in $old_library $library_names; do
- linklib="$l"
+ linklib=$l
done
fi
if test -z "$linklib"; then
- func_fatal_error "cannot find name of link library for \`$lib'"
+ func_fatal_error "cannot find name of link library for '$lib'"
fi
# This library was specified with -dlopen.
- if test "$pass" = dlopen; then
- if test -z "$libdir"; then
- func_fatal_error "cannot -dlopen a convenience library: \`$lib'"
- fi
+ if test dlopen = "$pass"; then
+ test -z "$libdir" \
+ && func_fatal_error "cannot -dlopen a convenience library: '$lib'"
if test -z "$dlname" ||
- test "$dlopen_support" != yes ||
- test "$build_libtool_libs" = no; then
+ test yes != "$dlopen_support" ||
+ test no = "$build_libtool_libs"
+ then
# If there is no dlname, no dlopen support or we're linking
# statically, we need to preload. We also need to preload any
# dependent libraries so libltdl's deplib preloader doesn't
@@ -6497,40 +7940,40 @@ func_mode_link ()
# We need an absolute path.
case $ladir in
- [\\/]* | [A-Za-z]:[\\/]*) abs_ladir="$ladir" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs_ladir=$ladir ;;
*)
abs_ladir=`cd "$ladir" && pwd`
if test -z "$abs_ladir"; then
- func_warning "cannot determine absolute directory name of \`$ladir'"
+ func_warning "cannot determine absolute directory name of '$ladir'"
func_warning "passing it literally to the linker, although it might fail"
- abs_ladir="$ladir"
+ abs_ladir=$ladir
fi
;;
esac
func_basename "$lib"
- laname="$func_basename_result"
+ laname=$func_basename_result
# Find the relevant object directory and library name.
- if test "X$installed" = Xyes; then
+ if test yes = "$installed"; then
if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- func_warning "library \`$lib' was moved."
- dir="$ladir"
- absdir="$abs_ladir"
- libdir="$abs_ladir"
+ func_warning "library '$lib' was moved."
+ dir=$ladir
+ absdir=$abs_ladir
+ libdir=$abs_ladir
else
- dir="$lt_sysroot$libdir"
- absdir="$lt_sysroot$libdir"
+ dir=$lt_sysroot$libdir
+ absdir=$lt_sysroot$libdir
fi
- test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ test yes = "$hardcode_automatic" && avoidtemprpath=yes
else
if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
- dir="$ladir"
- absdir="$abs_ladir"
+ dir=$ladir
+ absdir=$abs_ladir
# Remove this search path later
func_append notinst_path " $abs_ladir"
else
- dir="$ladir/$objdir"
- absdir="$abs_ladir/$objdir"
+ dir=$ladir/$objdir
+ absdir=$abs_ladir/$objdir
# Remove this search path later
func_append notinst_path " $abs_ladir"
fi
@@ -6539,11 +7982,11 @@ func_mode_link ()
name=$func_stripname_result
# This library was specified with -dlpreopen.
- if test "$pass" = dlpreopen; then
- if test -z "$libdir" && test "$linkmode" = prog; then
- func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
+ if test dlpreopen = "$pass"; then
+ if test -z "$libdir" && test prog = "$linkmode"; then
+ func_fatal_error "only libraries may -dlpreopen a convenience library: '$lib'"
fi
- case "$host" in
+ case $host in
# special handling for platforms with PE-DLLs.
*cygwin* | *mingw* | *cegcc* )
# Linker will automatically link against shared library if both
@@ -6587,9 +8030,9 @@ func_mode_link ()
if test -z "$libdir"; then
# Link the convenience library
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
deplibs="$dir/$old_library $deplibs"
- elif test "$linkmode,$pass" = "prog,link"; then
+ elif test prog,link = "$linkmode,$pass"; then
compile_deplibs="$dir/$old_library $compile_deplibs"
finalize_deplibs="$dir/$old_library $finalize_deplibs"
else
@@ -6599,14 +8042,14 @@ func_mode_link ()
fi
- if test "$linkmode" = prog && test "$pass" != link; then
+ if test prog = "$linkmode" && test link != "$pass"; then
func_append newlib_search_path " $ladir"
deplibs="$lib $deplibs"
- linkalldeplibs=no
- if test "$link_all_deplibs" != no || test -z "$library_names" ||
- test "$build_libtool_libs" = no; then
- linkalldeplibs=yes
+ linkalldeplibs=false
+ if test no != "$link_all_deplibs" || test -z "$library_names" ||
+ test no = "$build_libtool_libs"; then
+ linkalldeplibs=:
fi
tmp_libs=
@@ -6618,14 +8061,14 @@ func_mode_link ()
;;
esac
# Need to link against all dependency_libs?
- if test "$linkalldeplibs" = yes; then
+ if $linkalldeplibs; then
deplibs="$deplib $deplibs"
else
# Need to hardcode shared library paths
# or/and link against static libraries
newdependency_libs="$deplib $newdependency_libs"
fi
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $deplib "*) func_append specialdeplibs " $deplib" ;;
esac
@@ -6635,15 +8078,15 @@ func_mode_link ()
continue
fi # $linkmode = prog...
- if test "$linkmode,$pass" = "prog,link"; then
+ if test prog,link = "$linkmode,$pass"; then
if test -n "$library_names" &&
- { { test "$prefer_static_libs" = no ||
- test "$prefer_static_libs,$installed" = "built,yes"; } ||
+ { { test no = "$prefer_static_libs" ||
+ test built,yes = "$prefer_static_libs,$installed"; } ||
test -z "$old_library"; }; then
# We need to hardcode the library path
- if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ if test -n "$shlibpath_var" && test -z "$avoidtemprpath"; then
# Make sure the rpath contains only unique directories.
- case "$temp_rpath:" in
+ case $temp_rpath: in
*"$absdir:"*) ;;
*) func_append temp_rpath "$absdir:" ;;
esac
@@ -6672,9 +8115,9 @@ func_mode_link ()
esac
fi # $linkmode,$pass = prog,link...
- if test "$alldeplibs" = yes &&
- { test "$deplibs_check_method" = pass_all ||
- { test "$build_libtool_libs" = yes &&
+ if $alldeplibs &&
+ { test pass_all = "$deplibs_check_method" ||
+ { test yes = "$build_libtool_libs" &&
test -n "$library_names"; }; }; then
# We only need to search for static libraries
continue
@@ -6683,19 +8126,19 @@ func_mode_link ()
link_static=no # Whether the deplib will be linked statically
use_static_libs=$prefer_static_libs
- if test "$use_static_libs" = built && test "$installed" = yes; then
+ if test built = "$use_static_libs" && test yes = "$installed"; then
use_static_libs=no
fi
if test -n "$library_names" &&
- { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ { test no = "$use_static_libs" || test -z "$old_library"; }; then
case $host in
- *cygwin* | *mingw* | *cegcc*)
+ *cygwin* | *mingw* | *cegcc* | *os2*)
# No point in relinking DLLs because paths are not encoded
func_append notinst_deplibs " $lib"
need_relink=no
;;
*)
- if test "$installed" = no; then
+ if test no = "$installed"; then
func_append notinst_deplibs " $lib"
need_relink=yes
fi
@@ -6705,24 +8148,24 @@ func_mode_link ()
# Warn about portability, can't link against -module's on some
# systems (darwin). Don't bleat about dlopened modules though!
- dlopenmodule=""
+ dlopenmodule=
for dlpremoduletest in $dlprefiles; do
if test "X$dlpremoduletest" = "X$lib"; then
- dlopenmodule="$dlpremoduletest"
+ dlopenmodule=$dlpremoduletest
break
fi
done
- if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
+ if test -z "$dlopenmodule" && test yes = "$shouldnotlink" && test link = "$pass"; then
echo
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
$ECHO "*** Warning: Linking the executable $output against the loadable module"
else
$ECHO "*** Warning: Linking the shared library $output against the loadable module"
fi
$ECHO "*** $linklib is not portable!"
fi
- if test "$linkmode" = lib &&
- test "$hardcode_into_libs" = yes; then
+ if test lib = "$linkmode" &&
+ test yes = "$hardcode_into_libs"; then
# Hardcode the library path.
# Skip directories that are in the system default run-time
# search path.
@@ -6750,43 +8193,43 @@ func_mode_link ()
# figure out the soname
set dummy $library_names
shift
- realname="$1"
+ realname=$1
shift
libname=`eval "\\$ECHO \"$libname_spec\""`
# use dlname if we got it. it's perfectly good, no?
if test -n "$dlname"; then
- soname="$dlname"
+ soname=$dlname
elif test -n "$soname_spec"; then
# bleh windows
case $host in
- *cygwin* | mingw* | *cegcc*)
+ *cygwin* | mingw* | *cegcc* | *os2*)
func_arith $current - $age
major=$func_arith_result
- versuffix="-$major"
+ versuffix=-$major
;;
esac
eval soname=\"$soname_spec\"
else
- soname="$realname"
+ soname=$realname
fi
# Make a new name for the extract_expsyms_cmds to use
- soroot="$soname"
+ soroot=$soname
func_basename "$soroot"
- soname="$func_basename_result"
+ soname=$func_basename_result
func_stripname 'lib' '.dll' "$soname"
newlib=libimp-$func_stripname_result.a
# If the library has no export list, then create one now
if test -f "$output_objdir/$soname-def"; then :
else
- func_verbose "extracting exported symbol list from \`$soname'"
+ func_verbose "extracting exported symbol list from '$soname'"
func_execute_cmds "$extract_expsyms_cmds" 'exit $?'
fi
# Create $newlib
if test -f "$output_objdir/$newlib"; then :; else
- func_verbose "generating import library for \`$soname'"
+ func_verbose "generating import library for '$soname'"
func_execute_cmds "$old_archive_from_expsyms_cmds" 'exit $?'
fi
# make sure the library variables are pointing to the new library
@@ -6794,58 +8237,58 @@ func_mode_link ()
linklib=$newlib
fi # test -n "$old_archive_from_expsyms_cmds"
- if test "$linkmode" = prog || test "$opt_mode" != relink; then
+ if test prog = "$linkmode" || test relink != "$opt_mode"; then
add_shlibpath=
add_dir=
add=
lib_linked=yes
case $hardcode_action in
immediate | unsupported)
- if test "$hardcode_direct" = no; then
- add="$dir/$linklib"
+ if test no = "$hardcode_direct"; then
+ add=$dir/$linklib
case $host in
- *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
- *-*-sysv4*uw2*) add_dir="-L$dir" ;;
+ *-*-sco3.2v5.0.[024]*) add_dir=-L$dir ;;
+ *-*-sysv4*uw2*) add_dir=-L$dir ;;
*-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
- *-*-unixware7*) add_dir="-L$dir" ;;
+ *-*-unixware7*) add_dir=-L$dir ;;
*-*-darwin* )
- # if the lib is a (non-dlopened) module then we can not
+ # if the lib is a (non-dlopened) module then we cannot
# link against it, someone is ignoring the earlier warnings
if /usr/bin/file -L $add 2> /dev/null |
- $GREP ": [^:]* bundle" >/dev/null ; then
+ $GREP ": [^:]* bundle" >/dev/null; then
if test "X$dlopenmodule" != "X$lib"; then
$ECHO "*** Warning: lib $linklib is a module, not a shared library"
- if test -z "$old_library" ; then
+ if test -z "$old_library"; then
echo
echo "*** And there doesn't seem to be a static archive available"
echo "*** The link will probably fail, sorry"
else
- add="$dir/$old_library"
+ add=$dir/$old_library
fi
elif test -n "$old_library"; then
- add="$dir/$old_library"
+ add=$dir/$old_library
fi
fi
esac
- elif test "$hardcode_minus_L" = no; then
+ elif test no = "$hardcode_minus_L"; then
case $host in
- *-*-sunos*) add_shlibpath="$dir" ;;
+ *-*-sunos*) add_shlibpath=$dir ;;
esac
- add_dir="-L$dir"
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = no; then
- add_shlibpath="$dir"
- add="-l$name"
+ add_dir=-L$dir
+ add=-l$name
+ elif test no = "$hardcode_shlibpath_var"; then
+ add_shlibpath=$dir
+ add=-l$name
else
lib_linked=no
fi
;;
relink)
- if test "$hardcode_direct" = yes &&
- test "$hardcode_direct_absolute" = no; then
- add="$dir/$linklib"
- elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$absdir"
+ if test yes = "$hardcode_direct" &&
+ test no = "$hardcode_direct_absolute"; then
+ add=$dir/$linklib
+ elif test yes = "$hardcode_minus_L"; then
+ add_dir=-L$absdir
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
@@ -6854,10 +8297,10 @@ func_mode_link ()
;;
esac
fi
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = yes; then
- add_shlibpath="$dir"
- add="-l$name"
+ add=-l$name
+ elif test yes = "$hardcode_shlibpath_var"; then
+ add_shlibpath=$dir
+ add=-l$name
else
lib_linked=no
fi
@@ -6865,7 +8308,7 @@ func_mode_link ()
*) lib_linked=no ;;
esac
- if test "$lib_linked" != yes; then
+ if test yes != "$lib_linked"; then
func_fatal_configuration "unsupported hardcode properties"
fi
@@ -6875,15 +8318,15 @@ func_mode_link ()
*) func_append compile_shlibpath "$add_shlibpath:" ;;
esac
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
test -n "$add_dir" && compile_deplibs="$add_dir $compile_deplibs"
test -n "$add" && compile_deplibs="$add $compile_deplibs"
else
test -n "$add_dir" && deplibs="$add_dir $deplibs"
test -n "$add" && deplibs="$add $deplibs"
- if test "$hardcode_direct" != yes &&
- test "$hardcode_minus_L" != yes &&
- test "$hardcode_shlibpath_var" = yes; then
+ if test yes != "$hardcode_direct" &&
+ test yes != "$hardcode_minus_L" &&
+ test yes = "$hardcode_shlibpath_var"; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
*) func_append finalize_shlibpath "$libdir:" ;;
@@ -6892,33 +8335,33 @@ func_mode_link ()
fi
fi
- if test "$linkmode" = prog || test "$opt_mode" = relink; then
+ if test prog = "$linkmode" || test relink = "$opt_mode"; then
add_shlibpath=
add_dir=
add=
# Finalize command for both is simple: just hardcode it.
- if test "$hardcode_direct" = yes &&
- test "$hardcode_direct_absolute" = no; then
- add="$libdir/$linklib"
- elif test "$hardcode_minus_L" = yes; then
- add_dir="-L$libdir"
- add="-l$name"
- elif test "$hardcode_shlibpath_var" = yes; then
+ if test yes = "$hardcode_direct" &&
+ test no = "$hardcode_direct_absolute"; then
+ add=$libdir/$linklib
+ elif test yes = "$hardcode_minus_L"; then
+ add_dir=-L$libdir
+ add=-l$name
+ elif test yes = "$hardcode_shlibpath_var"; then
case :$finalize_shlibpath: in
*":$libdir:"*) ;;
*) func_append finalize_shlibpath "$libdir:" ;;
esac
- add="-l$name"
- elif test "$hardcode_automatic" = yes; then
+ add=-l$name
+ elif test yes = "$hardcode_automatic"; then
if test -n "$inst_prefix_dir" &&
- test -f "$inst_prefix_dir$libdir/$linklib" ; then
- add="$inst_prefix_dir$libdir/$linklib"
+ test -f "$inst_prefix_dir$libdir/$linklib"; then
+ add=$inst_prefix_dir$libdir/$linklib
else
- add="$libdir/$linklib"
+ add=$libdir/$linklib
fi
else
# We cannot seem to hardcode it, guess we'll fake it.
- add_dir="-L$libdir"
+ add_dir=-L$libdir
# Try looking first in the location we're being installed to.
if test -n "$inst_prefix_dir"; then
case $libdir in
@@ -6927,10 +8370,10 @@ func_mode_link ()
;;
esac
fi
- add="-l$name"
+ add=-l$name
fi
- if test "$linkmode" = prog; then
+ if test prog = "$linkmode"; then
test -n "$add_dir" && finalize_deplibs="$add_dir $finalize_deplibs"
test -n "$add" && finalize_deplibs="$add $finalize_deplibs"
else
@@ -6938,43 +8381,43 @@ func_mode_link ()
test -n "$add" && deplibs="$add $deplibs"
fi
fi
- elif test "$linkmode" = prog; then
+ elif test prog = "$linkmode"; then
# Here we assume that one of hardcode_direct or hardcode_minus_L
# is not unsupported. This is valid on all known static and
# shared platforms.
- if test "$hardcode_direct" != unsupported; then
- test -n "$old_library" && linklib="$old_library"
+ if test unsupported != "$hardcode_direct"; then
+ test -n "$old_library" && linklib=$old_library
compile_deplibs="$dir/$linklib $compile_deplibs"
finalize_deplibs="$dir/$linklib $finalize_deplibs"
else
compile_deplibs="-l$name -L$dir $compile_deplibs"
finalize_deplibs="-l$name -L$dir $finalize_deplibs"
fi
- elif test "$build_libtool_libs" = yes; then
+ elif test yes = "$build_libtool_libs"; then
# Not a shared library
- if test "$deplibs_check_method" != pass_all; then
+ if test pass_all != "$deplibs_check_method"; then
# We're trying link a shared library against a static one
# but the system doesn't support it.
# Just print a warning and add the library to dependency_libs so
# that the program can be linked against the static library.
echo
- $ECHO "*** Warning: This system can not link to static lib archive $lib."
+ $ECHO "*** Warning: This system cannot link to static lib archive $lib."
echo "*** I have the capability to make that library automatically link in when"
echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have."
- if test "$module" = yes; then
+ if test yes = "$module"; then
echo "*** But as you try to build a module library, libtool will still create "
echo "*** a static module, that should work as long as the dlopening application"
echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
if test -z "$global_symbol_pipe"; then
echo
echo "*** However, this would only work if libtool was able to extract symbol"
- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
echo "*** not find such a program. So, this module is probably useless."
- echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ echo "*** 'nm' from GNU binutils and a full rebuild may help."
fi
- if test "$build_old_libs" = no; then
+ if test no = "$build_old_libs"; then
build_libtool_libs=module
build_old_libs=yes
else
@@ -6987,11 +8430,11 @@ func_mode_link ()
fi
fi # link shared/static library?
- if test "$linkmode" = lib; then
+ if test lib = "$linkmode"; then
if test -n "$dependency_libs" &&
- { test "$hardcode_into_libs" != yes ||
- test "$build_old_libs" = yes ||
- test "$link_static" = yes; }; then
+ { test yes != "$hardcode_into_libs" ||
+ test yes = "$build_old_libs" ||
+ test yes = "$link_static"; }; then
# Extract -R from dependency_libs
temp_deplibs=
for libdir in $dependency_libs; do
@@ -7005,12 +8448,12 @@ func_mode_link ()
*) func_append temp_deplibs " $libdir";;
esac
done
- dependency_libs="$temp_deplibs"
+ dependency_libs=$temp_deplibs
fi
func_append newlib_search_path " $absdir"
# Link against this library
- test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
+ test no = "$link_static" && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
# ... and its dependency_libs
tmp_libs=
for deplib in $dependency_libs; do
@@ -7020,7 +8463,7 @@ func_mode_link ()
func_resolve_sysroot "$func_stripname_result";;
*) func_resolve_sysroot "$deplib" ;;
esac
- if $opt_preserve_dup_deps ; then
+ if $opt_preserve_dup_deps; then
case "$tmp_libs " in
*" $func_resolve_sysroot_result "*)
func_append specialdeplibs " $func_resolve_sysroot_result" ;;
@@ -7029,12 +8472,12 @@ func_mode_link ()
func_append tmp_libs " $func_resolve_sysroot_result"
done
- if test "$link_all_deplibs" != no; then
+ if test no != "$link_all_deplibs"; then
# Add the search paths of all dependency libraries
for deplib in $dependency_libs; do
path=
case $deplib in
- -L*) path="$deplib" ;;
+ -L*) path=$deplib ;;
*.la)
func_resolve_sysroot "$deplib"
deplib=$func_resolve_sysroot_result
@@ -7042,12 +8485,12 @@ func_mode_link ()
dir=$func_dirname_result
# We need an absolute path.
case $dir in
- [\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) absdir=$dir ;;
*)
absdir=`cd "$dir" && pwd`
if test -z "$absdir"; then
- func_warning "cannot determine absolute directory name of \`$dir'"
- absdir="$dir"
+ func_warning "cannot determine absolute directory name of '$dir'"
+ absdir=$dir
fi
;;
esac
@@ -7055,35 +8498,35 @@ func_mode_link ()
case $host in
*-*-darwin*)
depdepl=
- eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
- if test -n "$deplibrary_names" ; then
- for tmp in $deplibrary_names ; do
+ eval deplibrary_names=`$SED -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ if test -n "$deplibrary_names"; then
+ for tmp in $deplibrary_names; do
depdepl=$tmp
done
- if test -f "$absdir/$objdir/$depdepl" ; then
- depdepl="$absdir/$objdir/$depdepl"
- darwin_install_name=`${OTOOL} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ if test -f "$absdir/$objdir/$depdepl"; then
+ depdepl=$absdir/$objdir/$depdepl
+ darwin_install_name=`$OTOOL -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
if test -z "$darwin_install_name"; then
- darwin_install_name=`${OTOOL64} -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
+ darwin_install_name=`$OTOOL64 -L $depdepl | awk '{if (NR == 2) {print $1;exit}}'`
fi
- func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
- func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
+ func_append compiler_flags " $wl-dylib_file $wl$darwin_install_name:$depdepl"
+ func_append linker_flags " -dylib_file $darwin_install_name:$depdepl"
path=
fi
fi
;;
*)
- path="-L$absdir/$objdir"
+ path=-L$absdir/$objdir
;;
esac
else
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
test -z "$libdir" && \
- func_fatal_error "\`$deplib' is not a valid libtool archive"
+ func_fatal_error "'$deplib' is not a valid libtool archive"
test "$absdir" != "$libdir" && \
- func_warning "\`$deplib' seems to be moved"
+ func_warning "'$deplib' seems to be moved"
- path="-L$absdir"
+ path=-L$absdir
fi
;;
esac
@@ -7095,23 +8538,23 @@ func_mode_link ()
fi # link_all_deplibs != no
fi # linkmode = lib
done # for deplib in $libs
- if test "$pass" = link; then
- if test "$linkmode" = "prog"; then
+ if test link = "$pass"; then
+ if test prog = "$linkmode"; then
compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
else
compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
fi
fi
- dependency_libs="$newdependency_libs"
- if test "$pass" = dlpreopen; then
+ dependency_libs=$newdependency_libs
+ if test dlpreopen = "$pass"; then
# Link the dlpreopened libraries before other libraries
for deplib in $save_deplibs; do
deplibs="$deplib $deplibs"
done
fi
- if test "$pass" != dlopen; then
- if test "$pass" != conv; then
+ if test dlopen != "$pass"; then
+ test conv = "$pass" || {
# Make sure lib_search_path contains only unique directories.
lib_search_path=
for dir in $newlib_search_path; do
@@ -7121,12 +8564,12 @@ func_mode_link ()
esac
done
newlib_search_path=
- fi
+ }
- if test "$linkmode,$pass" != "prog,link"; then
- vars="deplibs"
- else
+ if test prog,link = "$linkmode,$pass"; then
vars="compile_deplibs finalize_deplibs"
+ else
+ vars=deplibs
fi
for var in $vars dependency_libs; do
# Add libraries to $var in reverse order
@@ -7184,62 +8627,93 @@ func_mode_link ()
eval $var=\"$tmp_libs\"
done # for var
fi
+
+ # Add Sun CC postdeps if required:
+ test CXX = "$tagname" && {
+ case $host_os in
+ linux*)
+ case `$CC -V 2>&1 | sed 5q` in
+ *Sun\ C*) # Sun C++ 5.9
+ func_suncc_cstd_abi
+
+ if test no != "$suncc_use_cstd_abi"; then
+ func_append postdeps ' -library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+
+ solaris*)
+ func_cc_basename "$CC"
+ case $func_cc_basename_result in
+ CC* | sunCC*)
+ func_suncc_cstd_abi
+
+ if test no != "$suncc_use_cstd_abi"; then
+ func_append postdeps ' -library=Cstd -library=Crun'
+ fi
+ ;;
+ esac
+ ;;
+ esac
+ }
+
# Last step: remove runtime libs from dependency_libs
# (they stay in deplibs)
tmp_libs=
- for i in $dependency_libs ; do
+ for i in $dependency_libs; do
case " $predeps $postdeps $compiler_lib_search_path " in
*" $i "*)
- i=""
+ i=
;;
esac
- if test -n "$i" ; then
+ if test -n "$i"; then
func_append tmp_libs " $i"
fi
done
dependency_libs=$tmp_libs
done # for pass
- if test "$linkmode" = prog; then
- dlfiles="$newdlfiles"
+ if test prog = "$linkmode"; then
+ dlfiles=$newdlfiles
fi
- if test "$linkmode" = prog || test "$linkmode" = lib; then
- dlprefiles="$newdlprefiles"
+ if test prog = "$linkmode" || test lib = "$linkmode"; then
+ dlprefiles=$newdlprefiles
fi
case $linkmode in
oldlib)
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- func_warning "\`-dlopen' is ignored for archives"
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+ func_warning "'-dlopen' is ignored for archives"
fi
case " $deplibs" in
*\ -l* | *\ -L*)
- func_warning "\`-l' and \`-L' are ignored for archives" ;;
+ func_warning "'-l' and '-L' are ignored for archives" ;;
esac
test -n "$rpath" && \
- func_warning "\`-rpath' is ignored for archives"
+ func_warning "'-rpath' is ignored for archives"
test -n "$xrpath" && \
- func_warning "\`-R' is ignored for archives"
+ func_warning "'-R' is ignored for archives"
test -n "$vinfo" && \
- func_warning "\`-version-info/-version-number' is ignored for archives"
+ func_warning "'-version-info/-version-number' is ignored for archives"
test -n "$release" && \
- func_warning "\`-release' is ignored for archives"
+ func_warning "'-release' is ignored for archives"
test -n "$export_symbols$export_symbols_regex" && \
- func_warning "\`-export-symbols' is ignored for archives"
+ func_warning "'-export-symbols' is ignored for archives"
# Now set the variables for building old libraries.
build_libtool_libs=no
- oldlibs="$output"
+ oldlibs=$output
func_append objs "$old_deplibs"
;;
lib)
- # Make sure we only generate libraries of the form `libNAME.la'.
+ # Make sure we only generate libraries of the form 'libNAME.la'.
case $outputname in
lib*)
func_stripname 'lib' '.la' "$outputname"
@@ -7248,10 +8722,10 @@ func_mode_link ()
eval libname=\"$libname_spec\"
;;
*)
- test "$module" = no && \
- func_fatal_help "libtool library \`$output' must begin with \`lib'"
+ test no = "$module" \
+ && func_fatal_help "libtool library '$output' must begin with 'lib'"
- if test "$need_lib_prefix" != no; then
+ if test no != "$need_lib_prefix"; then
# Add the "lib" prefix for modules if required
func_stripname '' '.la' "$outputname"
name=$func_stripname_result
@@ -7265,8 +8739,8 @@ func_mode_link ()
esac
if test -n "$objs"; then
- if test "$deplibs_check_method" != pass_all; then
- func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
+ if test pass_all != "$deplibs_check_method"; then
+ func_fatal_error "cannot build libtool library '$output' from non-libtool objects on this host:$objs"
else
echo
$ECHO "*** Warning: Linking the shared library $output against the non-libtool"
@@ -7275,21 +8749,21 @@ func_mode_link ()
fi
fi
- test "$dlself" != no && \
- func_warning "\`-dlopen self' is ignored for libtool libraries"
+ test no = "$dlself" \
+ || func_warning "'-dlopen self' is ignored for libtool libraries"
set dummy $rpath
shift
- test "$#" -gt 1 && \
- func_warning "ignoring multiple \`-rpath's for a libtool library"
+ test 1 -lt "$#" \
+ && func_warning "ignoring multiple '-rpath's for a libtool library"
- install_libdir="$1"
+ install_libdir=$1
oldlibs=
if test -z "$rpath"; then
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
# Building a libtool convenience library.
- # Some compilers have problems with a `.al' extension so
+ # Some compilers have problems with a '.al' extension so
# convenience libraries should have the same extension an
# archive normally would.
oldlibs="$output_objdir/$libname.$libext $oldlibs"
@@ -7298,20 +8772,20 @@ func_mode_link ()
fi
test -n "$vinfo" && \
- func_warning "\`-version-info/-version-number' is ignored for convenience libraries"
+ func_warning "'-version-info/-version-number' is ignored for convenience libraries"
test -n "$release" && \
- func_warning "\`-release' is ignored for convenience libraries"
+ func_warning "'-release' is ignored for convenience libraries"
else
# Parse the version information argument.
- save_ifs="$IFS"; IFS=':'
+ save_ifs=$IFS; IFS=:
set dummy $vinfo 0 0 0
shift
- IFS="$save_ifs"
+ IFS=$save_ifs
test -n "$7" && \
- func_fatal_help "too many parameters to \`-version-info'"
+ func_fatal_help "too many parameters to '-version-info'"
# convert absolute version numbers to libtool ages
# this retains compatibility with .la files and attempts
@@ -7319,42 +8793,42 @@ func_mode_link ()
case $vinfo_number in
yes)
- number_major="$1"
- number_minor="$2"
- number_revision="$3"
+ number_major=$1
+ number_minor=$2
+ number_revision=$3
#
# There are really only two kinds -- those that
# use the current revision as the major version
# and those that subtract age and use age as
# a minor version. But, then there is irix
- # which has an extra 1 added just for fun
+ # that has an extra 1 added just for fun
#
case $version_type in
# correct linux to gnu/linux during the next big refactor
- darwin|linux|osf|windows|none)
+ darwin|freebsd-elf|linux|osf|windows|none)
func_arith $number_major + $number_minor
current=$func_arith_result
- age="$number_minor"
- revision="$number_revision"
+ age=$number_minor
+ revision=$number_revision
;;
- freebsd-aout|freebsd-elf|qnx|sunos)
- current="$number_major"
- revision="$number_minor"
- age="0"
+ freebsd-aout|qnx|sunos)
+ current=$number_major
+ revision=$number_minor
+ age=0
;;
irix|nonstopux)
func_arith $number_major + $number_minor
current=$func_arith_result
- age="$number_minor"
- revision="$number_minor"
+ age=$number_minor
+ revision=$number_minor
lt_irix_increment=no
;;
esac
;;
no)
- current="$1"
- revision="$2"
- age="$3"
+ current=$1
+ revision=$2
+ age=$3
;;
esac
@@ -7362,30 +8836,30 @@ func_mode_link ()
case $current in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- func_error "CURRENT \`$current' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "CURRENT '$current' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
case $revision in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- func_error "REVISION \`$revision' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "REVISION '$revision' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
case $age in
0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
*)
- func_error "AGE \`$age' must be a nonnegative integer"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "AGE '$age' must be a nonnegative integer"
+ func_fatal_error "'$vinfo' is not valid version information"
;;
esac
if test "$age" -gt "$current"; then
- func_error "AGE \`$age' is greater than the current interface number \`$current'"
- func_fatal_error "\`$vinfo' is not valid version information"
+ func_error "AGE '$age' is greater than the current interface number '$current'"
+ func_fatal_error "'$vinfo' is not valid version information"
fi
# Calculate the version variables.
@@ -7400,26 +8874,36 @@ func_mode_link ()
# verstring for coding it into the library header
func_arith $current - $age
major=.$func_arith_result
- versuffix="$major.$age.$revision"
+ versuffix=$major.$age.$revision
# Darwin ld doesn't like 0 for these options...
func_arith $current + 1
minor_current=$func_arith_result
- xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ xlcverstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ # On Darwin other compilers
+ case $CC in
+ nagfor*)
+ verstring="$wl-compatibility_version $wl$minor_current $wl-current_version $wl$minor_current.$revision"
+ ;;
+ *)
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ ;;
+ esac
;;
freebsd-aout)
- major=".$current"
- versuffix=".$current.$revision";
+ major=.$current
+ versuffix=.$current.$revision
;;
freebsd-elf)
- major=".$current"
- versuffix=".$current"
+ func_arith $current - $age
+ major=.$func_arith_result
+ versuffix=$major.$age.$revision
;;
irix | nonstopux)
- if test "X$lt_irix_increment" = "Xno"; then
+ if test no = "$lt_irix_increment"; then
func_arith $current - $age
else
func_arith $current - $age + 1
@@ -7430,69 +8914,74 @@ func_mode_link ()
nonstopux) verstring_prefix=nonstopux ;;
*) verstring_prefix=sgi ;;
esac
- verstring="$verstring_prefix$major.$revision"
+ verstring=$verstring_prefix$major.$revision
# Add in all the interfaces that we are compatible with.
loop=$revision
- while test "$loop" -ne 0; do
+ while test 0 -ne "$loop"; do
func_arith $revision - $loop
iface=$func_arith_result
func_arith $loop - 1
loop=$func_arith_result
- verstring="$verstring_prefix$major.$iface:$verstring"
+ verstring=$verstring_prefix$major.$iface:$verstring
done
- # Before this point, $major must not contain `.'.
+ # Before this point, $major must not contain '.'.
major=.$major
- versuffix="$major.$revision"
+ versuffix=$major.$revision
;;
linux) # correct to gnu/linux during the next big refactor
func_arith $current - $age
major=.$func_arith_result
- versuffix="$major.$age.$revision"
+ versuffix=$major.$age.$revision
;;
osf)
func_arith $current - $age
major=.$func_arith_result
- versuffix=".$current.$age.$revision"
- verstring="$current.$age.$revision"
+ versuffix=.$current.$age.$revision
+ verstring=$current.$age.$revision
# Add in all the interfaces that we are compatible with.
loop=$age
- while test "$loop" -ne 0; do
+ while test 0 -ne "$loop"; do
func_arith $current - $loop
iface=$func_arith_result
func_arith $loop - 1
loop=$func_arith_result
- verstring="$verstring:${iface}.0"
+ verstring=$verstring:$iface.0
done
# Make executables depend on our current version.
- func_append verstring ":${current}.0"
+ func_append verstring ":$current.0"
;;
qnx)
- major=".$current"
- versuffix=".$current"
+ major=.$current
+ versuffix=.$current
+ ;;
+
+ sco)
+ major=.$current
+ versuffix=.$current
;;
sunos)
- major=".$current"
- versuffix=".$current.$revision"
+ major=.$current
+ versuffix=.$current.$revision
;;
windows)
# Use '-' rather than '.', since we only want one
- # extension on DOS 8.3 filesystems.
+ # extension on DOS 8.3 file systems.
func_arith $current - $age
major=$func_arith_result
- versuffix="-$major"
+ versuffix=-$major
;;
*)
- func_fatal_configuration "unknown library version type \`$version_type'"
+ func_fatal_configuration "unknown library version type '$version_type'"
;;
esac
@@ -7506,42 +8995,45 @@ func_mode_link ()
verstring=
;;
*)
- verstring="0.0"
+ verstring=0.0
;;
esac
- if test "$need_version" = no; then
+ if test no = "$need_version"; then
versuffix=
else
- versuffix=".0.0"
+ versuffix=.0.0
fi
fi
# Remove version info from name if versioning should be avoided
- if test "$avoid_version" = yes && test "$need_version" = no; then
+ if test yes,no = "$avoid_version,$need_version"; then
major=
versuffix=
- verstring=""
+ verstring=
fi
# Check to see if the archive will have undefined symbols.
- if test "$allow_undefined" = yes; then
- if test "$allow_undefined_flag" = unsupported; then
- func_warning "undefined symbols not allowed in $host shared libraries"
- build_libtool_libs=no
- build_old_libs=yes
+ if test yes = "$allow_undefined"; then
+ if test unsupported = "$allow_undefined_flag"; then
+ if test yes = "$build_old_libs"; then
+ func_warning "undefined symbols not allowed in $host shared libraries; building static only"
+ build_libtool_libs=no
+ else
+ func_fatal_error "can't build $host shared library unless -no-undefined is specified"
+ fi
fi
else
# Don't allow undefined symbols.
- allow_undefined_flag="$no_undefined_flag"
+ allow_undefined_flag=$no_undefined_flag
fi
fi
- func_generate_dlsyms "$libname" "$libname" "yes"
+ func_generate_dlsyms "$libname" "$libname" :
func_append libobjs " $symfileobj"
- test "X$libobjs" = "X " && libobjs=
+ test " " = "$libobjs" && libobjs=
- if test "$opt_mode" != relink; then
+ if test relink != "$opt_mode"; then
# Remove our outputs, but don't remove object files since they
# may have been created when compiling PIC objects.
removelist=
@@ -7550,8 +9042,8 @@ func_mode_link ()
case $p in
*.$objext | *.gcno)
;;
- $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
- if test "X$precious_files_regex" != "X"; then
+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/$libname$release.*)
+ if test -n "$precious_files_regex"; then
if $ECHO "$p" | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
then
continue
@@ -7567,11 +9059,11 @@ func_mode_link ()
fi
# Now set the variables for building old libraries.
- if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
+ if test yes = "$build_old_libs" && test convenience != "$build_libtool_libs"; then
func_append oldlibs " $output_objdir/$libname.$libext"
# Transform .lo files to .o files.
- oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
+ oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; $lo2o" | $NL2SP`
fi
# Eliminate all temporary directories.
@@ -7592,13 +9084,13 @@ func_mode_link ()
*) func_append finalize_rpath " $libdir" ;;
esac
done
- if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ if test yes != "$hardcode_into_libs" || test yes = "$build_old_libs"; then
dependency_libs="$temp_xrpath $dependency_libs"
fi
fi
# Make sure dlfiles contains only unique files that won't be dlpreopened
- old_dlfiles="$dlfiles"
+ old_dlfiles=$dlfiles
dlfiles=
for lib in $old_dlfiles; do
case " $dlprefiles $dlfiles " in
@@ -7608,7 +9100,7 @@ func_mode_link ()
done
# Make sure dlprefiles contains only unique files
- old_dlprefiles="$dlprefiles"
+ old_dlprefiles=$dlprefiles
dlprefiles=
for lib in $old_dlprefiles; do
case "$dlprefiles " in
@@ -7617,7 +9109,7 @@ func_mode_link ()
esac
done
- if test "$build_libtool_libs" = yes; then
+ if test yes = "$build_libtool_libs"; then
if test -n "$rpath"; then
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
@@ -7641,7 +9133,7 @@ func_mode_link ()
;;
*)
# Add libc to deplibs on all other systems if necessary.
- if test "$build_libtool_need_lc" = "yes"; then
+ if test yes = "$build_libtool_need_lc"; then
func_append deplibs " -lc"
fi
;;
@@ -7657,9 +9149,9 @@ func_mode_link ()
# I'm not sure if I'm treating the release correctly. I think
# release should show up in the -l (ie -lgmp5) so we don't want to
# add it in twice. Is that correct?
- release=""
- versuffix=""
- major=""
+ release=
+ versuffix=
+ major=
newdeplibs=
droppeddeps=no
case $deplibs_check_method in
@@ -7688,20 +9180,20 @@ EOF
-l*)
func_stripname -l '' "$i"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $i "*)
func_append newdeplibs " $i"
- i=""
+ i=
;;
esac
fi
- if test -n "$i" ; then
+ if test -n "$i"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
set dummy $deplib_matches; shift
deplib_match=$1
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
func_append newdeplibs " $i"
else
droppeddeps=yes
@@ -7731,20 +9223,20 @@ EOF
$opt_dry_run || $RM conftest
if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
ldd_output=`ldd conftest`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $i "*)
func_append newdeplibs " $i"
- i=""
+ i=
;;
esac
fi
- if test -n "$i" ; then
+ if test -n "$i"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
deplib_matches=`eval "\\$ECHO \"$library_names_spec\""`
set dummy $deplib_matches; shift
deplib_match=$1
- if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
+ if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0; then
func_append newdeplibs " $i"
else
droppeddeps=yes
@@ -7781,24 +9273,24 @@ EOF
-l*)
func_stripname -l '' "$a_deplib"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $a_deplib "*)
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
;;
esac
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
if test -n "$file_magic_glob"; then
libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
else
libnameglob=$libname
fi
- test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
+ test yes = "$want_nocaseglob" && nocaseglob=`shopt -p nocaseglob`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
- if test "$want_nocaseglob" = yes; then
+ if test yes = "$want_nocaseglob"; then
shopt -s nocaseglob
potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
$nocaseglob
@@ -7816,25 +9308,25 @@ EOF
# We might still enter an endless loop, since a link
# loop can be closed while we follow links,
# but so what?
- potlib="$potent_lib"
+ potlib=$potent_lib
while test -h "$potlib" 2>/dev/null; do
- potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
+ potliblink=`ls -ld $potlib | $SED 's/.* -> //'`
case $potliblink in
- [\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
- *) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
+ [\\/]* | [A-Za-z]:[\\/]*) potlib=$potliblink;;
+ *) potlib=`$ECHO "$potlib" | $SED 's|[^/]*$||'`"$potliblink";;
esac
done
if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
$SED -e 10q |
$EGREP "$file_magic_regex" > /dev/null; then
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
break 2
fi
done
done
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
droppeddeps=yes
echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7842,7 +9334,7 @@ EOF
echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have"
echo "*** because I did check the linker path looking for a file starting"
- if test -z "$potlib" ; then
+ if test -z "$potlib"; then
$ECHO "*** with $libname but no candidates were found. (...for file magic test)"
else
$ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7865,30 +9357,30 @@ EOF
-l*)
func_stripname -l '' "$a_deplib"
name=$func_stripname_result
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
case " $predeps $postdeps " in
*" $a_deplib "*)
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
;;
esac
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
libname=`eval "\\$ECHO \"$libname_spec\""`
for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
for potent_lib in $potential_libs; do
- potlib="$potent_lib" # see symlink-check above in file_magic test
+ potlib=$potent_lib # see symlink-check above in file_magic test
if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
$EGREP "$match_pattern_regex" > /dev/null; then
func_append newdeplibs " $a_deplib"
- a_deplib=""
+ a_deplib=
break 2
fi
done
done
fi
- if test -n "$a_deplib" ; then
+ if test -n "$a_deplib"; then
droppeddeps=yes
echo
$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
@@ -7896,7 +9388,7 @@ EOF
echo "*** you link to this library. But I can only do this if you have a"
echo "*** shared version of the library, which you do not appear to have"
echo "*** because I did check the linker path looking for a file starting"
- if test -z "$potlib" ; then
+ if test -z "$potlib"; then
$ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
else
$ECHO "*** with $libname and none of the candidates passed a file format test"
@@ -7912,18 +9404,18 @@ EOF
done # Gone through all deplibs.
;;
none | unknown | *)
- newdeplibs=""
+ newdeplibs=
tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
- if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
- for i in $predeps $postdeps ; do
+ if test yes = "$allow_libtool_libs_with_static_runtimes"; then
+ for i in $predeps $postdeps; do
# can't use Xsed below, because $i might contain '/'
- tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
+ tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s|$i||"`
done
fi
case $tmp_deplibs in
*[!\ \ ]*)
echo
- if test "X$deplibs_check_method" = "Xnone"; then
+ if test none = "$deplibs_check_method"; then
echo "*** Warning: inter-library dependencies are not supported in this platform."
else
echo "*** Warning: inter-library dependencies are not known to be supported."
@@ -7947,8 +9439,8 @@ EOF
;;
esac
- if test "$droppeddeps" = yes; then
- if test "$module" = yes; then
+ if test yes = "$droppeddeps"; then
+ if test yes = "$module"; then
echo
echo "*** Warning: libtool could not satisfy all declared inter-library"
$ECHO "*** dependencies of module $libname. Therefore, libtool will create"
@@ -7957,12 +9449,12 @@ EOF
if test -z "$global_symbol_pipe"; then
echo
echo "*** However, this would only work if libtool was able to extract symbol"
- echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+ echo "*** lists from a program, using 'nm' or equivalent, but libtool could"
echo "*** not find such a program. So, this module is probably useless."
- echo "*** \`nm' from GNU binutils and a full rebuild may help."
+ echo "*** 'nm' from GNU binutils and a full rebuild may help."
fi
- if test "$build_old_libs" = no; then
- oldlibs="$output_objdir/$libname.$libext"
+ if test no = "$build_old_libs"; then
+ oldlibs=$output_objdir/$libname.$libext
build_libtool_libs=module
build_old_libs=yes
else
@@ -7973,14 +9465,14 @@ EOF
echo "*** automatically added whenever a program is linked with this library"
echo "*** or is declared to -dlopen it."
- if test "$allow_undefined" = no; then
+ if test no = "$allow_undefined"; then
echo
echo "*** Since this library must not contain undefined symbols,"
echo "*** because either the platform does not support them or"
echo "*** it was explicitly requested with -no-undefined,"
echo "*** libtool will only create a static version of it."
- if test "$build_old_libs" = no; then
- oldlibs="$output_objdir/$libname.$libext"
+ if test no = "$build_old_libs"; then
+ oldlibs=$output_objdir/$libname.$libext
build_libtool_libs=module
build_old_libs=yes
else
@@ -8026,7 +9518,7 @@ EOF
*) func_append new_libs " $deplib" ;;
esac
done
- deplibs="$new_libs"
+ deplibs=$new_libs
# All the library-specific variables (install_libdir is set above).
library_names=
@@ -8034,25 +9526,25 @@ EOF
dlname=
# Test again, we may have decided not to build it any more
- if test "$build_libtool_libs" = yes; then
- # Remove ${wl} instances when linking with ld.
+ if test yes = "$build_libtool_libs"; then
+ # Remove $wl instances when linking with ld.
# FIXME: should test the right _cmds variable.
case $archive_cmds in
*\$LD\ *) wl= ;;
esac
- if test "$hardcode_into_libs" = yes; then
+ if test yes = "$hardcode_into_libs"; then
# Hardcode the library paths
hardcode_libdirs=
dep_rpath=
- rpath="$finalize_rpath"
- test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
+ rpath=$finalize_rpath
+ test relink = "$opt_mode" || rpath=$compile_rpath$rpath
for libdir in $rpath; do
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
func_replace_sysroot "$libdir"
libdir=$func_replace_sysroot_result
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8077,7 +9569,7 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
fi
if test -n "$runpath_var" && test -n "$perm_rpath"; then
@@ -8091,8 +9583,8 @@ EOF
test -n "$dep_rpath" && deplibs="$dep_rpath $deplibs"
fi
- shlibpath="$finalize_shlibpath"
- test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+ shlibpath=$finalize_shlibpath
+ test relink = "$opt_mode" || shlibpath=$compile_shlibpath$shlibpath
if test -n "$shlibpath"; then
eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
fi
@@ -8102,19 +9594,19 @@ EOF
eval library_names=\"$library_names_spec\"
set dummy $library_names
shift
- realname="$1"
+ realname=$1
shift
if test -n "$soname_spec"; then
eval soname=\"$soname_spec\"
else
- soname="$realname"
+ soname=$realname
fi
if test -z "$dlname"; then
dlname=$soname
fi
- lib="$output_objdir/$realname"
+ lib=$output_objdir/$realname
linknames=
for link
do
@@ -8128,7 +9620,7 @@ EOF
delfiles=
if test -n "$export_symbols" && test -n "$include_expsyms"; then
$opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
- export_symbols="$output_objdir/$libname.uexp"
+ export_symbols=$output_objdir/$libname.uexp
func_append delfiles " $export_symbols"
fi
@@ -8137,31 +9629,31 @@ EOF
cygwin* | mingw* | cegcc*)
if test -n "$export_symbols" && test -z "$export_symbols_regex"; then
# exporting using user supplied symfile
- if test "x`$SED 1q $export_symbols`" != xEXPORTS; then
+ func_dll_def_p "$export_symbols" || {
# and it's NOT already a .def file. Must figure out
# which of the given symbols are data symbols and tag
# them as such. So, trigger use of export_symbols_cmds.
# export_symbols gets reassigned inside the "prepare
# the list of exported symbols" if statement, so the
# include_expsyms logic still works.
- orig_export_symbols="$export_symbols"
+ orig_export_symbols=$export_symbols
export_symbols=
always_export_symbols=yes
- fi
+ }
fi
;;
esac
# Prepare the list of exported symbols
if test -z "$export_symbols"; then
- if test "$always_export_symbols" = yes || test -n "$export_symbols_regex"; then
- func_verbose "generating symbol list for \`$libname.la'"
- export_symbols="$output_objdir/$libname.exp"
+ if test yes = "$always_export_symbols" || test -n "$export_symbols_regex"; then
+ func_verbose "generating symbol list for '$libname.la'"
+ export_symbols=$output_objdir/$libname.exp
$opt_dry_run || $RM $export_symbols
cmds=$export_symbols_cmds
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd1 in $cmds; do
- IFS="$save_ifs"
+ IFS=$save_ifs
# Take the normal branch if the nm_file_list_spec branch
# doesn't work or if tool conversion is not needed.
case $nm_file_list_spec~$to_tool_file_cmd in
@@ -8175,7 +9667,7 @@ EOF
try_normal_branch=no
;;
esac
- if test "$try_normal_branch" = yes \
+ if test yes = "$try_normal_branch" \
&& { test "$len" -lt "$max_cmd_len" \
|| test "$max_cmd_len" -le -1; }
then
@@ -8186,7 +9678,7 @@ EOF
output_la=$func_basename_result
save_libobjs=$libobjs
save_output=$output
- output=${output_objdir}/${output_la}.nm
+ output=$output_objdir/$output_la.nm
func_to_tool_file "$output"
libobjs=$nm_file_list_spec$func_to_tool_file_result
func_append delfiles " $output"
@@ -8209,8 +9701,8 @@ EOF
break
fi
done
- IFS="$save_ifs"
- if test -n "$export_symbols_regex" && test "X$skipped_export" != "X:"; then
+ IFS=$save_ifs
+ if test -n "$export_symbols_regex" && test : != "$skipped_export"; then
func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
func_show_eval '$MV "${export_symbols}T" "$export_symbols"'
fi
@@ -8218,16 +9710,16 @@ EOF
fi
if test -n "$export_symbols" && test -n "$include_expsyms"; then
- tmp_export_symbols="$export_symbols"
- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+ tmp_export_symbols=$export_symbols
+ test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
$opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
- if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
+ if test : != "$skipped_export" && test -n "$orig_export_symbols"; then
# The given exports_symbols file has to be filtered, so filter it.
- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
# FIXME: $output_objdir/$libname.filter potentially contains lots of
- # 's' commands which not all seds can handle. GNU sed should be fine
+ # 's' commands, which not all seds can handle. GNU sed should be fine
# though. Also, the filter scales superlinearly with the number of
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
@@ -8246,11 +9738,11 @@ EOF
;;
esac
done
- deplibs="$tmp_deplibs"
+ deplibs=$tmp_deplibs
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec" &&
- test "$compiler_needs_object" = yes &&
+ test yes = "$compiler_needs_object" &&
test -z "$libobjs"; then
# extract the archives, so we have objects to list.
# TODO: could optimize this to just extract one archive.
@@ -8261,7 +9753,7 @@ EOF
eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
test "X$libobjs" = "X " && libobjs=
else
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $convenience
@@ -8270,18 +9762,18 @@ EOF
fi
fi
- if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ if test yes = "$thread_safe" && test -n "$thread_safe_flag_spec"; then
eval flag=\"$thread_safe_flag_spec\"
func_append linker_flags " $flag"
fi
# Make a backup of the uninstalled library when relinking
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
fi
# Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
+ if test yes = "$module" && test -n "$module_cmds"; then
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
eval test_cmds=\"$module_expsym_cmds\"
cmds=$module_expsym_cmds
@@ -8299,7 +9791,7 @@ EOF
fi
fi
- if test "X$skipped_export" != "X:" &&
+ if test : != "$skipped_export" &&
func_len " $test_cmds" &&
len=$func_len_result &&
test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
@@ -8332,8 +9824,8 @@ EOF
last_robj=
k=1
- if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
- output=${output_objdir}/${output_la}.lnkscript
+ if test -n "$save_libobjs" && test : != "$skipped_export" && test yes = "$with_gnu_ld"; then
+ output=$output_objdir/$output_la.lnkscript
func_verbose "creating GNU ld script: $output"
echo 'INPUT (' > $output
for obj in $save_libobjs
@@ -8345,14 +9837,14 @@ EOF
func_append delfiles " $output"
func_to_tool_file "$output"
output=$func_to_tool_file_result
- elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
- output=${output_objdir}/${output_la}.lnk
+ elif test -n "$save_libobjs" && test : != "$skipped_export" && test -n "$file_list_spec"; then
+ output=$output_objdir/$output_la.lnk
func_verbose "creating linker input file list: $output"
: > $output
set x $save_libobjs
shift
firstobj=
- if test "$compiler_needs_object" = yes; then
+ if test yes = "$compiler_needs_object"; then
firstobj="$1 "
shift
fi
@@ -8367,7 +9859,7 @@ EOF
else
if test -n "$save_libobjs"; then
func_verbose "creating reloadable object files..."
- output=$output_objdir/$output_la-${k}.$objext
+ output=$output_objdir/$output_la-$k.$objext
eval test_cmds=\"$reload_cmds\"
func_len " $test_cmds"
len0=$func_len_result
@@ -8379,13 +9871,13 @@ EOF
func_len " $obj"
func_arith $len + $func_len_result
len=$func_arith_result
- if test "X$objlist" = X ||
+ if test -z "$objlist" ||
test "$len" -lt "$max_cmd_len"; then
func_append objlist " $obj"
else
# The command $test_cmds is almost too long, add a
# command to the queue.
- if test "$k" -eq 1 ; then
+ if test 1 -eq "$k"; then
# The first file doesn't have a previous command to add.
reload_objs=$objlist
eval concat_cmds=\"$reload_cmds\"
@@ -8395,10 +9887,10 @@ EOF
reload_objs="$objlist $last_robj"
eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
fi
- last_robj=$output_objdir/$output_la-${k}.$objext
+ last_robj=$output_objdir/$output_la-$k.$objext
func_arith $k + 1
k=$func_arith_result
- output=$output_objdir/$output_la-${k}.$objext
+ output=$output_objdir/$output_la-$k.$objext
objlist=" $obj"
func_len " $last_robj"
func_arith $len0 + $func_len_result
@@ -8410,9 +9902,9 @@ EOF
# files will link in the last one created.
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
reload_objs="$objlist $last_robj"
- eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
+ eval concat_cmds=\"\$concat_cmds$reload_cmds\"
if test -n "$last_robj"; then
- eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
+ eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
fi
func_append delfiles " $output"
@@ -8420,9 +9912,9 @@ EOF
output=
fi
- if ${skipped_export-false}; then
- func_verbose "generating symbol list for \`$libname.la'"
- export_symbols="$output_objdir/$libname.exp"
+ ${skipped_export-false} && {
+ func_verbose "generating symbol list for '$libname.la'"
+ export_symbols=$output_objdir/$libname.exp
$opt_dry_run || $RM $export_symbols
libobjs=$output
# Append the command to create the export file.
@@ -8431,16 +9923,16 @@ EOF
if test -n "$last_robj"; then
eval concat_cmds=\"\$concat_cmds~\$RM $last_robj\"
fi
- fi
+ }
test -n "$save_libobjs" &&
func_verbose "creating a temporary reloadable object file: $output"
# Loop through the commands generated above and execute them.
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd in $concat_cmds; do
- IFS="$save_ifs"
- $opt_silent || {
+ IFS=$save_ifs
+ $opt_quiet || {
func_quote_for_expand "$cmd"
eval "func_echo $func_quote_for_expand_result"
}
@@ -8448,7 +9940,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -8457,7 +9949,7 @@ EOF
exit $lt_exit
}
done
- IFS="$save_ifs"
+ IFS=$save_ifs
if test -n "$export_symbols_regex" && ${skipped_export-false}; then
func_show_eval '$EGREP -e "$export_symbols_regex" "$export_symbols" > "${export_symbols}T"'
@@ -8465,18 +9957,18 @@ EOF
fi
fi
- if ${skipped_export-false}; then
+ ${skipped_export-false} && {
if test -n "$export_symbols" && test -n "$include_expsyms"; then
- tmp_export_symbols="$export_symbols"
- test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
+ tmp_export_symbols=$export_symbols
+ test -n "$orig_export_symbols" && tmp_export_symbols=$orig_export_symbols
$opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
fi
if test -n "$orig_export_symbols"; then
# The given exports_symbols file has to be filtered, so filter it.
- func_verbose "filter symbol list for \`$libname.la' to tag DATA exports"
+ func_verbose "filter symbol list for '$libname.la' to tag DATA exports"
# FIXME: $output_objdir/$libname.filter potentially contains lots of
- # 's' commands which not all seds can handle. GNU sed should be fine
+ # 's' commands, which not all seds can handle. GNU sed should be fine
# though. Also, the filter scales superlinearly with the number of
# global variables. join(1) would be nice here, but unfortunately
# isn't a blessed tool.
@@ -8485,7 +9977,7 @@ EOF
export_symbols=$output_objdir/$libname.def
$opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
fi
- fi
+ }
libobjs=$output
# Restore the value of output.
@@ -8499,7 +9991,7 @@ EOF
# value of $libobjs for piecewise linking.
# Do each of the archive commands.
- if test "$module" = yes && test -n "$module_cmds" ; then
+ if test yes = "$module" && test -n "$module_cmds"; then
if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
cmds=$module_expsym_cmds
else
@@ -8521,7 +10013,7 @@ EOF
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
@@ -8529,11 +10021,12 @@ EOF
test "X$libobjs" = "X " && libobjs=
fi
- save_ifs="$IFS"; IFS='~'
+ save_ifs=$IFS; IFS='~'
for cmd in $cmds; do
- IFS="$save_ifs"
+ IFS=$sp$nl
eval cmd=\"$cmd\"
- $opt_silent || {
+ IFS=$save_ifs
+ $opt_quiet || {
func_quote_for_expand "$cmd"
eval "func_echo $func_quote_for_expand_result"
}
@@ -8541,7 +10034,7 @@ EOF
lt_exit=$?
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
( cd "$output_objdir" && \
$RM "${realname}T" && \
$MV "${realname}U" "$realname" )
@@ -8550,10 +10043,10 @@ EOF
exit $lt_exit
}
done
- IFS="$save_ifs"
+ IFS=$save_ifs
# Restore the uninstalled library and exit
- if test "$opt_mode" = relink; then
+ if test relink = "$opt_mode"; then
$opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
if test -n "$convenience"; then
@@ -8573,39 +10066,39 @@ EOF
done
# If -module or -export-dynamic was specified, set the dlname.
- if test "$module" = yes || test "$export_dynamic" = yes; then
+ if test yes = "$module" || test yes = "$export_dynamic"; then
# On all known operating systems, these are identical.
- dlname="$soname"
+ dlname=$soname
fi
fi
;;
obj)
- if test -n "$dlfiles$dlprefiles" || test "$dlself" != no; then
- func_warning "\`-dlopen' is ignored for objects"
+ if test -n "$dlfiles$dlprefiles" || test no != "$dlself"; then
+ func_warning "'-dlopen' is ignored for objects"
fi
case " $deplibs" in
*\ -l* | *\ -L*)
- func_warning "\`-l' and \`-L' are ignored for objects" ;;
+ func_warning "'-l' and '-L' are ignored for objects" ;;
esac
test -n "$rpath" && \
- func_warning "\`-rpath' is ignored for objects"
+ func_warning "'-rpath' is ignored for objects"
test -n "$xrpath" && \
- func_warning "\`-R' is ignored for objects"
+ func_warning "'-R' is ignored for objects"
test -n "$vinfo" && \
- func_warning "\`-version-info' is ignored for objects"
+ func_warning "'-version-info' is ignored for objects"
test -n "$release" && \
- func_warning "\`-release' is ignored for objects"
+ func_warning "'-release' is ignored for objects"
case $output in
*.lo)
test -n "$objs$old_deplibs" && \
- func_fatal_error "cannot build library object \`$output' from non-libtool objects"
+ func_fatal_error "cannot build library object '$output' from non-libtool objects"
libobj=$output
func_lo2o "$libobj"
@@ -8613,7 +10106,7 @@ EOF
;;
*)
libobj=
- obj="$output"
+ obj=$output
;;
esac
@@ -8626,17 +10119,19 @@ EOF
# the extraction.
reload_conv_objs=
gentop=
- # reload_cmds runs $LD directly, so let us get rid of
- # -Wl from whole_archive_flag_spec and hope we can get by with
- # turning comma into space..
- wl=
-
+ # if reload_cmds runs $LD directly, get rid of -Wl from
+ # whole_archive_flag_spec and hope we can get by with turning comma
+ # into space.
+ case $reload_cmds in
+ *\$LD[\ \$]*) wl= ;;
+ esac
if test -n "$convenience"; then
if test -n "$whole_archive_flag_spec"; then
eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
- reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+ test -n "$wl" || tmp_whole_archive_flags=`$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
+ reload_conv_objs=$reload_objs\ $tmp_whole_archive_flags
else
- gentop="$output_objdir/${obj}x"
+ gentop=$output_objdir/${obj}x
func_append generated " $gentop"
func_extract_archives $gentop $convenience
@@ -8645,12 +10140,12 @@ EOF
fi
# If we're not building shared, we need to use non_pic_objs
- test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+ test yes = "$build_libtool_libs" || libobjs=$non_pic_objects
# Create the old-style object.
- reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+ reload_objs=$objs$old_deplibs' '`$ECHO "$libobjs" | $SP2NL | $SED "/\.$libext$/d; /\.lib$/d; $lo2o" | $NL2SP`' '$reload_conv_objs
- output="$obj"
+ output=$obj
func_execute_cmds "$reload_cmds" 'exit $?'
# Exit if we aren't doing a library object file.
@@ -8662,7 +10157,7 @@ EOF
exit $EXIT_SUCCESS
fi
- if test "$build_libtool_libs" != yes; then
+ test yes = "$build_libtool_libs" || {
if test -n "$gentop"; then
func_show_eval '${RM}r "$gentop"'
fi
@@ -8672,12 +10167,12 @@ EOF
# $show "echo timestamp > $libobj"
# $opt_dry_run || eval "echo timestamp > $libobj" || exit $?
exit $EXIT_SUCCESS
- fi
+ }
- if test -n "$pic_flag" || test "$pic_mode" != default; then
+ if test -n "$pic_flag" || test default != "$pic_mode"; then
# Only do commands if we really have different PIC objects.
reload_objs="$libobjs $reload_conv_objs"
- output="$libobj"
+ output=$libobj
func_execute_cmds "$reload_cmds" 'exit $?'
fi
@@ -8694,16 +10189,14 @@ EOF
output=$func_stripname_result.exe;;
esac
test -n "$vinfo" && \
- func_warning "\`-version-info' is ignored for programs"
+ func_warning "'-version-info' is ignored for programs"
test -n "$release" && \
- func_warning "\`-release' is ignored for programs"
+ func_warning "'-release' is ignored for programs"
- test "$preload" = yes \
- && test "$dlopen_support" = unknown \
- && test "$dlopen_self" = unknown \
- && test "$dlopen_self_static" = unknown && \
- func_warning "\`LT_INIT([dlopen])' not used. Assuming no dlopen support."
+ $preload \
+ && test unknown,unknown,unknown = "$dlopen_support,$dlopen_self,$dlopen_self_static" \
+ && func_warning "'LT_INIT([dlopen])' not used. Assuming no dlopen support."
case $host in
*-*-rhapsody* | *-*-darwin1.[012])
@@ -8717,11 +10210,11 @@ EOF
*-*-darwin*)
# Don't allow lazy linking, it breaks C++ global constructors
# But is supposedly fixed on 10.4 or later (yay!).
- if test "$tagname" = CXX ; then
+ if test CXX = "$tagname"; then
case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
10.[0123])
- func_append compile_command " ${wl}-bind_at_load"
- func_append finalize_command " ${wl}-bind_at_load"
+ func_append compile_command " $wl-bind_at_load"
+ func_append finalize_command " $wl-bind_at_load"
;;
esac
fi
@@ -8757,7 +10250,7 @@ EOF
*) func_append new_libs " $deplib" ;;
esac
done
- compile_deplibs="$new_libs"
+ compile_deplibs=$new_libs
func_append compile_command " $compile_deplibs"
@@ -8781,7 +10274,7 @@ EOF
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8804,7 +10297,7 @@ EOF
fi
case $host in
*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
- testbindir=`${ECHO} "$libdir" | ${SED} -e 's*/lib$*/bin*'`
+ testbindir=`$ECHO "$libdir" | $SED -e 's*/lib$*/bin*'`
case :$dllsearchpath: in
*":$libdir:"*) ;;
::) dllsearchpath=$libdir;;
@@ -8821,10 +10314,10 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval rpath=\" $hardcode_libdir_flag_spec\"
fi
- compile_rpath="$rpath"
+ compile_rpath=$rpath
rpath=
hardcode_libdirs=
@@ -8832,7 +10325,7 @@ EOF
if test -n "$hardcode_libdir_flag_spec"; then
if test -n "$hardcode_libdir_separator"; then
if test -z "$hardcode_libdirs"; then
- hardcode_libdirs="$libdir"
+ hardcode_libdirs=$libdir
else
# Just accumulate the unique libdirs.
case $hardcode_libdir_separator$hardcode_libdirs$hardcode_libdir_separator in
@@ -8857,45 +10350,43 @@ EOF
# Substitute the hardcoded libdirs into the rpath.
if test -n "$hardcode_libdir_separator" &&
test -n "$hardcode_libdirs"; then
- libdir="$hardcode_libdirs"
+ libdir=$hardcode_libdirs
eval rpath=\" $hardcode_libdir_flag_spec\"
fi
- finalize_rpath="$rpath"
+ finalize_rpath=$rpath
- if test -n "$libobjs" && test "$build_old_libs" = yes; then
+ if test -n "$libobjs" && test yes = "$build_old_libs"; then
# Transform all the library objects into standard objects.
compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
fi
- func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
+ func_generate_dlsyms "$outputname" "@PROGRAM@" false
# template prelinking step
if test -n "$prelink_cmds"; then
func_execute_cmds "$prelink_cmds" 'exit $?'
fi
- wrappers_required=yes
+ wrappers_required=:
case $host in
*cegcc* | *mingw32ce*)
# Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
- wrappers_required=no
+ wrappers_required=false
;;
*cygwin* | *mingw* )
- if test "$build_libtool_libs" != yes; then
- wrappers_required=no
- fi
+ test yes = "$build_libtool_libs" || wrappers_required=false
;;
*)
- if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
- wrappers_required=no
+ if test no = "$need_relink" || test yes != "$build_libtool_libs"; then
+ wrappers_required=false
fi
;;
esac
- if test "$wrappers_required" = no; then
+ $wrappers_required || {
# Replace the output file specification.
compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
- link_command="$compile_command$compile_rpath"
+ link_command=$compile_command$compile_rpath
# We have no uninstalled library dependencies, so finalize right now.
exit_status=0
@@ -8908,12 +10399,12 @@ EOF
fi
# Delete the generated files.
- if test -f "$output_objdir/${outputname}S.${objext}"; then
- func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
+ if test -f "$output_objdir/${outputname}S.$objext"; then
+ func_show_eval '$RM "$output_objdir/${outputname}S.$objext"'
fi
exit $exit_status
- fi
+ }
if test -n "$compile_shlibpath$finalize_shlibpath"; then
compile_command="$shlibpath_var=\"$compile_shlibpath$finalize_shlibpath\$$shlibpath_var\" $compile_command"
@@ -8943,9 +10434,9 @@ EOF
fi
fi
- if test "$no_install" = yes; then
+ if test yes = "$no_install"; then
# We don't need to create a wrapper script.
- link_command="$compile_var$compile_command$compile_rpath"
+ link_command=$compile_var$compile_command$compile_rpath
# Replace the output file specification.
link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
# Delete the old output file.
@@ -8962,27 +10453,28 @@ EOF
exit $EXIT_SUCCESS
fi
- if test "$hardcode_action" = relink; then
- # Fast installation is not supported
- link_command="$compile_var$compile_command$compile_rpath"
- relink_command="$finalize_var$finalize_command$finalize_rpath"
+ case $hardcode_action,$fast_install in
+ relink,*)
+ # Fast installation is not supported
+ link_command=$compile_var$compile_command$compile_rpath
+ relink_command=$finalize_var$finalize_command$finalize_rpath
- func_warning "this platform does not like uninstalled shared libraries"
- func_warning "\`$output' will be relinked during installation"
- else
- if test "$fast_install" != no; then
- link_command="$finalize_var$compile_command$finalize_rpath"
- if test "$fast_install" = yes; then
- relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
- else
- # fast_install is set to needless
- relink_command=
- fi
- else
- link_command="$compile_var$compile_command$compile_rpath"
- relink_command="$finalize_var$finalize_command$finalize_rpath"
- fi
- fi
+ func_warning "this platform does not like uninstalled shared libraries"
+ func_warning "'$output' will be relinked during installation"
+ ;;
+ *,yes)
+ link_command=$finalize_var$compile_command$finalize_rpath
+ relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
+ ;;
+ *,no)
+ link_command=$compile_var$compile_command$compile_rpath
+ relink_command=$finalize_var$finalize_command$finalize_rpath
+ ;;
+ *,needless)
+ link_command=$finalize_var$compile_command$finalize_rpath
+ relink_command=
+ ;;
+ esac
# Replace the output file specification.
link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
@@ -9039,8 +10531,8 @@ EOF
func_dirname_and_basename "$output" "" "."
output_name=$func_basename_result
output_path=$func_dirname_result
- cwrappersource="$output_path/$objdir/lt-$output_name.c"
- cwrapper="$output_path/$output_name.exe"
+ cwrappersource=$output_path/$objdir/lt-$output_name.c
+ cwrapper=$output_path/$output_name.exe
$RM $cwrappersource $cwrapper
trap "$RM $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
@@ -9061,7 +10553,7 @@ EOF
trap "$RM $func_ltwrapper_scriptname_result; exit $EXIT_FAILURE" 1 2 15
$opt_dry_run || {
# note: this script will not be executed, so do not chmod.
- if test "x$build" = "x$host" ; then
+ if test "x$build" = "x$host"; then
$cwrapper --lt-dump-script > $func_ltwrapper_scriptname_result
else
func_emit_wrapper no > $func_ltwrapper_scriptname_result
@@ -9084,25 +10576,27 @@ EOF
# See if we need to build an old-fashioned archive.
for oldlib in $oldlibs; do
- if test "$build_libtool_libs" = convenience; then
- oldobjs="$libobjs_save $symfileobj"
- addlibs="$convenience"
- build_libtool_libs=no
- else
- if test "$build_libtool_libs" = module; then
- oldobjs="$libobjs_save"
+ case $build_libtool_libs in
+ convenience)
+ oldobjs="$libobjs_save $symfileobj"
+ addlibs=$convenience
build_libtool_libs=no
- else
+ ;;
+ module)
+ oldobjs=$libobjs_save
+ addlibs=$old_convenience
+ build_libtool_libs=no
+ ;;
+ *)
oldobjs="$old_deplibs $non_pic_objects"
- if test "$preload" = yes && test -f "$symfileobj"; then
- func_append oldobjs " $symfileobj"
- fi
- fi
- addlibs="$old_convenience"
- fi
+ $preload && test -f "$symfileobj" \
+ && func_append oldobjs " $symfileobj"
+ addlibs=$old_convenience
+ ;;
+ esac
if test -n "$addlibs"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $addlibs
@@ -9110,13 +10604,13 @@ EOF
fi
# Do each command in the archive commands.
- if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+ if test -n "$old_archive_from_new_cmds" && test yes = "$build_libtool_libs"; then
cmds=$old_archive_from_new_cmds
else
# Add any objects from preloaded convenience libraries
if test -n "$dlprefiles"; then
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_extract_archives $gentop $dlprefiles
@@ -9137,7 +10631,7 @@ EOF
:
else
echo "copying selected object files to avoid basename conflicts..."
- gentop="$output_objdir/${outputname}x"
+ gentop=$output_objdir/${outputname}x
func_append generated " $gentop"
func_mkdir_p "$gentop"
save_oldobjs=$oldobjs
@@ -9146,7 +10640,7 @@ EOF
for obj in $save_oldobjs
do
func_basename "$obj"
- objbase="$func_basename_result"
+ objbase=$func_basename_result
case " $oldobjs " in
" ") oldobjs=$obj ;;
*[\ /]"$objbase "*)
@@ -9215,18 +10709,18 @@ EOF
else
# the above command should be used before it gets too long
oldobjs=$objlist
- if test "$obj" = "$last_oldobj" ; then
+ if test "$obj" = "$last_oldobj"; then
RANLIB=$save_RANLIB
fi
test -z "$concat_cmds" || concat_cmds=$concat_cmds~
- eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ eval concat_cmds=\"\$concat_cmds$old_archive_cmds\"
objlist=
len=$len0
fi
done
RANLIB=$save_RANLIB
oldobjs=$objlist
- if test "X$oldobjs" = "X" ; then
+ if test -z "$oldobjs"; then
eval cmds=\"\$concat_cmds\"
else
eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
@@ -9243,7 +10737,7 @@ EOF
case $output in
*.la)
old_library=
- test "$build_old_libs" = yes && old_library="$libname.$libext"
+ test yes = "$build_old_libs" && old_library=$libname.$libext
func_verbose "creating $output"
# Preserve any variables that may affect compiler behavior
@@ -9258,31 +10752,31 @@ EOF
fi
done
# Quote the link command for shipping.
- relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
+ relink_command="(cd `pwd`; $SHELL \"$progpath\" $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
- if test "$hardcode_automatic" = yes ; then
+ if test yes = "$hardcode_automatic"; then
relink_command=
fi
# Only create the output if not a dry run.
$opt_dry_run || {
for installed in no yes; do
- if test "$installed" = yes; then
+ if test yes = "$installed"; then
if test -z "$install_libdir"; then
break
fi
- output="$output_objdir/$outputname"i
+ output=$output_objdir/${outputname}i
# Replace all uninstalled libtool libraries with the installed ones
newdependency_libs=
for deplib in $dependency_libs; do
case $deplib in
*.la)
func_basename "$deplib"
- name="$func_basename_result"
+ name=$func_basename_result
func_resolve_sysroot "$deplib"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
test -z "$libdir" && \
- func_fatal_error "\`$deplib' is not a valid libtool archive"
+ func_fatal_error "'$deplib' is not a valid libtool archive"
func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
;;
-L*)
@@ -9298,23 +10792,23 @@ EOF
*) func_append newdependency_libs " $deplib" ;;
esac
done
- dependency_libs="$newdependency_libs"
+ dependency_libs=$newdependency_libs
newdlfiles=
for lib in $dlfiles; do
case $lib in
*.la)
func_basename "$lib"
- name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ name=$func_basename_result
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
+ func_fatal_error "'$lib' is not a valid libtool archive"
func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
;;
*) func_append newdlfiles " $lib" ;;
esac
done
- dlfiles="$newdlfiles"
+ dlfiles=$newdlfiles
newdlprefiles=
for lib in $dlprefiles; do
case $lib in
@@ -9324,34 +10818,34 @@ EOF
# didn't already link the preopened objects directly into
# the library:
func_basename "$lib"
- name="$func_basename_result"
- eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ name=$func_basename_result
+ eval libdir=`$SED -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
test -z "$libdir" && \
- func_fatal_error "\`$lib' is not a valid libtool archive"
+ func_fatal_error "'$lib' is not a valid libtool archive"
func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
;;
esac
done
- dlprefiles="$newdlprefiles"
+ dlprefiles=$newdlprefiles
else
newdlfiles=
for lib in $dlfiles; do
case $lib in
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
*) abs=`pwd`"/$lib" ;;
esac
func_append newdlfiles " $abs"
done
- dlfiles="$newdlfiles"
+ dlfiles=$newdlfiles
newdlprefiles=
for lib in $dlprefiles; do
case $lib in
- [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
+ [\\/]* | [A-Za-z]:[\\/]*) abs=$lib ;;
*) abs=`pwd`"/$lib" ;;
esac
func_append newdlprefiles " $abs"
done
- dlprefiles="$newdlprefiles"
+ dlprefiles=$newdlprefiles
fi
$RM $output
# place dlname in correct position for cygwin
@@ -9367,10 +10861,9 @@ EOF
case $host,$output,$installed,$module,$dlname in
*cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
# If a -bindir argument was supplied, place the dll there.
- if test "x$bindir" != x ;
- then
+ if test -n "$bindir"; then
func_relative_path "$install_libdir" "$bindir"
- tdlname=$func_relative_path_result$dlname
+ tdlname=$func_relative_path_result/$dlname
else
# Otherwise fall back on heuristic.
tdlname=../bin/$dlname
@@ -9379,7 +10872,7 @@ EOF
esac
$ECHO > $output "\
# $outputname - a libtool library file
-# Generated by $PROGRAM (GNU $PACKAGE$TIMESTAMP) $VERSION
+# Generated by $PROGRAM (GNU $PACKAGE) $VERSION
#
# Please DO NOT delete this file!
# It is necessary for linking the library.
@@ -9393,7 +10886,7 @@ library_names='$library_names'
# The name of the static archive.
old_library='$old_library'
-# Linker flags that can not go in dependency_libs.
+# Linker flags that cannot go in dependency_libs.
inherited_linker_flags='$new_inherited_linker_flags'
# Libraries that this one depends upon.
@@ -9419,7 +10912,7 @@ dlpreopen='$dlprefiles'
# Directory that this library needs to be installed in:
libdir='$install_libdir'"
- if test "$installed" = no && test "$need_relink" = yes; then
+ if test no,yes = "$installed,$need_relink"; then
$ECHO >> $output "\
relink_command=\"$relink_command\""
fi
@@ -9434,27 +10927,29 @@ relink_command=\"$relink_command\""
exit $EXIT_SUCCESS
}
-{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
- func_mode_link ${1+"$@"}
+if test link = "$opt_mode" || test relink = "$opt_mode"; then
+ func_mode_link ${1+"$@"}
+fi
# func_mode_uninstall arg...
func_mode_uninstall ()
{
- $opt_debug
- RM="$nonopt"
+ $debug_cmd
+
+ RM=$nonopt
files=
- rmforce=
+ rmforce=false
exit_status=0
# This variable tells wrapper scripts just to set variables rather
# than running their programs.
- libtool_install_magic="$magic"
+ libtool_install_magic=$magic
for arg
do
case $arg in
- -f) func_append RM " $arg"; rmforce=yes ;;
+ -f) func_append RM " $arg"; rmforce=: ;;
-*) func_append RM " $arg" ;;
*) func_append files " $arg" ;;
esac
@@ -9467,18 +10962,18 @@ func_mode_uninstall ()
for file in $files; do
func_dirname "$file" "" "."
- dir="$func_dirname_result"
- if test "X$dir" = X.; then
- odir="$objdir"
+ dir=$func_dirname_result
+ if test . = "$dir"; then
+ odir=$objdir
else
- odir="$dir/$objdir"
+ odir=$dir/$objdir
fi
func_basename "$file"
- name="$func_basename_result"
- test "$opt_mode" = uninstall && odir="$dir"
+ name=$func_basename_result
+ test uninstall = "$opt_mode" && odir=$dir
# Remember odir for removal later, being careful to avoid duplicates
- if test "$opt_mode" = clean; then
+ if test clean = "$opt_mode"; then
case " $rmdirs " in
*" $odir "*) ;;
*) func_append rmdirs " $odir" ;;
@@ -9493,11 +10988,11 @@ func_mode_uninstall ()
elif test -d "$file"; then
exit_status=1
continue
- elif test "$rmforce" = yes; then
+ elif $rmforce; then
continue
fi
- rmfiles="$file"
+ rmfiles=$file
case $name in
*.la)
@@ -9511,7 +11006,7 @@ func_mode_uninstall ()
done
test -n "$old_library" && func_append rmfiles " $odir/$old_library"
- case "$opt_mode" in
+ case $opt_mode in
clean)
case " $library_names " in
*" $dlname "*) ;;
@@ -9522,12 +11017,12 @@ func_mode_uninstall ()
uninstall)
if test -n "$library_names"; then
# Do each command in the postuninstall commands.
- func_execute_cmds "$postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+ func_execute_cmds "$postuninstall_cmds" '$rmforce || exit_status=1'
fi
if test -n "$old_library"; then
# Do each command in the old_postuninstall commands.
- func_execute_cmds "$old_postuninstall_cmds" 'test "$rmforce" = yes || exit_status=1'
+ func_execute_cmds "$old_postuninstall_cmds" '$rmforce || exit_status=1'
fi
# FIXME: should reinstall the best remaining shared library.
;;
@@ -9543,21 +11038,19 @@ func_mode_uninstall ()
func_source $dir/$name
# Add PIC object to the list of files to remove.
- if test -n "$pic_object" &&
- test "$pic_object" != none; then
+ if test -n "$pic_object" && test none != "$pic_object"; then
func_append rmfiles " $dir/$pic_object"
fi
# Add non-PIC object to the list of files to remove.
- if test -n "$non_pic_object" &&
- test "$non_pic_object" != none; then
+ if test -n "$non_pic_object" && test none != "$non_pic_object"; then
func_append rmfiles " $dir/$non_pic_object"
fi
fi
;;
*)
- if test "$opt_mode" = clean ; then
+ if test clean = "$opt_mode"; then
noexename=$name
case $file in
*.exe)
@@ -9584,12 +11077,12 @@ func_mode_uninstall ()
# note $name still contains .exe if it was in $file originally
# as does the version of $file that was added into $rmfiles
- func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
- if test "$fast_install" = yes && test -n "$relink_command"; then
+ func_append rmfiles " $odir/$name $odir/${name}S.$objext"
+ if test yes = "$fast_install" && test -n "$relink_command"; then
func_append rmfiles " $odir/lt-$name"
fi
- if test "X$noexename" != "X$name" ; then
- func_append rmfiles " $odir/lt-${noexename}.c"
+ if test "X$noexename" != "X$name"; then
+ func_append rmfiles " $odir/lt-$noexename.c"
fi
fi
fi
@@ -9598,7 +11091,7 @@ func_mode_uninstall ()
func_show_eval "$RM $rmfiles" 'exit_status=1'
done
- # Try to remove the ${objdir}s in the directories where we deleted files
+ # Try to remove the $objdir's in the directories where we deleted files
for dir in $rmdirs; do
if test -d "$dir"; then
func_show_eval "rmdir $dir >/dev/null 2>&1"
@@ -9608,16 +11101,17 @@ func_mode_uninstall ()
exit $exit_status
}
-{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
- func_mode_uninstall ${1+"$@"}
+if test uninstall = "$opt_mode" || test clean = "$opt_mode"; then
+ func_mode_uninstall ${1+"$@"}
+fi
test -z "$opt_mode" && {
- help="$generic_help"
+ help=$generic_help
func_fatal_help "you must specify a MODE"
}
test -z "$exec_cmd" && \
- func_fatal_help "invalid operation mode \`$opt_mode'"
+ func_fatal_help "invalid operation mode '$opt_mode'"
if test -n "$exec_cmd"; then
eval exec "$exec_cmd"
@@ -9628,7 +11122,7 @@ exit $exit_status
# The TAGs below are defined such that we never get into a situation
-# in which we disable both kinds of libraries. Given conflicting
+# where we disable both kinds of libraries. Given conflicting
# choices, we go for a static library, that is the most portable,
# since we can't tell whether shared libraries were disabled because
# the user asked for that or because the platform doesn't support
@@ -9651,5 +11145,3 @@ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
# mode:shell-script
# sh-indentation:2
# End:
-# vi:sw=2
-
diff --git a/m4/acx_pthread.m4 b/m4/acx_pthread.m4
new file mode 100644
index 0000000000000000000000000000000000000000..2cf20de144a11be2aa603b04ea511244191037b7
--- /dev/null
+++ b/m4/acx_pthread.m4
@@ -0,0 +1,363 @@
+# This was retrieved from
+# http://svn.0pointer.de/viewvc/trunk/common/acx_pthread.m4?revision=1277&root=avahi
+# See also (perhaps for new versions?)
+# http://svn.0pointer.de/viewvc/trunk/common/acx_pthread.m4?root=avahi
+#
+# We've rewritten the inconsistency check code (from avahi), to work
+# more broadly. In particular, it no longer assumes ld accepts -zdefs.
+# This caused a restructing of the code, but the functionality has only
+# changed a little.
+
+dnl @synopsis ACX_PTHREAD([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]])
+dnl
+dnl @summary figure out how to build C programs using POSIX threads
+dnl
+dnl This macro figures out how to build C programs using POSIX threads.
+dnl It sets the PTHREAD_LIBS output variable to the threads library and
+dnl linker flags, and the PTHREAD_CFLAGS output variable to any special
+dnl C compiler flags that are needed. (The user can also force certain
+dnl compiler flags/libs to be tested by setting these environment
+dnl variables.)
+dnl
+dnl Also sets PTHREAD_CC to any special C compiler that is needed for
+dnl multi-threaded programs (defaults to the value of CC otherwise).
+dnl (This is necessary on AIX to use the special cc_r compiler alias.)
+dnl
+dnl NOTE: You are assumed to not only compile your program with these
+dnl flags, but also link it with them as well. e.g. you should link
+dnl with $PTHREAD_CC $CFLAGS $PTHREAD_CFLAGS $LDFLAGS ... $PTHREAD_LIBS
+dnl $LIBS
+dnl
+dnl If you are only building threads programs, you may wish to use
+dnl these variables in your default LIBS, CFLAGS, and CC:
+dnl
+dnl LIBS="$PTHREAD_LIBS $LIBS"
+dnl CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+dnl CC="$PTHREAD_CC"
+dnl
+dnl In addition, if the PTHREAD_CREATE_JOINABLE thread-attribute
+dnl constant has a nonstandard name, defines PTHREAD_CREATE_JOINABLE to
+dnl that name (e.g. PTHREAD_CREATE_UNDETACHED on AIX).
+dnl
+dnl ACTION-IF-FOUND is a list of shell commands to run if a threads
+dnl library is found, and ACTION-IF-NOT-FOUND is a list of commands to
+dnl run it if it is not found. If ACTION-IF-FOUND is not specified, the
+dnl default action will define HAVE_PTHREAD.
+dnl
+dnl Please let the authors know if this macro fails on any platform, or
+dnl if you have any other suggestions or comments. This macro was based
+dnl on work by SGJ on autoconf scripts for FFTW (www.fftw.org) (with
+dnl help from M. Frigo), as well as ac_pthread and hb_pthread macros
+dnl posted by Alejandro Forero Cuervo to the autoconf macro repository.
+dnl We are also grateful for the helpful feedback of numerous users.
+dnl
+dnl @category InstalledPackages
+dnl @author Steven G. Johnson <stevenj@alum.mit.edu>
+dnl @version 2006-05-29
+dnl @license GPLWithACException
+dnl
+dnl Checks for GCC shared/pthread inconsistency based on work by
+dnl Marcin Owsiany <marcin@owsiany.pl>
+
+
+AC_DEFUN([ACX_PTHREAD], [
+AC_REQUIRE([AC_CANONICAL_HOST])
+AC_LANG_SAVE
+AC_LANG_C
+acx_pthread_ok=no
+
+# We used to check for pthread.h first, but this fails if pthread.h
+# requires special compiler flags (e.g. on True64 or Sequent).
+# It gets checked for in the link test anyway.
+
+# First of all, check if the user has set any of the PTHREAD_LIBS,
+# etcetera environment variables, and if threads linking works using
+# them:
+if test x"$PTHREAD_LIBS$PTHREAD_CFLAGS" != x; then
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+ save_LIBS="$LIBS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ AC_MSG_CHECKING([for pthread_join in LIBS=$PTHREAD_LIBS with CFLAGS=$PTHREAD_CFLAGS])
+ AC_TRY_LINK_FUNC(pthread_join, acx_pthread_ok=yes)
+ AC_MSG_RESULT($acx_pthread_ok)
+ if test x"$acx_pthread_ok" = xno; then
+ PTHREAD_LIBS=""
+ PTHREAD_CFLAGS=""
+ fi
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+fi
+
+# We must check for the threads library under a number of different
+# names; the ordering is very important because some systems
+# (e.g. DEC) have both -lpthread and -lpthreads, where one of the
+# libraries is broken (non-POSIX).
+
+# Create a list of thread flags to try. Items starting with a "-" are
+# C compiler flags, and other items are library names, except for "none"
+# which indicates that we try without any flags at all, and "pthread-config"
+# which is a program returning the flags for the Pth emulation library.
+
+acx_pthread_flags="pthreads none -Kthread -kthread lthread -pthread -pthreads -mthreads pthread --thread-safe -mt pthread-config"
+
+# The ordering *is* (sometimes) important. Some notes on the
+# individual items follow:
+
+# pthreads: AIX (must check this before -lpthread)
+# none: in case threads are in libc; should be tried before -Kthread and
+# other compiler flags to prevent continual compiler warnings
+# -Kthread: Sequent (threads in libc, but -Kthread needed for pthread.h)
+# -kthread: FreeBSD kernel threads (preferred to -pthread since SMP-able)
+# lthread: LinuxThreads port on FreeBSD (also preferred to -pthread)
+# -pthread: Linux/gcc (kernel threads), BSD/gcc (userland threads)
+# -pthreads: Solaris/gcc
+# -mthreads: Mingw32/gcc, Lynx/gcc
+# -mt: Sun Workshop C (may only link SunOS threads [-lthread], but it
+# doesn't hurt to check since this sometimes defines pthreads too;
+# also defines -D_REENTRANT)
+# ... -mt is also the pthreads flag for HP/aCC
+# pthread: Linux, etcetera
+# --thread-safe: KAI C++
+# pthread-config: use pthread-config program (for GNU Pth library)
+
+case "${host_cpu}-${host_os}" in
+ *solaris*)
+
+ # On Solaris (at least, for some versions), libc contains stubbed
+ # (non-functional) versions of the pthreads routines, so link-based
+ # tests will erroneously succeed. (We need to link with -pthreads/-mt/
+ # -lpthread.) (The stubs are missing pthread_cleanup_push, or rather
+ # a function called by this macro, so we could check for that, but
+ # who knows whether they'll stub that too in a future libc.) So,
+ # we'll just look for -pthreads and -lpthread first:
+
+ acx_pthread_flags="-pthreads pthread -mt -pthread $acx_pthread_flags"
+ ;;
+esac
+
+if test x"$acx_pthread_ok" = xno; then
+for flag in $acx_pthread_flags; do
+
+ case $flag in
+ none)
+ AC_MSG_CHECKING([whether pthreads work without any flags])
+ ;;
+
+ -*)
+ AC_MSG_CHECKING([whether pthreads work with $flag])
+ PTHREAD_CFLAGS="$flag"
+ ;;
+
+ pthread-config)
+ AC_CHECK_PROG(acx_pthread_config, pthread-config, yes, no)
+ if test x"$acx_pthread_config" = xno; then continue; fi
+ PTHREAD_CFLAGS="`pthread-config --cflags`"
+ PTHREAD_LIBS="`pthread-config --ldflags` `pthread-config --libs`"
+ ;;
+
+ *)
+ AC_MSG_CHECKING([for the pthreads library -l$flag])
+ PTHREAD_LIBS="-l$flag"
+ ;;
+ esac
+
+ save_LIBS="$LIBS"
+ save_CFLAGS="$CFLAGS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+ # Check for various functions. We must include pthread.h,
+ # since some functions may be macros. (On the Sequent, we
+ # need a special flag -Kthread to make this header compile.)
+ # We check for pthread_join because it is in -lpthread on IRIX
+ # while pthread_create is in libc. We check for pthread_attr_init
+ # due to DEC craziness with -lpthreads. We check for
+ # pthread_cleanup_push because it is one of the few pthread
+ # functions on Solaris that doesn't have a non-functional libc stub.
+ # We try pthread_create on general principles.
+ AC_TRY_LINK([#include <pthread.h>],
+ [pthread_t th; pthread_join(th, 0);
+ pthread_attr_init(0); pthread_cleanup_push(0, 0);
+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+ [acx_pthread_ok=yes])
+
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+
+ AC_MSG_RESULT($acx_pthread_ok)
+ if test "x$acx_pthread_ok" = xyes; then
+ break;
+ fi
+
+ PTHREAD_LIBS=""
+ PTHREAD_CFLAGS=""
+done
+fi
+
+# Various other checks:
+if test "x$acx_pthread_ok" = xyes; then
+ save_LIBS="$LIBS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ save_CFLAGS="$CFLAGS"
+ CFLAGS="$CFLAGS $PTHREAD_CFLAGS"
+
+ # Detect AIX lossage: JOINABLE attribute is called UNDETACHED.
+ AC_MSG_CHECKING([for joinable pthread attribute])
+ attr_name=unknown
+ for attr in PTHREAD_CREATE_JOINABLE PTHREAD_CREATE_UNDETACHED; do
+ AC_TRY_LINK([#include <pthread.h>], [int attr=$attr; return attr;],
+ [attr_name=$attr; break])
+ done
+ AC_MSG_RESULT($attr_name)
+ if test "$attr_name" != PTHREAD_CREATE_JOINABLE; then
+ AC_DEFINE_UNQUOTED(PTHREAD_CREATE_JOINABLE, $attr_name,
+ [Define to necessary symbol if this constant
+ uses a non-standard name on your system.])
+ fi
+
+ AC_MSG_CHECKING([if more special flags are required for pthreads])
+ flag=no
+ case "${host_cpu}-${host_os}" in
+ *-aix* | *-freebsd* | *-darwin*) flag="-D_THREAD_SAFE";;
+ *solaris* | *-osf* | *-hpux*) flag="-D_REENTRANT";;
+ esac
+ AC_MSG_RESULT(${flag})
+ if test "x$flag" != xno; then
+ PTHREAD_CFLAGS="$flag $PTHREAD_CFLAGS"
+ fi
+
+ LIBS="$save_LIBS"
+ CFLAGS="$save_CFLAGS"
+ # More AIX lossage: must compile with xlc_r or cc_r
+ if test x"$GCC" != xyes; then
+ AC_CHECK_PROGS(PTHREAD_CC, xlc_r cc_r, ${CC})
+ else
+ PTHREAD_CC=$CC
+ fi
+
+ # The next part tries to detect GCC inconsistency with -shared on some
+ # architectures and systems. The problem is that in certain
+ # configurations, when -shared is specified, GCC "forgets" to
+ # internally use various flags which are still necessary.
+
+ #
+ # Prepare the flags
+ #
+ save_CFLAGS="$CFLAGS"
+ save_LIBS="$LIBS"
+ save_CC="$CC"
+
+ # Try with the flags determined by the earlier checks.
+ #
+ # -Wl,-z,defs forces link-time symbol resolution, so that the
+ # linking checks with -shared actually have any value
+ #
+ # FIXME: -fPIC is required for -shared on many architectures,
+ # so we specify it here, but the right way would probably be to
+ # properly detect whether it is actually required.
+ CFLAGS="-shared -fPIC -Wl,-z,defs $CFLAGS $PTHREAD_CFLAGS"
+ LIBS="$PTHREAD_LIBS $LIBS"
+ CC="$PTHREAD_CC"
+
+ # In order not to create several levels of indentation, we test
+ # the value of "$done" until we find the cure or run out of ideas.
+ done="no"
+
+ # First, make sure the CFLAGS we added are actually accepted by our
+ # compiler. If not (and OS X's ld, for instance, does not accept -z),
+ # then we can't do this test.
+ if test x"$done" = xno; then
+ AC_MSG_CHECKING([whether to check for GCC pthread/shared inconsistencies])
+ AC_TRY_LINK(,, , [done=yes])
+
+ if test "x$done" = xyes ; then
+ AC_MSG_RESULT([no])
+ else
+ AC_MSG_RESULT([yes])
+ fi
+ fi
+
+ if test x"$done" = xno; then
+ AC_MSG_CHECKING([whether -pthread is sufficient with -shared])
+ AC_TRY_LINK([#include <pthread.h>],
+ [pthread_t th; pthread_join(th, 0);
+ pthread_attr_init(0); pthread_cleanup_push(0, 0);
+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+ [done=yes])
+
+ if test "x$done" = xyes; then
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+ fi
+ fi
+
+ #
+ # Linux gcc on some architectures such as mips/mipsel forgets
+ # about -lpthread
+ #
+ if test x"$done" = xno; then
+ AC_MSG_CHECKING([whether -lpthread fixes that])
+ LIBS="-lpthread $PTHREAD_LIBS $save_LIBS"
+ AC_TRY_LINK([#include <pthread.h>],
+ [pthread_t th; pthread_join(th, 0);
+ pthread_attr_init(0); pthread_cleanup_push(0, 0);
+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+ [done=yes])
+
+ if test "x$done" = xyes; then
+ AC_MSG_RESULT([yes])
+ PTHREAD_LIBS="-lpthread $PTHREAD_LIBS"
+ else
+ AC_MSG_RESULT([no])
+ fi
+ fi
+ #
+ # FreeBSD 4.10 gcc forgets to use -lc_r instead of -lc
+ #
+ if test x"$done" = xno; then
+ AC_MSG_CHECKING([whether -lc_r fixes that])
+ LIBS="-lc_r $PTHREAD_LIBS $save_LIBS"
+ AC_TRY_LINK([#include <pthread.h>],
+ [pthread_t th; pthread_join(th, 0);
+ pthread_attr_init(0); pthread_cleanup_push(0, 0);
+ pthread_create(0,0,0,0); pthread_cleanup_pop(0); ],
+ [done=yes])
+
+ if test "x$done" = xyes; then
+ AC_MSG_RESULT([yes])
+ PTHREAD_LIBS="-lc_r $PTHREAD_LIBS"
+ else
+ AC_MSG_RESULT([no])
+ fi
+ fi
+ if test x"$done" = xno; then
+ # OK, we have run out of ideas
+ AC_MSG_WARN([Impossible to determine how to use pthreads with shared libraries])
+
+ # so it's not safe to assume that we may use pthreads
+ acx_pthread_ok=no
+ fi
+
+ CFLAGS="$save_CFLAGS"
+ LIBS="$save_LIBS"
+ CC="$save_CC"
+else
+ PTHREAD_CC="$CC"
+fi
+
+AC_SUBST(PTHREAD_LIBS)
+AC_SUBST(PTHREAD_CFLAGS)
+AC_SUBST(PTHREAD_CC)
+
+# Finally, execute ACTION-IF-FOUND/ACTION-IF-NOT-FOUND:
+if test x"$acx_pthread_ok" = xyes; then
+ ifelse([$1],,AC_DEFINE(HAVE_PTHREAD,1,[Define if you have POSIX threads libraries and header files.]),[$1])
+ :
+else
+ acx_pthread_ok=no
+ $2
+fi
+AC_LANG_RESTORE
+])dnl ACX_PTHREAD
diff --git a/m4/libtool.m4 b/m4/libtool.m4
index f12cfdf0b48ee2153b5e1747dc0315e9eca9d169..a644432f431895cff03337b765a7389c7fd0c221 100644
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -1,8 +1,6 @@
# libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
#
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
+# Copyright (C) 1996-2001, 2003-2015 Free Software Foundation, Inc.
# Written by Gordon Matzigkeit, 1996
#
# This file is free software; the Free Software Foundation gives
@@ -10,36 +8,30 @@
# modifications, as long as this notice is preserved.
m4_define([_LT_COPYING], [dnl
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-# 2006, 2007, 2008, 2009, 2010, 2011 Free Software
-# Foundation, Inc.
-# Written by Gordon Matzigkeit, 1996
-#
-# This file is part of GNU Libtool.
-#
-# GNU Libtool is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License as
-# published by the Free Software Foundation; either version 2 of
-# the License, or (at your option) any later version.
+# Copyright (C) 2014 Free Software Foundation, Inc.
+# This is free software; see the source for copying conditions. There is NO
+# warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+
+# GNU Libtool is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of of the License, or
+# (at your option) any later version.
#
-# As a special exception to the GNU General Public License,
-# if you distribute this file as part of a program or library that
-# is built using GNU Libtool, you may include this file under the
-# same distribution terms that you use for the rest of that program.
+# As a special exception to the GNU General Public License, if you
+# distribute this file as part of a program or library that is built
+# using GNU Libtool, you may include this file under the same
+# distribution terms that you use for the rest of that program.
#
-# GNU Libtool is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# GNU Libtool is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
-# along with GNU Libtool; see the file COPYING. If not, a copy
-# can be downloaded from http://www.gnu.org/licenses/gpl.html, or
-# obtained by writing to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
])
-# serial 57 LT_INIT
+# serial 58 LT_INIT
# LT_PREREQ(VERSION)
@@ -67,7 +59,7 @@ esac
# LT_INIT([OPTIONS])
# ------------------
AC_DEFUN([LT_INIT],
-[AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+[AC_PREREQ([2.62])dnl We use AC_PATH_PROGS_FEATURE_CHECK
AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
AC_BEFORE([$0], [LT_LANG])dnl
AC_BEFORE([$0], [LT_OUTPUT])dnl
@@ -91,7 +83,7 @@ dnl Parse OPTIONS
_LT_SET_OPTIONS([$0], [$1])
# This can be used to rebuild libtool when needed
-LIBTOOL_DEPS="$ltmain"
+LIBTOOL_DEPS=$ltmain
# Always use our own libtool.
LIBTOOL='$(SHELL) $(top_builddir)/libtool'
@@ -111,26 +103,43 @@ dnl AC_DEFUN([AC_PROG_LIBTOOL], [])
dnl AC_DEFUN([AM_PROG_LIBTOOL], [])
+# _LT_PREPARE_CC_BASENAME
+# -----------------------
+m4_defun([_LT_PREPARE_CC_BASENAME], [
+# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+func_cc_basename ()
+{
+ for cc_temp in @S|@*""; do
+ case $cc_temp in
+ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
+ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
+ \-*) ;;
+ *) break;;
+ esac
+ done
+ func_cc_basename_result=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+}
+])# _LT_PREPARE_CC_BASENAME
+
+
# _LT_CC_BASENAME(CC)
# -------------------
-# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
+# It would be clearer to call AC_REQUIREs from _LT_PREPARE_CC_BASENAME,
+# but that macro is also expanded into generated libtool script, which
+# arranges for $SED and $ECHO to be set by different means.
m4_defun([_LT_CC_BASENAME],
-[for cc_temp in $1""; do
- case $cc_temp in
- compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
- distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
- \-*) ;;
- *) break;;
- esac
-done
-cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
+[m4_require([_LT_PREPARE_CC_BASENAME])dnl
+AC_REQUIRE([_LT_DECL_SED])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+func_cc_basename $1
+cc_basename=$func_cc_basename_result
])
# _LT_FILEUTILS_DEFAULTS
# ----------------------
# It is okay to use these file commands and assume they have been set
-# sensibly after `m4_require([_LT_FILEUTILS_DEFAULTS])'.
+# sensibly after 'm4_require([_LT_FILEUTILS_DEFAULTS])'.
m4_defun([_LT_FILEUTILS_DEFAULTS],
[: ${CP="cp -f"}
: ${MV="mv -f"}
@@ -177,15 +186,16 @@ m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
m4_require([_LT_CMD_OLD_ARCHIVE])dnl
m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
m4_require([_LT_WITH_SYSROOT])dnl
+m4_require([_LT_CMD_TRUNCATE])dnl
_LT_CONFIG_LIBTOOL_INIT([
-# See if we are running on zsh, and set the options which allow our
+# See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes INIT.
-if test -n "\${ZSH_VERSION+set}" ; then
+if test -n "\${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
])
-if test -n "${ZSH_VERSION+set}" ; then
+if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
@@ -198,7 +208,7 @@ aix3*)
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
- if test "X${COLLECT_NAMES+set}" != Xset; then
+ if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -209,14 +219,14 @@ esac
ofile=libtool
can_build_shared=yes
-# All known linkers require a `.a' archive for static linking (except MSVC,
+# All known linkers require a '.a' archive for static linking (except MSVC,
# which needs '.lib').
libext=a
-with_gnu_ld="$lt_cv_prog_gnu_ld"
+with_gnu_ld=$lt_cv_prog_gnu_ld
-old_CC="$CC"
-old_CFLAGS="$CFLAGS"
+old_CC=$CC
+old_CFLAGS=$CFLAGS
# Set sane defaults for various variables
test -z "$CC" && CC=cc
@@ -269,14 +279,14 @@ no_glob_subst='s/\*/\\\*/g'
# _LT_PROG_LTMAIN
# ---------------
-# Note that this code is called both from `configure', and `config.status'
+# Note that this code is called both from 'configure', and 'config.status'
# now that we use AC_CONFIG_COMMANDS to generate libtool. Notably,
-# `config.status' has no value for ac_aux_dir unless we are using Automake,
+# 'config.status' has no value for ac_aux_dir unless we are using Automake,
# so we pass a copy along to make sure it has a sensible value anyway.
m4_defun([_LT_PROG_LTMAIN],
[m4_ifdef([AC_REQUIRE_AUX_FILE], [AC_REQUIRE_AUX_FILE([ltmain.sh])])dnl
_LT_CONFIG_LIBTOOL_INIT([ac_aux_dir='$ac_aux_dir'])
-ltmain="$ac_aux_dir/ltmain.sh"
+ltmain=$ac_aux_dir/ltmain.sh
])# _LT_PROG_LTMAIN
@@ -286,7 +296,7 @@ ltmain="$ac_aux_dir/ltmain.sh"
# So that we can recreate a full libtool script including additional
# tags, we accumulate the chunks of code to send to AC_CONFIG_COMMANDS
-# in macros and then make a single call at the end using the `libtool'
+# in macros and then make a single call at the end using the 'libtool'
# label.
@@ -421,8 +431,8 @@ m4_define([_lt_decl_all_varnames],
# _LT_CONFIG_STATUS_DECLARE([VARNAME])
# ------------------------------------
-# Quote a variable value, and forward it to `config.status' so that its
-# declaration there will have the same value as in `configure'. VARNAME
+# Quote a variable value, and forward it to 'config.status' so that its
+# declaration there will have the same value as in 'configure'. VARNAME
# must have a single quote delimited value for this to work.
m4_define([_LT_CONFIG_STATUS_DECLARE],
[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
@@ -446,7 +456,7 @@ m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
# Output comment and list of tags supported by the script
m4_defun([_LT_LIBTOOL_TAGS],
[_LT_FORMAT_COMMENT([The names of the tagged configurations supported by this script])dnl
-available_tags="_LT_TAGS"dnl
+available_tags='_LT_TAGS'dnl
])
@@ -474,7 +484,7 @@ m4_ifval([$2], [_$2])[]m4_popdef([_libtool_name])[]dnl
# _LT_LIBTOOL_CONFIG_VARS
# -----------------------
# Produce commented declarations of non-tagged libtool config variables
-# suitable for insertion in the LIBTOOL CONFIG section of the `libtool'
+# suitable for insertion in the LIBTOOL CONFIG section of the 'libtool'
# script. Tagged libtool config variables (even for the LIBTOOL CONFIG
# section) are produced by _LT_LIBTOOL_TAG_VARS.
m4_defun([_LT_LIBTOOL_CONFIG_VARS],
@@ -500,8 +510,8 @@ m4_define([_LT_TAGVAR], [m4_ifval([$2], [$1_$2], [$1])])
# Send accumulated output to $CONFIG_STATUS. Thanks to the lists of
# variables for single and double quote escaping we saved from calls
# to _LT_DECL, we can put quote escaped variables declarations
-# into `config.status', and then the shell code to quote escape them in
-# for loops in `config.status'. Finally, any additional code accumulated
+# into 'config.status', and then the shell code to quote escape them in
+# for loops in 'config.status'. Finally, any additional code accumulated
# from calls to _LT_CONFIG_LIBTOOL_INIT is expanded.
m4_defun([_LT_CONFIG_COMMANDS],
[AC_PROVIDE_IFELSE([LT_OUTPUT],
@@ -547,7 +557,7 @@ for var in lt_decl_all_varnames([[ \
]], lt_decl_quote_varnames); do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -560,7 +570,7 @@ for var in lt_decl_all_varnames([[ \
]], lt_decl_dquote_varnames); do
case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
*[[\\\\\\\`\\"\\\$]]*)
- eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+ eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\"" ## exclude from sc_prohibit_nested_quotes
;;
*)
eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -576,7 +586,7 @@ _LT_OUTPUT_LIBTOOL_INIT
# Generate a child script FILE with all initialization necessary to
# reuse the environment learned by the parent script, and make the
# file executable. If COMMENT is supplied, it is inserted after the
-# `#!' sequence but before initialization text begins. After this
+# '#!' sequence but before initialization text begins. After this
# macro, additional text can be appended to FILE to form the body of
# the child script. The macro ends with non-zero status if the
# file could not be fully written (such as if the disk is full).
@@ -598,7 +608,7 @@ AS_SHELL_SANITIZE
_AS_PREPARE
exec AS_MESSAGE_FD>&1
_ASEOF
-test $lt_write_fail = 0 && chmod +x $1[]dnl
+test 0 = "$lt_write_fail" && chmod +x $1[]dnl
m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
# LT_OUTPUT
@@ -621,7 +631,7 @@ exec AS_MESSAGE_LOG_FD>>config.log
} >&AS_MESSAGE_LOG_FD
lt_cl_help="\
-\`$as_me' creates a local libtool stub from the current configuration,
+'$as_me' creates a local libtool stub from the current configuration,
for use in further configure time tests before the real libtool is
generated.
@@ -643,7 +653,7 @@ Copyright (C) 2011 Free Software Foundation, Inc.
This config.lt script is free software; the Free Software Foundation
gives unlimited permision to copy, distribute and modify it."
-while test $[#] != 0
+while test 0 != $[#]
do
case $[1] in
--version | --v* | -V )
@@ -656,10 +666,10 @@ do
lt_cl_silent=: ;;
-*) AC_MSG_ERROR([unrecognized option: $[1]
-Try \`$[0] --help' for more information.]) ;;
+Try '$[0] --help' for more information.]) ;;
*) AC_MSG_ERROR([unrecognized argument: $[1]
-Try \`$[0] --help' for more information.]) ;;
+Try '$[0] --help' for more information.]) ;;
esac
shift
done
@@ -685,7 +695,7 @@ chmod +x "$CONFIG_LT"
# open by configure. Here we exec the FD to /dev/null, effectively closing
# config.log, so it can be properly (re)opened and appended to by config.lt.
lt_cl_success=:
-test "$silent" = yes &&
+test yes = "$silent" &&
lt_config_lt_args="$lt_config_lt_args --quiet"
exec AS_MESSAGE_LOG_FD>/dev/null
$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
@@ -705,32 +715,47 @@ m4_defun([_LT_CONFIG],
_LT_CONFIG_SAVE_COMMANDS([
m4_define([_LT_TAG], m4_if([$1], [], [C], [$1]))dnl
m4_if(_LT_TAG, [C], [
- # See if we are running on zsh, and set the options which allow our
+ # See if we are running on zsh, and set the options that allow our
# commands through without removal of \ escapes.
- if test -n "${ZSH_VERSION+set}" ; then
+ if test -n "${ZSH_VERSION+set}"; then
setopt NO_GLOB_SUBST
fi
- cfgfile="${ofile}T"
+ cfgfile=${ofile}T
trap "$RM \"$cfgfile\"; exit 1" 1 2 15
$RM "$cfgfile"
cat <<_LT_EOF >> "$cfgfile"
#! $SHELL
-
-# `$ECHO "$ofile" | sed 's%^.*/%%'` - Provide generalized library-building support services.
-# Generated automatically by $as_me ($PACKAGE$TIMESTAMP) $VERSION
+# Generated automatically by $as_me ($PACKAGE) $VERSION
# Libtool was configured on host `(hostname || uname -n) 2>/dev/null | sed 1q`:
# NOTE: Changes made to this file will be lost: look at ltmain.sh.
-#
+
+# Provide generalized library-building support services.
+# Written by Gordon Matzigkeit, 1996
+
_LT_COPYING
_LT_LIBTOOL_TAGS
+# Configured defaults for sys_lib_dlsearch_path munging.
+: \${LT_SYS_LIBRARY_PATH="$configure_time_lt_sys_library_path"}
+
# ### BEGIN LIBTOOL CONFIG
_LT_LIBTOOL_CONFIG_VARS
_LT_LIBTOOL_TAG_VARS
# ### END LIBTOOL CONFIG
+_LT_EOF
+
+ cat <<'_LT_EOF' >> "$cfgfile"
+
+# ### BEGIN FUNCTIONS SHARED WITH CONFIGURE
+
+_LT_PREPARE_MUNGE_PATH_LIST
+_LT_PREPARE_CC_BASENAME
+
+# ### END FUNCTIONS SHARED WITH CONFIGURE
+
_LT_EOF
case $host_os in
@@ -739,7 +764,7 @@ _LT_EOF
# AIX sometimes has problems with the GCC collect2 program. For some
# reason, if we set the COLLECT_NAMES environment variable, the problems
# vanish in a puff of smoke.
-if test "X${COLLECT_NAMES+set}" != Xset; then
+if test set != "${COLLECT_NAMES+set}"; then
COLLECT_NAMES=
export COLLECT_NAMES
fi
@@ -756,8 +781,6 @@ _LT_EOF
sed '$q' "$ltmain" >> "$cfgfile" \
|| (rm -f "$cfgfile"; exit 1)
- _LT_PROG_REPLACE_SHELLFNS
-
mv -f "$cfgfile" "$ofile" ||
(rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
chmod +x "$ofile"
@@ -775,7 +798,6 @@ _LT_EOF
[m4_if([$1], [], [
PACKAGE='$PACKAGE'
VERSION='$VERSION'
- TIMESTAMP='$TIMESTAMP'
RM='$RM'
ofile='$ofile'], [])
])dnl /_LT_CONFIG_SAVE_COMMANDS
@@ -974,7 +996,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],
[lt_cv_apple_cc_single_mod=no
- if test -z "${LT_MULTI_MODULE}"; then
+ if test -z "$LT_MULTI_MODULE"; then
# By default we will add the -single_module flag. You can override
# by either setting the environment variable LT_MULTI_MODULE
# non-empty at configure time, or by adding -multi_module to the
@@ -992,7 +1014,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
cat conftest.err >&AS_MESSAGE_LOG_FD
# Otherwise, if the output was created with a 0 exit code from
# the compiler, it worked.
- elif test -f libconftest.dylib && test $_lt_result -eq 0; then
+ elif test -f libconftest.dylib && test 0 = "$_lt_result"; then
lt_cv_apple_cc_single_mod=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1010,7 +1032,7 @@ m4_defun_once([_LT_REQUIRED_DARWIN_CHECKS],[
AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
[lt_cv_ld_exported_symbols_list=yes],
[lt_cv_ld_exported_symbols_list=no])
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
])
AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
@@ -1032,7 +1054,7 @@ _LT_EOF
_lt_result=$?
if test -s conftest.err && $GREP force_load conftest.err; then
cat conftest.err >&AS_MESSAGE_LOG_FD
- elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+ elif test -f conftest && test 0 = "$_lt_result" && $GREP forced_load conftest >/dev/null 2>&1; then
lt_cv_ld_force_load=yes
else
cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -1042,32 +1064,32 @@ _LT_EOF
])
case $host_os in
rhapsody* | darwin1.[[012]])
- _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}suppress' ;;
darwin1.*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
darwin*) # darwin 5.x on
# if running on 10.5 or later, the deployment target defaults
# to the OS version, if on x86, and 10.4, the deployment
# target defaults to 10.4. Don't you love it?
case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in
10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
- 10.[[012]]*)
- _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
+ 10.[[012]][[,.]]*)
+ _lt_dar_allow_undefined='$wl-flat_namespace $wl-undefined ${wl}suppress' ;;
10.*)
- _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;
+ _lt_dar_allow_undefined='$wl-undefined ${wl}dynamic_lookup' ;;
esac
;;
esac
- if test "$lt_cv_apple_cc_single_mod" = "yes"; then
+ if test yes = "$lt_cv_apple_cc_single_mod"; then
_lt_dar_single_mod='$single_module'
fi
- if test "$lt_cv_ld_exported_symbols_list" = "yes"; then
- _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'
+ if test yes = "$lt_cv_ld_exported_symbols_list"; then
+ _lt_dar_export_syms=' $wl-exported_symbols_list,$output_objdir/$libname-symbols.expsym'
else
- _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
+ _lt_dar_export_syms='~$NMEDIT -s $output_objdir/$libname-symbols.expsym $lib'
fi
- if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
+ if test : != "$DSYMUTIL" && test no = "$lt_cv_ld_force_load"; then
_lt_dsymutil='~$DSYMUTIL $lib || :'
else
_lt_dsymutil=
@@ -1087,29 +1109,29 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_automatic, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
- if test "$lt_cv_ld_force_load" = "yes"; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+ if test yes = "$lt_cv_ld_force_load"; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience $wl-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
[FC], [_LT_TAGVAR(compiler_needs_object, $1)=yes])
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=''
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
+ _LT_TAGVAR(allow_undefined_flag, $1)=$_lt_dar_allow_undefined
case $cc_basename in
- ifort*) _lt_dar_can_shared=yes ;;
+ ifort*|nagfor*) _lt_dar_can_shared=yes ;;
*) _lt_dar_can_shared=$GCC ;;
esac
- if test "$_lt_dar_can_shared" = "yes"; then
+ if test yes = "$_lt_dar_can_shared"; then
output_verbose_link_cmd=func_echo_all
- _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
- _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
- _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dar_export_syms}${_lt_dsymutil}"
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dsymutil"
+ _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dsymutil"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod$_lt_dar_export_syms$_lt_dsymutil"
+ _LT_TAGVAR(module_expsym_cmds, $1)="sed -e 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags$_lt_dar_export_syms$_lt_dsymutil"
m4_if([$1], [CXX],
-[ if test "$lt_cv_apple_cc_single_mod" != "yes"; then
- _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dsymutil}"
- _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \${lib}-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \${lib}-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring${_lt_dar_export_syms}${_lt_dsymutil}"
+[ if test yes != "$lt_cv_apple_cc_single_mod"; then
+ _LT_TAGVAR(archive_cmds, $1)="\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dsymutil"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's|^|_|' < \$export_symbols > \$output_objdir/\$libname-symbols.expsym~\$CC -r -keep_private_externs -nostdlib -o \$lib-master.o \$libobjs~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$lib-master.o \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring$_lt_dar_export_syms$_lt_dsymutil"
fi
],[])
else
@@ -1129,7 +1151,7 @@ m4_defun([_LT_DARWIN_LINKER_FEATURES],
# Allow to override them for all tags through lt_cv_aix_libpath.
m4_defun([_LT_SYS_MODULE_PATH_AIX],
[m4_require([_LT_DECL_SED])dnl
-if test "${lt_cv_aix_libpath+set}" = set; then
+if test set = "${lt_cv_aix_libpath+set}"; then
aix_libpath=$lt_cv_aix_libpath
else
AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
@@ -1147,7 +1169,7 @@ else
_LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
fi],[])
if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
- _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+ _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=/usr/lib:/lib
fi
])
aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
@@ -1167,8 +1189,8 @@ m4_define([_LT_SHELL_INIT],
# -----------------------
# Find how we can fake an echo command that does not interpret backslash.
# In particular, with Autoconf 2.60 or later we add some code to the start
-# of the generated configure script which will find a shell with a builtin
-# printf (which we can use as an echo command).
+# of the generated configure script that will find a shell with a builtin
+# printf (that we can use as an echo command).
m4_defun([_LT_PROG_ECHO_BACKSLASH],
[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
@@ -1196,10 +1218,10 @@ fi
# Invoke $ECHO with all args, space-separated.
func_echo_all ()
{
- $ECHO "$*"
+ $ECHO "$*"
}
-case "$ECHO" in
+case $ECHO in
printf*) AC_MSG_RESULT([printf]) ;;
print*) AC_MSG_RESULT([print -r]) ;;
*) AC_MSG_RESULT([cat]) ;;
@@ -1225,16 +1247,17 @@ _LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
AC_DEFUN([_LT_WITH_SYSROOT],
[AC_MSG_CHECKING([for sysroot])
AC_ARG_WITH([sysroot],
-[ --with-sysroot[=DIR] Search for dependent libraries within DIR
- (or the compiler's sysroot if not specified).],
+[AS_HELP_STRING([--with-sysroot@<:@=DIR@:>@],
+ [Search for dependent libraries within DIR (or the compiler's sysroot
+ if not specified).])],
[], [with_sysroot=no])
dnl lt_sysroot will always be passed unquoted. We quote it here
dnl in case the user passed a directory name.
lt_sysroot=
-case ${with_sysroot} in #(
+case $with_sysroot in #(
yes)
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
lt_sysroot=`$CC --print-sysroot 2>/dev/null`
fi
;; #(
@@ -1244,14 +1267,14 @@ case ${with_sysroot} in #(
no|'')
;; #(
*)
- AC_MSG_RESULT([${with_sysroot}])
+ AC_MSG_RESULT([$with_sysroot])
AC_MSG_ERROR([The sysroot must be an absolute path.])
;;
esac
AC_MSG_RESULT([${lt_sysroot:-no}])
_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
-[dependent libraries, and in which our libraries should be installed.])])
+[dependent libraries, and where our libraries should be installed.])])
# _LT_ENABLE_LOCK
# ---------------
@@ -1259,31 +1282,33 @@ m4_defun([_LT_ENABLE_LOCK],
[AC_ARG_ENABLE([libtool-lock],
[AS_HELP_STRING([--disable-libtool-lock],
[avoid locking (might break parallel builds)])])
-test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes
+test no = "$enable_libtool_lock" || enable_libtool_lock=yes
# Some flags need to be propagated to the compiler or linker for good
# libtool support.
case $host in
ia64-*-hpux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set mode
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.$ac_objext` in
*ELF-32*)
- HPUX_IA64_MODE="32"
+ HPUX_IA64_MODE=32
;;
*ELF-64*)
- HPUX_IA64_MODE="64"
+ HPUX_IA64_MODE=64
;;
esac
fi
rm -rf conftest*
;;
*-*-irix6*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
case `/usr/bin/file conftest.$ac_objext` in
*32-bit*)
LD="${LD-ld} -melf32bsmip"
@@ -1312,9 +1337,46 @@ ia64-*-hpux*)
rm -rf conftest*
;;
+mips64*-*linux*)
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
+ echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+ emul=elf
+ case `/usr/bin/file conftest.$ac_objext` in
+ *32-bit*)
+ emul="${emul}32"
+ ;;
+ *64-bit*)
+ emul="${emul}64"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *MSB*)
+ emul="${emul}btsmip"
+ ;;
+ *LSB*)
+ emul="${emul}ltsmip"
+ ;;
+ esac
+ case `/usr/bin/file conftest.$ac_objext` in
+ *N32*)
+ emul="${emul}n32"
+ ;;
+ esac
+ LD="${LD-ld} -m $emul"
+ fi
+ rm -rf conftest*
+ ;;
+
x86_64-*kfreebsd*-gnu|x86_64-*linux*|powerpc*-*linux*| \
s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly. Note that the listed cases only cover the
+ # situations where additional linker options are needed (such as when
+ # doing 32-bit compilation for a host where ld defaults to 64-bit, or
+ # vice versa); the common cases where no linker options are needed do
+ # not appear in the list.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
@@ -1324,7 +1386,14 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- LD="${LD-ld} -m elf_i386"
+ case `/usr/bin/file conftest.o` in
+ *x86-64*)
+ LD="${LD-ld} -m elf32_x86_64"
+ ;;
+ *)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+ esac
;;
powerpc64le-*linux*)
LD="${LD-ld} -m elf32lppclinux"
@@ -1369,19 +1438,20 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
*-*-sco3.2v5*)
# On SCO OpenServer 5, we need -belf to get full-featured binaries.
- SAVE_CFLAGS="$CFLAGS"
+ SAVE_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS -belf"
AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf,
[AC_LANG_PUSH(C)
AC_LINK_IFELSE([AC_LANG_PROGRAM([[]],[[]])],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])
AC_LANG_POP])
- if test x"$lt_cv_cc_needs_belf" != x"yes"; then
+ if test yes != "$lt_cv_cc_needs_belf"; then
# this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf
- CFLAGS="$SAVE_CFLAGS"
+ CFLAGS=$SAVE_CFLAGS
fi
;;
*-*solaris*)
- # Find out which ABI we are using.
+ # Find out what ABI is being produced by ac_compile, and set linker
+ # options accordingly.
echo 'int i;' > conftest.$ac_ext
if AC_TRY_EVAL(ac_compile); then
case `/usr/bin/file conftest.o` in
@@ -1389,7 +1459,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
case $lt_cv_prog_gnu_ld in
yes*)
case $host in
- i?86-*-solaris*)
+ i?86-*-solaris*|x86_64-*-solaris*)
LD="${LD-ld} -m elf_x86_64"
;;
sparc*-*-solaris*)
@@ -1398,7 +1468,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
esac
# GNU ld 2.21 introduced _sol2 emulations. Use them if available.
if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
- LD="${LD-ld}_sol2"
+ LD=${LD-ld}_sol2
fi
;;
*)
@@ -1414,7 +1484,7 @@ s390*-*linux*|s390*-*tpf*|sparc*-*linux*)
;;
esac
-need_locks="$enable_libtool_lock"
+need_locks=$enable_libtool_lock
])# _LT_ENABLE_LOCK
@@ -1433,11 +1503,11 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
[echo conftest.$ac_objext > conftest.lst
lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
AC_TRY_EVAL([lt_ar_try])
- if test "$ac_status" -eq 0; then
+ if test 0 -eq "$ac_status"; then
# Ensure the archiver fails upon bogus file names.
rm -f conftest.$ac_objext libconftest.a
AC_TRY_EVAL([lt_ar_try])
- if test "$ac_status" -ne 0; then
+ if test 0 -ne "$ac_status"; then
lt_cv_ar_at_file=@
fi
fi
@@ -1445,7 +1515,7 @@ AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
])
])
-if test "x$lt_cv_ar_at_file" = xno; then
+if test no = "$lt_cv_ar_at_file"; then
archiver_list_spec=
else
archiver_list_spec=$lt_cv_ar_at_file
@@ -1476,7 +1546,7 @@ old_postuninstall_cmds=
if test -n "$RANLIB"; then
case $host_os in
- openbsd*)
+ bitrig* | openbsd*)
old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
;;
*)
@@ -1512,7 +1582,7 @@ AC_CACHE_CHECK([$1], [$2],
[$2=no
m4_if([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
echo "$lt_simple_compile_test_code" > conftest.$ac_ext
- lt_compiler_flag="$3"
+ lt_compiler_flag="$3" ## exclude from sc_useless_quotes_in_assignment
# Insert the option either (1) after the last *FLAGS variable, or
# (2) before a word containing "conftest.", or (3) at the end.
# Note that $ac_compile itself does not contain backslashes and begins
@@ -1539,7 +1609,7 @@ AC_CACHE_CHECK([$1], [$2],
$RM conftest*
])
-if test x"[$]$2" = xyes; then
+if test yes = "[$]$2"; then
m4_if([$5], , :, [$5])
else
m4_if([$6], , :, [$6])
@@ -1561,7 +1631,7 @@ AC_DEFUN([_LT_LINKER_OPTION],
m4_require([_LT_DECL_SED])dnl
AC_CACHE_CHECK([$1], [$2],
[$2=no
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS $3"
echo "$lt_simple_link_test_code" > conftest.$ac_ext
if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -1580,10 +1650,10 @@ AC_CACHE_CHECK([$1], [$2],
fi
fi
$RM -r conftest*
- LDFLAGS="$save_LDFLAGS"
+ LDFLAGS=$save_LDFLAGS
])
-if test x"[$]$2" = xyes; then
+if test yes = "[$]$2"; then
m4_if([$4], , :, [$4])
else
m4_if([$5], , :, [$5])
@@ -1604,7 +1674,7 @@ AC_DEFUN([LT_CMD_MAX_LEN],
AC_MSG_CHECKING([the maximum length of command line arguments])
AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
i=0
- teststring="ABCD"
+ teststring=ABCD
case $build_os in
msdosdjgpp*)
@@ -1644,7 +1714,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
lt_cv_sys_max_cmd_len=8192;
;;
- netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
+ bitrig* | darwin* | dragonfly* | freebsd* | netbsd* | openbsd*)
# This has been around since 386BSD, at least. Likely further.
if test -x /sbin/sysctl; then
lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
@@ -1694,22 +1764,23 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len" && \
+ test undefined != "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
# Make teststring a little bigger before we do anything with it.
# a 1K string should be a reasonable start.
- for i in 1 2 3 4 5 6 7 8 ; do
+ for i in 1 2 3 4 5 6 7 8; do
teststring=$teststring$teststring
done
SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
# If test is not a shell built-in, we'll probably end up computing a
# maximum length that is only half of the actual maximum length, but
# we can't tell.
- while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+ while { test X`env echo "$teststring$teststring" 2>/dev/null` \
= "X$teststring$teststring"; } >/dev/null 2>&1 &&
- test $i != 17 # 1/2 MB should be enough
+ test 17 != "$i" # 1/2 MB should be enough
do
i=`expr $i + 1`
teststring=$teststring$teststring
@@ -1725,7 +1796,7 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
;;
esac
])
-if test -n $lt_cv_sys_max_cmd_len ; then
+if test -n "$lt_cv_sys_max_cmd_len"; then
AC_MSG_RESULT($lt_cv_sys_max_cmd_len)
else
AC_MSG_RESULT(none)
@@ -1753,7 +1824,7 @@ m4_defun([_LT_HEADER_DLFCN],
# ----------------------------------------------------------------
m4_defun([_LT_TRY_DLOPEN_SELF],
[m4_require([_LT_HEADER_DLFCN])dnl
-if test "$cross_compiling" = yes; then :
+if test yes = "$cross_compiling"; then :
[$4]
else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
@@ -1800,9 +1871,9 @@ else
# endif
#endif
-/* When -fvisbility=hidden is used, assume the code has been annotated
+/* When -fvisibility=hidden is used, assume the code has been annotated
correspondingly for the symbols needed. */
-#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+#if defined __GNUC__ && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
int fnord () __attribute__((visibility("default")));
#endif
@@ -1828,7 +1899,7 @@ int main ()
return status;
}]
_LT_EOF
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+ if AC_TRY_EVAL(ac_link) && test -s "conftest$ac_exeext" 2>/dev/null; then
(./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
lt_status=$?
case x$lt_status in
@@ -1849,7 +1920,7 @@ rm -fr conftest*
# ------------------
AC_DEFUN([LT_SYS_DLOPEN_SELF],
[m4_require([_LT_HEADER_DLFCN])dnl
-if test "x$enable_dlopen" != xyes; then
+if test yes != "$enable_dlopen"; then
enable_dlopen=unknown
enable_dlopen_self=unknown
enable_dlopen_self_static=unknown
@@ -1859,44 +1930,52 @@ else
case $host_os in
beos*)
- lt_cv_dlopen="load_add_on"
+ lt_cv_dlopen=load_add_on
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
;;
mingw* | pw32* | cegcc*)
- lt_cv_dlopen="LoadLibrary"
+ lt_cv_dlopen=LoadLibrary
lt_cv_dlopen_libs=
;;
cygwin*)
- lt_cv_dlopen="dlopen"
+ lt_cv_dlopen=dlopen
lt_cv_dlopen_libs=
;;
darwin*)
- # if libdl is installed we need to link against it
+ # if libdl is installed we need to link against it
AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],[
- lt_cv_dlopen="dyld"
+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],[
+ lt_cv_dlopen=dyld
lt_cv_dlopen_libs=
lt_cv_dlopen_self=yes
])
;;
+ tpf*)
+ # Don't try to run any link tests for TPF. We know it's impossible
+ # because TPF is a cross-compiler, and we know how we open DSOs.
+ lt_cv_dlopen=dlopen
+ lt_cv_dlopen_libs=
+ lt_cv_dlopen_self=no
+ ;;
+
*)
AC_CHECK_FUNC([shl_load],
- [lt_cv_dlopen="shl_load"],
+ [lt_cv_dlopen=shl_load],
[AC_CHECK_LIB([dld], [shl_load],
- [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],
+ [lt_cv_dlopen=shl_load lt_cv_dlopen_libs=-ldld],
[AC_CHECK_FUNC([dlopen],
- [lt_cv_dlopen="dlopen"],
+ [lt_cv_dlopen=dlopen],
[AC_CHECK_LIB([dl], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],
+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-ldl],
[AC_CHECK_LIB([svld], [dlopen],
- [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],
+ [lt_cv_dlopen=dlopen lt_cv_dlopen_libs=-lsvld],
[AC_CHECK_LIB([dld], [dld_link],
- [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])
+ [lt_cv_dlopen=dld_link lt_cv_dlopen_libs=-ldld])
])
])
])
@@ -1905,21 +1984,21 @@ else
;;
esac
- if test "x$lt_cv_dlopen" != xno; then
- enable_dlopen=yes
- else
+ if test no = "$lt_cv_dlopen"; then
enable_dlopen=no
+ else
+ enable_dlopen=yes
fi
case $lt_cv_dlopen in
dlopen)
- save_CPPFLAGS="$CPPFLAGS"
- test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+ save_CPPFLAGS=$CPPFLAGS
+ test yes = "$ac_cv_header_dlfcn_h" && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
- save_LDFLAGS="$LDFLAGS"
+ save_LDFLAGS=$LDFLAGS
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
- save_LIBS="$LIBS"
+ save_LIBS=$LIBS
LIBS="$lt_cv_dlopen_libs $LIBS"
AC_CACHE_CHECK([whether a program can dlopen itself],
@@ -1929,7 +2008,7 @@ else
lt_cv_dlopen_self=no, lt_cv_dlopen_self=cross)
])
- if test "x$lt_cv_dlopen_self" = xyes; then
+ if test yes = "$lt_cv_dlopen_self"; then
wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
lt_cv_dlopen_self_static, [dnl
@@ -1939,9 +2018,9 @@ else
])
fi
- CPPFLAGS="$save_CPPFLAGS"
- LDFLAGS="$save_LDFLAGS"
- LIBS="$save_LIBS"
+ CPPFLAGS=$save_CPPFLAGS
+ LDFLAGS=$save_LDFLAGS
+ LIBS=$save_LIBS
;;
esac
@@ -2033,8 +2112,8 @@ m4_defun([_LT_COMPILER_FILE_LOCKS],
m4_require([_LT_FILEUTILS_DEFAULTS])dnl
_LT_COMPILER_C_O([$1])
-hard_links="nottested"
-if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" != no; then
+hard_links=nottested
+if test no = "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" && test no != "$need_locks"; then
# do not overwrite the value of need_locks provided by the user
AC_MSG_CHECKING([if we can lock with hard links])
hard_links=yes
@@ -2044,8 +2123,8 @@ if test "$_LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)" = no && test "$need_locks" !=
ln conftest.a conftest.b 2>&5 || hard_links=no
ln conftest.a conftest.b 2>/dev/null && hard_links=no
AC_MSG_RESULT([$hard_links])
- if test "$hard_links" = no; then
- AC_MSG_WARN([`$CC' does not support `-c -o', so `make -j' may be unsafe])
+ if test no = "$hard_links"; then
+ AC_MSG_WARN(['$CC' does not support '-c -o', so 'make -j' may be unsafe])
need_locks=warn
fi
else
@@ -2072,8 +2151,8 @@ objdir=$lt_cv_objdir
_LT_DECL([], [objdir], [0],
[The name of the directory that contains temporary libtool files])dnl
m4_pattern_allow([LT_OBJDIR])dnl
-AC_DEFINE_UNQUOTED(LT_OBJDIR, "$lt_cv_objdir/",
- [Define to the sub-directory in which libtool stores uninstalled libraries.])
+AC_DEFINE_UNQUOTED([LT_OBJDIR], "$lt_cv_objdir/",
+ [Define to the sub-directory where libtool stores uninstalled libraries.])
])# _LT_CHECK_OBJDIR
@@ -2085,15 +2164,15 @@ m4_defun([_LT_LINKER_HARDCODE_LIBPATH],
_LT_TAGVAR(hardcode_action, $1)=
if test -n "$_LT_TAGVAR(hardcode_libdir_flag_spec, $1)" ||
test -n "$_LT_TAGVAR(runpath_var, $1)" ||
- test "X$_LT_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+ test yes = "$_LT_TAGVAR(hardcode_automatic, $1)"; then
# We can hardcode non-existent directories.
- if test "$_LT_TAGVAR(hardcode_direct, $1)" != no &&
+ if test no != "$_LT_TAGVAR(hardcode_direct, $1)" &&
# If the only mechanism to avoid hardcoding is shlibpath_var, we
# have to relink, otherwise we might link with an installed library
# when we should be linking with a yet-to-be-installed one
- ## test "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" != no &&
- test "$_LT_TAGVAR(hardcode_minus_L, $1)" != no; then
+ ## test no != "$_LT_TAGVAR(hardcode_shlibpath_var, $1)" &&
+ test no != "$_LT_TAGVAR(hardcode_minus_L, $1)"; then
# Linking always hardcodes the temporary library directory.
_LT_TAGVAR(hardcode_action, $1)=relink
else
@@ -2107,12 +2186,12 @@ else
fi
AC_MSG_RESULT([$_LT_TAGVAR(hardcode_action, $1)])
-if test "$_LT_TAGVAR(hardcode_action, $1)" = relink ||
- test "$_LT_TAGVAR(inherit_rpath, $1)" = yes; then
+if test relink = "$_LT_TAGVAR(hardcode_action, $1)" ||
+ test yes = "$_LT_TAGVAR(inherit_rpath, $1)"; then
# Fast installation is not supported
enable_fast_install=no
-elif test "$shlibpath_overrides_runpath" = yes ||
- test "$enable_shared" = no; then
+elif test yes = "$shlibpath_overrides_runpath" ||
+ test no = "$enable_shared"; then
# Fast installation is not necessary
enable_fast_install=needless
fi
@@ -2136,7 +2215,7 @@ else
# FIXME - insert some real tests, host_os isn't really good enough
case $host_os in
darwin*)
- if test -n "$STRIP" ; then
+ if test -n "$STRIP"; then
striplib="$STRIP -x"
old_striplib="$STRIP -S"
AC_MSG_RESULT([yes])
@@ -2154,6 +2233,47 @@ _LT_DECL([], [striplib], [1])
])# _LT_CMD_STRIPLIB
+# _LT_PREPARE_MUNGE_PATH_LIST
+# ---------------------------
+# Make sure func_munge_path_list() is defined correctly.
+m4_defun([_LT_PREPARE_MUNGE_PATH_LIST],
+[[# func_munge_path_list VARIABLE PATH
+# -----------------------------------
+# VARIABLE is name of variable containing _space_ separated list of
+# directories to be munged by the contents of PATH, which is string
+# having a format:
+# "DIR[:DIR]:"
+# string "DIR[ DIR]" will be prepended to VARIABLE
+# ":DIR[:DIR]"
+# string "DIR[ DIR]" will be appended to VARIABLE
+# "DIRP[:DIRP]::[DIRA:]DIRA"
+# string "DIRP[ DIRP]" will be prepended to VARIABLE and string
+# "DIRA[ DIRA]" will be appended to VARIABLE
+# "DIR[:DIR]"
+# VARIABLE will be replaced by "DIR[ DIR]"
+func_munge_path_list ()
+{
+ case x@S|@2 in
+ x)
+ ;;
+ *:)
+ eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'` \@S|@@S|@1\"
+ ;;
+ x:*)
+ eval @S|@1=\"\@S|@@S|@1 `$ECHO @S|@2 | $SED 's/:/ /g'`\"
+ ;;
+ *::*)
+ eval @S|@1=\"\@S|@@S|@1\ `$ECHO @S|@2 | $SED -e 's/.*:://' -e 's/:/ /g'`\"
+ eval @S|@1=\"`$ECHO @S|@2 | $SED -e 's/::.*//' -e 's/:/ /g'`\ \@S|@@S|@1\"
+ ;;
+ *)
+ eval @S|@1=\"`$ECHO @S|@2 | $SED 's/:/ /g'`\"
+ ;;
+ esac
+}
+]])# _LT_PREPARE_PATH_LIST
+
+
# _LT_SYS_DYNAMIC_LINKER([TAG])
# -----------------------------
# PORTME Fill in your ld.so characteristics
@@ -2164,17 +2284,18 @@ m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_OBJDUMP])dnl
m4_require([_LT_DECL_SED])dnl
m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PREPARE_MUNGE_PATH_LIST])dnl
AC_MSG_CHECKING([dynamic linker characteristics])
m4_if([$1],
[], [
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $host_os in
- darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
- *) lt_awk_arg="/^libraries:/" ;;
+ darwin*) lt_awk_arg='/^libraries:/,/LR/' ;;
+ *) lt_awk_arg='/^libraries:/' ;;
esac
case $host_os in
- mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
- *) lt_sed_strip_eq="s,=/,/,g" ;;
+ mingw* | cegcc*) lt_sed_strip_eq='s|=\([[A-Za-z]]:\)|\1|g' ;;
+ *) lt_sed_strip_eq='s|=/|/|g' ;;
esac
lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
case $lt_search_path_spec in
@@ -2190,28 +2311,35 @@ if test "$GCC" = yes; then
;;
esac
# Ok, now we have the path, separated by spaces, we can step through it
- # and add multilib dir if necessary.
+ # and add multilib dir if necessary...
lt_tmp_lt_search_path_spec=
- lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ lt_multi_os_dir=/`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
+ # ...but if some path component already ends with the multilib dir we assume
+ # that all is fine and trust -print-search-dirs as is (GCC 4.2? or newer).
+ case "$lt_multi_os_dir; $lt_search_path_spec " in
+ "/; "* | "/.; "* | "/./; "* | *"$lt_multi_os_dir "* | *"$lt_multi_os_dir/ "*)
+ lt_multi_os_dir=
+ ;;
+ esac
for lt_sys_path in $lt_search_path_spec; do
- if test -d "$lt_sys_path/$lt_multi_os_dir"; then
- lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
- else
+ if test -d "$lt_sys_path$lt_multi_os_dir"; then
+ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path$lt_multi_os_dir"
+ elif test -n "$lt_multi_os_dir"; then
test -d "$lt_sys_path" && \
lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
fi
done
lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
-BEGIN {RS=" "; FS="/|\n";} {
- lt_foo="";
- lt_count=0;
+BEGIN {RS = " "; FS = "/|\n";} {
+ lt_foo = "";
+ lt_count = 0;
for (lt_i = NF; lt_i > 0; lt_i--) {
if ($lt_i != "" && $lt_i != ".") {
if ($lt_i == "..") {
lt_count++;
} else {
if (lt_count == 0) {
- lt_foo="/" $lt_i lt_foo;
+ lt_foo = "/" $lt_i lt_foo;
} else {
lt_count--;
}
@@ -2225,7 +2353,7 @@ BEGIN {RS=" "; FS="/|\n";} {
# for these hosts.
case $host_os in
mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
- $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+ $SED 's|/\([[A-Za-z]]:\)|\1|g'` ;;
esac
sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
else
@@ -2234,7 +2362,7 @@ fi])
library_names_spec=
libname_spec='lib$name'
soname_spec=
-shrext_cmds=".so"
+shrext_cmds=.so
postinstall_cmds=
postuninstall_cmds=
finish_cmds=
@@ -2251,14 +2379,17 @@ hardcode_into_libs=no
# flags to be left without arguments
need_version=unknown
+AC_ARG_VAR([LT_SYS_LIBRARY_PATH],
+[User-defined run-time library search path.])
+
case $host_os in
aix3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname.a'
shlibpath_var=LIBPATH
# AIX 3 has no versioning support, so we append a major version to the name.
- soname_spec='${libname}${release}${shared_ext}$major'
+ soname_spec='$libname$release$shared_ext$major'
;;
aix[[4-9]]*)
@@ -2266,41 +2397,91 @@ aix[[4-9]]*)
need_lib_prefix=no
need_version=no
hardcode_into_libs=yes
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 supports IA64
- library_names_spec='${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext}$versuffix $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$major $libname$release$shared_ext$versuffix $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
else
# With GCC up to 2.95.x, collect2 would create an import file
# for dependence libraries. The import file would start with
- # the line `#! .'. This would cause the generated library to
- # depend on `.', always an invalid library. This was fixed in
+ # the line '#! .'. This would cause the generated library to
+ # depend on '.', always an invalid library. This was fixed in
# development snapshots of GCC prior to 3.0.
case $host_os in
aix4 | aix4.[[01]] | aix4.[[01]].*)
if { echo '#if __GNUC__ > 2 || (__GNUC__ == 2 && __GNUC_MINOR__ >= 97)'
echo ' yes '
- echo '#endif'; } | ${CC} -E - | $GREP yes > /dev/null; then
+ echo '#endif'; } | $CC -E - | $GREP yes > /dev/null; then
:
else
can_build_shared=no
fi
;;
esac
- # AIX (on Power*) has no versioning support, so currently we can not hardcode correct
+ # Using Import Files as archive members, it is possible to support
+ # filename-based versioning of shared library archives on AIX. While
+ # this would work for both with and without runtime linking, it will
+ # prevent static linking of such archives. So we do filename-based
+ # shared library versioning with .so extension only, which is used
+ # when both runtime linking and shared linking is enabled.
+ # Unfortunately, runtime linking may impact performance, so we do
+ # not want this to be the default eventually. Also, we use the
+ # versioned .so libs for executables only if there is the -brtl
+ # linker flag in LDFLAGS as well, or --with-aix-soname=svr4 only.
+ # To allow for filename-based versioning support, we need to create
+ # libNAME.so.V as an archive file, containing:
+ # *) an Import File, referring to the versioned filename of the
+ # archive as well as the shared archive member, telling the
+ # bitwidth (32 or 64) of that shared object, and providing the
+ # list of exported symbols of that shared object, eventually
+ # decorated with the 'weak' keyword
+ # *) the shared object with the F_LOADONLY flag set, to really avoid
+ # it being seen by the linker.
+ # At run time we better use the real file rather than another symlink,
+ # but for link time we create the symlink libNAME.so -> libNAME.so.V
+
+ case $with_aix_soname,$aix_use_runtimelinking in
+ # AIX (on Power*) has no versioning support, so currently we cannot hardcode correct
# soname into executable. Probably we can add versioning support to
# collect2, so additional links can be useful in future.
- if test "$aix_use_runtimelinking" = yes; then
+ aix,yes) # traditional libtool
+ dynamic_linker='AIX unversionable lib.so'
# If using run time linking (on AIX 4.2 or later) use lib<name>.so
# instead of lib<name>.a to let people know that these are not
# typical AIX shared libraries.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- else
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ ;;
+ aix,no) # traditional AIX only
+ dynamic_linker='AIX lib.a[(]lib.so.V[)]'
# We preserve .a as extension for shared libraries through AIX4.2
# and later when we are not doing run time linking.
- library_names_spec='${libname}${release}.a $libname.a'
- soname_spec='${libname}${release}${shared_ext}$major'
- fi
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ ;;
+ svr4,*) # full svr4 only
+ dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)]"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,yes) # both, prefer svr4
+ dynamic_linker="AIX lib.so.V[(]$shared_archive_member_spec.o[)], lib.a[(]lib.so.V[)]"
+ library_names_spec='$libname$release$shared_ext$major $libname$shared_ext'
+ # unpreferred sharedlib libNAME.a needs extra handling
+ postinstall_cmds='test -n "$linkname" || linkname="$realname"~func_stripname "" ".so" "$linkname"~$install_shared_prog "$dir/$func_stripname_result.$libext" "$destdir/$func_stripname_result.$libext"~test -z "$tstripme" || test -z "$striplib" || $striplib "$destdir/$func_stripname_result.$libext"'
+ postuninstall_cmds='for n in $library_names $old_library; do :; done~func_stripname "" ".so" "$n"~test "$func_stripname_result" = "$n" || func_append rmfiles " $odir/$func_stripname_result.$libext"'
+ # We do not specify a path in Import Files, so LIBPATH fires.
+ shlibpath_overrides_runpath=yes
+ ;;
+ *,no) # both, prefer aix
+ dynamic_linker="AIX lib.a[(]lib.so.V[)], lib.so.V[(]$shared_archive_member_spec.o[)]"
+ library_names_spec='$libname$release.a $libname.a'
+ soname_spec='$libname$release$shared_ext$major'
+ # unpreferred sharedlib libNAME.so.V and symlink libNAME.so need extra handling
+ postinstall_cmds='test -z "$dlname" || $install_shared_prog $dir/$dlname $destdir/$dlname~test -z "$tstripme" || test -z "$striplib" || $striplib $destdir/$dlname~test -n "$linkname" || linkname=$realname~func_stripname "" ".a" "$linkname"~(cd "$destdir" && $LN_S -f $dlname $func_stripname_result.so)'
+ postuninstall_cmds='test -z "$dlname" || func_append rmfiles " $odir/$dlname"~for n in $old_library $library_names; do :; done~func_stripname "" ".a" "$n"~func_append rmfiles " $odir/$func_stripname_result.so"'
+ ;;
+ esac
shlibpath_var=LIBPATH
fi
;;
@@ -2310,18 +2491,18 @@ amigaos*)
powerpc)
# Since July 2007 AmigaOS4 officially supports .so libraries.
# When compiling the executable, add -use-dynld -Lsobjs: to the compileline.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
;;
m68k)
library_names_spec='$libname.ixlibrary $libname.a'
# Create ${libname}_ixlibrary.a entries in /sys/libs.
- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
;;
esac
;;
beos*)
- library_names_spec='${libname}${shared_ext}'
+ library_names_spec='$libname$shared_ext'
dynamic_linker="$host_os ld.so"
shlibpath_var=LIBRARY_PATH
;;
@@ -2329,8 +2510,8 @@ beos*)
bsdi[[45]]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/shlib /usr/lib /usr/X11/lib /usr/contrib/lib /lib /usr/local/lib"
@@ -2342,7 +2523,7 @@ bsdi[[45]]*)
cygwin* | mingw* | pw32* | cegcc*)
version_type=windows
- shrext_cmds=".dll"
+ shrext_cmds=.dll
need_version=no
need_lib_prefix=no
@@ -2351,8 +2532,8 @@ cygwin* | mingw* | pw32* | cegcc*)
# gcc
library_names_spec='$libname.dll.a'
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname~
@@ -2368,17 +2549,17 @@ cygwin* | mingw* | pw32* | cegcc*)
case $host_os in
cygwin*)
# Cygwin DLLs use 'cyg' prefix rather than 'lib'
- soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='`echo $libname | sed -e 's/^lib/cyg/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
m4_if([$1], [],[
sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
;;
mingw* | cegcc*)
# MinGW DLLs use traditional 'lib' prefix
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
;;
pw32*)
# pw32 DLLs use 'pw' prefix rather than 'lib'
- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ library_names_spec='`echo $libname | sed -e 's/^lib/pw/'``echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
;;
esac
dynamic_linker='Win32 ld.exe'
@@ -2387,8 +2568,8 @@ m4_if([$1], [],[
*,cl*)
# Native MSVC
libname_spec='$name'
- soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
- library_names_spec='${libname}.dll.lib'
+ soname_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext'
+ library_names_spec='$libname.dll.lib'
case $build_os in
mingw*)
@@ -2415,7 +2596,7 @@ m4_if([$1], [],[
sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
;;
*)
- sys_lib_search_path_spec="$LIB"
+ sys_lib_search_path_spec=$LIB
if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
# It is most probably a Windows format PATH.
sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
@@ -2428,8 +2609,8 @@ m4_if([$1], [],[
esac
# DLL is installed to $(libdir)/../bin by postinstall_cmds
- postinstall_cmds='base_file=`basename \${file}`~
- dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; echo \$dlname'\''`~
dldir=$destdir/`dirname \$dlpath`~
test -d \$dldir || mkdir -p \$dldir~
$install_prog $dir/$dlname \$dldir/$dlname'
@@ -2442,7 +2623,7 @@ m4_if([$1], [],[
*)
# Assume MSVC wrapper
- library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+ library_names_spec='$libname`echo $release | $SED -e 's/[[.]]/-/g'`$versuffix$shared_ext $libname.lib'
dynamic_linker='Win32 ld.exe'
;;
esac
@@ -2455,8 +2636,8 @@ darwin* | rhapsody*)
version_type=darwin
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${major}$shared_ext ${libname}$shared_ext'
- soname_spec='${libname}${release}${major}$shared_ext'
+ library_names_spec='$libname$release$major$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$major$shared_ext'
shlibpath_overrides_runpath=yes
shlibpath_var=DYLD_LIBRARY_PATH
shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
@@ -2469,8 +2650,8 @@ dgux*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -2488,12 +2669,13 @@ freebsd* | dragonfly*)
version_type=freebsd-$objformat
case $version_type in
freebsd-elf*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
need_version=no
need_lib_prefix=no
;;
freebsd-*)
- library_names_spec='${libname}${release}${shared_ext}$versuffix $libname${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
need_version=yes
;;
esac
@@ -2518,26 +2700,15 @@ freebsd* | dragonfly*)
esac
;;
-gnu*)
- version_type=linux # correct to gnu/linux during the next big refactor
- need_lib_prefix=no
- need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- shlibpath_var=LD_LIBRARY_PATH
- shlibpath_overrides_runpath=no
- hardcode_into_libs=yes
- ;;
-
haiku*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
dynamic_linker="$host_os runtime_loader"
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LIBRARY_PATH
- shlibpath_overrides_runpath=yes
+ shlibpath_overrides_runpath=no
sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
hardcode_into_libs=yes
;;
@@ -2555,14 +2726,15 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.so"
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
- if test "X$HPUX_IA64_MODE" = X32; then
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
+ if test 32 = "$HPUX_IA64_MODE"; then
sys_lib_search_path_spec="/usr/lib/hpux32 /usr/local/lib/hpux32 /usr/local/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux32
else
sys_lib_search_path_spec="/usr/lib/hpux64 /usr/local/lib/hpux64"
+ sys_lib_dlsearch_path_spec=/usr/lib/hpux64
fi
- sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
hppa*64*)
shrext_cmds='.sl'
@@ -2570,8 +2742,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
shlibpath_overrides_runpath=yes # Unless +noenvvar is specified.
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
sys_lib_search_path_spec="/usr/lib/pa20_64 /usr/ccs/lib/pa20_64"
sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
@@ -2580,8 +2752,8 @@ hpux9* | hpux10* | hpux11*)
dynamic_linker="$host_os dld.sl"
shlibpath_var=SHLIB_PATH
shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
;;
esac
# HP-UX runs *really* slowly unless shared libraries are mode 555, ...
@@ -2594,8 +2766,8 @@ interix[[3-9]]*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -2606,7 +2778,7 @@ irix5* | irix6* | nonstopux*)
case $host_os in
nonstopux*) version_type=nonstopux ;;
*)
- if test "$lt_cv_prog_gnu_ld" = yes; then
+ if test yes = "$lt_cv_prog_gnu_ld"; then
version_type=linux # correct to gnu/linux during the next big refactor
else
version_type=irix
@@ -2614,8 +2786,8 @@ irix5* | irix6* | nonstopux*)
esac
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$release$shared_ext $libname$shared_ext'
case $host_os in
irix5* | nonstopux*)
libsuff= shlibsuff=
@@ -2634,8 +2806,8 @@ irix5* | irix6* | nonstopux*)
esac
shlibpath_var=LD_LIBRARY${shlibsuff}_PATH
shlibpath_overrides_runpath=no
- sys_lib_search_path_spec="/usr/lib${libsuff} /lib${libsuff} /usr/local/lib${libsuff}"
- sys_lib_dlsearch_path_spec="/usr/lib${libsuff} /lib${libsuff}"
+ sys_lib_search_path_spec="/usr/lib$libsuff /lib$libsuff /usr/local/lib$libsuff"
+ sys_lib_dlsearch_path_spec="/usr/lib$libsuff /lib$libsuff"
hardcode_into_libs=yes
;;
@@ -2644,13 +2816,33 @@ linux*oldld* | linux*aout* | linux*coff*)
dynamic_linker=no
;;
+linux*android*)
+ version_type=none # Android doesn't support versioned libraries.
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='$libname$release$shared_ext'
+ soname_spec='$libname$release$shared_ext'
+ finish_cmds=
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
+
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
+ dynamic_linker='Android linker'
+ # Don't embed -rpath directories since the linker doesn't support them.
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ ;;
+
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
@@ -2678,11 +2870,15 @@ linux* | k*bsd*-gnu | kopensolaris*-gnu)
# Add ABI-specific directories to the system library path.
sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
- # Append ld.so.conf contents to the search path
+ # Ideally, we could use ldconfig to report *all* directores which are
+ # searched for libraries, however this is still not possible. Aside from not
+ # being certain /sbin/ldconfig is available, command
+ # 'ldconfig -N -X -v | grep ^/' on 64bit Fedora does not report /usr/lib64,
+ # even though it is searched at run-time. Try to do the best guess by
+ # appending ld.so.conf contents (and includes) to the search path.
if test -f /etc/ld.so.conf; then
lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
-
fi
# We used to test for /lib/ld.so.1 and disable shared libraries on
@@ -2699,12 +2895,12 @@ netbsd*)
need_lib_prefix=no
need_version=no
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
dynamic_linker='NetBSD (a.out) ld.so'
else
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
dynamic_linker='NetBSD ld.elf_so'
fi
shlibpath_var=LD_LIBRARY_PATH
@@ -2714,7 +2910,7 @@ netbsd*)
newsos6)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
;;
@@ -2723,58 +2919,68 @@ newsos6)
version_type=qnx
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
dynamic_linker='ldqnx.so'
;;
-openbsd*)
+openbsd* | bitrig*)
version_type=sunos
- sys_lib_dlsearch_path_spec="/usr/lib"
+ sys_lib_dlsearch_path_spec=/usr/lib
need_lib_prefix=no
- # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
- case $host_os in
- openbsd3.3 | openbsd3.3.*) need_version=yes ;;
- *) need_version=no ;;
- esac
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
- finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
- shlibpath_var=LD_LIBRARY_PATH
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- case $host_os in
- openbsd2.[[89]] | openbsd2.[[89]].*)
- shlibpath_overrides_runpath=no
- ;;
- *)
- shlibpath_overrides_runpath=yes
- ;;
- esac
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
+ need_version=no
else
- shlibpath_overrides_runpath=yes
+ need_version=yes
fi
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=yes
;;
os2*)
libname_spec='$name'
- shrext_cmds=".dll"
+ version_type=windows
+ shrext_cmds=.dll
+ need_version=no
need_lib_prefix=no
- library_names_spec='$libname${shared_ext} $libname.a'
+ # OS/2 can only load a DLL with a base name of 8 characters or less.
+ soname_spec='`test -n "$os2dllname" && libname="$os2dllname";
+ v=$($ECHO $release$versuffix | tr -d .-);
+ n=$($ECHO $libname | cut -b -$((8 - ${#v})) | tr . _);
+ $ECHO $n$v`$shared_ext'
+ library_names_spec='${libname}_dll.$libext'
dynamic_linker='OS/2 ld.exe'
- shlibpath_var=LIBPATH
+ shlibpath_var=BEGINLIBPATH
+ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ postinstall_cmds='base_file=`basename \$file`~
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\$base_file'\''i; $ECHO \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+ $install_prog $dir/$dlname \$dldir/$dlname~
+ chmod a+x \$dldir/$dlname~
+ if test -n '\''$stripme'\'' && test -n '\''$striplib'\''; then
+ eval '\''$striplib \$dldir/$dlname'\'' || exit \$?;
+ fi'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; $ECHO \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $RM \$dlpath'
;;
osf3* | osf4* | osf5*)
version_type=osf
need_lib_prefix=no
need_version=no
- soname_spec='${libname}${release}${shared_ext}$major'
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='$libname$release$shared_ext$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
sys_lib_search_path_spec="/usr/shlib /usr/ccs/lib /usr/lib/cmplrs/cc /usr/lib /usr/local/lib /var/shlib"
- sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
;;
rdos*)
@@ -2785,8 +2991,8 @@ solaris*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
@@ -2796,11 +3002,11 @@ solaris*)
sunos4*)
version_type=sunos
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$shared_ext$versuffix'
finish_cmds='PATH="\$PATH:/usr/etc" ldconfig $libdir'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
need_lib_prefix=no
fi
need_version=yes
@@ -2808,8 +3014,8 @@ sunos4*)
sysv4 | sysv4.3*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
case $host_vendor in
sni)
@@ -2830,24 +3036,24 @@ sysv4 | sysv4.3*)
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
- soname_spec='$libname${shared_ext}.$major'
+ library_names_spec='$libname$shared_ext.$versuffix $libname$shared_ext.$major $libname$shared_ext'
+ soname_spec='$libname$shared_ext.$major'
shlibpath_var=LD_LIBRARY_PATH
fi
;;
sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
- version_type=freebsd-elf
+ version_type=sco
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=yes
hardcode_into_libs=yes
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
else
sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
@@ -2865,7 +3071,7 @@ tpf*)
version_type=linux # correct to gnu/linux during the next big refactor
need_lib_prefix=no
need_version=no
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
shlibpath_var=LD_LIBRARY_PATH
shlibpath_overrides_runpath=no
hardcode_into_libs=yes
@@ -2873,8 +3079,8 @@ tpf*)
uts4*)
version_type=linux # correct to gnu/linux during the next big refactor
- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
- soname_spec='${libname}${release}${shared_ext}$major'
+ library_names_spec='$libname$release$shared_ext$versuffix $libname$release$shared_ext$major $libname$shared_ext'
+ soname_spec='$libname$release$shared_ext$major'
shlibpath_var=LD_LIBRARY_PATH
;;
@@ -2883,20 +3089,30 @@ uts4*)
;;
esac
AC_MSG_RESULT([$dynamic_linker])
-test "$dynamic_linker" = no && can_build_shared=no
+test no = "$dynamic_linker" && can_build_shared=no
variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
fi
-if test "${lt_cv_sys_lib_search_path_spec+set}" = set; then
- sys_lib_search_path_spec="$lt_cv_sys_lib_search_path_spec"
+if test set = "${lt_cv_sys_lib_search_path_spec+set}"; then
+ sys_lib_search_path_spec=$lt_cv_sys_lib_search_path_spec
fi
-if test "${lt_cv_sys_lib_dlsearch_path_spec+set}" = set; then
- sys_lib_dlsearch_path_spec="$lt_cv_sys_lib_dlsearch_path_spec"
+
+if test set = "${lt_cv_sys_lib_dlsearch_path_spec+set}"; then
+ sys_lib_dlsearch_path_spec=$lt_cv_sys_lib_dlsearch_path_spec
fi
+# remember unaugmented sys_lib_dlsearch_path content for libtool script decls...
+configure_time_dlsearch_path=$sys_lib_dlsearch_path_spec
+
+# ... but it needs LT_SYS_LIBRARY_PATH munging for other configure-time code
+func_munge_path_list sys_lib_dlsearch_path_spec "$LT_SYS_LIBRARY_PATH"
+
+# to be used as default LT_SYS_LIBRARY_PATH value in generated libtool
+configure_time_lt_sys_library_path=$LT_SYS_LIBRARY_PATH
+
_LT_DECL([], [variables_saved_for_relink], [1],
[Variables whose values should be saved in libtool wrapper scripts and
restored at link time])
@@ -2929,39 +3145,41 @@ _LT_DECL([], [hardcode_into_libs], [0],
[Whether we should hardcode library paths into libraries])
_LT_DECL([], [sys_lib_search_path_spec], [2],
[Compile-time system search path for libraries])
-_LT_DECL([], [sys_lib_dlsearch_path_spec], [2],
- [Run-time system search path for libraries])
+_LT_DECL([sys_lib_dlsearch_path_spec], [configure_time_dlsearch_path], [2],
+ [Detected run-time system search path for libraries])
+_LT_DECL([], [configure_time_lt_sys_library_path], [2],
+ [Explicit LT_SYS_LIBRARY_PATH set during ./configure time])
])# _LT_SYS_DYNAMIC_LINKER
# _LT_PATH_TOOL_PREFIX(TOOL)
# --------------------------
-# find a file program which can recognize shared library
+# find a file program that can recognize shared library
AC_DEFUN([_LT_PATH_TOOL_PREFIX],
[m4_require([_LT_DECL_EGREP])dnl
AC_MSG_CHECKING([for $1])
AC_CACHE_VAL(lt_cv_path_MAGIC_CMD,
[case $MAGIC_CMD in
[[\\/*] | ?:[\\/]*])
- lt_cv_path_MAGIC_CMD="$MAGIC_CMD" # Let the user override the test with a path.
+ lt_cv_path_MAGIC_CMD=$MAGIC_CMD # Let the user override the test with a path.
;;
*)
- lt_save_MAGIC_CMD="$MAGIC_CMD"
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_MAGIC_CMD=$MAGIC_CMD
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
dnl $ac_dummy forces splitting on constant user-supplied paths.
dnl POSIX.2 word splitting is done only on the output of word expansions,
dnl not every word. This closes a longstanding sh security hole.
ac_dummy="m4_if([$2], , $PATH, [$2])"
for ac_dir in $ac_dummy; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- if test -f $ac_dir/$1; then
- lt_cv_path_MAGIC_CMD="$ac_dir/$1"
+ if test -f "$ac_dir/$1"; then
+ lt_cv_path_MAGIC_CMD=$ac_dir/"$1"
if test -n "$file_magic_test_file"; then
case $deplibs_check_method in
"file_magic "*)
file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
- MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
$EGREP "$file_magic_regex" > /dev/null; then
:
@@ -2984,11 +3202,11 @@ _LT_EOF
break
fi
done
- IFS="$lt_save_ifs"
- MAGIC_CMD="$lt_save_MAGIC_CMD"
+ IFS=$lt_save_ifs
+ MAGIC_CMD=$lt_save_MAGIC_CMD
;;
esac])
-MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+MAGIC_CMD=$lt_cv_path_MAGIC_CMD
if test -n "$MAGIC_CMD"; then
AC_MSG_RESULT($MAGIC_CMD)
else
@@ -3006,7 +3224,7 @@ dnl AC_DEFUN([AC_PATH_TOOL_PREFIX], [])
# _LT_PATH_MAGIC
# --------------
-# find a file program which can recognize a shared library
+# find a file program that can recognize a shared library
m4_defun([_LT_PATH_MAGIC],
[_LT_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
if test -z "$lt_cv_path_MAGIC_CMD"; then
@@ -3033,16 +3251,16 @@ m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
AC_ARG_WITH([gnu-ld],
[AS_HELP_STRING([--with-gnu-ld],
[assume the C compiler uses GNU ld @<:@default=no@:>@])],
- [test "$withval" = no || with_gnu_ld=yes],
+ [test no = "$withval" || with_gnu_ld=yes],
[with_gnu_ld=no])dnl
ac_prog=ld
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
# Check if gcc -print-prog-name=ld gives a path.
AC_MSG_CHECKING([for ld used by $CC])
case $host in
*-*-mingw*)
- # gcc leaves a trailing carriage return which upsets mingw
+ # gcc leaves a trailing carriage return, which upsets mingw
ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;;
*)
ac_prog=`($CC -print-prog-name=ld) 2>&5` ;;
@@ -3056,7 +3274,7 @@ if test "$GCC" = yes; then
while $ECHO "$ac_prog" | $GREP "$re_direlt" > /dev/null 2>&1; do
ac_prog=`$ECHO $ac_prog| $SED "s%$re_direlt%/%"`
done
- test -z "$LD" && LD="$ac_prog"
+ test -z "$LD" && LD=$ac_prog
;;
"")
# If it fails, then pretend we aren't using GCC.
@@ -3067,37 +3285,37 @@ if test "$GCC" = yes; then
with_gnu_ld=unknown
;;
esac
-elif test "$with_gnu_ld" = yes; then
+elif test yes = "$with_gnu_ld"; then
AC_MSG_CHECKING([for GNU ld])
else
AC_MSG_CHECKING([for non-GNU ld])
fi
AC_CACHE_VAL(lt_cv_path_LD,
[if test -z "$LD"; then
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
- lt_cv_path_LD="$ac_dir/$ac_prog"
+ lt_cv_path_LD=$ac_dir/$ac_prog
# Check to see if the program is GNU ld. I'd rather use --version,
# but apparently some variants of GNU ld only accept -v.
# Break only if it was the GNU/non-GNU ld that we prefer.
case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
*GNU* | *'with BFD'*)
- test "$with_gnu_ld" != no && break
+ test no != "$with_gnu_ld" && break
;;
*)
- test "$with_gnu_ld" != yes && break
+ test yes != "$with_gnu_ld" && break
;;
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
else
- lt_cv_path_LD="$LD" # Let the user override the test with a path.
+ lt_cv_path_LD=$LD # Let the user override the test with a path.
fi])
-LD="$lt_cv_path_LD"
+LD=$lt_cv_path_LD
if test -n "$LD"; then
AC_MSG_RESULT($LD)
else
@@ -3151,13 +3369,13 @@ esac
reload_cmds='$LD$reload_flag -o $output$reload_objs'
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
reload_cmds=false
fi
;;
darwin*)
- if test "$GCC" = yes; then
- reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
+ if test yes = "$GCC"; then
+ reload_cmds='$LTCC $LTCFLAGS -nostdlib $wl-r -o $output$reload_objs'
else
reload_cmds='$LD$reload_flag -o $output$reload_objs'
fi
@@ -3168,6 +3386,43 @@ _LT_TAGDECL([], [reload_cmds], [2])dnl
])# _LT_CMD_RELOAD
+# _LT_PATH_DD
+# -----------
+# find a working dd
+m4_defun([_LT_PATH_DD],
+[AC_CACHE_CHECK([for a working dd], [ac_cv_path_lt_DD],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+: ${lt_DD:=$DD}
+AC_PATH_PROGS_FEATURE_CHECK([lt_DD], [dd],
+[if "$ac_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && ac_cv_path_lt_DD="$ac_path_lt_DD" ac_path_lt_DD_found=:
+fi])
+rm -f conftest.i conftest2.i conftest.out])
+])# _LT_PATH_DD
+
+
+# _LT_CMD_TRUNCATE
+# ----------------
+# find command to truncate a binary pipe
+m4_defun([_LT_CMD_TRUNCATE],
+[m4_require([_LT_PATH_DD])
+AC_CACHE_CHECK([how to truncate binary pipes], [lt_cv_truncate_bin],
+[printf 0123456789abcdef0123456789abcdef >conftest.i
+cat conftest.i conftest.i >conftest2.i
+lt_cv_truncate_bin=
+if "$ac_cv_path_lt_DD" bs=32 count=1 <conftest2.i >conftest.out 2>/dev/null; then
+ cmp -s conftest.i conftest.out \
+ && lt_cv_truncate_bin="$ac_cv_path_lt_DD bs=4096 count=1"
+fi
+rm -f conftest.i conftest2.i conftest.out
+test -z "$lt_cv_truncate_bin" && lt_cv_truncate_bin="$SED -e 4q"])
+_LT_DECL([lt_truncate_bin], [lt_cv_truncate_bin], [1],
+ [Command to truncate a binary pipe])
+])# _LT_CMD_TRUNCATE
+
+
# _LT_CHECK_MAGIC_METHOD
# ----------------------
# how to check for library dependencies
@@ -3183,13 +3438,13 @@ lt_cv_deplibs_check_method='unknown'
# Need to set the preceding variable on all platforms that support
# interlibrary dependencies.
# 'none' -- dependencies not supported.
-# `unknown' -- same as none, but documents that we really don't know.
+# 'unknown' -- same as none, but documents that we really don't know.
# 'pass_all' -- all dependencies passed with no checks.
# 'test_compile' -- check by making test program.
# 'file_magic [[regex]]' -- check by looking for files in library path
-# which responds to the $file_magic_cmd with a given extended regex.
-# If you have `file' or equivalent on your system and you're not sure
-# whether `pass_all' will *always* work, you probably want this one.
+# that responds to the $file_magic_cmd with a given extended regex.
+# If you have 'file' or equivalent on your system and you're not sure
+# whether 'pass_all' will *always* work, you probably want this one.
case $host_os in
aix[[4-9]]*)
@@ -3216,8 +3471,7 @@ mingw* | pw32*)
# Base MSYS/MinGW do not provide the 'file' command needed by
# func_win32_libid shell function, so use a weaker test based on 'objdump',
# unless we find 'file', for example because we are cross-compiling.
- # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
- if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
+ if ( file / ) >/dev/null 2>&1; then
lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
lt_cv_file_magic_cmd='func_win32_libid'
else
@@ -3253,10 +3507,6 @@ freebsd* | dragonfly*)
fi
;;
-gnu*)
- lt_cv_deplibs_check_method=pass_all
- ;;
-
haiku*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3295,7 +3545,7 @@ irix5* | irix6* | nonstopux*)
;;
# This must be glibc/ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
lt_cv_deplibs_check_method=pass_all
;;
@@ -3317,8 +3567,8 @@ newos6*)
lt_cv_deplibs_check_method=pass_all
;;
-openbsd*)
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+openbsd* | bitrig*)
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
else
lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
@@ -3371,6 +3621,9 @@ sysv4 | sysv4.3*)
tpf*)
lt_cv_deplibs_check_method=pass_all
;;
+os2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
esac
])
@@ -3411,33 +3664,38 @@ AC_DEFUN([LT_PATH_NM],
AC_CACHE_CHECK([for BSD- or MS-compatible name lister (nm)], lt_cv_path_NM,
[if test -n "$NM"; then
# Let the user override the test.
- lt_cv_path_NM="$NM"
+ lt_cv_path_NM=$NM
else
- lt_nm_to_check="${ac_tool_prefix}nm"
+ lt_nm_to_check=${ac_tool_prefix}nm
if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
lt_nm_to_check="$lt_nm_to_check nm"
fi
for lt_tmp_nm in $lt_nm_to_check; do
- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+ lt_save_ifs=$IFS; IFS=$PATH_SEPARATOR
for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
test -z "$ac_dir" && ac_dir=.
- tmp_nm="$ac_dir/$lt_tmp_nm"
- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+ tmp_nm=$ac_dir/$lt_tmp_nm
+ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext"; then
# Check to see if the nm accepts a BSD-compat flag.
- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+ # Adding the 'sed 1q' prevents false positives on HP-UX, which says:
# nm: unknown option "B" ignored
# Tru64's nm complains that /dev/null is an invalid object file
- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
- */dev/null* | *'Invalid file or object type'*)
+ # MSYS converts /dev/null to NUL, MinGW nm treats NUL as empty
+ case $build_os in
+ mingw*) lt_bad_file=conftest.nm/nofile ;;
+ *) lt_bad_file=/dev/null ;;
+ esac
+ case `"$tmp_nm" -B $lt_bad_file 2>&1 | sed '1q'` in
+ *$lt_bad_file* | *'Invalid file or object type'*)
lt_cv_path_NM="$tmp_nm -B"
- break
+ break 2
;;
*)
case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
*/dev/null*)
lt_cv_path_NM="$tmp_nm -p"
- break
+ break 2
;;
*)
lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
@@ -3448,21 +3706,21 @@ else
esac
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
done
: ${lt_cv_path_NM=no}
fi])
-if test "$lt_cv_path_NM" != "no"; then
- NM="$lt_cv_path_NM"
+if test no != "$lt_cv_path_NM"; then
+ NM=$lt_cv_path_NM
else
# Didn't find any BSD compatible name lister, look for dumpbin.
if test -n "$DUMPBIN"; then :
# Let the user override the test.
else
AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
- case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+ case `$DUMPBIN -symbols -headers /dev/null 2>&1 | sed '1q'` in
*COFF*)
- DUMPBIN="$DUMPBIN -symbols"
+ DUMPBIN="$DUMPBIN -symbols -headers"
;;
*)
DUMPBIN=:
@@ -3470,8 +3728,8 @@ else
esac
fi
AC_SUBST([DUMPBIN])
- if test "$DUMPBIN" != ":"; then
- NM="$DUMPBIN"
+ if test : != "$DUMPBIN"; then
+ NM=$DUMPBIN
fi
fi
test -z "$NM" && NM=nm
@@ -3517,8 +3775,8 @@ lt_cv_sharedlib_from_linklib_cmd,
case $host_os in
cygwin* | mingw* | pw32* | cegcc*)
- # two different shell functions defined in ltmain.sh
- # decide which to use based on capabilities of $DLLTOOL
+ # two different shell functions defined in ltmain.sh;
+ # decide which one to use based on capabilities of $DLLTOOL
case `$DLLTOOL --help 2>&1` in
*--identify-strict*)
lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
@@ -3530,7 +3788,7 @@ cygwin* | mingw* | pw32* | cegcc*)
;;
*)
# fallback: assume linklib IS sharedlib
- lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+ lt_cv_sharedlib_from_linklib_cmd=$ECHO
;;
esac
])
@@ -3557,13 +3815,28 @@ AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool
lt_cv_path_mainfest_tool=yes
fi
rm -f conftest*])
-if test "x$lt_cv_path_mainfest_tool" != xyes; then
+if test yes != "$lt_cv_path_mainfest_tool"; then
MANIFEST_TOOL=:
fi
_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
])# _LT_PATH_MANIFEST_TOOL
+# _LT_DLL_DEF_P([FILE])
+# ---------------------
+# True iff FILE is a Windows DLL '.def' file.
+# Keep in sync with func_dll_def_p in the libtool script
+AC_DEFUN([_LT_DLL_DEF_P],
+[dnl
+ test DEF = "`$SED -n dnl
+ -e '\''s/^[[ ]]*//'\'' dnl Strip leading whitespace
+ -e '\''/^\(;.*\)*$/d'\'' dnl Delete empty lines and comments
+ -e '\''s/^\(EXPORTS\|LIBRARY\)\([[ ]].*\)*$/DEF/p'\'' dnl
+ -e q dnl Only consider the first "real" line
+ $1`" dnl
+])# _LT_DLL_DEF_P
+
+
# LT_LIB_M
# --------
# check for math library
@@ -3575,11 +3848,11 @@ case $host in
# These system don't have libm, or don't need it
;;
*-ncr-sysv4.3*)
- AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw")
+ AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM=-lmw)
AC_CHECK_LIB(m, cos, LIBM="$LIBM -lm")
;;
*)
- AC_CHECK_LIB(m, cos, LIBM="-lm")
+ AC_CHECK_LIB(m, cos, LIBM=-lm)
;;
esac
AC_SUBST([LIBM])
@@ -3598,7 +3871,7 @@ m4_defun([_LT_COMPILER_NO_RTTI],
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
-if test "$GCC" = yes; then
+if test yes = "$GCC"; then
case $cc_basename in
nvcc*)
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
@@ -3650,7 +3923,7 @@ cygwin* | mingw* | pw32* | cegcc*)
symcode='[[ABCDGISTW]]'
;;
hpux*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
symcode='[[ABCDEGRST]]'
fi
;;
@@ -3683,14 +3956,44 @@ case `$NM -V 2>&1` in
symcode='[[ABCDGIRSTW]]' ;;
esac
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+ # Gets list of data symbols to import.
+ lt_cv_sys_global_symbol_to_import="sed -n -e 's/^I .* \(.*\)$/\1/p'"
+ # Adjust the below global symbol transforms to fixup imported variables.
+ lt_cdecl_hook=" -e 's/^I .* \(.*\)$/extern __declspec(dllimport) char \1;/p'"
+ lt_c_name_hook=" -e 's/^I .* \(.*\)$/ {\"\1\", (void *) 0},/p'"
+ lt_c_name_lib_hook="\
+ -e 's/^I .* \(lib.*\)$/ {\"\1\", (void *) 0},/p'\
+ -e 's/^I .* \(.*\)$/ {\"lib\1\", (void *) 0},/p'"
+else
+ # Disable hooks by default.
+ lt_cv_sys_global_symbol_to_import=
+ lt_cdecl_hook=
+ lt_c_name_hook=
+ lt_c_name_lib_hook=
+fi
+
# Transform an extracted symbol line into a proper C declaration.
# Some systems (esp. on ia64) link data and code symbols differently,
# so use this general approach.
-lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+lt_cv_sys_global_symbol_to_cdecl="sed -n"\
+$lt_cdecl_hook\
+" -e 's/^T .* \(.*\)$/extern int \1();/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/extern char \1;/p'"
# Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/ {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/ {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n"\
+$lt_c_name_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/p'"
+
+# Transform an extracted symbol line into symbol name with lib prefix and
+# symbol address.
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n"\
+$lt_c_name_lib_hook\
+" -e 's/^: \(.*\) .*$/ {\"\1\", (void *) 0},/p'"\
+" -e 's/^$symcode$symcode* .* \(lib.*\)$/ {\"\1\", (void *) \&\1},/p'"\
+" -e 's/^$symcode$symcode* .* \(.*\)$/ {\"lib\1\", (void *) \&\1},/p'"
# Handle CRLF in mingw tool chain
opt_cr=
@@ -3708,21 +4011,24 @@ for ac_symprfx in "" "_"; do
# Write the raw and C identifiers.
if test "$lt_cv_nm_interface" = "MS dumpbin"; then
- # Fake it for dumpbin and say T for any non-static function
- # and D for any global variable.
+ # Fake it for dumpbin and say T for any non-static function,
+ # D for any global variable and I for any imported variable.
# Also find C++ and __fastcall symbols from MSVC++,
# which start with @ or ?.
lt_cv_sys_global_symbol_pipe="$AWK ['"\
" {last_section=section; section=\$ 3};"\
" /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
" /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
+" /^ *Symbol name *: /{split(\$ 0,sn,\":\"); si=substr(sn[2],2)};"\
+" /^ *Type *: code/{print \"T\",si,substr(si,length(prfx))};"\
+" /^ *Type *: data/{print \"I\",si,substr(si,length(prfx))};"\
" \$ 0!~/External *\|/{next};"\
" / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
" {if(hide[section]) next};"\
-" {f=0}; \$ 0~/\(\).*\|/{f=1}; {printf f ? \"T \" : \"D \"};"\
-" {split(\$ 0, a, /\||\r/); split(a[2], s)};"\
-" s[1]~/^[@?]/{print s[1], s[1]; next};"\
-" s[1]~prfx {split(s[1],t,\"@\"); print t[1], substr(t[1],length(prfx))}"\
+" {f=\"D\"}; \$ 0~/\(\).*\|/{f=\"T\"};"\
+" {split(\$ 0,a,/\||\r/); split(a[2],s)};"\
+" s[1]~/^[@?]/{print f,s[1],s[1]; next};"\
+" s[1]~prfx {split(s[1],t,\"@\"); print f,t[1],substr(t[1],length(prfx))}"\
" ' prfx=^$ac_symprfx]"
else
lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
@@ -3762,11 +4068,11 @@ _LT_EOF
if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
cat <<_LT_EOF > conftest.$ac_ext
/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests. */
-#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
-/* DATA imports from DLLs on WIN32 con't be const, because runtime
+#if defined _WIN32 || defined __CYGWIN__ || defined _WIN32_WCE
+/* DATA imports from DLLs on WIN32 can't be const, because runtime
relocations are performed -- see ld's documentation on pseudo-relocs. */
# define LT@&t@_DLSYM_CONST
-#elif defined(__osf__)
+#elif defined __osf__
/* This system does not cope well with relocations in const data. */
# define LT@&t@_DLSYM_CONST
#else
@@ -3792,7 +4098,7 @@ lt__PROGRAM__LTX_preloaded_symbols[[]] =
{
{ "@PROGRAM@", (void *) 0 },
_LT_EOF
- $SED "s/^$symcode$symcode* \(.*\) \(.*\)$/ {\"\2\", (void *) \&\2},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
+ $SED "s/^$symcode$symcode* .* \(.*\)$/ {\"\1\", (void *) \&\1},/" < "$nlist" | $GREP -v main >> conftest.$ac_ext
cat <<\_LT_EOF >> conftest.$ac_ext
{0, (void *) 0}
};
@@ -3812,9 +4118,9 @@ _LT_EOF
mv conftest.$ac_objext conftstm.$ac_objext
lt_globsym_save_LIBS=$LIBS
lt_globsym_save_CFLAGS=$CFLAGS
- LIBS="conftstm.$ac_objext"
+ LIBS=conftstm.$ac_objext
CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
- if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
+ if AC_TRY_EVAL(ac_link) && test -s conftest$ac_exeext; then
pipe_works=yes
fi
LIBS=$lt_globsym_save_LIBS
@@ -3835,7 +4141,7 @@ _LT_EOF
rm -rf conftest* conftst*
# Do not use the global_symbol_pipe unless it works.
- if test "$pipe_works" = yes; then
+ if test yes = "$pipe_works"; then
break
else
lt_cv_sys_global_symbol_pipe=
@@ -3862,12 +4168,16 @@ _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
[Take the output of nm and produce a listing of raw symbols and C names])
_LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
[Transform the output of nm in a proper C declaration])
+_LT_DECL([global_symbol_to_import], [lt_cv_sys_global_symbol_to_import], [1],
+ [Transform the output of nm into a list of symbols to manually relocate])
_LT_DECL([global_symbol_to_c_name_address],
[lt_cv_sys_global_symbol_to_c_name_address], [1],
[Transform the output of nm in a C name address pair])
_LT_DECL([global_symbol_to_c_name_address_lib_prefix],
[lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
[Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([nm_interface], [lt_cv_nm_interface], [1],
+ [The name lister interface])
_LT_DECL([], [nm_file_list_spec], [1],
[Specify filename containing input files for $NM])
]) # _LT_CMD_GLOBAL_SYMBOLS
@@ -3883,17 +4193,18 @@ _LT_TAGVAR(lt_prog_compiler_static, $1)=
m4_if([$1], [CXX], [
# C++ specific cases for pic, static, wl, etc.
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
amigaos*)
@@ -3904,8 +4215,8 @@ m4_if([$1], [CXX], [
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -3921,6 +4232,11 @@ m4_if([$1], [CXX], [
# (--disable-auto-import) libraries
m4_if([$1], [GCJ], [],
[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
# PIC is the default on this platform
@@ -3970,7 +4286,7 @@ m4_if([$1], [CXX], [
case $host_os in
aix[[4-9]]*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
else
@@ -4011,14 +4327,14 @@ m4_if([$1], [CXX], [
case $cc_basename in
CC*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
- if test "$host_cpu" != ia64; then
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
+ if test ia64 != "$host_cpu"; then
_LT_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
fi
;;
aCC*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
case $host_cpu in
hppa*64*|ia64*)
# +Z the default
@@ -4047,7 +4363,7 @@ m4_if([$1], [CXX], [
;;
esac
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# KAI C++ Compiler
@@ -4055,7 +4371,7 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
ecpc* )
- # old Intel C++ for x86_64 which still supported -KPIC.
+ # old Intel C++ for x86_64, which still supported -KPIC.
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
@@ -4200,17 +4516,18 @@ m4_if([$1], [CXX], [
fi
],
[
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
case $host_os in
aix*)
# All AIX code is PIC.
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
;;
amigaos*)
@@ -4221,8 +4538,8 @@ m4_if([$1], [CXX], [
;;
m68k)
# FIXME: we need at least 68020 code to build shared libraries, but
- # adding the `-m68020' flag to GCC prevents building anything better,
- # like `-m68040'.
+ # adding the '-m68020' flag to GCC prevents building anything better,
+ # like '-m68040'.
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
;;
esac
@@ -4239,6 +4556,11 @@ m4_if([$1], [CXX], [
# (--disable-auto-import) libraries
m4_if([$1], [GCJ], [],
[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
darwin* | rhapsody*)
@@ -4309,7 +4631,7 @@ m4_if([$1], [CXX], [
case $host_os in
aix*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# AIX 5 now supports IA64 processor
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
else
@@ -4317,11 +4639,30 @@ m4_if([$1], [CXX], [
fi
;;
+ darwin* | rhapsody*)
+ # PIC is the default on this platform
+ # Common symbols not allowed in MH_DYLIB files
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ case $cc_basename in
+ nagfor*)
+ # NAG Fortran compiler
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+ esac
+ ;;
+
mingw* | cygwin* | pw32* | os2* | cegcc*)
# This hack is so that the source file can tell whether it is being
# built for inclusion in a dll (and should export symbols for example).
m4_if([$1], [GCJ], [],
[_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+ case $host_os in
+ os2*)
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-static'
+ ;;
+ esac
;;
hpux9* | hpux10* | hpux11*)
@@ -4337,7 +4678,7 @@ m4_if([$1], [CXX], [
;;
esac
# Is there a better lt_prog_compiler_static that works with the bundled CC?
- _LT_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='$wl-a ${wl}archive'
;;
irix5* | irix6* | nonstopux*)
@@ -4346,9 +4687,9 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
- # old Intel for x86_64 which still supported -KPIC.
+ # old Intel for x86_64, which still supported -KPIC.
ecc*)
_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
@@ -4373,6 +4714,12 @@ m4_if([$1], [CXX], [
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
;;
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group compilers (*not* the Pentium gcc compiler,
# which looks to be a dead project)
@@ -4470,7 +4817,7 @@ m4_if([$1], [CXX], [
;;
sysv4*MP*)
- if test -d /usr/nec ;then
+ if test -d /usr/nec; then
_LT_TAGVAR(lt_prog_compiler_pic, $1)='-Kconform_pic'
_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
fi
@@ -4499,7 +4846,7 @@ m4_if([$1], [CXX], [
fi
])
case $host_os in
- # For platforms which do not support PIC, -DPIC is meaningless:
+ # For platforms that do not support PIC, -DPIC is meaningless:
*djgpp*)
_LT_TAGVAR(lt_prog_compiler_pic, $1)=
;;
@@ -4565,17 +4912,21 @@ m4_if([$1], [CXX], [
case $host_os in
aix[[4-9]]*)
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global defined
- # symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
;;
pw32*)
- _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ _LT_TAGVAR(export_symbols_cmds, $1)=$ltdll_cmds
;;
cygwin* | mingw* | cegcc*)
case $cc_basename in
@@ -4621,9 +4972,9 @@ m4_if([$1], [CXX], [
# included in the symbol list
_LT_TAGVAR(include_expsyms, $1)=
# exclude_expsyms can be an extended regexp of symbols to exclude
- # it will be wrapped by ` (' and `)$', so one must not match beginning or
- # end of line. Example: `a|bc|.*d.*' will exclude the symbols `a' and `bc',
- # as well as any symbol that contains `d'.
+ # it will be wrapped by ' (' and ')$', so one must not match beginning or
+ # end of line. Example: 'a|bc|.*d.*' will exclude the symbols 'a' and 'bc',
+ # as well as any symbol that contains 'd'.
_LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
# Although _GLOBAL_OFFSET_TABLE_ is a valid symbol C name, most a.out
# platforms (ab)use it in PIC code, but their linkers get confused if
@@ -4639,7 +4990,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
# FIXME: the MSVC++ port hasn't been tested in a loooong time
# When not using gcc, we currently assume that we are using
# Microsoft Visual C++.
- if test "$GCC" != yes; then
+ if test yes != "$GCC"; then
with_gnu_ld=no
fi
;;
@@ -4647,7 +4998,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
# we just hope/assume this is gcc and not c89 (= MSVC++)
with_gnu_ld=yes
;;
- openbsd*)
+ openbsd* | bitrig*)
with_gnu_ld=no
;;
esac
@@ -4657,7 +5008,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
# On some targets, GNU ld is compatible enough with the native linker
# that we're better off using the native interface for both.
lt_use_gnu_ld_interface=no
- if test "$with_gnu_ld" = yes; then
+ if test yes = "$with_gnu_ld"; then
case $host_os in
aix*)
# The AIX port of GNU ld has always aspired to compatibility
@@ -4679,24 +5030,24 @@ dnl Note also adjust exclude_expsyms for C++ above.
esac
fi
- if test "$lt_use_gnu_ld_interface" = yes; then
+ if test yes = "$lt_use_gnu_ld_interface"; then
# If archive_cmds runs LD, not CC, wlarc should be empty
- wlarc='${wl}'
+ wlarc='$wl'
# Set some defaults for GNU ld with shared library support. These
# are reset later if shared libraries are not supported. Putting them
# here allows them to be overridden if necessary.
runpath_var=LD_RUN_PATH
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
# ancient GNU ld didn't support --whole-archive et. al.
if $LD --help 2>&1 | $GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=
fi
supports_anon_versioning=no
- case `$LD -v 2>&1` in
+ case `$LD -v | $SED -e 's/([^)]\+)\s\+//' 2>&1` in
*GNU\ gold*) supports_anon_versioning=yes ;;
*\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
*\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
@@ -4709,7 +5060,7 @@ dnl Note also adjust exclude_expsyms for C++ above.
case $host_os in
aix[[3-9]]*)
# On AIX/PPC, the GNU linker is very broken
- if test "$host_cpu" != ia64; then
+ if test ia64 != "$host_cpu"; then
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
@@ -4728,7 +5079,7 @@ _LT_EOF
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)=''
;;
m68k)
@@ -4744,7 +5095,7 @@ _LT_EOF
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4754,7 +5105,7 @@ _LT_EOF
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -4762,61 +5113,89 @@ _LT_EOF
_LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file, use it as
+ # is; otherwise, prepend EXPORTS...
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
;;
haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
+ os2*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
gnu* | linux* | tpf* | k*bsd*-gnu | kopensolaris*-gnu)
tmp_diet=no
- if test "$host_os" = linux-dietlibc; then
+ if test linux-dietlibc = "$host_os"; then
case $cc_basename in
diet\ *) tmp_diet=yes;; # linux-dietlibc with static linking (!diet-dyn)
esac
fi
if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
- && test "$tmp_diet" = no
+ && test no = "$tmp_diet"
then
tmp_addflag=' $pic_flag'
tmp_sharedflag='-shared'
case $cc_basename,$host_cpu in
pgcc*) # Portland Group C compiler
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag'
;;
pgf77* | pgf90* | pgf95* | pgfortran*)
# Portland Group f77 and f90 compilers
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
tmp_addflag=' $pic_flag -Mnomain' ;;
ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
tmp_addflag=' -i_dynamic' ;;
@@ -4827,42 +5206,47 @@ _LT_EOF
lf95*) # Lahey Fortran 8.1
_LT_TAGVAR(whole_archive_flag_spec, $1)=
tmp_sharedflag='--shared' ;;
+ nagfor*) # NAGFOR 5.3
+ tmp_sharedflag='-Wl,-shared' ;;
xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
tmp_sharedflag='-qmkshrobj'
tmp_addflag= ;;
nvcc*) # Cuda Compiler Driver 2.2
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
;;
esac
case `$CC -V 2>&1 | sed 5q` in
*Sun\ C*) # Sun C 5.9
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
tmp_sharedflag='-G' ;;
*Sun\ F*) # Sun Fortran 8.3
tmp_sharedflag='-G' ;;
esac
- _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
case $cc_basename in
+ tcc*)
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='-rdynamic'
+ ;;
xlf* | bgf* | bgxlf* | mpixlf*)
# IBM XL Fortran 10.1 on PPC cannot create shared libs itself
_LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ if test yes = "$supports_anon_versioning"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
fi
;;
esac
@@ -4876,8 +5260,8 @@ _LT_EOF
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
wlarc=
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
fi
;;
@@ -4895,8 +5279,8 @@ _LT_EOF
_LT_EOF
elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4908,7 +5292,7 @@ _LT_EOF
_LT_TAGVAR(ld_shlibs, $1)=no
cat <<_LT_EOF 1>&2
-*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
+*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 cannot
*** reliably create shared libraries on SCO systems. Therefore, libtool
*** is disabling shared libraries support. We urge you to upgrade GNU
*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
@@ -4923,9 +5307,9 @@ _LT_EOF
# DT_RUNPATH tag from executables and libraries. But doing so
# requires that you compile everything twice, which is a pain.
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -4942,15 +5326,15 @@ _LT_EOF
*)
if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
;;
esac
- if test "$_LT_TAGVAR(ld_shlibs, $1)" = no; then
+ if test no = "$_LT_TAGVAR(ld_shlibs, $1)"; then
runpath_var=
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
_LT_TAGVAR(export_dynamic_flag_spec, $1)=
@@ -4966,7 +5350,7 @@ _LT_EOF
# Note: this linker hardcodes the directories in LIBPATH if there
# are no directories specified by -L.
_LT_TAGVAR(hardcode_minus_L, $1)=yes
- if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ if test yes = "$GCC" && test -z "$lt_prog_compiler_static"; then
# Neither direct hardcoding nor static linking is supported with a
# broken collect2.
_LT_TAGVAR(hardcode_direct, $1)=unsupported
@@ -4974,34 +5358,57 @@ _LT_EOF
;;
aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
# If we're using GNU nm, then we don't want the "-C" option.
- # -C means demangle to AIX nm, but means don't demangle with GNU nm
- # Also, AIX nm treats weak defined symbols like other global
- # defined symbols, whereas GNU nm marks them as "W".
+ # -C means demangle to GNU nm, but means don't demangle to AIX nm.
+ # Without the "-l" option, or with the "-B" option, AIX nm treats
+ # weak defined symbols like other global defined symbols, whereas
+ # GNU nm marks them as "W".
+ # While the 'weak' keyword is ignored in the Export File, we need
+ # it in the Import File for the 'aix-soname' feature, so we have
+ # to replace the "-B" option with "-P" for AIX nm.
if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { if (\$ 2 == "W") { print \$ 3 " weak" } else { print \$ 3 } } }'\'' | sort -u > $export_symbols'
else
- _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+ _LT_TAGVAR(export_symbols_cmds, $1)='`func_echo_all $NM | $SED -e '\''s/B\([[^B]]*\)$/P\1/'\''` -PCpgl $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) && ([substr](\$ 1,1,1) != ".")) { if ((\$ 2 == "W") || (\$ 2 == "V") || (\$ 2 == "Z")) { print \$ 1 " weak" } else { print \$ 1 } } }'\'' | sort -u > $export_symbols'
fi
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
- if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
+ if (test x-brtl = "x$ld_flag" || test x-Wl,-brtl = "x$ld_flag"); then
aix_use_runtimelinking=yes
break
fi
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -5020,13 +5427,21 @@ _LT_EOF
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+ _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # traditional, no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ ;;
+ esac
- if test "$GCC" = yes; then
+ if test yes = "$GCC"; then
case $host_os in aix4.[[012]]|aix4.[[012]].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -5045,61 +5460,80 @@ _LT_EOF
;;
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag="$shared_flag "'$wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to export.
_LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
# Determine the default libpath from the value encoded in an
# empty executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
else
- if test "$host_cpu" = ia64; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ if test ia64 = "$host_cpu"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
_LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
_LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared libraries.
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared libraries.
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -5108,7 +5542,7 @@ _LT_EOF
case $host_cpu in
powerpc)
# see comment about AmigaOS4 .so support
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)=''
;;
m68k)
@@ -5138,16 +5572,17 @@ _LT_EOF
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
@@ -5156,18 +5591,18 @@ _LT_EOF
# Don't use ranlib
_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
;;
*)
# Assume MSVC wrapper
@@ -5176,7 +5611,7 @@ _LT_EOF
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
# The linker will automatically build a .lib file if we build a DLL.
@@ -5226,33 +5661,33 @@ _LT_EOF
;;
hpux9*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_direct, $1)=yes
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
_LT_TAGVAR(hardcode_minus_L, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
;;
hpux10*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes,no = "$GCC,$with_gnu_ld"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
fi
- if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
_LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -5260,25 +5695,25 @@ _LT_EOF
;;
hpux11*)
- if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+ if test yes,no = "$GCC,$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
else
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
m4_if($1, [], [
@@ -5286,14 +5721,14 @@ _LT_EOF
# (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
_LT_LINKER_OPTION([if $CC understands -b],
_LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
[_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
- [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
+ [_LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
;;
esac
fi
- if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
@@ -5304,7 +5739,7 @@ _LT_EOF
*)
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# hardcode_minus_L: Not really in the search PATH,
# but as the default location of the library.
@@ -5315,16 +5750,16 @@ _LT_EOF
;;
irix5* | irix6* | nonstopux*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
# Try to use the -exported_symbol ld option, if it does not
# work, assume that -exports_file does not work either and
# implicitly export all symbols.
# This should be the same for all languages, so no per-tag cache variable.
AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
[lt_cv_irix_exported_symbol],
- [save_LDFLAGS="$LDFLAGS"
- LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+ [save_LDFLAGS=$LDFLAGS
+ LDFLAGS="$LDFLAGS -shared $wl-exported_symbol ${wl}foo $wl-update_registry $wl/dev/null"
AC_LINK_IFELSE(
[AC_LANG_SOURCE(
[AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
@@ -5337,21 +5772,31 @@ _LT_EOF
end]])])],
[lt_cv_irix_exported_symbol=yes],
[lt_cv_irix_exported_symbol=no])
- LDFLAGS="$save_LDFLAGS"])
- if test "$lt_cv_irix_exported_symbol" = yes; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+ LDFLAGS=$save_LDFLAGS])
+ if test yes = "$lt_cv_irix_exported_symbol"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations $wl-exports_file $wl$export_symbols -o $lib'
fi
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -exports_file $export_symbols -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(inherit_rpath, $1)=yes
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
+ linux*)
+ case $cc_basename in
+ tcc*)
+ # Fabrice Bellard et al's Tiny C Compiler
+ _LT_TAGVAR(ld_shlibs, $1)=yes
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ ;;
+
netbsd*)
if echo __ELF__ | $CC -E - | $GREP __ELF__ >/dev/null; then
_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
@@ -5366,7 +5811,7 @@ _LT_EOF
newsos6)
_LT_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_TAGVAR(hardcode_direct, $1)=yes
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
;;
@@ -5374,27 +5819,19 @@ _LT_EOF
*nto* | *qnx*)
;;
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
- if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+ if test -z "`echo __ELF__ | $CC -E - | $GREP __ELF__`"; then
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags $wl-retain-symbols-file,$export_symbols'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
else
- case $host_os in
- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
- _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- ;;
- *)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- ;;
- esac
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
fi
else
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -5405,33 +5842,53 @@ _LT_EOF
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
_LT_TAGVAR(hardcode_minus_L, $1)=yes
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
- _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
- _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
;;
osf3*)
- if test "$GCC" = yes; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)='no'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
;;
osf4* | osf5*) # as osf3* with the addition of -msym flag
- if test "$GCC" = yes; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $pic_flag $libobjs $deplibs $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
else
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
- $CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+ $CC -shared$allow_undefined_flag $wl-input $wl$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~$RM $lib.exp'
# Both c and cxx compiler support -rpath directly
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -5442,24 +5899,24 @@ _LT_EOF
solaris*)
_LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
- if test "$GCC" = yes; then
- wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ wlarc='$wl'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $wl-z ${wl}text $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag $wl-z ${wl}text $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
else
case `$CC -V 2>&1` in
*"Compilers 5.0"*)
wlarc=''
- _LT_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$LD -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $linker_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
+ $LD -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$RM $lib.exp'
;;
*)
- wlarc='${wl}'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ wlarc='$wl'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h $soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag -M $lib.exp -h $soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
;;
esac
fi
@@ -5469,11 +5926,11 @@ _LT_EOF
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'. GCC discards it without `$wl',
+ # but understands '-z linker_flag'. GCC discards it without '$wl',
# but is careful enough not to reorder.
# Supported since Solaris 2.6 (maybe 2.5.1?)
- if test "$GCC" = yes; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
fi
@@ -5483,10 +5940,10 @@ _LT_EOF
;;
sunos4*)
- if test "x$host_vendor" = xsequent; then
+ if test sequent = "$host_vendor"; then
# Use $CC to link under sequent, because it throws in some extra .o
# files that make .init and .fini sections work.
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h $soname -o $lib $libobjs $deplibs $compiler_flags'
else
_LT_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
fi
@@ -5535,43 +5992,43 @@ _LT_EOF
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT use -z defs as we might desire, because we do not
# link with -lc, and that would cause any symbols used from libc to
# always be unresolved, which means just about no library would
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+ _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
runpath_var='LD_RUN_PATH'
- if test "$GCC" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ if test yes = "$GCC"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
fi
;;
@@ -5586,17 +6043,17 @@ _LT_EOF
;;
esac
- if test x$host_vendor = xsni; then
+ if test sni = "$host_vendor"; then
case $host in
sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Blargedynsym'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Blargedynsym'
;;
esac
fi
fi
])
AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
-test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
_LT_TAGVAR(with_gnu_ld, $1)=$with_gnu_ld
@@ -5613,7 +6070,7 @@ x|xyes)
# Assume -lc should be added
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- if test "$enable_shared" = yes && test "$GCC" = yes; then
+ if test yes,yes = "$GCC,$enable_shared"; then
case $_LT_TAGVAR(archive_cmds, $1) in
*'~'*)
# FIXME: we may have to deal with multi-command sequences.
@@ -5693,12 +6150,12 @@ _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
_LT_TAGDECL([], [hardcode_libdir_separator], [1],
[Whether we need a single "-rpath" flag with a separated argument])
_LT_TAGDECL([], [hardcode_direct], [0],
- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+ [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
DIR into the resulting binary])
_LT_TAGDECL([], [hardcode_direct_absolute], [0],
- [Set to "yes" if using DIR/libNAME${shared_ext} during linking hardcodes
+ [Set to "yes" if using DIR/libNAME$shared_ext during linking hardcodes
DIR into the resulting binary and the resulting library dependency is
- "absolute", i.e impossible to change by setting ${shlibpath_var} if the
+ "absolute", i.e impossible to change by setting $shlibpath_var if the
library is relocated])
_LT_TAGDECL([], [hardcode_minus_L], [0],
[Set to "yes" if using the -LDIR flag during linking hardcodes DIR
@@ -5739,10 +6196,10 @@ dnl [Compiler flag to generate thread safe objects])
# ------------------------
# Ensure that the configuration variables for a C compiler are suitably
# defined. These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
+# the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_C_CONFIG],
[m4_require([_LT_DECL_EGREP])dnl
-lt_save_CC="$CC"
+lt_save_CC=$CC
AC_LANG_PUSH(C)
# Source file extension for C test sources.
@@ -5782,18 +6239,18 @@ if test -n "$compiler"; then
LT_SYS_DLOPEN_SELF
_LT_CMD_STRIPLIB
- # Report which library types will actually be built
+ # Report what library types will actually be built
AC_MSG_CHECKING([if libtool supports shared libraries])
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
@@ -5801,8 +6258,12 @@ if test -n "$compiler"; then
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -5810,13 +6271,13 @@ if test -n "$compiler"; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
_LT_CONFIG($1)
fi
AC_LANG_POP
-CC="$lt_save_CC"
+CC=$lt_save_CC
])# _LT_LANG_C_CONFIG
@@ -5824,14 +6285,14 @@ CC="$lt_save_CC"
# --------------------------
# Ensure that the configuration variables for a C++ compiler are suitably
# defined. These variables are subsequently used by _LT_CONFIG to write
-# the compiler configuration to `libtool'.
+# the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_CXX_CONFIG],
[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
m4_require([_LT_DECL_EGREP])dnl
m4_require([_LT_PATH_MANIFEST_TOOL])dnl
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
- ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
- (test "X$CXX" != "Xg++"))) ; then
+if test -n "$CXX" && ( test no != "$CXX" &&
+ ( (test g++ = "$CXX" && `g++ -v >/dev/null 2>&1` ) ||
+ (test g++ != "$CXX"))); then
AC_PROG_CXXCPP
else
_lt_caught_CXX_error=yes
@@ -5873,7 +6334,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the CXX compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_caught_CXX_error" != yes; then
+if test yes != "$_lt_caught_CXX_error"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="int some_variable = 0;"
@@ -5915,35 +6376,35 @@ if test "$_lt_caught_CXX_error" != yes; then
if test -n "$compiler"; then
# We don't want -fno-exception when compiling C++ code, so set the
# no_builtin_flag separately
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
else
_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
fi
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
# Set up default GNU C++ configuration
LT_PATH_LD
# Check if GNU C++ uses GNU ld as the underlying linker, since the
# archiving commands below assume that GNU ld is being used.
- if test "$with_gnu_ld" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ if test yes = "$with_gnu_ld"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
# If archive_cmds runs LD, not CC, wlarc should be empty
# XXX I think wlarc can be eliminated in ltcf-cxx, but I need to
# investigate it a little bit more. (MM)
- wlarc='${wl}'
+ wlarc='$wl'
# ancient GNU ld didn't support --whole-archive et. al.
if eval "`$CC -print-prog-name=ld` --help 2>&1" |
$GREP 'no-whole-archive' > /dev/null; then
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
else
_LT_TAGVAR(whole_archive_flag_spec, $1)=
fi
@@ -5979,18 +6440,30 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=no
;;
aix[[4-9]]*)
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# On IA64, the linker does run time linking by default, so we don't
# have to do anything special.
aix_use_runtimelinking=no
exp_sym_flag='-Bexport'
- no_entry_flag=""
+ no_entry_flag=
else
aix_use_runtimelinking=no
# Test if we are trying to use run time linking or normal
# AIX style linking. If -brtl is somewhere in LDFLAGS, we
- # need to do runtime linking.
+ # have runtime linking enabled, and use it for executables.
+ # For shared libraries, we enable/disable runtime linking
+ # depending on the kind of the shared library created -
+ # when "with_aix_soname,aix_use_runtimelinking" is:
+ # "aix,no" lib.a(lib.so.V) shared, rtl:no, for executables
+ # "aix,yes" lib.so shared, rtl:yes, for executables
+ # lib.a static archive
+ # "both,no" lib.so.V(shr.o) shared, rtl:yes
+ # lib.a(lib.so.V) shared, rtl:no, for executables
+ # "both,yes" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a(lib.so.V) shared, rtl:no
+ # "svr4,*" lib.so.V(shr.o) shared, rtl:yes, for executables
+ # lib.a static archive
case $host_os in aix4.[[23]]|aix4.[[23]].*|aix[[5-9]]*)
for ld_flag in $LDFLAGS; do
case $ld_flag in
@@ -6000,6 +6473,13 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
esac
done
+ if test svr4,no = "$with_aix_soname,$aix_use_runtimelinking"; then
+ # With aix-soname=svr4, we create the lib.so.V shared archives only,
+ # so we don't have lib.a shared libs to link our executables.
+ # We have to force runtime linking in this case.
+ aix_use_runtimelinking=yes
+ LDFLAGS="$LDFLAGS -Wl,-brtl"
+ fi
;;
esac
@@ -6018,13 +6498,21 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(file_list_spec, $1)='${wl}-f,'
+ _LT_TAGVAR(file_list_spec, $1)='$wl-f,'
+ case $with_aix_soname,$aix_use_runtimelinking in
+ aix,*) ;; # no import file
+ svr4,* | *,yes) # use import file
+ # The Import File defines what to hardcode.
+ _LT_TAGVAR(hardcode_direct, $1)=no
+ _LT_TAGVAR(hardcode_direct_absolute, $1)=no
+ ;;
+ esac
- if test "$GXX" = yes; then
+ if test yes = "$GXX"; then
case $host_os in aix4.[[012]]|aix4.[[012]].*)
# We only want to do this on AIX 4.2 and lower, the check
# below for broken collect2 doesn't work under 4.3+
- collect2name=`${CC} -print-prog-name=collect2`
+ collect2name=`$CC -print-prog-name=collect2`
if test -f "$collect2name" &&
strings "$collect2name" | $GREP resolve_lib_name >/dev/null
then
@@ -6042,64 +6530,84 @@ if test "$_lt_caught_CXX_error" != yes; then
fi
esac
shared_flag='-shared'
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag="$shared_flag "'${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag=$shared_flag' $wl-G'
fi
+ # Need to ensure runtime linking is disabled for the traditional
+ # shared library, or the linker may eventually find shared libraries
+ # /with/ Import File - we do not want to mix them.
+ shared_flag_aix='-shared'
+ shared_flag_svr4='-shared $wl-G'
else
# not using gcc
- if test "$host_cpu" = ia64; then
+ if test ia64 = "$host_cpu"; then
# VisualAge C++, Version 5.5 for AIX 5L for IA-64, Beta 3 Release
# chokes on -Wl,-G. The following line is correct:
shared_flag='-G'
else
- if test "$aix_use_runtimelinking" = yes; then
- shared_flag='${wl}-G'
+ if test yes = "$aix_use_runtimelinking"; then
+ shared_flag='$wl-G'
else
- shared_flag='${wl}-bM:SRE'
+ shared_flag='$wl-bM:SRE'
fi
+ shared_flag_aix='$wl-bM:SRE'
+ shared_flag_svr4='$wl-G'
fi
fi
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-bexpall'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-bexpall'
# It seems that -bexpall does not export symbols beginning with
# underscore (_), so it is better to generate a list of symbols to
# export.
_LT_TAGVAR(always_export_symbols, $1)=yes
- if test "$aix_use_runtimelinking" = yes; then
+ if test aix,yes = "$with_aix_soname,$aix_use_runtimelinking"; then
# Warning - without using the other runtime loading flags (-brtl),
# -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # The "-G" linker flag allows undefined symbols.
+ _LT_TAGVAR(no_undefined_flag, $1)='-bernotok'
# Determine the default libpath from the value encoded in an empty
# executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs $wl'$no_entry_flag' $compiler_flags `if test -n "$allow_undefined_flag"; then func_echo_all "$wl$allow_undefined_flag"; else :; fi` $wl'$exp_sym_flag:\$export_symbols' '$shared_flag
else
- if test "$host_cpu" = ia64; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ if test ia64 = "$host_cpu"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $libdir:/usr/lib:/lib'
_LT_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\$wl$no_entry_flag"' $compiler_flags $wl$allow_undefined_flag '"\$wl$exp_sym_flag:\$export_symbols"
else
# Determine the default libpath from the value encoded in an
# empty executable.
_LT_SYS_MODULE_PATH_AIX([$1])
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-blibpath:$libdir:'"$aix_libpath"
# Warning - without using the other run time loading flags,
# -berok will link without error, but may produce a broken library.
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
- if test "$with_gnu_ld" = yes; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-bernotok'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-berok'
+ if test yes = "$with_gnu_ld"; then
# We only use this code for GNU lds that support --whole-archive.
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
else
# Exported symbols can be pulled into shared objects from archives
_LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
fi
_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
- # This is similar to how AIX traditionally builds its shared
- # libraries.
- _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$RM -r $output_objdir/$realname.d~$MKDIR $output_objdir/$realname.d'
+ # -brtl affects multiple linker settings, -berok does not and is overridden later
+ compiler_flags_filtered='`func_echo_all "$compiler_flags " | $SED -e "s%-brtl\\([[, ]]\\)%-berok\\1%g"`'
+ if test svr4 != "$with_aix_soname"; then
+ # This is similar to how AIX traditionally builds its shared
+ # libraries. Need -bnortl late, we may have -brtl in LDFLAGS.
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_aix' -o $output_objdir/$realname.d/$soname $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$realname.d/$soname'
+ fi
+ if test aix != "$with_aix_soname"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$CC '$shared_flag_svr4' -o $output_objdir/$realname.d/$shared_archive_member_spec.o $libobjs $deplibs $wl-bnoentry '$compiler_flags_filtered'$wl-bE:$export_symbols$allow_undefined_flag~$STRIP -e $output_objdir/$realname.d/$shared_archive_member_spec.o~( func_echo_all "#! $soname($shared_archive_member_spec.o)"; if test shr_64 = "$shared_archive_member_spec"; then func_echo_all "# 64"; else func_echo_all "# 32"; fi; cat $export_symbols ) > $output_objdir/$realname.d/$shared_archive_member_spec.imp~$AR $AR_FLAGS $output_objdir/$soname $output_objdir/$realname.d/$shared_archive_member_spec.o $output_objdir/$realname.d/$shared_archive_member_spec.imp'
+ else
+ # used by -dlpreopen to get the symbols
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$MV $output_objdir/$realname.d/$soname $output_objdir'
+ fi
+ _LT_TAGVAR(archive_expsym_cmds, $1)="$_LT_TAGVAR(archive_expsym_cmds, $1)"'~$RM -r $output_objdir/$realname.d'
fi
fi
;;
@@ -6109,7 +6617,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
# Joseph Beckenbach <jrb3@best.com> says some releases of gcc
# support --undefined. This deserves some investigation. FIXME
- _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -6137,57 +6645,58 @@ if test "$_lt_caught_CXX_error" != yes; then
# Tell ltmain to make .lib files, not .a files.
libext=lib
# Tell ltmain to make .dll files, not .so files.
- shrext_cmds=".dll"
+ shrext_cmds=.dll
# FIXME: Setting linknames here is a bad hack.
- _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
- else
- $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
- fi~
- $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
- linknames='
+ _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~linknames='
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp "$export_symbols" "$output_objdir/$soname.def";
+ echo "$tool_output_objdir$soname.def" > "$output_objdir/$soname.exp";
+ else
+ $SED -e '\''s/^/-link -EXPORT:/'\'' < $export_symbols > $output_objdir/$soname.exp;
+ fi~
+ $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+ linknames='
# The linker will not automatically build a static lib if we build a DLL.
# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
# Don't use ranlib
_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
- lt_tool_outputfile="@TOOL_OUTPUT@"~
- case $lt_outputfile in
- *.exe|*.EXE) ;;
- *)
- lt_outputfile="$lt_outputfile.exe"
- lt_tool_outputfile="$lt_tool_outputfile.exe"
- ;;
- esac~
- func_to_tool_file "$lt_outputfile"~
- if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
- $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
- $RM "$lt_outputfile.manifest";
- fi'
+ lt_tool_outputfile="@TOOL_OUTPUT@"~
+ case $lt_outputfile in
+ *.exe|*.EXE) ;;
+ *)
+ lt_outputfile=$lt_outputfile.exe
+ lt_tool_outputfile=$lt_tool_outputfile.exe
+ ;;
+ esac~
+ func_to_tool_file "$lt_outputfile"~
+ if test : != "$MANIFEST_TOOL" && test -f "$lt_outputfile.manifest"; then
+ $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+ $RM "$lt_outputfile.manifest";
+ fi'
;;
*)
# g++
# _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
# as there is no search path for DLLs.
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-all-symbols'
_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
_LT_TAGVAR(always_export_symbols, $1)=no
_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
- # If the export-symbols file already is a .def file (1st line
- # is EXPORTS), use it as is; otherwise, prepend...
- _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
- cp $export_symbols $output_objdir/$soname.def;
- else
- echo EXPORTS > $output_objdir/$soname.def;
- cat $export_symbols >> $output_objdir/$soname.def;
- fi~
- $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file, use it as
+ # is; otherwise, prepend EXPORTS...
+ _LT_TAGVAR(archive_expsym_cmds, $1)='if _LT_DLL_DEF_P([$export_symbols]); then
+ cp $export_symbols $output_objdir/$soname.def;
+ else
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname $wl--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
else
_LT_TAGVAR(ld_shlibs, $1)=no
fi
@@ -6198,6 +6707,34 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_DARWIN_LINKER_FEATURES($1)
;;
+ os2*)
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+ shrext_cmds=.dll
+ _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ emxexp $libobjs | $SED /"_DLL_InitTerm"/d >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$ECHO "LIBRARY ${soname%$shared_ext} INITINSTANCE TERMINSTANCE" > $output_objdir/$libname.def~
+ $ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~
+ $ECHO "DATA MULTIPLE NONSHARED" >> $output_objdir/$libname.def~
+ $ECHO EXPORTS >> $output_objdir/$libname.def~
+ prefix_cmds="$SED"~
+ if test EXPORTS = "`$SED 1q $export_symbols`"; then
+ prefix_cmds="$prefix_cmds -e 1d";
+ fi~
+ prefix_cmds="$prefix_cmds -e \"s/^\(.*\)$/_\1/g\""~
+ cat $export_symbols | $prefix_cmds >> $output_objdir/$libname.def~
+ $CC -Zdll -Zcrtdll -o $output_objdir/$soname $libobjs $deplibs $compiler_flags $output_objdir/$libname.def~
+ emximp -o $lib $output_objdir/$libname.def'
+ _LT_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/${libname}_dll.a $output_objdir/$libname.def'
+ _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
dgux*)
case $cc_basename in
ec++*)
@@ -6232,18 +6769,15 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
- gnu*)
- ;;
-
haiku*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
hpux9*)
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
# but as the default
@@ -6255,7 +6789,7 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=no
;;
aCC*)
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -b $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -6264,11 +6798,11 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes; then
- _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ if test yes = "$GXX"; then
+ _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag $wl+b $wl$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test "x$output_objdir/$soname" = "x$lib" || mv $output_objdir/$soname $lib'
else
# FIXME: insert proper C++ library support
_LT_TAGVAR(ld_shlibs, $1)=no
@@ -6278,15 +6812,15 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
hpux10*|hpux11*)
- if test $with_gnu_ld = no; then
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl+b $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
case $host_cpu in
hppa*64*|ia64*)
;;
*)
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
;;
esac
fi
@@ -6312,13 +6846,13 @@ if test "$_lt_caught_CXX_error" != yes; then
aCC*)
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -b $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
# Commands to make compiler produce verbose output that lists
@@ -6329,20 +6863,20 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes; then
- if test $with_gnu_ld = no; then
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
case $host_cpu in
hppa*64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC $wl+h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
ia64*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag $wl+h $wl$soname $wl+b $wl$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
;;
esac
fi
@@ -6357,22 +6891,22 @@ if test "$_lt_caught_CXX_error" != yes; then
interix[[3-9]]*)
_LT_TAGVAR(hardcode_direct, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
# Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
# Instead, shared libraries are loaded at an image base (0x10000000 by
# default) and relocated if they conflict, which is a slow very memory
# consuming and fragmenting process. To avoid this, we pick a random,
# 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
# time. Moving up from 0x10000000 also allows more sbrk(2) space.
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='sed "s|^|_|" $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags $wl-h,$soname $wl--retain-symbols-file,$output_objdir/$soname.expsym $wl--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
;;
irix5* | irix6*)
case $cc_basename in
CC*)
# SGI C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
# Archives containing C++ object files must be created using
# "CC -ar", where "CC" is the IRIX C++ compiler. This is
@@ -6381,22 +6915,22 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(old_archive_cmds, $1)='$CC -ar -WR,-u -o $oldlib $oldobjs'
;;
*)
- if test "$GXX" = yes; then
- if test "$with_gnu_ld" = no; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ if test yes = "$GXX"; then
+ if test no = "$with_gnu_ld"; then
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
else
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` -o $lib'
fi
fi
_LT_TAGVAR(link_all_deplibs, $1)=yes
;;
esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
_LT_TAGVAR(inherit_rpath, $1)=yes
;;
- linux* | k*bsd*-gnu | kopensolaris*-gnu)
+ linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
case $cc_basename in
KCC*)
# Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -6404,8 +6938,8 @@ if test "$_lt_caught_CXX_error" != yes; then
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib $wl-retain-symbols-file,$export_symbols; mv \$templib $lib'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
@@ -6414,10 +6948,10 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
# Archives containing C++ object files must be created using
# "CC -Bstatic", where "CC" is the KAI C++ compiler.
@@ -6431,59 +6965,59 @@ if test "$_lt_caught_CXX_error" != yes; then
# earlier do not add the objects themselves.
case `$CC -V 2>&1` in
*"Version 7."*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
*) # Version 8.0 or newer
tmp_idyn=
case $host_cpu in
ia64*) tmp_idyn=' -i_dynamic';;
esac
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
esac
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive$convenience $wl--no-whole-archive'
;;
pgCC* | pgcpp*)
# Portland Group C++ compiler
case `$CC -V` in
*pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
_LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
- compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
+ compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
_LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
- $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
- $RANLIB $oldlib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
+ $AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
+ $RANLIB $oldlib'
_LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
- rm -rf $tpldir~
- $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
- $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ rm -rf $tpldir~
+ $CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
+ $CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
*) # Version 6 and above use weak symbols
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname $wl-retain-symbols-file $wl$export_symbols -o $lib'
;;
esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl--rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
;;
cxx*)
# Compaq C++
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname -o $lib $wl-retain-symbols-file $wl$export_symbols'
runpath_var=LD_RUN_PATH
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -6497,18 +7031,18 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
;;
xl* | mpixl* | bgxl*)
# IBM XL 8.0 on PPC, with GNU ld
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
- _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
- if test "x$supports_anon_versioning" = xyes; then
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl--export-dynamic'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname -o $lib'
+ if test yes = "$supports_anon_versioning"; then
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
- cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
- echo "local: *; };" >> $output_objdir/$libname.ver~
- $CC -qmkshrobj $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
+ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
+ echo "local: *; };" >> $output_objdir/$libname.ver~
+ $CC -qmkshrobj $libobjs $deplibs $compiler_flags $wl-soname $wl$soname $wl-version-script $wl$output_objdir/$libname.ver -o $lib'
fi
;;
*)
@@ -6516,10 +7050,10 @@ if test "$_lt_caught_CXX_error" != yes; then
*Sun\ C*)
# Sun C++ 5.9
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file $wl$export_symbols'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` $wl--no-whole-archive'
_LT_TAGVAR(compiler_needs_object, $1)=yes
# Not sure whether something based on
@@ -6577,22 +7111,17 @@ if test "$_lt_caught_CXX_error" != yes; then
_LT_TAGVAR(ld_shlibs, $1)=yes
;;
- openbsd2*)
- # C++ shared libraries are fairly broken
- _LT_TAGVAR(ld_shlibs, $1)=no
- ;;
-
- openbsd*)
+ openbsd* | bitrig*)
if test -f /usr/libexec/ld.so; then
_LT_TAGVAR(hardcode_direct, $1)=yes
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
- _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`"; then
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-retain-symbols-file,$export_symbols -o $lib'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-E'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)=$wlarc'--whole-archive$convenience '$wlarc'--no-whole-archive'
fi
output_verbose_link_cmd=func_echo_all
else
@@ -6608,9 +7137,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# KCC will only create a shared library if the output file
# ends with ".so" (or ".sl" for HP-UX), so rename the library
# to its proper name (with version) after linking.
- _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+ _LT_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo "$lib" | $SED -e "s/\$tempext\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
# Archives containing C++ object files must be created using
@@ -6628,17 +7157,17 @@ if test "$_lt_caught_CXX_error" != yes; then
cxx*)
case $host in
osf3*)
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $soname `test -n "$verstring" && func_echo_all "$wl-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
;;
*)
_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
- echo "-hidden">> $lib.exp~
- $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
- $RM $lib.exp'
+ echo "-hidden">> $lib.exp~
+ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname $wl-input $wl$lib.exp `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry $output_objdir/so_locations -o $lib~
+ $RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
;;
esac
@@ -6653,21 +7182,21 @@ if test "$_lt_caught_CXX_error" != yes; then
# explicitly linking system object files so we need to strip them
# from the output so that they don't get included in the library
# dependencies.
- output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
;;
*)
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+ if test yes,no = "$GXX,$with_gnu_ld"; then
+ _LT_TAGVAR(allow_undefined_flag, $1)=' $wl-expect_unresolved $wl\*'
case $host in
osf3*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-msym $wl-soname $wl$soname `test -n "$verstring" && func_echo_all "$wl-set_version $wl$verstring"` $wl-update_registry $wl$output_objdir/so_locations -o $lib'
;;
esac
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-rpath $wl$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=:
# Commands to make compiler produce verbose output that lists
@@ -6713,9 +7242,9 @@ if test "$_lt_caught_CXX_error" != yes; then
# Sun C++ 4.2, 5.x and Centerline C++
_LT_TAGVAR(archive_cmds_need_lc,$1)=yes
_LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
- _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G$allow_undefined_flag -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G$allow_undefined_flag $wl-M $wl$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -6723,7 +7252,7 @@ if test "$_lt_caught_CXX_error" != yes; then
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
# The compiler driver will combine and reorder linker options,
- # but understands `-z linker_flag'.
+ # but understands '-z linker_flag'.
# Supported since Solaris 2.6 (maybe 2.5.1?)
_LT_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
;;
@@ -6740,30 +7269,30 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
gcx*)
# Green Hills C++ Compiler
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
# The C++ compiler must be used to create the archive.
_LT_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
;;
*)
# GNU C++ compiler with Solaris linker
- if test "$GXX" = yes && test "$with_gnu_ld" = no; then
- _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ if test yes,no = "$GXX,$with_gnu_ld"; then
+ _LT_TAGVAR(no_undefined_flag, $1)=' $wl-z ${wl}defs'
if $CC --version | $GREP -v '^2\.7' > /dev/null; then
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -shared $pic_flag -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
# linking a shared library.
output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
else
- # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # g++ 2.7 appears to require '-G' NOT '-shared' on this
# platform.
- _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags $wl-h $wl$soname -o $lib'
_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+ $CC -G -nostdlib $wl-M $wl$lib.exp $wl-h $wl$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
# Commands to make compiler produce verbose output that lists
# what "hidden" libraries, object files and flags are used when
@@ -6771,11 +7300,11 @@ if test "$_lt_caught_CXX_error" != yes; then
output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
fi
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'
case $host_os in
solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
*)
- _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
+ _LT_TAGVAR(whole_archive_flag_spec, $1)='$wl-z ${wl}allextract$convenience $wl-z ${wl}defaultextract'
;;
esac
fi
@@ -6784,52 +7313,52 @@ if test "$_lt_caught_CXX_error" != yes; then
;;
sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
runpath_var='LD_RUN_PATH'
case $cc_basename in
CC*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
;;
sysv5* | sco3.2v5* | sco5v6*)
- # Note: We can NOT use -z defs as we might desire, because we do not
+ # Note: We CANNOT use -z defs as we might desire, because we do not
# link with -lc, and that would cause any symbols used from libc to
# always be unresolved, which means just about no library would
# ever link correctly. If we're not using GNU ld we use -z text
# though, which does catch some bad symbols but isn't as heavy-handed
# as -z defs.
- _LT_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
- _LT_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
+ _LT_TAGVAR(no_undefined_flag, $1)='$wl-z,text'
+ _LT_TAGVAR(allow_undefined_flag, $1)='$wl-z,nodefs'
_LT_TAGVAR(archive_cmds_need_lc, $1)=no
_LT_TAGVAR(hardcode_shlibpath_var, $1)=no
- _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R,$libdir'
+ _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R,$libdir'
_LT_TAGVAR(hardcode_libdir_separator, $1)=':'
_LT_TAGVAR(link_all_deplibs, $1)=yes
- _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ _LT_TAGVAR(export_dynamic_flag_spec, $1)='$wl-Bexport'
runpath_var='LD_RUN_PATH'
case $cc_basename in
CC*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -G $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
_LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
- '"$_LT_TAGVAR(old_archive_cmds, $1)"
+ '"$_LT_TAGVAR(old_archive_cmds, $1)"
_LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
- '"$_LT_TAGVAR(reload_cmds, $1)"
+ '"$_LT_TAGVAR(reload_cmds, $1)"
;;
*)
- _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
- _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_cmds, $1)='$CC -shared $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $wl-Bexport:$export_symbols $wl-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
;;
esac
;;
@@ -6860,10 +7389,10 @@ if test "$_lt_caught_CXX_error" != yes; then
esac
AC_MSG_RESULT([$_LT_TAGVAR(ld_shlibs, $1)])
- test "$_LT_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+ test no = "$_LT_TAGVAR(ld_shlibs, $1)" && can_build_shared=no
- _LT_TAGVAR(GCC, $1)="$GXX"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$GXX
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -6890,7 +7419,7 @@ if test "$_lt_caught_CXX_error" != yes; then
lt_cv_path_LD=$lt_save_path_LD
lt_cv_prog_gnu_ldcxx=$lt_cv_prog_gnu_ld
lt_cv_prog_gnu_ld=$lt_save_with_gnu_ld
-fi # test "$_lt_caught_CXX_error" != yes
+fi # test yes != "$_lt_caught_CXX_error"
AC_LANG_POP
])# _LT_LANG_CXX_CONFIG
@@ -6912,13 +7441,14 @@ AC_REQUIRE([_LT_DECL_SED])
AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
func_stripname_cnf ()
{
- case ${2} in
- .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
- *) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+ case @S|@2 in
+ .*) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%\\\\@S|@2\$%%"`;;
+ *) func_stripname_result=`$ECHO "@S|@3" | $SED "s%^@S|@1%%; s%@S|@2\$%%"`;;
esac
} # func_stripname_cnf
])# _LT_FUNC_STRIPNAME_CNF
+
# _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
# ---------------------------------
# Figure out "hidden" library dependencies from verbose
@@ -7002,13 +7532,13 @@ if AC_TRY_EVAL(ac_compile); then
pre_test_object_deps_done=no
for p in `eval "$output_verbose_link_cmd"`; do
- case ${prev}${p} in
+ case $prev$p in
-L* | -R* | -l*)
# Some compilers place space between "-{L,R}" and the path.
# Remove the space.
- if test $p = "-L" ||
- test $p = "-R"; then
+ if test x-L = "$p" ||
+ test x-R = "$p"; then
prev=$p
continue
fi
@@ -7024,16 +7554,16 @@ if AC_TRY_EVAL(ac_compile); then
case $p in
=*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
esac
- if test "$pre_test_object_deps_done" = no; then
- case ${prev} in
+ if test no = "$pre_test_object_deps_done"; then
+ case $prev in
-L | -R)
# Internal compiler library paths should come after those
# provided the user. The postdeps already come after the
# user supplied libs so there is no need to process them.
if test -z "$_LT_TAGVAR(compiler_lib_search_path, $1)"; then
- _LT_TAGVAR(compiler_lib_search_path, $1)="${prev}${p}"
+ _LT_TAGVAR(compiler_lib_search_path, $1)=$prev$p
else
- _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} ${prev}${p}"
+ _LT_TAGVAR(compiler_lib_search_path, $1)="${_LT_TAGVAR(compiler_lib_search_path, $1)} $prev$p"
fi
;;
# The "-l" case would never come before the object being
@@ -7041,9 +7571,9 @@ if AC_TRY_EVAL(ac_compile); then
esac
else
if test -z "$_LT_TAGVAR(postdeps, $1)"; then
- _LT_TAGVAR(postdeps, $1)="${prev}${p}"
+ _LT_TAGVAR(postdeps, $1)=$prev$p
else
- _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
+ _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} $prev$p"
fi
fi
prev=
@@ -7058,15 +7588,15 @@ if AC_TRY_EVAL(ac_compile); then
continue
fi
- if test "$pre_test_object_deps_done" = no; then
+ if test no = "$pre_test_object_deps_done"; then
if test -z "$_LT_TAGVAR(predep_objects, $1)"; then
- _LT_TAGVAR(predep_objects, $1)="$p"
+ _LT_TAGVAR(predep_objects, $1)=$p
else
_LT_TAGVAR(predep_objects, $1)="$_LT_TAGVAR(predep_objects, $1) $p"
fi
else
if test -z "$_LT_TAGVAR(postdep_objects, $1)"; then
- _LT_TAGVAR(postdep_objects, $1)="$p"
+ _LT_TAGVAR(postdep_objects, $1)=$p
else
_LT_TAGVAR(postdep_objects, $1)="$_LT_TAGVAR(postdep_objects, $1) $p"
fi
@@ -7097,51 +7627,6 @@ interix[[3-9]]*)
_LT_TAGVAR(postdep_objects,$1)=
_LT_TAGVAR(postdeps,$1)=
;;
-
-linux*)
- case `$CC -V 2>&1 | sed 5q` in
- *Sun\ C*)
- # Sun C++ 5.9
-
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- if test "$solaris_use_stlport4" != yes; then
- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
-
-solaris*)
- case $cc_basename in
- CC* | sunCC*)
- # The more standards-conforming stlport4 library is
- # incompatible with the Cstd library. Avoid specifying
- # it if it's in CXXFLAGS. Ignore libCrun as
- # -library=stlport4 depends on it.
- case " $CXX $CXXFLAGS " in
- *" -library=stlport4 "*)
- solaris_use_stlport4=yes
- ;;
- esac
-
- # Adding this requires a known-good setup of shared libraries for
- # Sun compiler versions before 5.6, else PIC objects from an old
- # archive will be linked into the output, leading to subtle bugs.
- if test "$solaris_use_stlport4" != yes; then
- _LT_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
- fi
- ;;
- esac
- ;;
esac
])
@@ -7150,7 +7635,7 @@ case " $_LT_TAGVAR(postdeps, $1) " in
esac
_LT_TAGVAR(compiler_lib_search_dirs, $1)=
if test -n "${_LT_TAGVAR(compiler_lib_search_path, $1)}"; then
- _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | ${SED} -e 's! -L! !g' -e 's!^ !!'`
+ _LT_TAGVAR(compiler_lib_search_dirs, $1)=`echo " ${_LT_TAGVAR(compiler_lib_search_path, $1)}" | $SED -e 's! -L! !g' -e 's!^ !!'`
fi
_LT_TAGDECL([], [compiler_lib_search_dirs], [1],
[The directories searched by this compiler when creating a shared library])
@@ -7170,10 +7655,10 @@ _LT_TAGDECL([], [compiler_lib_search_path], [1],
# --------------------------
# Ensure that the configuration variables for a Fortran 77 compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_F77_CONFIG],
[AC_LANG_PUSH(Fortran 77)
-if test -z "$F77" || test "X$F77" = "Xno"; then
+if test -z "$F77" || test no = "$F77"; then
_lt_disable_F77=yes
fi
@@ -7210,7 +7695,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the F77 compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_F77" != yes; then
+if test yes != "$_lt_disable_F77"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="\
subroutine t
@@ -7232,7 +7717,7 @@ if test "$_lt_disable_F77" != yes; then
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
+ lt_save_CC=$CC
lt_save_GCC=$GCC
lt_save_CFLAGS=$CFLAGS
CC=${F77-"f77"}
@@ -7246,21 +7731,25 @@ if test "$_lt_disable_F77" != yes; then
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
fi
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -7268,11 +7757,11 @@ if test "$_lt_disable_F77" != yes; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
- _LT_TAGVAR(GCC, $1)="$G77"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$G77
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -7289,9 +7778,9 @@ if test "$_lt_disable_F77" != yes; then
fi # test -n "$compiler"
GCC=$lt_save_GCC
- CC="$lt_save_CC"
- CFLAGS="$lt_save_CFLAGS"
-fi # test "$_lt_disable_F77" != yes
+ CC=$lt_save_CC
+ CFLAGS=$lt_save_CFLAGS
+fi # test yes != "$_lt_disable_F77"
AC_LANG_POP
])# _LT_LANG_F77_CONFIG
@@ -7301,11 +7790,11 @@ AC_LANG_POP
# -------------------------
# Ensure that the configuration variables for a Fortran compiler are
# suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_FC_CONFIG],
[AC_LANG_PUSH(Fortran)
-if test -z "$FC" || test "X$FC" = "Xno"; then
+if test -z "$FC" || test no = "$FC"; then
_lt_disable_FC=yes
fi
@@ -7342,7 +7831,7 @@ _LT_TAGVAR(objext, $1)=$objext
# the FC compiler isn't working. Some variables (like enable_shared)
# are currently assumed to apply to all compilers on this platform,
# and will be corrupted by setting them based on a non-working compiler.
-if test "$_lt_disable_FC" != yes; then
+if test yes != "$_lt_disable_FC"; then
# Code to be used in simple compile tests
lt_simple_compile_test_code="\
subroutine t
@@ -7364,7 +7853,7 @@ if test "$_lt_disable_FC" != yes; then
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
- lt_save_CC="$CC"
+ lt_save_CC=$CC
lt_save_GCC=$GCC
lt_save_CFLAGS=$CFLAGS
CC=${FC-"f95"}
@@ -7380,21 +7869,25 @@ if test "$_lt_disable_FC" != yes; then
AC_MSG_RESULT([$can_build_shared])
AC_MSG_CHECKING([whether to build shared libraries])
- test "$can_build_shared" = "no" && enable_shared=no
+ test no = "$can_build_shared" && enable_shared=no
# On AIX, shared libraries and static libraries use the same namespace, and
# are all built from PIC.
case $host_os in
aix3*)
- test "$enable_shared" = yes && enable_static=no
+ test yes = "$enable_shared" && enable_static=no
if test -n "$RANLIB"; then
archive_cmds="$archive_cmds~\$RANLIB \$lib"
postinstall_cmds='$RANLIB $lib'
fi
;;
aix[[4-9]]*)
- if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
- test "$enable_shared" = yes && enable_static=no
+ if test ia64 != "$host_cpu"; then
+ case $enable_shared,$with_aix_soname,$aix_use_runtimelinking in
+ yes,aix,yes) ;; # shared object as lib.so file only
+ yes,svr4,*) ;; # shared object as lib.so archive member only
+ yes,*) enable_static=no ;; # shared object in lib.a archive as well
+ esac
fi
;;
esac
@@ -7402,11 +7895,11 @@ if test "$_lt_disable_FC" != yes; then
AC_MSG_CHECKING([whether to build static libraries])
# Make sure either enable_shared or enable_static is yes.
- test "$enable_shared" = yes || enable_static=yes
+ test yes = "$enable_shared" || enable_static=yes
AC_MSG_RESULT([$enable_static])
- _LT_TAGVAR(GCC, $1)="$ac_cv_fc_compiler_gnu"
- _LT_TAGVAR(LD, $1)="$LD"
+ _LT_TAGVAR(GCC, $1)=$ac_cv_fc_compiler_gnu
+ _LT_TAGVAR(LD, $1)=$LD
## CAVEAT EMPTOR:
## There is no encapsulation within the following macros, do not change
@@ -7426,7 +7919,7 @@ if test "$_lt_disable_FC" != yes; then
GCC=$lt_save_GCC
CC=$lt_save_CC
CFLAGS=$lt_save_CFLAGS
-fi # test "$_lt_disable_FC" != yes
+fi # test yes != "$_lt_disable_FC"
AC_LANG_POP
])# _LT_LANG_FC_CONFIG
@@ -7436,7 +7929,7 @@ AC_LANG_POP
# --------------------------
# Ensure that the configuration variables for the GNU Java Compiler compiler
# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_GCJ_CONFIG],
[AC_REQUIRE([LT_PROG_GCJ])dnl
AC_LANG_SAVE
@@ -7470,7 +7963,7 @@ CC=${GCJ-"gcj"}
CFLAGS=$GCJFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
+_LT_TAGVAR(LD, $1)=$LD
_LT_CC_BASENAME([$compiler])
# GCJ did not exist at the time GCC didn't implicitly link libc in.
@@ -7507,7 +8000,7 @@ CFLAGS=$lt_save_CFLAGS
# --------------------------
# Ensure that the configuration variables for the GNU Go compiler
# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_GO_CONFIG],
[AC_REQUIRE([LT_PROG_GO])dnl
AC_LANG_SAVE
@@ -7541,7 +8034,7 @@ CC=${GOC-"gccgo"}
CFLAGS=$GOFLAGS
compiler=$CC
_LT_TAGVAR(compiler, $1)=$CC
-_LT_TAGVAR(LD, $1)="$LD"
+_LT_TAGVAR(LD, $1)=$LD
_LT_CC_BASENAME([$compiler])
# Go did not exist at the time GCC didn't implicitly link libc in.
@@ -7578,7 +8071,7 @@ CFLAGS=$lt_save_CFLAGS
# -------------------------
# Ensure that the configuration variables for the Windows resource compiler
# are suitably defined. These variables are subsequently used by _LT_CONFIG
-# to write the compiler configuration to `libtool'.
+# to write the compiler configuration to 'libtool'.
m4_defun([_LT_LANG_RC_CONFIG],
[AC_REQUIRE([LT_PROG_RC])dnl
AC_LANG_SAVE
@@ -7594,7 +8087,7 @@ _LT_TAGVAR(objext, $1)=$objext
lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
# Code to be used in simple link tests
-lt_simple_link_test_code="$lt_simple_compile_test_code"
+lt_simple_link_test_code=$lt_simple_compile_test_code
# ltmain only uses $CC for tagged configurations so make sure $CC is set.
_LT_TAG_COMPILER
@@ -7604,7 +8097,7 @@ _LT_COMPILER_BOILERPLATE
_LT_LINKER_BOILERPLATE
# Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
lt_save_CFLAGS=$CFLAGS
lt_save_GCC=$GCC
GCC=
@@ -7633,7 +8126,7 @@ AC_DEFUN([LT_PROG_GCJ],
[m4_ifdef([AC_PROG_GCJ], [AC_PROG_GCJ],
[m4_ifdef([A][M_PROG_GCJ], [A][M_PROG_GCJ],
[AC_CHECK_TOOL(GCJ, gcj,)
- test "x${GCJFLAGS+set}" = xset || GCJFLAGS="-g -O2"
+ test set = "${GCJFLAGS+set}" || GCJFLAGS="-g -O2"
AC_SUBST(GCJFLAGS)])])[]dnl
])
@@ -7744,7 +8237,7 @@ lt_ac_count=0
# Add /usr/xpg4/bin/sed as it is typically found on Solaris
# along with /bin/sed that truncates output.
for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
- test ! -f $lt_ac_sed && continue
+ test ! -f "$lt_ac_sed" && continue
cat /dev/null > conftest.in
lt_ac_count=0
echo $ECHO_N "0123456789$ECHO_C" >conftest.in
@@ -7761,9 +8254,9 @@ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
$lt_ac_sed -e 's/a$//' < conftest.nl >conftest.out || break
cmp -s conftest.out conftest.nl || break
# 10000 chars as input seems more than enough
- test $lt_ac_count -gt 10 && break
+ test 10 -lt "$lt_ac_count" && break
lt_ac_count=`expr $lt_ac_count + 1`
- if test $lt_ac_count -gt $lt_ac_max; then
+ if test "$lt_ac_count" -gt "$lt_ac_max"; then
lt_ac_max=$lt_ac_count
lt_cv_path_SED=$lt_ac_sed
fi
@@ -7787,27 +8280,7 @@ dnl AC_DEFUN([LT_AC_PROG_SED], [])
# Find out whether the shell is Bourne or XSI compatible,
# or has some other useful features.
m4_defun([_LT_CHECK_SHELL_FEATURES],
-[AC_MSG_CHECKING([whether the shell understands some XSI constructs])
-# Try some XSI features
-xsi_shell=no
-( _lt_dummy="a/b/c"
- test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
- = c,a/b,b/c, \
- && eval 'test $(( 1 + 1 )) -eq 2 \
- && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
- && xsi_shell=yes
-AC_MSG_RESULT([$xsi_shell])
-_LT_CONFIG_LIBTOOL_INIT([xsi_shell='$xsi_shell'])
-
-AC_MSG_CHECKING([whether the shell understands "+="])
-lt_shell_append=no
-( foo=bar; set foo baz; eval "$[1]+=\$[2]" && test "$foo" = barbaz ) \
- >/dev/null 2>&1 \
- && lt_shell_append=yes
-AC_MSG_RESULT([$lt_shell_append])
-_LT_CONFIG_LIBTOOL_INIT([lt_shell_append='$lt_shell_append'])
-
-if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
+[if ( (MAIL=60; unset MAIL) || exit) >/dev/null 2>&1; then
lt_unset=unset
else
lt_unset=false
@@ -7831,102 +8304,9 @@ _LT_DECL([NL2SP], [lt_NL2SP], [1], [turn newlines into spaces])dnl
])# _LT_CHECK_SHELL_FEATURES
-# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
-# ------------------------------------------------------
-# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
-# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
-m4_defun([_LT_PROG_FUNCTION_REPLACE],
-[dnl {
-sed -e '/^$1 ()$/,/^} # $1 /c\
-$1 ()\
-{\
-m4_bpatsubsts([$2], [$], [\\], [^\([ ]\)], [\\\1])
-} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
-test 0 -eq $? || _lt_function_replace_fail=:
-])
-
-
-# _LT_PROG_REPLACE_SHELLFNS
-# -------------------------
-# Replace existing portable implementations of several shell functions with
-# equivalent extended shell implementations where those features are available..
-m4_defun([_LT_PROG_REPLACE_SHELLFNS],
-[if test x"$xsi_shell" = xyes; then
- _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac])
-
- _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
- func_basename_result="${1##*/}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
- case ${1} in
- */*) func_dirname_result="${1%/*}${2}" ;;
- * ) func_dirname_result="${3}" ;;
- esac
- func_basename_result="${1##*/}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
- # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
- # positional parameters, so assign one to ordinary parameter first.
- func_stripname_result=${3}
- func_stripname_result=${func_stripname_result#"${1}"}
- func_stripname_result=${func_stripname_result%"${2}"}])
-
- _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
- func_split_long_opt_name=${1%%=*}
- func_split_long_opt_arg=${1#*=}])
-
- _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
- func_split_short_opt_arg=${1#??}
- func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
-
- _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
- case ${1} in
- *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
- *) func_lo2o_result=${1} ;;
- esac])
-
- _LT_PROG_FUNCTION_REPLACE([func_xform], [ func_xform_result=${1%.*}.lo])
-
- _LT_PROG_FUNCTION_REPLACE([func_arith], [ func_arith_result=$(( $[*] ))])
-
- _LT_PROG_FUNCTION_REPLACE([func_len], [ func_len_result=${#1}])
-fi
-
-if test x"$lt_shell_append" = xyes; then
- _LT_PROG_FUNCTION_REPLACE([func_append], [ eval "${1}+=\\${2}"])
-
- _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
- func_quote_for_eval "${2}"
-dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
- eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
-
- # Save a `func_append' function call where possible by direct use of '+='
- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-else
- # Save a `func_append' function call even when '+=' is not available
- sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
- && mv -f "$cfgfile.tmp" "$cfgfile" \
- || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
- test 0 -eq $? || _lt_function_replace_fail=:
-fi
-
-if test x"$_lt_function_replace_fail" = x":"; then
- AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
-fi
-])
-
# _LT_PATH_CONVERSION_FUNCTIONS
# -----------------------------
-# Determine which file name conversion functions should be used by
+# Determine what file name conversion functions should be used by
# func_to_host_file (and, implicitly, by func_to_host_path). These are needed
# for certain cross-compile configurations and native mingw.
m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
diff --git a/m4/ltoptions.m4 b/m4/ltoptions.m4
index 5d9acd8e23bcfd20d353804aff13666ecbed54f4..94b082976667c0c9edf2e9ff7a668c1fd7d997bf 100644
--- a/m4/ltoptions.m4
+++ b/m4/ltoptions.m4
@@ -1,14 +1,14 @@
# Helper functions for option handling. -*- Autoconf -*-
#
-# Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
-# Inc.
+# Copyright (C) 2004-2005, 2007-2009, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
# unlimited permission to copy and/or distribute it, with or without
# modifications, as long as this notice is preserved.
-# serial 7 ltoptions.m4
+# serial 8 ltoptions.m4
# This is to help aclocal find these macros, as it can't see m4_define.
AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -29,7 +29,7 @@ m4_define([_LT_SET_OPTION],
[m4_define(_LT_MANGLE_OPTION([$1], [$2]))dnl
m4_ifdef(_LT_MANGLE_DEFUN([$1], [$2]),
_LT_MANGLE_DEFUN([$1], [$2]),
- [m4_warning([Unknown $1 option `$2'])])[]dnl
+ [m4_warning([Unknown $1 option '$2'])])[]dnl
])
@@ -75,13 +75,15 @@ m4_if([$1],[LT_INIT],[
dnl
dnl If no reference was made to various pairs of opposing options, then
dnl we run the default mode handler for the pair. For example, if neither
- dnl `shared' nor `disable-shared' was passed, we enable building of shared
+ dnl 'shared' nor 'disable-shared' was passed, we enable building of shared
dnl archives by default:
_LT_UNLESS_OPTIONS([LT_INIT], [shared disable-shared], [_LT_ENABLE_SHARED])
_LT_UNLESS_OPTIONS([LT_INIT], [static disable-static], [_LT_ENABLE_STATIC])
_LT_UNLESS_OPTIONS([LT_INIT], [pic-only no-pic], [_LT_WITH_PIC])
_LT_UNLESS_OPTIONS([LT_INIT], [fast-install disable-fast-install],
- [_LT_ENABLE_FAST_INSTALL])
+ [_LT_ENABLE_FAST_INSTALL])
+ _LT_UNLESS_OPTIONS([LT_INIT], [aix-soname=aix aix-soname=both aix-soname=svr4],
+ [_LT_WITH_AIX_SONAME([aix])])
])
])# _LT_SET_OPTIONS
@@ -112,7 +114,7 @@ AU_DEFUN([AC_LIBTOOL_DLOPEN],
[_LT_SET_OPTION([LT_INIT], [dlopen])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `dlopen' option into LT_INIT's first parameter.])
+put the 'dlopen' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -148,7 +150,7 @@ AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
_LT_SET_OPTION([LT_INIT], [win32-dll])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `win32-dll' option into LT_INIT's first parameter.])
+put the 'win32-dll' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -157,9 +159,9 @@ dnl AC_DEFUN([AC_LIBTOOL_WIN32_DLL], [])
# _LT_ENABLE_SHARED([DEFAULT])
# ----------------------------
-# implement the --enable-shared flag, and supports the `shared' and
-# `disable-shared' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-shared flag, and supports the 'shared' and
+# 'disable-shared' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_SHARED],
[m4_define([_LT_ENABLE_SHARED_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([shared],
@@ -172,14 +174,14 @@ AC_ARG_ENABLE([shared],
*)
enable_shared=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_shared=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_shared=]_LT_ENABLE_SHARED_DEFAULT)
@@ -211,9 +213,9 @@ dnl AC_DEFUN([AM_DISABLE_SHARED], [])
# _LT_ENABLE_STATIC([DEFAULT])
# ----------------------------
-# implement the --enable-static flag, and support the `static' and
-# `disable-static' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-static flag, and support the 'static' and
+# 'disable-static' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_STATIC],
[m4_define([_LT_ENABLE_STATIC_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([static],
@@ -226,14 +228,14 @@ AC_ARG_ENABLE([static],
*)
enable_static=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_static=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_static=]_LT_ENABLE_STATIC_DEFAULT)
@@ -265,9 +267,9 @@ dnl AC_DEFUN([AM_DISABLE_STATIC], [])
# _LT_ENABLE_FAST_INSTALL([DEFAULT])
# ----------------------------------
-# implement the --enable-fast-install flag, and support the `fast-install'
-# and `disable-fast-install' LT_INIT options.
-# DEFAULT is either `yes' or `no'. If omitted, it defaults to `yes'.
+# implement the --enable-fast-install flag, and support the 'fast-install'
+# and 'disable-fast-install' LT_INIT options.
+# DEFAULT is either 'yes' or 'no'. If omitted, it defaults to 'yes'.
m4_define([_LT_ENABLE_FAST_INSTALL],
[m4_define([_LT_ENABLE_FAST_INSTALL_DEFAULT], [m4_if($1, no, no, yes)])dnl
AC_ARG_ENABLE([fast-install],
@@ -280,14 +282,14 @@ AC_ARG_ENABLE([fast-install],
*)
enable_fast_install=no
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for pkg in $enableval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$pkg" = "X$p"; then
enable_fast_install=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
[enable_fast_install=]_LT_ENABLE_FAST_INSTALL_DEFAULT)
@@ -304,14 +306,14 @@ AU_DEFUN([AC_ENABLE_FAST_INSTALL],
[_LT_SET_OPTION([LT_INIT], m4_if([$1], [no], [disable-])[fast-install])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `fast-install' option into LT_INIT's first parameter.])
+the 'fast-install' option into LT_INIT's first parameter.])
])
AU_DEFUN([AC_DISABLE_FAST_INSTALL],
[_LT_SET_OPTION([LT_INIT], [disable-fast-install])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you put
-the `disable-fast-install' option into LT_INIT's first parameter.])
+the 'disable-fast-install' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
@@ -319,11 +321,64 @@ dnl AC_DEFUN([AC_ENABLE_FAST_INSTALL], [])
dnl AC_DEFUN([AM_DISABLE_FAST_INSTALL], [])
+# _LT_WITH_AIX_SONAME([DEFAULT])
+# ----------------------------------
+# implement the --with-aix-soname flag, and support the `aix-soname=aix'
+# and `aix-soname=both' and `aix-soname=svr4' LT_INIT options. DEFAULT
+# is either `aix', `both' or `svr4'. If omitted, it defaults to `aix'.
+m4_define([_LT_WITH_AIX_SONAME],
+[m4_define([_LT_WITH_AIX_SONAME_DEFAULT], [m4_if($1, svr4, svr4, m4_if($1, both, both, aix))])dnl
+shared_archive_member_spec=
+case $host,$enable_shared in
+power*-*-aix[[5-9]]*,yes)
+ AC_MSG_CHECKING([which variant of shared library versioning to provide])
+ AC_ARG_WITH([aix-soname],
+ [AS_HELP_STRING([--with-aix-soname=aix|svr4|both],
+ [shared library versioning (aka "SONAME") variant to provide on AIX, @<:@default=]_LT_WITH_AIX_SONAME_DEFAULT[@:>@.])],
+ [case $withval in
+ aix|svr4|both)
+ ;;
+ *)
+ AC_MSG_ERROR([Unknown argument to --with-aix-soname])
+ ;;
+ esac
+ lt_cv_with_aix_soname=$with_aix_soname],
+ [AC_CACHE_VAL([lt_cv_with_aix_soname],
+ [lt_cv_with_aix_soname=]_LT_WITH_AIX_SONAME_DEFAULT)
+ with_aix_soname=$lt_cv_with_aix_soname])
+ AC_MSG_RESULT([$with_aix_soname])
+ if test aix != "$with_aix_soname"; then
+ # For the AIX way of multilib, we name the shared archive member
+ # based on the bitwidth used, traditionally 'shr.o' or 'shr_64.o',
+ # and 'shr.imp' or 'shr_64.imp', respectively, for the Import File.
+ # Even when GNU compilers ignore OBJECT_MODE but need '-maix64' flag,
+ # the AIX toolchain works better with OBJECT_MODE set (default 32).
+ if test 64 = "${OBJECT_MODE-32}"; then
+ shared_archive_member_spec=shr_64
+ else
+ shared_archive_member_spec=shr
+ fi
+ fi
+ ;;
+*)
+ with_aix_soname=aix
+ ;;
+esac
+
+_LT_DECL([], [shared_archive_member_spec], [0],
+ [Shared archive member basename, for filename based shared library versioning on AIX])dnl
+])# _LT_WITH_AIX_SONAME
+
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=aix], [_LT_WITH_AIX_SONAME([aix])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=both], [_LT_WITH_AIX_SONAME([both])])
+LT_OPTION_DEFINE([LT_INIT], [aix-soname=svr4], [_LT_WITH_AIX_SONAME([svr4])])
+
+
# _LT_WITH_PIC([MODE])
# --------------------
-# implement the --with-pic flag, and support the `pic-only' and `no-pic'
+# implement the --with-pic flag, and support the 'pic-only' and 'no-pic'
# LT_INIT options.
-# MODE is either `yes' or `no'. If omitted, it defaults to `both'.
+# MODE is either 'yes' or 'no'. If omitted, it defaults to 'both'.
m4_define([_LT_WITH_PIC],
[AC_ARG_WITH([pic],
[AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
@@ -334,19 +389,17 @@ m4_define([_LT_WITH_PIC],
*)
pic_mode=default
# Look at the argument we got. We use all the common list separators.
- lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+ lt_save_ifs=$IFS; IFS=$IFS$PATH_SEPARATOR,
for lt_pkg in $withval; do
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
if test "X$lt_pkg" = "X$lt_p"; then
pic_mode=yes
fi
done
- IFS="$lt_save_ifs"
+ IFS=$lt_save_ifs
;;
esac],
- [pic_mode=default])
-
-test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
+ [pic_mode=m4_default([$1], [default])])
_LT_DECL([], [pic_mode], [0], [What type of objects to build])dnl
])# _LT_WITH_PIC
@@ -359,7 +412,7 @@ AU_DEFUN([AC_LIBTOOL_PICMODE],
[_LT_SET_OPTION([LT_INIT], [pic-only])
AC_DIAGNOSE([obsolete],
[$0: Remove this warning and the call to _LT_SET_OPTION when you
-put the `pic-only' option into LT_INIT's first parameter.])
+put the 'pic-only' option into LT_INIT's first parameter.])
])
dnl aclocal-1.4 backwards compatibility:
diff --git a/m4/ltsugar.m4 b/m4/ltsugar.m4
index 9000a057d31ddf75cb85ccda8757de4493bcdbe7..48bc9344a4d661e116be1483d5520753875b2bd1 100644
--- a/m4/ltsugar.m4
+++ b/m4/ltsugar.m4
@@ -1,6 +1,7 @@
# ltsugar.m4 -- libtool m4 base layer. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007-2008, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Gary V. Vaughan, 2004
#
# This file is free software; the Free Software Foundation gives
@@ -33,7 +34,7 @@ m4_define([_lt_join],
# ------------
# Manipulate m4 lists.
# These macros are necessary as long as will still need to support
-# Autoconf-2.59 which quotes differently.
+# Autoconf-2.59, which quotes differently.
m4_define([lt_car], [[$1]])
m4_define([lt_cdr],
[m4_if([$#], 0, [m4_fatal([$0: cannot be called without arguments])],
@@ -44,7 +45,7 @@ m4_define([lt_unquote], $1)
# lt_append(MACRO-NAME, STRING, [SEPARATOR])
# ------------------------------------------
-# Redefine MACRO-NAME to hold its former content plus `SEPARATOR'`STRING'.
+# Redefine MACRO-NAME to hold its former content plus 'SEPARATOR''STRING'.
# Note that neither SEPARATOR nor STRING are expanded; they are appended
# to MACRO-NAME as is (leaving the expansion for when MACRO-NAME is invoked).
# No SEPARATOR is output if MACRO-NAME was previously undefined (different
diff --git a/m4/ltversion.m4 b/m4/ltversion.m4
index 07a8602d48d615a65800b14446d8c8c8694f2818..fa04b52a3bf868bd57e7ba796d64385a51e7ec5a 100644
--- a/m4/ltversion.m4
+++ b/m4/ltversion.m4
@@ -1,6 +1,6 @@
# ltversion.m4 -- version numbers -*- Autoconf -*-
#
-# Copyright (C) 2004 Free Software Foundation, Inc.
+# Copyright (C) 2004, 2011-2015 Free Software Foundation, Inc.
# Written by Scott James Remnant, 2004
#
# This file is free software; the Free Software Foundation gives
@@ -9,15 +9,15 @@
# @configure_input@
-# serial 3337 ltversion.m4
+# serial 4179 ltversion.m4
# This file is part of GNU Libtool
-m4_define([LT_PACKAGE_VERSION], [2.4.2])
-m4_define([LT_PACKAGE_REVISION], [1.3337])
+m4_define([LT_PACKAGE_VERSION], [2.4.6])
+m4_define([LT_PACKAGE_REVISION], [2.4.6])
AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.4.2'
-macro_revision='1.3337'
+[macro_version='2.4.6'
+macro_revision='2.4.6'
_LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
_LT_DECL(, macro_revision, 0)
])
diff --git a/m4/lt~obsolete.m4 b/m4/lt~obsolete.m4
index c573da90c5ccebffba4dce9a6462036bfa986d5f..c6b26f88f6c3c1a052afa6314ba2adf832d785ee 100644
--- a/m4/lt~obsolete.m4
+++ b/m4/lt~obsolete.m4
@@ -1,6 +1,7 @@
# lt~obsolete.m4 -- aclocal satisfying obsolete definitions. -*-Autoconf-*-
#
-# Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
+# Copyright (C) 2004-2005, 2007, 2009, 2011-2015 Free Software
+# Foundation, Inc.
# Written by Scott James Remnant, 2004.
#
# This file is free software; the Free Software Foundation gives
@@ -11,7 +12,7 @@
# These exist entirely to fool aclocal when bootstrapping libtool.
#
-# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN)
+# In the past libtool.m4 has provided macros via AC_DEFUN (or AU_DEFUN),
# which have later been changed to m4_define as they aren't part of the
# exported API, or moved to Autoconf or Automake where they belong.
#
@@ -25,7 +26,7 @@
# included after everything else. This provides aclocal with the
# AC_DEFUNs it wants, but when m4 processes it, it doesn't do anything
# because those macros already exist, or will be overwritten later.
-# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
+# We use AC_DEFUN over AU_DEFUN for compatibility with aclocal-1.6.
#
# Anytime we withdraw an AC_DEFUN or AU_DEFUN, remember to add it here.
# Yes, that means every name once taken will need to remain here until
diff --git a/sPuReMD/Makefile.am b/sPuReMD/Makefile.am
index 4102573deee8d6fefac290cce49f0755bd726200..a31309c6433e65d994c92b0543dad51e0172e501 100644
--- a/sPuReMD/Makefile.am
+++ b/sPuReMD/Makefile.am
@@ -1,6 +1,7 @@
ACLOCAL_AMFLAGS = -I ../m4
bin_PROGRAMS = bin/spuremd
+
bin_spuremd_SOURCES = src/ffield.c src/grid.c src/list.c src/lookup.c src/print_utils.c \
src/reset_utils.c src/restart.c src/random.c src/tool_box.c src/traj.c \
src/vector.c src/allocate.c src/analyze.c src/box.c src/system_props.c src/control.c \
@@ -16,3 +17,17 @@ include_HEADERS = src/mytypes.h src/ffield.h src/grid.h src/list.h src/lookup.h
src/single_body_interactions.h src/two_body_interactions.h \
src/three_body_interactions.h src/four_body_interactions.h src/forces.h \
src/integrate.h src/init_md.h
+
+check_PROGRAMS =
+TESTS =
+
+if BUILD_TEST
+check_PROGRAMS += tests/test_vector
+TESTS += $(check_PROGRAMS)
+
+tests_test_vector_SOURCES = tests/test_vector.cpp
+tests_test_vector_CPPFLAGS = -Isrc $(GTEST_CPPFLAGS)
+tests_test_vector_CXXFLAGS = $(GTEST_CXXFLAGS)
+tests_test_vector_LDFLAGS = $(GTEST_LDFLAGS) $(GTEST_LIBS)
+tests_test_vector_LDADD = -lgtest
+endif
diff --git a/sPuReMD/aclocal.m4 b/sPuReMD/aclocal.m4
index f23d4faf7e046b186869ab73a7a8e044765e1d83..48e9bea0b26ee47b32d9eb55e5270e1f45964620 100644
--- a/sPuReMD/aclocal.m4
+++ b/sPuReMD/aclocal.m4
@@ -1150,4 +1150,5 @@ AC_SUBST([am__tar])
AC_SUBST([am__untar])
]) # _AM_PROG_TAR
+m4_include([../m4/acx_pthread.m4])
m4_include([../m4/ax_compiler_vendor.m4])
diff --git a/sPuReMD/configure.ac b/sPuReMD/configure.ac
index 57b6b8ea8bcebe279ea1e14c11c28a6e66cea439..312fa804e8cf375a499f48218f0a1532474e4ec2 100644
--- a/sPuReMD/configure.ac
+++ b/sPuReMD/configure.ac
@@ -129,6 +129,46 @@ then
CFLAGS="${CFLAGS} ${GPROF_FLAGS}"
fi
+# Tests using Google C++ testing framework (gtest)
+AC_LANG_PUSH([C++])
+AC_PROG_CXX([icpc g++ clang++ CC])
+AC_COMPILE_IFELSE([AC_LANG_PROGRAM(
+ [[#ifndef __cplusplus
+ #error "broken C++"
+ #endif]])],,
+ [CXX=;])
+if test "x${CXX}" != "x"
+then
+ AC_CHECK_HEADER([gtest/gtest.h], [HAVE_GTEST_H="yes"])
+ if test "x${HAVE_GTEST_H}" != "xyes"
+ then
+ AC_MSG_WARN([gtest.h not found. Unable to build tests. Continuing...])
+ else
+ ACX_PTHREAD([have_pthread=yes])
+
+ # define gtest variables
+ if test "x${have_pthread}" = "xyes"; then
+ GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=1"
+ GTEST_CXXFLAGS="$PTHREAD_CFLAGS"
+ GTEST_LDFLAGS=
+ GTEST_LIBS="$PTHREAD_LIBS"
+ else
+ GTEST_CPPFLAGS="-DGTEST_HAS_PTHREAD=0"
+ GTEST_CXXFLAGS=
+ GTEST_LDFLAGS=
+ GTEST_LIBS=
+ fi
+ AC_SUBST([GTEST_CPPFLAGS])
+ AC_SUBST([GTEST_CXXFLAGS])
+ AC_SUBST([GTEST_LDFLAGS])
+ AC_SUBST([GTEST_LIBS])
+ fi
+else
+ AC_MSG_WARN([C++ compiler not found. Unable to build tests. Continuing...])
+fi
+AM_CONDITIONAL([BUILD_TEST], [test "x${HAVE_GTEST_H}" = "xyes"])
+AC_LANG_POP([C++])
+
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
diff --git a/sPuReMD/src/allocate.c b/sPuReMD/src/allocate.c
index ab075f94e4537120d9229efb1f073e886e1f28e8..6da598bd527a670cc14d8dcf21a3f7a842c6eea0 100644
--- a/sPuReMD/src/allocate.c
+++ b/sPuReMD/src/allocate.c
@@ -56,7 +56,7 @@ int PreAllocate_Space( reax_system *system, control_params *control,
void Reallocate_Neighbor_List( list *far_nbrs, int n, int num_intrs )
{
- Delete_List( far_nbrs );
+ Delete_List( TYP_FAR_NEIGHBOR, far_nbrs );
if (!Make_List( n, num_intrs, TYP_FAR_NEIGHBOR, far_nbrs ))
{
@@ -188,7 +188,7 @@ int Reallocate_HBonds_List( int n, int num_h, int *h_index, list *hbonds )
}
}
- Delete_List( hbonds );
+ Delete_List( TYP_HBOND, hbonds );
Allocate_HBond_List( n, num_h, h_index, hb_top, hbonds );
@@ -249,7 +249,7 @@ int Reallocate_Bonds_List( int n, list *bonds, int *num_bonds, int *est_3body )
bond_top[i] = MAX( Num_Entries( i, bonds ) * 2, MIN_BONDS );
}
- Delete_List( bonds );
+ Delete_List( TYP_BOND, bonds );
Allocate_Bond_List( n, bond_top, bonds );
*num_bonds = bond_top[n - 1];
@@ -306,7 +306,7 @@ void Reallocate( reax_system *system, static_storage *workspace, list **lists,
if ( realloc->num_3body > 0 )
{
- Delete_List( (*lists) + THREE_BODIES );
+ Delete_List( TYP_THREE_BODY, (*lists) + THREE_BODIES );
if ( num_bonds == -1 )
num_bonds = ((*lists) + BONDS)->num_intrs;
diff --git a/sPuReMD/src/analyze.c b/sPuReMD/src/analyze.c
index b9f5c33a91ead4e21fd4a7c1d7365b6063c45ca8..e78f533d5743d0dd398d5131b442ae9ad4afe879 100644
--- a/sPuReMD/src/analyze.c
+++ b/sPuReMD/src/analyze.c
@@ -20,12 +20,42 @@
----------------------------------------------------------------------*/
#include "analyze.h"
+
#include "box.h"
#include "list.h"
#include "vector.h"
+
#define MAX_FRAGMENT_TYPES 100
+
+enum atoms
+{
+ C_ATOM = 0,
+ H_ATOM = 1,
+ O_ATOM = 2,
+ N_ATOM = 3,
+ S_ATOM = 4,
+ SI_ATOM = 5,
+ GE_ATOM = 6,
+ X_ATOM = 7,
+};
+
+enum molecule_type
+{
+ UNKNOWN = 0,
+ WATER = 1,
+};
+
+
+typedef struct
+{
+ int atom_count;
+ int atom_list[MAX_MOLECULE_SIZE];
+ int mtypes[MAX_ATOM_TYPES];
+} molecule;
+
+
// copy bond list into old bond list
void Copy_Bond_List( reax_system *system, control_params *control,
list **lists )
@@ -772,9 +802,9 @@ void Calculate_Drift( reax_system *system, control_params *control,
Distance_on_T3_Gen( workspace->x_old[i], system->atoms[i].x,
&(system->box), driftvec );
- if ( fabs( driftvec[0] ) >= system->box.box_norms[0] / 2.0 - 2.0 ||
- fabs( driftvec[1] ) >= system->box.box_norms[0] / 2.0 - 2.0 ||
- fabs( driftvec[2] ) >= system->box.box_norms[0] / 2.0 - 2.0 )
+ if ( FABS( driftvec[0] ) >= system->box.box_norms[0] / 2.0 - 2.0 ||
+ FABS( driftvec[1] ) >= system->box.box_norms[0] / 2.0 - 2.0 ||
+ FABS( driftvec[2] ) >= system->box.box_norms[0] / 2.0 - 2.0 )
{
/* the atom has moved almost half the box size.
exclude it from further drift computations as it might have an
diff --git a/sPuReMD/src/bond_orders.c b/sPuReMD/src/bond_orders.c
index 348184680ac82d13a2531753c1c4d1c26049f393..686cf3b0318f53fcc735d73884f82bfb753dab19 100644
--- a/sPuReMD/src/bond_orders.c
+++ b/sPuReMD/src/bond_orders.c
@@ -29,9 +29,10 @@
inline real Cf45( real p1, real p2 )
{
return -EXP(-p2 / 2) /
- ( SQR( EXP(-p1 / 2) + EXP(p1 / 2) ) * (EXP(-p2 / 2) + EXP(p2 / 2)) );
+ ( SQR( EXP(-p1 / 2) + EXP(p1 / 2) ) * (EXP(-p2 / 2) + EXP(p2 / 2)) );
}
+
#ifdef TEST_FORCES
void Get_dBO( reax_system *system, list **lists,
int i, int pj, real C, rvec *v )
@@ -152,35 +153,41 @@ void Add_dBOpinpi2_to_Forces( reax_system *system, list **lists,
void Add_dDelta( reax_system *system, list **lists, int i, real C, rvec *v )
{
- list *dDeltas = &((*lists)[DDELTA]);
- int start = Start_Index(i, dDeltas);
- int end = End_Index(i, dDeltas);
- int k;
+ list *dDeltas;
+ int start, end, k;
+
+ dDeltas = &((*lists)[DDELTA]);
+ start = Start_Index(i, dDeltas);
+ end = End_Index(i, dDeltas);
for ( k = start; k < end; ++k )
+ {
rvec_ScaledAdd( v[dDeltas->select.dDelta_list[k].wrt],
- C, dDeltas->select.dDelta_list[k].dVal );
+ C, dDeltas->select.dDelta_list[k].dVal );
+ }
}
void Add_dDelta_to_Forces( reax_system *system, list **lists, int i, real C )
{
- list *dDeltas = &((*lists)[DDELTA]);
- int start = Start_Index(i, dDeltas);
- int end = End_Index(i, dDeltas);
- int k;
+ list *dDeltas;
+ int start, end, k;
+
+ dDeltas = &((*lists)[DDELTA]);
+ start = Start_Index(i, dDeltas);
+ end = End_Index(i, dDeltas);
for ( k = start; k < end; ++k )
+ {
rvec_ScaledAdd( system->atoms[dDeltas->select.dDelta_list[k].wrt].f,
- C, dDeltas->select.dDelta_list[k].dVal );
+ C, dDeltas->select.dDelta_list[k].dVal );
+ }
}
-
void Calculate_dBO( int i, int pj, static_storage *workspace, list **lists,
- int *top )
+ int *top )
{
- /* Initializations */
int j, k, l, start_i, end_i, end_j;
rvec dDeltap_self, dBOp;
list *bonds, *dBOs;
@@ -188,34 +195,20 @@ void Calculate_dBO( int i, int pj, static_storage *workspace, list **lists,
bond_order_data *bo_ij;
dbond_data *top_dbo;
+ /* Initializations */
bonds = (*lists) + BONDS;
dBOs = (*lists) + DBO;
-
j = bonds->select.bond_list[pj].nbr;
bo_ij = &(bonds->select.bond_list[pj].bo_data);
-
- /*rvec due_j[1000], due_i[1000];
- rvec due_j_pi[1000], due_i_pi[1000];
-
- memset(due_j, 0, sizeof(rvec)*1000 );
- memset(due_i, 0, sizeof(rvec)*1000 );
- memset(due_j_pi, 0, sizeof(rvec)*1000 );
- memset(due_i_pi, 0, sizeof(rvec)*1000 );*/
-
- //fprintf( stderr,"dbo %d-%d\n",workspace->orig_id[i],workspace->orig_id[j] );
-
- start_i = Start_Index(i, bonds);
- end_i = End_Index(i, bonds);
-
- l = Start_Index(j, bonds);
- end_j = End_Index(j, bonds);
-
+ start_i = Start_Index( i, bonds );
+ end_i = End_Index( i, bonds );
+ l = Start_Index( j, bonds );
+ end_j = End_Index( j, bonds );
top_dbo = &(dBOs->select.dbo_list[ (*top) ]);
for ( k = start_i; k < end_i; ++k )
{
nbr_k = &(bonds->select.bond_list[k]);
- //fprintf( stderr, "\tnbr_k = %d\n", workspace->orig_id[nbr_k->nbr] );
for ( ; l < end_j && bonds->select.bond_list[l].nbr < nbr_k->nbr; ++l )
{
@@ -224,12 +217,10 @@ void Calculate_dBO( int i, int pj, static_storage *workspace, list **lists,
nbr_l = &(bonds->select.bond_list[l]);
top_dbo->wrt = nbr_l->nbr;
rvec_Copy( dBOp, nbr_l->bo_data.dBOp );
- //fprintf( stderr,"\t\tnbr_l = %d\n",workspace->orig_id[nbr_l->nbr] );
rvec_Scale( top_dbo->dBO, -bo_ij->C3dbo, dBOp ); // dBO, 3rd
rvec_Scale( top_dbo->dBOpi, -bo_ij->C4dbopi, dBOp ); // dBOpi, 4th
rvec_Scale( top_dbo->dBOpi2, -bo_ij->C4dbopi2, dBOp );// dBOpipi, 4th
- //rvec_ScaledAdd(due_j[top_dbo->wrt],-bo_ij->BO*bo_ij->A2_ji, dBOp);
if ( nbr_l->nbr == i )
{
@@ -240,24 +231,19 @@ void Calculate_dBO( int i, int pj, static_storage *workspace, list **lists,
rvec_ScaledAdd( top_dbo->dBO, bo_ij->C2dbo, dDeltap_self ); //2nd
/* dBOpi */
- rvec_ScaledAdd(top_dbo->dBOpi, bo_ij->C1dbopi, bo_ij->dln_BOp_pi); //1
- rvec_ScaledAdd(top_dbo->dBOpi, bo_ij->C2dbopi, bo_ij->dBOp); //2nd
- rvec_ScaledAdd(top_dbo->dBOpi, bo_ij->C3dbopi, dDeltap_self); //3rd
+ rvec_ScaledAdd( top_dbo->dBOpi, bo_ij->C1dbopi, bo_ij->dln_BOp_pi ); //1
+ rvec_ScaledAdd( top_dbo->dBOpi, bo_ij->C2dbopi, bo_ij->dBOp ); //2nd
+ rvec_ScaledAdd( top_dbo->dBOpi, bo_ij->C3dbopi, dDeltap_self ); //3rd
/* dBOpp, 1st */
- rvec_ScaledAdd(top_dbo->dBOpi2, bo_ij->C1dbopi2, bo_ij->dln_BOp_pi2);
- rvec_ScaledAdd(top_dbo->dBOpi2, bo_ij->C2dbopi2, bo_ij->dBOp); //2nd
- rvec_ScaledAdd(top_dbo->dBOpi2, bo_ij->C3dbopi2, dDeltap_self); //3rd
-
- /* do the adjustments on i */
- //rvec_ScaledAdd( due_i[i],
- //bo_ij->A0_ij + bo_ij->BO * bo_ij->A1_ij, bo_ij->dBOp );//1st,dBO
- //rvec_ScaledAdd( due_i[i], bo_ij->BO * bo_ij->A2_ij,
- //dDeltap_self ); //2nd, dBO
+ rvec_ScaledAdd( top_dbo->dBOpi2, bo_ij->C1dbopi2, bo_ij->dln_BOp_pi2 );
+ rvec_ScaledAdd( top_dbo->dBOpi2, bo_ij->C2dbopi2, bo_ij->dBOp ); //2nd
+ rvec_ScaledAdd( top_dbo->dBOpi2, bo_ij->C3dbopi2, dDeltap_self ); //3rd
+
}
- //rvec_Add( workspace->dDelta[nbr_l->nbr], top_dbo->dBO );
- ++(*top), ++top_dbo;
+ ++(*top);
+ ++top_dbo;
}
/* Now we are processing neighbor k of i. */
@@ -267,11 +253,6 @@ void Calculate_dBO( int i, int pj, static_storage *workspace, list **lists,
rvec_Scale( top_dbo->dBO, -bo_ij->C2dbo, dBOp ); //dBO-2
rvec_Scale( top_dbo->dBOpi, -bo_ij->C3dbopi, dBOp ); //dBOpi-3
rvec_Scale( top_dbo->dBOpi2, -bo_ij->C3dbopi2, dBOp );//dBOpp-3
- //rvec_ScaledAdd(due_i[top_dbo->wrt],-bo_ij->BO*bo_ij->A2_ij,dBOp);//dBO-2
-
- // fprintf( stderr, "\tnbr_k = %d, nbr_l = %d, l = %d, end_j = %d\n",
- // workspace->orig_id[nbr_k->nbr],
- // workspace->orig_id[bonds->select.bond_list[l].nbr], l, end_j );
if ( l < end_j && bonds->select.bond_list[l].nbr == nbr_k->nbr )
{
@@ -283,9 +264,6 @@ void Calculate_dBO( int i, int pj, static_storage *workspace, list **lists,
rvec_ScaledAdd( top_dbo->dBOpi, -bo_ij->C4dbopi, dBOp ); //dBOpi,4th
rvec_ScaledAdd( top_dbo->dBOpi2, -bo_ij->C4dbopi2, dBOp );//dBOpp.4th
++l;
-
- //rvec_ScaledAdd( due_j[top_dbo->wrt], -bo_ij->BO * bo_ij->A2_ji,
- //nbr_l->bo_data.dBOp ); //3rd, dBO
}
else if ( k == pj )
{
@@ -296,22 +274,16 @@ void Calculate_dBO( int i, int pj, static_storage *workspace, list **lists,
rvec_ScaledAdd( top_dbo->dBO, bo_ij->C3dbo, dDeltap_self );// 3rd, dBO
/* dBOpi, 1st */
- rvec_ScaledAdd(top_dbo->dBOpi, -bo_ij->C1dbopi, bo_ij->dln_BOp_pi);
- rvec_ScaledAdd(top_dbo->dBOpi, -bo_ij->C2dbopi, bo_ij->dBOp); //2nd
+ rvec_ScaledAdd( top_dbo->dBOpi, -bo_ij->C1dbopi, bo_ij->dln_BOp_pi );
+ rvec_ScaledAdd( top_dbo->dBOpi, -bo_ij->C2dbopi, bo_ij->dBOp ); //2nd
rvec_ScaledAdd( top_dbo->dBOpi, bo_ij->C4dbopi, dDeltap_self ); //4th
/* dBOpi2, 1st */
- rvec_ScaledAdd(top_dbo->dBOpi2, -bo_ij->C1dbopi2, bo_ij->dln_BOp_pi2 );
- rvec_ScaledAdd(top_dbo->dBOpi2, -bo_ij->C2dbopi2, bo_ij->dBOp ); //2nd
- rvec_ScaledAdd(top_dbo->dBOpi2, bo_ij->C4dbopi2, dDeltap_self ); //4th
-
- //rvec_ScaledAdd( due_j[j], -(bo_ij->A0_ij + bo_ij->BO*bo_ij->A1_ij),
- //bo_ij->dBOp ); //1st, dBO
- //rvec_ScaledAdd( due_j[j], bo_ij->BO * bo_ij->A2_ji,
- //workspace->dDeltap_self[j] ); //3rd, dBO
+ rvec_ScaledAdd( top_dbo->dBOpi2, -bo_ij->C1dbopi2, bo_ij->dln_BOp_pi2 );
+ rvec_ScaledAdd( top_dbo->dBOpi2, -bo_ij->C2dbopi2, bo_ij->dBOp ); //2nd
+ rvec_ScaledAdd( top_dbo->dBOpi2, bo_ij->C4dbopi2, dDeltap_self ); //4th
}
- // rvec_Add( workspace->dDelta[nbr_k->nbr], top_dbo->dBO );
++(*top), ++top_dbo;
}
@@ -322,15 +294,11 @@ void Calculate_dBO( int i, int pj, static_storage *workspace, list **lists,
nbr_l = &(bonds->select.bond_list[l]);
top_dbo->wrt = nbr_l->nbr;
rvec_Copy( dBOp, nbr_l->bo_data.dBOp );
- //fprintf( stderr,"\tl=%d, nbr_l=%d\n",l,workspace->orig_id[nbr_l->nbr] );
rvec_Scale( top_dbo->dBO, -bo_ij->C3dbo, dBOp ); //3rd, dBO
rvec_Scale( top_dbo->dBOpi, -bo_ij->C4dbopi, dBOp ); //4th, dBOpi
rvec_Scale( top_dbo->dBOpi2, -bo_ij->C4dbopi2, dBOp );//4th, dBOpp
- // rvec_ScaledAdd( due_j[top_dbo->wrt], -bo_ij->BO * bo_ij->A2_ji,
- // nbr_l->bo_data.dBOp );
-
if ( nbr_l->nbr == i )
{
/* do the adjustments on i */
@@ -349,31 +317,16 @@ void Calculate_dBO( int i, int pj, static_storage *workspace, list **lists,
rvec_ScaledAdd(top_dbo->dBOpi2, bo_ij->C1dbopi2, bo_ij->dln_BOp_pi2);
rvec_ScaledAdd( top_dbo->dBOpi2, bo_ij->C2dbopi2, bo_ij->dBOp ); //2nd
rvec_ScaledAdd( top_dbo->dBOpi2, bo_ij->C3dbopi2, dDeltap_self );//3rd
-
- //rvec_ScaledAdd( due_i[i], bo_ij->A0_ij + bo_ij->BO * bo_ij->A1_ij,
- //bo_ij->dBOp ); /*1st, dBO*/
- //rvec_ScaledAdd( due_i[i], bo_ij->BO * bo_ij->A2_ij,
- //dDeltap_self ); /*2nd, dBO*/
}
- // rvec_Add( workspace->dDelta[nbr_l->nbr], top_dbo->dBO );
++(*top), ++top_dbo;
}
-
- /*for( k = 0; k < 21; ++k ){
- fprintf( stderr, "%d %d %d, due_i:[%g %g %g]\n",
- i+1, j+1, k+1, due_i[k][0], due_i[k][1], due_i[k][2] );
- fprintf( stderr, "%d %d %d, due_j:[%g %g %g]\n",
- i+1, j+1, k+1, due_j[k][0], due_j[k][1], due_j[k][2] );
- }*/
}
#endif
-
void Add_dBond_to_Forces_NPT( int i, int pj, reax_system *system,
- simulation_data *data, static_storage *workspace,
- list **lists )
+ simulation_data *data, static_storage *workspace, list **lists )
{
list *bonds = (*lists) + BONDS;
bond_data *nbr_j, *nbr_k;
@@ -382,12 +335,23 @@ void Add_dBond_to_Forces_NPT( int i, int pj, reax_system *system,
rvec temp, ext_press;
ivec rel_box;
int pk, k, j;
+ rvec *f_i, *f_j, *f_k;
+#ifdef _OPENMP
+ int tid = omp_get_thread_num( );
+#endif
/* Initializations */
nbr_j = &(bonds->select.bond_list[pj]);
j = nbr_j->nbr;
bo_ij = &(nbr_j->bo_data);
bo_ji = &(bonds->select.bond_list[ nbr_j->sym_index ].bo_data);
+#ifdef _OPENMP
+ f_i = &(workspace->f_local[tid * system->N + i]);
+ f_j = &(workspace->f_local[tid * system->N + j]);
+#else
+ f_i = &(system->atoms[i].f);
+ f_j = &(system->atoms[j].f);
+#endif
coef.C1dbo = bo_ij->C1dbo * (bo_ij->Cdbo + bo_ji->Cdbo);
coef.C2dbo = bo_ij->C2dbo * (bo_ij->Cdbo + bo_ji->Cdbo);
@@ -407,7 +371,6 @@ void Add_dBond_to_Forces_NPT( int i, int pj, reax_system *system,
coef.C2dDelta = bo_ij->C2dbo * (workspace->CdDelta[i] + workspace->CdDelta[j]);
coef.C3dDelta = bo_ij->C3dbo * (workspace->CdDelta[i] + workspace->CdDelta[j]);
-
/************************************
* forces related to atom i *
* first neighbors of atom i *
@@ -416,6 +379,11 @@ void Add_dBond_to_Forces_NPT( int i, int pj, reax_system *system,
{
nbr_k = &(bonds->select.bond_list[pk]);
k = nbr_k->nbr;
+#ifdef _OPENMP
+ f_k = &(workspace->f_local[tid * system->N + k]);
+#else
+ f_k = &(system->atoms[k].f);
+#endif
rvec_Scale( temp, -coef.C2dbo, nbr_k->bo_data.dBOp ); /*2nd,dBO*/
rvec_ScaledAdd( temp, -coef.C2dDelta, nbr_k->bo_data.dBOp );/*dDelta*/
@@ -423,10 +391,15 @@ void Add_dBond_to_Forces_NPT( int i, int pj, reax_system *system,
rvec_ScaledAdd( temp, -coef.C3dbopi2, nbr_k->bo_data.dBOp );/*3rd,dBOpi2*/
/* force */
- rvec_Add( system->atoms[k].f, temp );
+ rvec_Add( *f_k, temp );
/* pressure */
rvec_iMultiply( ext_press, nbr_k->rel_box, temp );
- rvec_Add( data->ext_press, ext_press );
+#ifdef _OPENMP
+ #pragma omp critical (Add_dBond_to_Forces_NPT_ext_press)
+#endif
+ {
+ rvec_Add( data->ext_press, ext_press );
+ }
/* if( !ivec_isZero( nbr_k->rel_box ) )
fprintf( stderr, "%3d %3d %3d: dvec[%10.6f %10.6f %10.6f]
@@ -451,15 +424,14 @@ void Add_dBond_to_Forces_NPT( int i, int pj, reax_system *system,
rvec_ScaledAdd( temp, coef.C2dbopi, bo_ij->dBOp ); /*2nd,dBOpi*/
rvec_ScaledAdd( temp, coef.C3dbopi, workspace->dDeltap_self[i] );/*3rd,dBOpi*/
- rvec_ScaledAdd(temp, coef.C1dbopi2, bo_ij->dln_BOp_pi2) ; /*1st,dBO_pi2*/
- rvec_ScaledAdd(temp, coef.C2dbopi2, bo_ij->dBOp); /*2nd,dBO_pi2*/
- rvec_ScaledAdd(temp, coef.C3dbopi2, workspace->dDeltap_self[i]);/*3rd,dBO_pi2*/
+ rvec_ScaledAdd( temp, coef.C1dbopi2, bo_ij->dln_BOp_pi2 ) ; /*1st,dBO_pi2*/
+ rvec_ScaledAdd( temp, coef.C2dbopi2, bo_ij->dBOp ); /*2nd,dBO_pi2*/
+ rvec_ScaledAdd( temp, coef.C3dbopi2, workspace->dDeltap_self[i] );/*3rd,dBO_pi2*/
/* force */
- rvec_Add( system->atoms[i].f, temp );
+ rvec_Add( *f_i, temp );
/* ext pressure due to i dropped, counting force on j only will be enough */
-
/****************************************************************************
* forces and pressure related to atom j *
* first neighbors of atom j *
@@ -468,6 +440,11 @@ void Add_dBond_to_Forces_NPT( int i, int pj, reax_system *system,
{
nbr_k = &(bonds->select.bond_list[pk]);
k = nbr_k->nbr;
+#ifdef _OPENMP
+ f_k = &(workspace->f_local[tid * system->N + k]);
+#else
+ f_k = &(system->atoms[k].f);
+#endif
rvec_Scale( temp, -coef.C3dbo, nbr_k->bo_data.dBOp ); /*3rd,dBO*/
rvec_ScaledAdd( temp, -coef.C3dDelta, nbr_k->bo_data.dBOp );/*dDelta*/
@@ -475,13 +452,18 @@ void Add_dBond_to_Forces_NPT( int i, int pj, reax_system *system,
rvec_ScaledAdd( temp, -coef.C4dbopi2, nbr_k->bo_data.dBOp );/*4th,dBOpi2*/
/* force */
- rvec_Add( system->atoms[k].f, temp );
+ rvec_Add( *f_k, temp );
/* pressure */
if ( k != i )
{
- ivec_Sum(rel_box, nbr_k->rel_box, nbr_j->rel_box);//k's rel_box wrt i
+ ivec_Sum( rel_box, nbr_k->rel_box, nbr_j->rel_box );//k's rel_box wrt i
rvec_iMultiply( ext_press, rel_box, temp );
- rvec_Add( data->ext_press, ext_press );
+#ifdef _OPENMP
+ #pragma omp critical (Add_dBond_to_Forces_NPT_ext_press)
+#endif
+ {
+ rvec_Add( data->ext_press, ext_press );
+ }
/* if( !ivec_isZero( rel_box ) )
fprintf( stderr, "%3d %3d %3d: dvec[%10.6f %10.6f %10.6f]
@@ -507,15 +489,20 @@ void Add_dBond_to_Forces_NPT( int i, int pj, reax_system *system,
rvec_ScaledAdd( temp, -coef.C2dbopi, bo_ij->dBOp ); /*2nd,dBOpi*/
rvec_ScaledAdd( temp, coef.C4dbopi, workspace->dDeltap_self[j] );/*3rd,dBOpi*/
- rvec_ScaledAdd(temp, -coef.C1dbopi2, bo_ij->dln_BOp_pi2); /*1st,dBOpi2*/
- rvec_ScaledAdd(temp, -coef.C2dbopi2, bo_ij->dBOp); /*2nd,dBOpi2*/
- rvec_ScaledAdd(temp, coef.C4dbopi2, workspace->dDeltap_self[j]);/*3rd,dBOpi2*/
+ rvec_ScaledAdd( temp, -coef.C1dbopi2, bo_ij->dln_BOp_pi2 ); /*1st,dBOpi2*/
+ rvec_ScaledAdd( temp, -coef.C2dbopi2, bo_ij->dBOp ); /*2nd,dBOpi2*/
+ rvec_ScaledAdd( temp, coef.C4dbopi2, workspace->dDeltap_self[j] );/*3rd,dBOpi2*/
/* force */
- rvec_Add( system->atoms[j].f, temp );
+ rvec_Add( *f_j, temp );
/* pressure */
rvec_iMultiply( ext_press, nbr_j->rel_box, temp );
- rvec_Add( data->ext_press, ext_press );
+#ifdef _OPENMP
+ #pragma omp critical (Add_dBond_to_Forces_NPT_ext_press)
+#endif
+ {
+ rvec_Add( data->ext_press, ext_press );
+ }
/* if( !ivec_isZero( nbr_j->rel_box ) )
fprintf( stderr, "%3d %3d %3d: dvec[%10.6f %10.6f %10.6f]
@@ -528,22 +515,31 @@ void Add_dBond_to_Forces_NPT( int i, int pj, reax_system *system,
}
-
void Add_dBond_to_Forces( int i, int pj, reax_system *system,
- simulation_data *data, static_storage *workspace,
- list **lists )
+ simulation_data *data, static_storage *workspace, list **lists )
{
list *bonds = (*lists) + BONDS;
bond_data *nbr_j, *nbr_k;
bond_order_data *bo_ij, *bo_ji;
dbond_coefficients coef;
int pk, k, j;
+ rvec *f_i, *f_j, *f_k;
+#ifdef _OPENMP
+ int tid = omp_get_thread_num( );
+#endif
/* Initializations */
nbr_j = &(bonds->select.bond_list[pj]);
j = nbr_j->nbr;
bo_ij = &(nbr_j->bo_data);
bo_ji = &(bonds->select.bond_list[ nbr_j->sym_index ].bo_data);
+#ifdef _OPENMP
+ f_i = &(workspace->f_local[tid * system->N + i]);
+ f_j = &(workspace->f_local[tid * system->N + j]);
+#else
+ f_i = &(system->atoms[i].f);
+ f_j = &(system->atoms[j].f);
+#endif
coef.C1dbo = bo_ij->C1dbo * (bo_ij->Cdbo + bo_ji->Cdbo);
coef.C2dbo = bo_ij->C2dbo * (bo_ij->Cdbo + bo_ji->Cdbo);
@@ -567,79 +563,88 @@ void Add_dBond_to_Forces( int i, int pj, reax_system *system,
{
nbr_k = &(bonds->select.bond_list[pk]);
k = nbr_k->nbr;
+#ifdef _OPENMP
+ f_k = &(workspace->f_local[tid * system->N + k]);
+#else
+ f_k = &(system->atoms[k].f);
+#endif
- rvec_ScaledAdd( system->atoms[k].f, -coef.C2dbo, nbr_k->bo_data.dBOp );
+ rvec_ScaledAdd( *f_k, -coef.C2dbo, nbr_k->bo_data.dBOp );
/*2nd, dBO*/
- rvec_ScaledAdd( system->atoms[k].f, -coef.C2dDelta, nbr_k->bo_data.dBOp );
+ rvec_ScaledAdd( *f_k, -coef.C2dDelta, nbr_k->bo_data.dBOp );
/*dDelta*/
- rvec_ScaledAdd( system->atoms[k].f, -coef.C3dbopi, nbr_k->bo_data.dBOp );
+ rvec_ScaledAdd( *f_k, -coef.C3dbopi, nbr_k->bo_data.dBOp );
/*3rd, dBOpi*/
- rvec_ScaledAdd( system->atoms[k].f, -coef.C3dbopi2, nbr_k->bo_data.dBOp );
+ rvec_ScaledAdd( *f_k, -coef.C3dbopi2, nbr_k->bo_data.dBOp );
/*3rd, dBOpi2*/
}
- rvec_ScaledAdd( system->atoms[i].f, coef.C1dbo, bo_ij->dBOp );
+ rvec_ScaledAdd( *f_i, coef.C1dbo, bo_ij->dBOp );
/*1st, dBO*/
- rvec_ScaledAdd( system->atoms[i].f, coef.C2dbo, workspace->dDeltap_self[i] );
+ rvec_ScaledAdd( *f_i, coef.C2dbo, workspace->dDeltap_self[i] );
/*2nd, dBO*/
- rvec_ScaledAdd(system->atoms[i].f, coef.C1dDelta, bo_ij->dBOp);
+ rvec_ScaledAdd( *f_i, coef.C1dDelta, bo_ij->dBOp );
/*1st, dBO*/
- rvec_ScaledAdd(system->atoms[i].f, coef.C2dDelta, workspace->dDeltap_self[i]);
+ rvec_ScaledAdd( *f_i, coef.C2dDelta, workspace->dDeltap_self[i] );
/*2nd, dBO*/
- rvec_ScaledAdd( system->atoms[i].f, coef.C1dbopi, bo_ij->dln_BOp_pi );
+ rvec_ScaledAdd( *f_i, coef.C1dbopi, bo_ij->dln_BOp_pi );
/*1st, dBOpi*/
- rvec_ScaledAdd( system->atoms[i].f, coef.C2dbopi, bo_ij->dBOp );
+ rvec_ScaledAdd( *f_i, coef.C2dbopi, bo_ij->dBOp );
/*2nd, dBOpi*/
- rvec_ScaledAdd(system->atoms[i].f, coef.C3dbopi, workspace->dDeltap_self[i]);
+ rvec_ScaledAdd( *f_i, coef.C3dbopi, workspace->dDeltap_self[i] );
/*3rd, dBOpi*/
- rvec_ScaledAdd( system->atoms[i].f, coef.C1dbopi2, bo_ij->dln_BOp_pi2 );
+ rvec_ScaledAdd( *f_i, coef.C1dbopi2, bo_ij->dln_BOp_pi2 );
/*1st, dBO_pi2*/
- rvec_ScaledAdd( system->atoms[i].f, coef.C2dbopi2, bo_ij->dBOp );
+ rvec_ScaledAdd( *f_i, coef.C2dbopi2, bo_ij->dBOp );
/*2nd, dBO_pi2*/
- rvec_ScaledAdd(system->atoms[i].f, coef.C3dbopi2, workspace->dDeltap_self[i]);
+ rvec_ScaledAdd( *f_i, coef.C3dbopi2, workspace->dDeltap_self[i] );
/*3rd, dBO_pi2*/
-
for ( pk = Start_Index(j, bonds); pk < End_Index(j, bonds); ++pk )
{
nbr_k = &(bonds->select.bond_list[pk]);
k = nbr_k->nbr;
+#ifdef _OPENMP
+ f_k = &(workspace->f_local[tid * system->N + k]);
+#else
+ f_k = &(system->atoms[k].f);
+#endif
- rvec_ScaledAdd( system->atoms[k].f, -coef.C3dbo, nbr_k->bo_data.dBOp );
+ rvec_ScaledAdd( *f_k, -coef.C3dbo, nbr_k->bo_data.dBOp );
/*3rd, dBO*/
- rvec_ScaledAdd( system->atoms[k].f, -coef.C3dDelta, nbr_k->bo_data.dBOp );
+ rvec_ScaledAdd( *f_k, -coef.C3dDelta, nbr_k->bo_data.dBOp );
/*dDelta*/
- rvec_ScaledAdd( system->atoms[k].f, -coef.C4dbopi, nbr_k->bo_data.dBOp );
+ rvec_ScaledAdd( *f_k, -coef.C4dbopi, nbr_k->bo_data.dBOp );
/*4th, dBOpi*/
- rvec_ScaledAdd( system->atoms[k].f, -coef.C4dbopi2, nbr_k->bo_data.dBOp );
+ rvec_ScaledAdd( *f_k, -coef.C4dbopi2, nbr_k->bo_data.dBOp );
/*4th, dBOpi2*/
}
- rvec_ScaledAdd( system->atoms[j].f, -coef.C1dbo, bo_ij->dBOp );
+ rvec_ScaledAdd( *f_j, -coef.C1dbo, bo_ij->dBOp );
/*1st, dBO*/
- rvec_ScaledAdd( system->atoms[j].f, coef.C3dbo, workspace->dDeltap_self[j] );
+ rvec_ScaledAdd( *f_j, coef.C3dbo, workspace->dDeltap_self[j] );
/*2nd, dBO*/
- rvec_ScaledAdd( system->atoms[j].f, -coef.C1dDelta, bo_ij->dBOp );
+ rvec_ScaledAdd( *f_j, -coef.C1dDelta, bo_ij->dBOp );
/*1st, dBO*/
- rvec_ScaledAdd(system->atoms[j].f, coef.C3dDelta, workspace->dDeltap_self[j]);
+ rvec_ScaledAdd( *f_j, coef.C3dDelta, workspace->dDeltap_self[j] );
/*2nd, dBO*/
- rvec_ScaledAdd( system->atoms[j].f, -coef.C1dbopi, bo_ij->dln_BOp_pi );
+ rvec_ScaledAdd( *f_j, -coef.C1dbopi, bo_ij->dln_BOp_pi );
/*1st, dBOpi*/
- rvec_ScaledAdd( system->atoms[j].f, -coef.C2dbopi, bo_ij->dBOp );
+ rvec_ScaledAdd( *f_j, -coef.C2dbopi, bo_ij->dBOp );
/*2nd, dBOpi*/
- rvec_ScaledAdd(system->atoms[j].f, coef.C4dbopi, workspace->dDeltap_self[j]);
+ rvec_ScaledAdd( *f_j, coef.C4dbopi, workspace->dDeltap_self[j] );
/*3rd, dBOpi*/
- rvec_ScaledAdd( system->atoms[j].f, -coef.C1dbopi2, bo_ij->dln_BOp_pi2 );
+ rvec_ScaledAdd( *f_j, -coef.C1dbopi2, bo_ij->dln_BOp_pi2 );
/*1st, dBOpi2*/
- rvec_ScaledAdd( system->atoms[j].f, -coef.C2dbopi2, bo_ij->dBOp );
+ rvec_ScaledAdd( *f_j, -coef.C2dbopi2, bo_ij->dBOp );
/*2nd, dBOpi2*/
- rvec_ScaledAdd(system->atoms[j].f, coef.C4dbopi2, workspace->dDeltap_self[j]);
+ rvec_ScaledAdd( *f_j, coef.C4dbopi2, workspace->dDeltap_self[j] );
/*3rd, dBOpi2*/
}
@@ -659,8 +664,13 @@ int Locate_Symmetric_Bond( list *bonds, int i, int j )
/*fprintf( stderr, "\tstart: %d end: %d mid: %d\n",
start, end, mid );*/
if ( mid_nbr < j )
+ {
start = mid + 1;
- else end = mid - 1;
+ }
+ else
+ {
+ end = mid - 1;
+ }
mid = (start + end) / 2;
}
@@ -703,401 +713,432 @@ int compare_bonds( const void *p1, const void *p2 )
belonging to a different atom in nbrhoods->nbr_list is sorted in its own.
This can either be done in the general coordinator function or here */
void Calculate_Bond_Orders( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
- int i, j, pj, type_i, type_j;
- int start_i, end_i;
- int num_bonds, sym_index;
+ real p_lp1;
real p_boc1, p_boc2;
- real val_i, Deltap_i, Deltap_boc_i;
- real val_j, Deltap_j, Deltap_boc_j;
- real temp, f1, f2, f3, f4, f5, f4f5, exp_f4, exp_f5;
- real exp_p1i, exp_p2i, exp_p1j, exp_p2j;
- real u1_ij, u1_ji, Cf1A_ij, Cf1B_ij, Cf1_ij, Cf1_ji;
- real Cf45_ij, Cf45_ji, p_lp1;
- real A0_ij, A1_ij, A2_ij, A2_ji, A3_ij, A3_ji;
- real explp1;
- two_body_parameters *twbp;
- bond_order_data *bo_ij, *bo_ji;
- single_body_parameters *sbp_i, *sbp_j;
- list *bonds = (*lists) + BONDS;
-#if defined(TEST_FORCES)
- int k, pk, start_j, end_j;
- int top_dbo = 0, top_dDelta = 0;
- dbond_data *pdbo;
- dDelta_data *ptop_dDelta;
- list *dDeltas = (*lists) + DDELTA;
- list *dBOs = (*lists) + DBO;
-#endif
+ list *bonds;
- num_bonds = 0;
+ p_lp1 = system->reaxprm.gp.l[15];
p_boc1 = system->reaxprm.gp.l[0];
p_boc2 = system->reaxprm.gp.l[1];
+ bonds = (*lists) + BONDS;
- /* Calculate Deltaprime, Deltaprime_boc values */
- for ( i = 0; i < system->N; ++i )
+#ifdef _OPENMP
+ #pragma omp parallel default(shared)
+#endif
{
- type_i = system->atoms[i].type;
- sbp_i = &(system->reaxprm.sbp[type_i]);
- workspace->Deltap[i] = workspace->total_bond_order[i] - sbp_i->valency;
- workspace->Deltap_boc[i] =
- workspace->total_bond_order[i] - sbp_i->valency_val;
- workspace->total_bond_order[i] = 0;
- }
- // fprintf( stderr, "done with uncorrected bond orders\n" );
-
+ int i, j, pj, type_i, type_j;
+ int start_i, end_i;
+ int sym_index;
+ real val_i, Deltap_i, Deltap_boc_i;
+ real val_j, Deltap_j, Deltap_boc_j;
+ real temp, f1, f2, f3, f4, f5, f4f5, exp_f4, exp_f5;
+ real exp_p1i, exp_p2i, exp_p1j, exp_p2j;
+ real u1_ij, u1_ji, Cf1A_ij, Cf1B_ij, Cf1_ij, Cf1_ji;
+ real Cf45_ij, Cf45_ji;
+ real A0_ij, A1_ij, A2_ij, A2_ji, A3_ij, A3_ji;
+ real explp1;
+ two_body_parameters *twbp;
+ bond_order_data *bo_ij, *bo_ji;
+ single_body_parameters *sbp_i, *sbp_j;
+#if defined(TEST_FORCES)
+ int k, pk, start_j, end_j;
+ int top_dbo, top_dDelta;
+ dbond_data *pdbo;
+ dDelta_data *ptop_dDelta;
+ list *dDeltas;
+ list *dBOs;
+
+ top_dbo = 0;
+ top_dDelta = 0;
+ dDeltas = (*lists) + DDELTA;
+ dBOs = (*lists) + DBO;
+#endif
- /* Corrected Bond Order calculations */
- for ( i = 0; i < system->N; ++i )
- {
- type_i = system->atoms[i].type;
- sbp_i = &(system->reaxprm.sbp[type_i]);
- val_i = sbp_i->valency;
- Deltap_i = workspace->Deltap[i];
- Deltap_boc_i = workspace->Deltap_boc[i];
- start_i = Start_Index(i, bonds);
- end_i = End_Index(i, bonds);
- //fprintf( stderr, "i:%d Dp:%g Dbocp:%g s:%d e:%d\n",
- // i+1, Deltap_i, Deltap_boc_i, start_i, end_i );
-
- for ( pj = start_i; pj < end_i; ++pj )
+ /* Calculate Deltaprime, Deltaprime_boc values */
+#ifdef _OPENMP
+ #pragma omp for schedule(static)
+#endif
+ for ( i = 0; i < system->N; ++i )
{
- j = bonds->select.bond_list[pj].nbr;
- type_j = system->atoms[j].type;
- bo_ij = &( bonds->select.bond_list[pj].bo_data );
- //fprintf( stderr, "\tj:%d - ubo: %8.3f\n", j+1, bo_ij->BO );
+ type_i = system->atoms[i].type;
+ sbp_i = &(system->reaxprm.sbp[type_i]);
+ workspace->Deltap[i] = workspace->total_bond_order[i] - sbp_i->valency;
+ workspace->Deltap_boc[i] =
+ workspace->total_bond_order[i] - sbp_i->valency_val;
+ workspace->total_bond_order[i] = 0.0;
+ }
- if ( i < j )
- {
- twbp = &( system->reaxprm.tbp[type_i][type_j] );
-#ifdef TEST_FORCES
- Set_Start_Index( pj, top_dbo, dBOs );
- /* fprintf( stderr, "%6d%6d%23.15e%23.15e%23.15e\n",
- workspace->reverse_map[i], workspace->reverse_map[j],
- twbp->ovc, twbp->v13cor, bo_ij->BO ); */
+ /* wait until initialization complete */
+#ifdef _OPENMP
+ #pragma omp barrier
+#endif
+
+ /* Corrected Bond Order calculations */
+#ifdef _OPENMP
+ #pragma omp for schedule(guided)
#endif
- if ( twbp->ovc < 0.001 && twbp->v13cor < 0.001 )
+ for ( i = 0; i < system->N; ++i )
+ {
+ type_i = system->atoms[i].type;
+ sbp_i = &(system->reaxprm.sbp[type_i]);
+ val_i = sbp_i->valency;
+ Deltap_i = workspace->Deltap[i];
+ Deltap_boc_i = workspace->Deltap_boc[i];
+ start_i = Start_Index(i, bonds);
+ end_i = End_Index(i, bonds);
+
+ for ( pj = start_i; pj < end_i; ++pj )
+ {
+ j = bonds->select.bond_list[pj].nbr;
+ type_j = system->atoms[j].type;
+ bo_ij = &( bonds->select.bond_list[pj].bo_data );
+
+ if ( i < j )
{
- /* There is no correction to bond orders nor to derivatives of
- bond order prime! So we leave bond orders unchanged and
- set derivative of bond order coefficients s.t.
- dBO = dBOp & dBOxx = dBOxxp in Add_dBO_to_Forces */
- bo_ij->C1dbo = 1.000000;
- bo_ij->C2dbo = 0.000000;
- bo_ij->C3dbo = 0.000000;
-
- bo_ij->C1dbopi = bo_ij->BO_pi;
- bo_ij->C2dbopi = 0.000000;
- bo_ij->C3dbopi = 0.000000;
- bo_ij->C4dbopi = 0.000000;
-
- bo_ij->C1dbopi2 = bo_ij->BO_pi2;
- bo_ij->C2dbopi2 = 0.000000;
- bo_ij->C3dbopi2 = 0.000000;
- bo_ij->C4dbopi2 = 0.000000;
+ twbp = &( system->reaxprm.tbp[type_i][type_j] );
#ifdef TEST_FORCES
- pdbo = &(dBOs->select.dbo_list[ top_dbo ]);
-
- // compute dBO_ij/dr_i
- pdbo->wrt = i;
- rvec_Copy( pdbo->dBO, bo_ij->dBOp );
- rvec_Scale( pdbo->dBOpi, bo_ij->BO_pi, bo_ij->dln_BOp_pi );
- rvec_Scale( pdbo->dBOpi2, bo_ij->BO_pi2, bo_ij->dln_BOp_pi2 );
-
- // compute dBO_ij/dr_j
- pdbo++;
- pdbo->wrt = j;
- rvec_Scale( pdbo->dBO, -1.0, bo_ij->dBOp );
- rvec_Scale( pdbo->dBOpi, -bo_ij->BO_pi, bo_ij->dln_BOp_pi );
- rvec_Scale( pdbo->dBOpi2, -bo_ij->BO_pi2, bo_ij->dln_BOp_pi2 );
-
- top_dbo += 2;
+ Set_Start_Index( pj, top_dbo, dBOs );
+ /* fprintf( stderr, "%6d%6d%23.15e%23.15e%23.15e\n",
+ workspace->reverse_map[i], workspace->reverse_map[j],
+ twbp->ovc, twbp->v13cor, bo_ij->BO ); */
#endif
- }
- else
- {
- val_j = system->reaxprm.sbp[type_j].valency;
- Deltap_j = workspace->Deltap[j];
- Deltap_boc_j = workspace->Deltap_boc[j];
- /* on page 1 */
- if ( twbp->ovc >= 0.001 )
+ if ( twbp->ovc < 0.001 && twbp->v13cor < 0.001 )
{
- /* Correction for overcoordination */
- exp_p1i = EXP( -p_boc1 * Deltap_i );
- exp_p2i = EXP( -p_boc2 * Deltap_i );
- exp_p1j = EXP( -p_boc1 * Deltap_j );
- exp_p2j = EXP( -p_boc2 * Deltap_j );
-
- f2 = exp_p1i + exp_p1j;
- f3 = -1.0 / p_boc2 * log( 0.5 * ( exp_p2i + exp_p2j ) );
- f1 = 0.5 * ( ( val_i + f2 ) / ( val_i + f2 + f3 ) +
- ( val_j + f2 ) / ( val_j + f2 + f3 ) );
-
- /*fprintf( stderr,"%6d%6d\t%g %g j:%g %g p_boc:%g %g\n",
- i+1, j+1, val_i, Deltap_i, val_j, Deltap_j, p_boc1, p_boc2 );
- fprintf( stderr,"\tf:%g %g %g, exp:%g %g %g %g\n",
- f1, f2, f3, exp_p1i, exp_p2i, exp_p1j, exp_p2j );*/
-
- /* Now come the derivates */
- /* Bond Order pages 5-7, derivative of f1 */
- temp = f2 + f3;
- u1_ij = val_i + temp;
- u1_ji = val_j + temp;
- Cf1A_ij = 0.5 * f3 * (1.0 / SQR( u1_ij ) + 1.0 / SQR( u1_ji ));
- Cf1B_ij = -0.5 * (( u1_ij - f3 ) / SQR( u1_ij ) +
- ( u1_ji - f3 ) / SQR( u1_ji ));
-
- //Cf1_ij = -Cf1A_ij * p_boc1 * exp_p1i +
- // Cf1B_ij * exp_p2i / ( exp_p2i + exp_p2j );
- Cf1_ij = 0.50 * ( -p_boc1 * exp_p1i / u1_ij -
- ((val_i + f2) / SQR(u1_ij)) *
- ( -p_boc1 * exp_p1i +
- exp_p2i / ( exp_p2i + exp_p2j ) ) +
- -p_boc1 * exp_p1i / u1_ji -
- ((val_j + f2) / SQR(u1_ji)) * ( -p_boc1 * exp_p1i +
- exp_p2i / ( exp_p2i + exp_p2j ) ));
-
- Cf1_ji = -Cf1A_ij * p_boc1 * exp_p1j +
- Cf1B_ij * exp_p2j / ( exp_p2i + exp_p2j );
- //fprintf( stderr, "\tCf1:%g %g\n", Cf1_ij, Cf1_ji );
+ /* There is no correction to bond orders nor to derivatives of
+ bond order prime! So we leave bond orders unchanged and
+ set derivative of bond order coefficients s.t.
+ dBO = dBOp & dBOxx = dBOxxp in Add_dBO_to_Forces */
+ bo_ij->C1dbo = 1.000000;
+ bo_ij->C2dbo = 0.000000;
+ bo_ij->C3dbo = 0.000000;
+
+ bo_ij->C1dbopi = bo_ij->BO_pi;
+ bo_ij->C2dbopi = 0.000000;
+ bo_ij->C3dbopi = 0.000000;
+ bo_ij->C4dbopi = 0.000000;
+
+ bo_ij->C1dbopi2 = bo_ij->BO_pi2;
+ bo_ij->C2dbopi2 = 0.000000;
+ bo_ij->C3dbopi2 = 0.000000;
+ bo_ij->C4dbopi2 = 0.000000;
+
+#ifdef TEST_FORCES
+ pdbo = &(dBOs->select.dbo_list[ top_dbo ]);
+
+ /* compute dBO_ij/dr_i */
+ pdbo->wrt = i;
+ rvec_Copy( pdbo->dBO, bo_ij->dBOp );
+ rvec_Scale( pdbo->dBOpi, bo_ij->BO_pi, bo_ij->dln_BOp_pi );
+ rvec_Scale( pdbo->dBOpi2, bo_ij->BO_pi2, bo_ij->dln_BOp_pi2 );
+
+ /* compute dBO_ij/dr_j */
+ pdbo++;
+ pdbo->wrt = j;
+ rvec_Scale( pdbo->dBO, -1.0, bo_ij->dBOp );
+ rvec_Scale( pdbo->dBOpi, -bo_ij->BO_pi, bo_ij->dln_BOp_pi );
+ rvec_Scale( pdbo->dBOpi2, -bo_ij->BO_pi2, bo_ij->dln_BOp_pi2 );
+
+ top_dbo += 2;
+#endif
}
else
{
- /* No overcoordination correction! */
- f1 = 1.0;
- Cf1_ij = Cf1_ji = 0.0;
+ val_j = system->reaxprm.sbp[type_j].valency;
+ Deltap_j = workspace->Deltap[j];
+ Deltap_boc_j = workspace->Deltap_boc[j];
+
+ /* on page 1 */
+ if ( twbp->ovc >= 0.001 )
+ {
+ /* Correction for overcoordination */
+ exp_p1i = EXP( -p_boc1 * Deltap_i );
+ exp_p2i = EXP( -p_boc2 * Deltap_i );
+ exp_p1j = EXP( -p_boc1 * Deltap_j );
+ exp_p2j = EXP( -p_boc2 * Deltap_j );
+
+ f2 = exp_p1i + exp_p1j;
+ f3 = -1.0 / p_boc2 * log( 0.5 * ( exp_p2i + exp_p2j ) );
+ f1 = 0.5 * ( ( val_i + f2 ) / ( val_i + f2 + f3 ) +
+ ( val_j + f2 ) / ( val_j + f2 + f3 ) );
+
+ /* Now come the derivates */
+ /* Bond Order pages 5-7, derivative of f1 */
+ temp = f2 + f3;
+ u1_ij = val_i + temp;
+ u1_ji = val_j + temp;
+ Cf1A_ij = 0.5 * f3 * (1.0 / SQR( u1_ij ) + 1.0 / SQR( u1_ji ));
+ Cf1B_ij = -0.5 * (( u1_ij - f3 ) / SQR( u1_ij ) +
+ ( u1_ji - f3 ) / SQR( u1_ji ));
+
+ //Cf1_ij = -Cf1A_ij * p_boc1 * exp_p1i +
+ // Cf1B_ij * exp_p2i / ( exp_p2i + exp_p2j );
+ Cf1_ij = 0.50 * ( -p_boc1 * exp_p1i / u1_ij -
+ ((val_i + f2) / SQR(u1_ij)) * ( -p_boc1 * exp_p1i +
+ exp_p2i / ( exp_p2i + exp_p2j ) ) + -p_boc1 * exp_p1i / u1_ji -
+ ((val_j + f2) / SQR(u1_ji)) * ( -p_boc1 * exp_p1i +
+ exp_p2i / ( exp_p2i + exp_p2j ) ));
+
+ Cf1_ji = -Cf1A_ij * p_boc1 * exp_p1j +
+ Cf1B_ij * exp_p2j / ( exp_p2i + exp_p2j );
+ }
+ else
+ {
+ /* No overcoordination correction! */
+ f1 = 1.0;
+ Cf1_ij = Cf1_ji = 0.0;
+ }
+
+ if ( twbp->v13cor >= 0.001 )
+ {
+ /* Correction for 1-3 bond orders */
+ exp_f4 = EXP(-(twbp->p_boc4 * SQR( bo_ij->BO ) -
+ Deltap_boc_i) * twbp->p_boc3 + twbp->p_boc5);
+ exp_f5 = EXP(-(twbp->p_boc4 * SQR( bo_ij->BO ) -
+ Deltap_boc_j) * twbp->p_boc3 + twbp->p_boc5);
+
+ f4 = 1. / (1. + exp_f4);
+ f5 = 1. / (1. + exp_f5);
+ f4f5 = f4 * f5;
+
+ /* Bond Order pages 8-9, derivative of f4 and f5 */
+ /*temp = twbp->p_boc5 -
+ twbp->p_boc3 * twbp->p_boc4 * SQR( bo_ij->BO );
+ u_ij = temp + twbp->p_boc3 * Deltap_boc_i;
+ u_ji = temp + twbp->p_boc3 * Deltap_boc_j;
+ Cf45_ij = Cf45( u_ij, u_ji ) / f4f5;
+ Cf45_ji = Cf45( u_ji, u_ij ) / f4f5;*/
+ Cf45_ij = -f4 * exp_f4;
+ Cf45_ji = -f5 * exp_f5;
+ }
+ else
+ {
+ f4 = f5 = f4f5 = 1.0;
+ Cf45_ij = Cf45_ji = 0.0;
+ }
+
+ /* Bond Order page 10, derivative of total bond order */
+ A0_ij = f1 * f4f5;
+ A1_ij = -2 * twbp->p_boc3 * twbp->p_boc4 * bo_ij->BO *
+ (Cf45_ij + Cf45_ji);
+ A2_ij = Cf1_ij / f1 + twbp->p_boc3 * Cf45_ij;
+ A2_ji = Cf1_ji / f1 + twbp->p_boc3 * Cf45_ji;
+ A3_ij = A2_ij + Cf1_ij / f1;
+ A3_ji = A2_ji + Cf1_ji / f1;
+
+ /* find corrected bond order values and their deriv coefs */
+ bo_ij->BO = bo_ij->BO * A0_ij;
+ bo_ij->BO_pi = bo_ij->BO_pi * A0_ij * f1;
+ bo_ij->BO_pi2 = bo_ij->BO_pi2 * A0_ij * f1;
+ bo_ij->BO_s = bo_ij->BO - ( bo_ij->BO_pi + bo_ij->BO_pi2 );
+
+ bo_ij->C1dbo = A0_ij + bo_ij->BO * A1_ij;
+ bo_ij->C2dbo = bo_ij->BO * A2_ij;
+ bo_ij->C3dbo = bo_ij->BO * A2_ji;
+
+ bo_ij->C1dbopi = f1 * f1 * f4 * f5;
+ bo_ij->C2dbopi = bo_ij->BO_pi * A1_ij;
+ bo_ij->C3dbopi = bo_ij->BO_pi * A3_ij;
+ bo_ij->C4dbopi = bo_ij->BO_pi * A3_ji;
+
+ bo_ij->C1dbopi2 = f1 * f1 * f4 * f5;
+ bo_ij->C2dbopi2 = bo_ij->BO_pi2 * A1_ij;
+ bo_ij->C3dbopi2 = bo_ij->BO_pi2 * A3_ij;
+ bo_ij->C4dbopi2 = bo_ij->BO_pi2 * A3_ji;
+
+#ifdef TEST_FORCES
+ /*fprintf( stderr, "%6d%6d%13.6f%13.6f%13.6f%13.6f\n",
+ i+1, j+1, bo_ij->BO, bo_ij->C1dbo, Cf45_ij, Cf45_ji );*/
+
+ /* fprintf( stderr, "%6d%6d%13.6f%13.6f%13.6f%13.6f\n",
+ //"%6d%6d%10.6f%10.6f%10.6f%10.6f\n%10.6f%10.6f%10.6f\n%10.6f%10.6f%10.6f%10.6f\n%10.6f%10.6f%10.6f%10.6f\n\n",
+ workspace->orig_id[i], workspace->orig_id[j]
+ A0_ij, A1_ij, A2_ij, A2_ji, A3_ij, A3_ji
+ bo_ij->BO, bo_ij->BO_pi, bo_ij->BO_pi2, bo_ij->BO_s,
+ bo_ij->C1dbo, bo_ij->C2dbo, bo_ij->C3dbo,
+ bo_ij->C1dbopi,bo_ij->C2dbopi,bo_ij->C3dbopi,bo_ij->C4dbopi,
+ bo_ij->C1dbopi2,bo_ij->C2dbopi2,bo_ij->C3dbopi2,bo_ij->C4dbopi2
+ ); */
+
+ Calculate_dBO( i, pj, workspace, lists, &top_dbo );
+#endif
}
- if ( twbp->v13cor >= 0.001 )
+ /* neglect bonds that are < 1e-10 */
+ if ( bo_ij->BO < 1e-10 )
{
- /* Correction for 1-3 bond orders */
- exp_f4 = EXP(-(twbp->p_boc4 * SQR( bo_ij->BO ) -
- Deltap_boc_i) * twbp->p_boc3 + twbp->p_boc5);
- exp_f5 = EXP(-(twbp->p_boc4 * SQR( bo_ij->BO ) -
- Deltap_boc_j) * twbp->p_boc3 + twbp->p_boc5);
-
- f4 = 1. / (1. + exp_f4);
- f5 = 1. / (1. + exp_f5);
- f4f5 = f4 * f5;
-
- /* Bond Order pages 8-9, derivative of f4 and f5 */
- /*temp = twbp->p_boc5 -
- twbp->p_boc3 * twbp->p_boc4 * SQR( bo_ij->BO );
- u_ij = temp + twbp->p_boc3 * Deltap_boc_i;
- u_ji = temp + twbp->p_boc3 * Deltap_boc_j;
- Cf45_ij = Cf45( u_ij, u_ji ) / f4f5;
- Cf45_ji = Cf45( u_ji, u_ij ) / f4f5;*/
- Cf45_ij = -f4 * exp_f4;
- Cf45_ji = -f5 * exp_f5;
+ bo_ij->BO = 0.0;
}
- else
+ if ( bo_ij->BO_s < 1e-10 )
{
- f4 = f5 = f4f5 = 1.0;
- Cf45_ij = Cf45_ji = 0.0;
+ bo_ij->BO_s = 0.0;
+ }
+ if ( bo_ij->BO_pi < 1e-10 )
+ {
+ bo_ij->BO_pi = 0.0;
+ }
+ if ( bo_ij->BO_pi2 < 1e-10 )
+ {
+ bo_ij->BO_pi2 = 0.0;
}
- /* Bond Order page 10, derivative of total bond order */
- A0_ij = f1 * f4f5;
- A1_ij = -2 * twbp->p_boc3 * twbp->p_boc4 * bo_ij->BO *
- (Cf45_ij + Cf45_ji);
- A2_ij = Cf1_ij / f1 + twbp->p_boc3 * Cf45_ij;
- A2_ji = Cf1_ji / f1 + twbp->p_boc3 * Cf45_ji;
- A3_ij = A2_ij + Cf1_ij / f1;
- A3_ji = A2_ji + Cf1_ji / f1;
-
- /*fprintf( stderr, "\tBO: %f, A0: %f, A1: %f, A2_ij: %f
- A2_ji: %f, A3_ij: %f, A3_ji: %f\n",
- bo_ij->BO, A0_ij, A1_ij, A2_ij, A2_ji, A3_ij, A3_ji );*/
-
+ workspace->total_bond_order[i] += bo_ij->BO; // now keeps total_BO
- /* find corrected bond order values and their deriv coefs */
- bo_ij->BO = bo_ij->BO * A0_ij;
- bo_ij->BO_pi = bo_ij->BO_pi * A0_ij * f1;
- bo_ij->BO_pi2 = bo_ij->BO_pi2 * A0_ij * f1;
- bo_ij->BO_s = bo_ij->BO - ( bo_ij->BO_pi + bo_ij->BO_pi2 );
+#ifdef TEST_FORCES
+ Set_End_Index( pj, top_dbo, dBOs );
+ Add_dBO( system, lists, i, pj, 1.0, workspace->dDelta );
+#endif
+ }
+ }
- bo_ij->C1dbo = A0_ij + bo_ij->BO * A1_ij;
- bo_ij->C2dbo = bo_ij->BO * A2_ij;
- bo_ij->C3dbo = bo_ij->BO * A2_ji;
+#ifdef TEST_FORCES
+ Set_Start_Index( i, top_dDelta, dDeltas );
+ ptop_dDelta = &( dDeltas->select.dDelta_list[top_dDelta] );
- bo_ij->C1dbopi = f1 * f1 * f4 * f5;
- bo_ij->C2dbopi = bo_ij->BO_pi * A1_ij;
- bo_ij->C3dbopi = bo_ij->BO_pi * A3_ij;
- bo_ij->C4dbopi = bo_ij->BO_pi * A3_ji;
+ for ( pj = start_i; pj < end_i; ++pj )
+ {
+ j = bonds->select.bond_list[pj].nbr;
- bo_ij->C1dbopi2 = f1 * f1 * f4 * f5;
- bo_ij->C2dbopi2 = bo_ij->BO_pi2 * A1_ij;
- bo_ij->C3dbopi2 = bo_ij->BO_pi2 * A3_ij;
- bo_ij->C4dbopi2 = bo_ij->BO_pi2 * A3_ji;
+ if ( !rvec_isZero( workspace->dDelta[j] ) )
+ {
+ ptop_dDelta->wrt = j;
+ rvec_Copy( ptop_dDelta->dVal, workspace->dDelta[j] );
+ rvec_MakeZero( workspace->dDelta[j] );
+ ++top_dDelta, ++ptop_dDelta;
+ }
-#ifdef TEST_FORCES
- /*fprintf( stderr, "%6d%6d%13.6f%13.6f%13.6f%13.6f\n",
- i+1, j+1, bo_ij->BO, bo_ij->C1dbo, Cf45_ij, Cf45_ji );*/
-
- /* fprintf( stderr, "%6d%6d%13.6f%13.6f%13.6f%13.6f\n",
- //"%6d%6d%10.6f%10.6f%10.6f%10.6f\n%10.6f%10.6f%10.6f\n%10.6f%10.6f%10.6f%10.6f\n%10.6f%10.6f%10.6f%10.6f\n\n",
- workspace->orig_id[i], workspace->orig_id[j]
- A0_ij, A1_ij, A2_ij, A2_ji, A3_ij, A3_ji
- bo_ij->BO, bo_ij->BO_pi, bo_ij->BO_pi2, bo_ij->BO_s,
- bo_ij->C1dbo, bo_ij->C2dbo, bo_ij->C3dbo,
- bo_ij->C1dbopi,bo_ij->C2dbopi,bo_ij->C3dbopi,bo_ij->C4dbopi,
- bo_ij->C1dbopi2,bo_ij->C2dbopi2,bo_ij->C3dbopi2,bo_ij->C4dbopi2
- ); */
-
- Calculate_dBO( i, pj, workspace, lists, &top_dbo );
-#endif
+ start_j = Start_Index(j, bonds);
+ end_j = End_Index(j, bonds);
+ for ( pk = start_j; pk < end_j; ++pk )
+ {
+ k = bonds->select.bond_list[pk].nbr;
+ if ( !rvec_isZero( workspace->dDelta[k] ) )
+ {
+ ptop_dDelta->wrt = k;
+ rvec_Copy( ptop_dDelta->dVal, workspace->dDelta[k] );
+ rvec_MakeZero( workspace->dDelta[k] );
+ ++top_dDelta, ++ptop_dDelta;
+ }
}
+ }
- /* neglect bonds that are < 1e-10 */
- if ( bo_ij->BO < 1e-10 )
- bo_ij->BO = 0.0;
- if ( bo_ij->BO_s < 1e-10 )
- bo_ij->BO_s = 0.0;
- if ( bo_ij->BO_pi < 1e-10 )
- bo_ij->BO_pi = 0.0;
- if ( bo_ij->BO_pi2 < 1e-10 )
- bo_ij->BO_pi2 = 0.0;
-
- workspace->total_bond_order[i] += bo_ij->BO; // now keeps total_BO
-
-
- /* fprintf( stderr, "%d %d\t%g %g %g %g\n
- Cdbo:\t%g %g %g\n
- Cdbopi:\t%g %g %g %g\n
- Cdbopi2:%g %g %g %g\n\n",
- i+1, j+1, bonds->select.bond_list[ pj ].d,
- bo_ij->BO,bo_ij->BO_pi, bo_ij->BO_pi2,
- bo_ij->C1dbo, bo_ij->C2dbo, bo_ij->C3dbo,
- bo_ij->C1dbopi, bo_ij->C2dbopi, bo_ij->C3dbopi, bo_ij->C4dbopi,
- bo_ij->C1dbopi2, bo_ij->C2dbopi2,
- bo_ij->C3dbopi2, bo_ij->C4dbopi2 ); */
-
- /* fprintf( stderr, "%d %d, BO:%f BO_s:%f BO_pi:%f BO_pi2:%f\n",
- i+1,j+1,bo_ij->BO,bo_ij->BO_s,bo_ij->BO_pi,bo_ij->BO_pi2 ); */
+ Set_End_Index( i, top_dDelta, dDeltas );
-#ifdef TEST_FORCES
- Set_End_Index( pj, top_dbo, dBOs );
- Add_dBO( system, lists, i, pj, 1.0, workspace->dDelta );
+ /*for( pj=Start_Index(i,dDeltas); pj<End_Index(i,dDeltas); ++pj )
+ fprintf( stdout, "dDel: %d %d [%g %g %g]\n",
+ i+1, dDeltas->select.dDelta_list[pj].wrt+1,
+ dDeltas->select.dDelta_list[pj].dVal[0],
+ dDeltas->select.dDelta_list[pj].dVal[1],
+ dDeltas->select.dDelta_list[pj].dVal[2] );*/
#endif
- }
- else
- {
- /* We only need to update bond orders from bo_ji
- everything else is set in uncorrected_bo calculations */
- sym_index = bonds->select.bond_list[pj].sym_index;
- bo_ji = &(bonds->select.bond_list[ sym_index ].bo_data);
- bo_ij->BO = bo_ji->BO;
- bo_ij->BO_s = bo_ji->BO_s;
- bo_ij->BO_pi = bo_ji->BO_pi;
- bo_ij->BO_pi2 = bo_ji->BO_pi2;
-
- workspace->total_bond_order[i] += bo_ij->BO; // now keeps total_BO
-#ifdef TEST_FORCES
- Add_dBO( system, lists, j, sym_index, 1.0, workspace->dDelta );
-#endif
- }
}
-#ifdef TEST_FORCES
- // fprintf( stderr, "dDelta computations\nj:" );
- Set_Start_Index( i, top_dDelta, dDeltas );
- ptop_dDelta = &( dDeltas->select.dDelta_list[top_dDelta] );
+ /* wait for bo_ij to be updated */
+#ifdef _OPENMP
+ #pragma omp barrier
+#endif
- for ( pj = start_i; pj < end_i; ++pj )
+#ifdef _OPENMP
+ #pragma omp for schedule(guided)
+#endif
+ for ( i = 0; i < system->N; ++i )
{
- j = bonds->select.bond_list[pj].nbr;
- // fprintf( stderr, "%d ", j );
-
- if ( !rvec_isZero( workspace->dDelta[j] ) )
+ type_i = system->atoms[i].type;
+ if ( type_i < 0 )
{
- ptop_dDelta->wrt = j;
- rvec_Copy( ptop_dDelta->dVal, workspace->dDelta[j] );
- rvec_MakeZero( workspace->dDelta[j] );
- ++top_dDelta, ++ptop_dDelta;
+ continue;
}
+ start_i = Start_Index(i, bonds);
+ end_i = End_Index(i, bonds);
- start_j = Start_Index(j, bonds);
- end_j = End_Index(j, bonds);
- for ( pk = start_j; pk < end_j; ++pk )
+ for ( pj = start_i; pj < end_i; ++pj )
{
- k = bonds->select.bond_list[pk].nbr;
- if ( !rvec_isZero( workspace->dDelta[k] ) )
+ j = bonds->select.bond_list[pj].nbr;
+ type_j = system->atoms[j].type;
+ if ( type_j < 0 )
{
- ptop_dDelta->wrt = k;
- rvec_Copy( ptop_dDelta->dVal, workspace->dDelta[k] );
- rvec_MakeZero( workspace->dDelta[k] );
- ++top_dDelta, ++ptop_dDelta;
+ continue;
}
- }
- }
- Set_End_Index( i, top_dDelta, dDeltas );
+ if ( i < j )
+ {
+ /* computed in previous for-loop */
+ }
+ else
+ {
+ /* We only need to update bond orders from bo_ji
+ everything else is set in uncorrected_bo calculations */
+ sym_index = bonds->select.bond_list[pj].sym_index;
- /*for( pj=Start_Index(i,dDeltas); pj<End_Index(i,dDeltas); ++pj )
- fprintf( stdout, "dDel: %d %d [%g %g %g]\n",
- i+1, dDeltas->select.dDelta_list[pj].wrt+1,
- dDeltas->select.dDelta_list[pj].dVal[0],
- dDeltas->select.dDelta_list[pj].dVal[1],
- dDeltas->select.dDelta_list[pj].dVal[2] );*/
-#endif
- }
+ bo_ij = &(bonds->select.bond_list[ pj ].bo_data);
+ bo_ji = &(bonds->select.bond_list[ sym_index ].bo_data);
+ bo_ij->BO = bo_ji->BO;
+ bo_ij->BO_s = bo_ji->BO_s;
+ bo_ij->BO_pi = bo_ji->BO_pi;
+ bo_ij->BO_pi2 = bo_ji->BO_pi2;
- /*fprintf(stderr,"\tCalculated actual bond orders ...\n" );
- fprintf(stderr,"%6s%8s%8s%8s%8s%8s%8s%8s\n",
- "atom", "Delta", "Delta_e", "Delta_boc", "nlp",
- "Delta_lp", "Clp", "dDelta_lp" );*/
+ /* now keeps total_BO */
+ workspace->total_bond_order[i] += bo_ij->BO;
- p_lp1 = system->reaxprm.gp.l[15];
- /* Calculate some helper variables that are used at many places
- throughout force calculations */
- for ( j = 0; j < system->N; ++j )
- {
- type_j = system->atoms[j].type;
- sbp_j = &(system->reaxprm.sbp[ type_j ]);
-
- workspace->Delta[j] = workspace->total_bond_order[j] - sbp_j->valency;
- workspace->Delta_e[j] = workspace->total_bond_order[j] - sbp_j->valency_e;
- workspace->Delta_boc[j] = workspace->total_bond_order[j] -
- sbp_j->valency_boc;
-
- workspace->vlpex[j] = workspace->Delta_e[j] -
- 2.0 * (int)(workspace->Delta_e[j] / 2.0);
- explp1 = EXP(-p_lp1 * SQR(2.0 + workspace->vlpex[j]));
- workspace->nlp[j] = explp1 - (int)(workspace->Delta_e[j] / 2.0);
- workspace->Delta_lp[j] = sbp_j->nlp_opt - workspace->nlp[j];
- workspace->Clp[j] = 2.0 * p_lp1 * explp1 * (2.0 + workspace->vlpex[j]);
- /* Adri uses different dDelta_lp values than the ones in notes... */
- workspace->dDelta_lp[j] = workspace->Clp[j];
- //workspace->dDelta_lp[j] = workspace->Clp[j] + (0.5-workspace->Clp[j]) *
- //((fabs(workspace->Delta_e[j]/2.0 -
- // (int)(workspace->Delta_e[j]/2.0)) < 0.1) ? 1 : 0 );
-
- if ( sbp_j->mass > 21.0 )
- {
- workspace->nlp_temp[j] = 0.5 * (sbp_j->valency_e - sbp_j->valency);
- workspace->Delta_lp_temp[j] = sbp_j->nlp_opt - workspace->nlp_temp[j];
- workspace->dDelta_lp_temp[j] = 0.;
+#ifdef TEST_FORCES
+ Add_dBO( system, lists, j, sym_index, 1.0, workspace->dDelta );
+#endif
+ }
+ }
}
- else
+
+ /* need to wait for total_bond_order to be accumulated */
+#ifdef _OPENMP
+ #pragma omp barrier
+#endif
+
+ /* Calculate some helper variables that are used at many places
+ throughout force calculations */
+#ifdef _OPENMP
+ #pragma omp for schedule(guided)
+#endif
+ for ( j = 0; j < system->N; ++j )
{
- workspace->nlp_temp[j] = workspace->nlp[j];
- workspace->Delta_lp_temp[j] = sbp_j->nlp_opt - workspace->nlp_temp[j];
- workspace->dDelta_lp_temp[j] = workspace->Clp[j];
+ type_j = system->atoms[j].type;
+ sbp_j = &(system->reaxprm.sbp[ type_j ]);
+
+ workspace->Delta[j] = workspace->total_bond_order[j] - sbp_j->valency;
+ workspace->Delta_e[j] = workspace->total_bond_order[j] - sbp_j->valency_e;
+ workspace->Delta_boc[j] = workspace->total_bond_order[j] -
+ sbp_j->valency_boc;
+
+ workspace->vlpex[j] = workspace->Delta_e[j] -
+ 2.0 * (int)(workspace->Delta_e[j] / 2.0);
+ explp1 = EXP(-p_lp1 * SQR(2.0 + workspace->vlpex[j]));
+ workspace->nlp[j] = explp1 - (int)(workspace->Delta_e[j] / 2.0);
+ workspace->Delta_lp[j] = sbp_j->nlp_opt - workspace->nlp[j];
+ workspace->Clp[j] = 2.0 * p_lp1 * explp1 * (2.0 + workspace->vlpex[j]);
+ /* Adri uses different dDelta_lp values than the ones in notes... */
+ workspace->dDelta_lp[j] = workspace->Clp[j];
+ //workspace->dDelta_lp[j] = workspace->Clp[j] + (0.5-workspace->Clp[j]) *
+ //((FABS(workspace->Delta_e[j]/2.0 -
+ // (int)(workspace->Delta_e[j]/2.0)) < 0.1) ? 1 : 0 );
+
+ if ( sbp_j->mass > 21.0 )
+ {
+ workspace->nlp_temp[j] = 0.5 * (sbp_j->valency_e - sbp_j->valency);
+ workspace->Delta_lp_temp[j] = sbp_j->nlp_opt - workspace->nlp_temp[j];
+ workspace->dDelta_lp_temp[j] = 0.0;
+ }
+ else
+ {
+ workspace->nlp_temp[j] = workspace->nlp[j];
+ workspace->Delta_lp_temp[j] = sbp_j->nlp_opt - workspace->nlp_temp[j];
+ workspace->dDelta_lp_temp[j] = workspace->Clp[j];
+ }
}
-
- //fprintf( stderr, "%d\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\t%lf\n",
- //j, workspace->Delta[j], workspace->Delta_e[j], workspace->Delta_boc[j],
- //workspace->nlp[j], system->reaxprm.sbp[type_j].nlp_opt,
- //workspace->Delta_lp[j], workspace->Clp[j], workspace->dDelta_lp[j] );
}
- //Print_Bonds( system, bonds, "sbonds.out" );
-
#if defined(DEBUG)
- fprintf( stderr, "Number of bonds: %d\n", num_bonds );
Print_Bond_Orders( system, control, data, workspace, lists, out_control );
#endif
}
diff --git a/sPuReMD/src/box.c b/sPuReMD/src/box.c
index 6c2fda0ba797a4472333aceaa7ebc9e19ecad8df..3cddaf2d36f7ad9092540f9e9e47b049d798b614 100644
--- a/sPuReMD/src/box.c
+++ b/sPuReMD/src/box.c
@@ -190,9 +190,13 @@ void Update_Box( rtensor box_tensor, simulation_box* box )
{
int i, j;
- for (i = 0; i < 3; i++)
- for (j = 0; j < 3; j++)
+ for ( i = 0; i < 3; i++ )
+ {
+ for ( j = 0; j < 3; j++ )
+ {
box->box[i][j] = box_tensor[i][j];
+ }
+ }
Make_Consistent( box );
}
@@ -240,15 +244,20 @@ void Inc_on_T3( rvec x, rvec dx, simulation_box *box )
{
tmp = x[i] + dx[i];
if ( tmp <= -box->box_norms[i] || tmp >= box->box_norms[i] )
+ {
tmp = FMOD( tmp, box->box_norms[i] );
+ }
- if ( tmp < 0 ) tmp += box->box_norms[i];
+ if ( tmp < 0 )
+ {
+ tmp += box->box_norms[i];
+ }
x[i] = tmp;
}
}
-real Sq_Distance_on_T3(rvec x1, rvec x2, simulation_box* box, rvec r)
+real Sq_Distance_on_T3( rvec x1, rvec x2, simulation_box* box, rvec r )
{
real norm = 0.0;
real d, tmp;
@@ -262,9 +271,13 @@ real Sq_Distance_on_T3(rvec x1, rvec x2, simulation_box* box, rvec r)
if ( tmp >= SQR( box->box_norms[i] / 2.0 ) )
{
if (x2[i] > x1[i])
+ {
d -= box->box_norms[i];
+ }
else
+ {
d += box->box_norms[i];
+ }
r[i] = d;
norm += SQR(d);
@@ -323,7 +336,9 @@ real Metric_Product( rvec x1, rvec x2, simulation_box* box )
{
tmp = 0.0;
for ( j = 0; j < 3; j++ )
+ {
tmp += box->g[i][j] * x2[j];
+ }
dist += x1[i] * tmp;
}
@@ -332,7 +347,7 @@ real Metric_Product( rvec x1, rvec x2, simulation_box* box )
int Are_Far_Neighbors( rvec x1, rvec x2, simulation_box *box,
- real cutoff, far_neighbor_data *data )
+ real cutoff, far_neighbor_data *data )
{
real norm_sqr, d, tmp;
int i;
@@ -368,9 +383,9 @@ int Are_Far_Neighbors( rvec x1, rvec x2, simulation_box *box,
}
}
- if ( norm_sqr <= SQR(cutoff) )
+ if ( norm_sqr <= SQR( cutoff ) )
{
- data->d = sqrt(norm_sqr);
+ data->d = SQRT( norm_sqr );
return 1;
}
@@ -382,13 +397,11 @@ int Are_Far_Neighbors( rvec x1, rvec x2, simulation_box *box,
If so, this neighborhood is added to the list of far neighbors.
Periodic boundary conditions do not apply. */
void Get_NonPeriodic_Far_Neighbors( rvec x1, rvec x2, simulation_box *box,
- control_params *control,
- far_neighbor_data *new_nbrs, int *count )
+ control_params *control, far_neighbor_data *new_nbrs, int *count )
{
real norm_sqr;
rvec_ScaledSum( new_nbrs[0].dvec, 1.0, x2, -1.0, x1 );
-
norm_sqr = rvec_Norm_Sqr( new_nbrs[0].dvec );
if ( norm_sqr <= SQR( control->vlist_cut ) )
@@ -399,7 +412,10 @@ void Get_NonPeriodic_Far_Neighbors( rvec x1, rvec x2, simulation_box *box,
ivec_MakeZero( new_nbrs[0].rel_box );
// rvec_MakeZero( new_nbrs[0].ext_factor );
}
- else *count = 0;
+ else
+ {
+ *count = 0;
+ }
}
@@ -408,9 +424,7 @@ void Get_NonPeriodic_Far_Neighbors( rvec x1, rvec x2, simulation_box *box,
If the periodic distance between x1 and x2 is than vlist_cut, this
neighborhood is added to the list of far neighbors. */
void Get_Periodic_Far_Neighbors_Big_Box( rvec x1, rvec x2, simulation_box *box,
- control_params *control,
- far_neighbor_data *periodic_nbrs,
- int *count )
+ control_params *control, far_neighbor_data *periodic_nbrs, int *count )
{
real norm_sqr, d, tmp;
int i;
@@ -456,7 +470,10 @@ void Get_Periodic_Far_Neighbors_Big_Box( rvec x1, rvec x2, simulation_box *box,
*count = 1;
periodic_nbrs[0].d = SQRT( norm_sqr );
}
- else *count = 0;
+ else
+ {
+ *count = 0;
+ }
}
@@ -468,9 +485,7 @@ void Get_Periodic_Far_Neighbors_Big_Box( rvec x1, rvec x2, simulation_box *box,
periodic images of x2 that are two boxs away!!!
*/
void Get_Periodic_Far_Neighbors_Small_Box( rvec x1, rvec x2, simulation_box *box,
- control_params *control,
- far_neighbor_data *periodic_nbrs,
- int *count )
+ control_params *control, far_neighbor_data *periodic_nbrs, int *count )
{
int i, j, k;
int imax, jmax, kmax;
@@ -489,13 +504,16 @@ void Get_Periodic_Far_Neighbors_Small_Box( rvec x1, rvec x2, simulation_box *box
for ( i = -imax; i <= imax; ++i )
- if (fabs(d_i = ((x2[0] + i * box->box_norms[0]) - x1[0])) <= control->vlist_cut)
+ {
+ if (FABS(d_i = ((x2[0] + i * box->box_norms[0]) - x1[0])) <= control->vlist_cut)
{
for ( j = -jmax; j <= jmax; ++j )
- if (fabs(d_j = ((x2[1] + j * box->box_norms[1]) - x1[1])) <= control->vlist_cut)
+ {
+ if (FABS(d_j = ((x2[1] + j * box->box_norms[1]) - x1[1])) <= control->vlist_cut)
{
for ( k = -kmax; k <= kmax; ++k )
- if (fabs(d_k = ((x2[2] + k * box->box_norms[2]) - x1[2])) <= control->vlist_cut)
+ {
+ if (FABS(d_k = ((x2[2] + k * box->box_norms[2]) - x1[2])) <= control->vlist_cut)
{
sqr_norm = SQR(d_i) + SQR(d_j) + SQR(d_k);
if ( sqr_norm <= SQR(control->vlist_cut) )
@@ -533,8 +551,11 @@ void Get_Periodic_Far_Neighbors_Small_Box( rvec x1, rvec x2, simulation_box *box
++(*count);
}
}
+ }
}
+ }
}
+ }
}
@@ -586,7 +607,9 @@ void Print_Box( simulation_box* box, FILE *out )
{
fprintf( out, "{" );
for ( j = 0; j < 3; ++j )
+ {
fprintf( out, "%8.3f ", box->box[i][j] );
+ }
fprintf( out, "}" );
}
fprintf( out, "}\n" );
@@ -600,7 +623,9 @@ void Print_Box( simulation_box* box, FILE *out )
{
fprintf( out, "{" );
for ( j = 0; j < 3; ++j )
+ {
fprintf( out, "%8.3f ", box->trans[i][j] );
+ }
fprintf( out, "}" );
}
fprintf( out, "}\n" );
@@ -610,7 +635,9 @@ void Print_Box( simulation_box* box, FILE *out )
{
fprintf( out, "{" );
for ( j = 0; j < 3; ++j )
+ {
fprintf( out, "%8.3f ", box->trans_inv[i][j] );
+ }
fprintf( out, "}" );
}
fprintf( out, "}\n" );
diff --git a/sPuReMD/src/charges.c b/sPuReMD/src/charges.c
index f81fba699cf4bb451c7a71911772a3ecf1a424da..07641a6993f93737b01781d8d62a7e7bc0e4b123 100644
--- a/sPuReMD/src/charges.c
+++ b/sPuReMD/src/charges.c
@@ -107,7 +107,9 @@ static void Sort_Matrix_Rows( sparse_matrix * const A )
unsigned int i, j, si, ei;
sparse_matrix_entry *temp;
+#ifdef _OPENMP
// #pragma omp parallel default(none) private(i, j, si, ei, temp) shared(stderr)
+#endif
{
if ( ( temp = (sparse_matrix_entry *) malloc( A->n * sizeof(sparse_matrix_entry)) ) == NULL )
{
@@ -116,7 +118,9 @@ static void Sort_Matrix_Rows( sparse_matrix * const A )
}
/* sort each row of A using column indices */
+#ifdef _OPENMP
// #pragma omp for schedule(guided)
+#endif
for ( i = 0; i < A->n; ++i )
{
si = A->start[i];
@@ -153,7 +157,9 @@ static void Calculate_Droptol( const sparse_matrix * const A,
unsigned int tid;
#endif
+#ifdef _OPENMP
#pragma omp parallel default(none) private(i, j, k, val, tid), shared(droptol_local, stderr)
+#endif
{
#ifdef _OPENMP
tid = omp_get_thread_num();
@@ -185,10 +191,14 @@ static void Calculate_Droptol( const sparse_matrix * const A,
#endif
}
+#ifdef _OPENMP
#pragma omp barrier
+#endif
/* calculate sqaure of the norm of each row */
+#ifdef _OPENMP
#pragma omp for schedule(static)
+#endif
for ( i = 0; i < A->n; ++i )
{
for ( k = A->start[i]; k < A->start[i + 1] - 1; ++k )
@@ -214,9 +224,9 @@ static void Calculate_Droptol( const sparse_matrix * const A,
#endif
}
+#ifdef _OPENMP
#pragma omp barrier
-#ifdef _OPENMP
#pragma omp for schedule(static)
for ( i = 0; i < A->n; ++i )
{
@@ -226,13 +236,15 @@ static void Calculate_Droptol( const sparse_matrix * const A,
droptol[i] += droptol_local[k * A->n + i];
}
}
-#endif
#pragma omp barrier
+#endif
/* calculate local droptol for each row */
//fprintf( stderr, "droptol: " );
+#ifdef _OPENMP
#pragma omp for schedule(static)
+#endif
for ( i = 0; i < A->n; ++i )
{
//fprintf( stderr, "%f-->", droptol[i] );
@@ -246,19 +258,20 @@ static void Calculate_Droptol( const sparse_matrix * const A,
static int Estimate_LU_Fill( const sparse_matrix * const A, const real * const droptol )
{
- int i, j, pj;
+ int i, pj;
int fillin;
real val;
fillin = 0;
+#ifdef _OPENMP
#pragma omp parallel for schedule(static) \
- default(none) private(i, j, pj, val) reduction(+: fillin)
+ default(none) private(i, pj, val) reduction(+: fillin)
+#endif
for ( i = 0; i < A->n; ++i )
{
for ( pj = A->start[i]; pj < A->start[i + 1] - 1; ++pj )
{
- j = A->j[pj];
val = A->val[pj];
if ( FABS(val) > droptol[i] )
@@ -304,7 +317,7 @@ static real SuperLU_Factorize( const sparse_matrix * const A,
#ifdef _OPENMP
//TODO: set as global parameter and use
#pragma omp parallel \
- default(none) shared(nprocs)
+ default(none) shared(nprocs)
{
#pragma omp master
{
@@ -578,8 +591,10 @@ static real diag_pre_comp( const sparse_matrix * const H, real * const Hdia_inv
start = Get_Time( );
+#ifdef _OPENMP
#pragma omp parallel for schedule(static) \
default(none) private(i)
+#endif
for ( i = 0; i < H->n; ++i )
{
if ( H->val[H->start[i + 1] - 1] != 0.0 )
@@ -749,6 +764,7 @@ static real ICHOLT( const sparse_matrix * const A, const real * const droptol,
* Edmond Chow and Aftab Patel
* Fine-Grained Parallel Incomplete LU Factorization
* SIAM J. Sci. Comp. */
+#if defined(TESTING)
static real ICHOL_PAR( const sparse_matrix * const A, const unsigned int sweeps,
sparse_matrix * const U_t, sparse_matrix * const U )
{
@@ -768,8 +784,10 @@ static real ICHOL_PAR( const sparse_matrix * const A, const unsigned int sweeps,
exit( INSUFFICIENT_MEMORY );
}
+#ifdef _OPENMP
#pragma omp parallel for schedule(static) \
- default(none) shared(D_inv, D) private(i)
+ default(none) shared(D_inv, D) private(i)
+#endif
for ( i = 0; i < A->n; ++i )
{
D_inv[i] = SQRT( A->val[A->start[i + 1] - 1] );
@@ -780,10 +798,12 @@ static real ICHOL_PAR( const sparse_matrix * const A, const unsigned int sweeps,
memset( Utop, 0, sizeof(unsigned int) * (A->n + 1) );
/* to get convergence, A must have unit diagonal, so apply
- * transformation DAD, where D = D(1./sqrt(D(A))) */
+ * transformation DAD, where D = D(1./SQRT(D(A))) */
memcpy( DAD->start, A->start, sizeof(int) * (A->n + 1) );
+#ifdef _OPENMP
#pragma omp parallel for schedule(guided) \
- default(none) shared(DAD, D_inv, D) private(i, pj)
+ default(none) shared(DAD, D_inv, D) private(i, pj)
+#endif
for ( i = 0; i < A->n; ++i )
{
/* non-diagonals */
@@ -806,8 +826,10 @@ static real ICHOL_PAR( const sparse_matrix * const A, const unsigned int sweeps,
for ( i = 0; i < sweeps; ++i )
{
/* for each nonzero */
+#ifdef _OPENMP
#pragma omp parallel for schedule(static) \
- default(none) shared(DAD, stderr) private(sum, ei_x, ei_y, k) firstprivate(x, y)
+ default(none) shared(DAD, stderr) private(sum, ei_x, ei_y, k) firstprivate(x, y)
+#endif
for ( j = 0; j < A->start[A->n]; ++j )
{
sum = ZERO;
@@ -879,8 +901,10 @@ static real ICHOL_PAR( const sparse_matrix * const A, const unsigned int sweeps,
/* apply inverse transformation D^{-1}U^{T},
* since DAD \approx U^{T}U, so
* D^{-1}DADD^{-1} = A \approx D^{-1}U^{T}UD^{-1} */
+#ifdef _OPENMP
#pragma omp parallel for schedule(guided) \
- default(none) shared(D_inv) private(i, pj)
+ default(none) shared(D_inv) private(i, pj)
+#endif
for ( i = 0; i < A->n; ++i )
{
for ( pj = A->start[i]; pj < A->start[i + 1]; ++pj )
@@ -907,6 +931,7 @@ static real ICHOL_PAR( const sparse_matrix * const A, const unsigned int sweeps,
return Get_Timing_Info( start );
}
+#endif
/* Fine-grained (parallel) incomplete LU factorization
@@ -936,8 +961,10 @@ static real ILU_PAR( const sparse_matrix * const A, const unsigned int sweeps,
exit( INSUFFICIENT_MEMORY );
}
+#ifdef _OPENMP
#pragma omp parallel for schedule(static) \
- default(none) shared(D, D_inv) private(i)
+ default(none) shared(D, D_inv) private(i)
+#endif
for ( i = 0; i < A->n; ++i )
{
D_inv[i] = SQRT( FABS( A->val[A->start[i + 1] - 1] ) );
@@ -946,10 +973,12 @@ static real ILU_PAR( const sparse_matrix * const A, const unsigned int sweeps,
}
/* to get convergence, A must have unit diagonal, so apply
- * transformation DAD, where D = D(1./sqrt(abs(D(A)))) */
+ * transformation DAD, where D = D(1./SQRT(abs(D(A)))) */
memcpy( DAD->start, A->start, sizeof(int) * (A->n + 1) );
+#ifdef _OPENMP
#pragma omp parallel for schedule(static) \
- default(none) shared(DAD, D) private(i, pj)
+ default(none) shared(DAD, D) private(i, pj)
+#endif
for ( i = 0; i < A->n; ++i )
{
/* non-diagonals */
@@ -974,7 +1003,9 @@ static real ILU_PAR( const sparse_matrix * const A, const unsigned int sweeps,
memcpy( U->val, DAD->val, sizeof(real) * (DAD->start[DAD->n]) );
/* L has unit diagonal, by convention */
+#ifdef _OPENMP
#pragma omp parallel for schedule(static) default(none) private(i)
+#endif
for ( i = 0; i < A->n; ++i )
{
L->val[L->start[i + 1] - 1] = 1.0;
@@ -983,8 +1014,10 @@ static real ILU_PAR( const sparse_matrix * const A, const unsigned int sweeps,
for ( i = 0; i < sweeps; ++i )
{
/* for each nonzero in L */
+#ifdef _OPENMP
#pragma omp parallel for schedule(static) \
- default(none) shared(DAD) private(j, k, x, y, ei_x, ei_y, sum)
+ default(none) shared(DAD) private(j, k, x, y, ei_x, ei_y, sum)
+#endif
for ( j = 0; j < DAD->start[DAD->n]; ++j )
{
sum = ZERO;
@@ -1033,8 +1066,10 @@ static real ILU_PAR( const sparse_matrix * const A, const unsigned int sweeps,
}
}
+#ifdef _OPENMP
#pragma omp parallel for schedule(static) \
- default(none) shared(DAD) private(j, k, x, y, ei_x, ei_y, sum)
+ default(none) shared(DAD) private(j, k, x, y, ei_x, ei_y, sum)
+#endif
for ( j = 0; j < DAD->start[DAD->n]; ++j )
{
sum = ZERO;
@@ -1084,8 +1119,10 @@ static real ILU_PAR( const sparse_matrix * const A, const unsigned int sweeps,
/* apply inverse transformation:
* since DAD \approx LU, then
* D^{-1}DADD^{-1} = A \approx D^{-1}LUD^{-1} */
+#ifdef _OPENMP
#pragma omp parallel for schedule(static) \
- default(none) shared(DAD, D_inv) private(i, pj)
+ default(none) shared(DAD, D_inv) private(i, pj)
+#endif
for ( i = 0; i < DAD->n; ++i )
{
for ( pj = DAD->start[i]; pj < DAD->start[i + 1]; ++pj )
@@ -1146,8 +1183,10 @@ static real ILUT_PAR( const sparse_matrix * const A, const real * droptol,
exit( INSUFFICIENT_MEMORY );
}
+#ifdef _OPENMP
#pragma omp parallel for schedule(static) \
- default(none) shared(D, D_inv) private(i)
+ default(none) shared(D, D_inv) private(i)
+#endif
for ( i = 0; i < A->n; ++i )
{
D_inv[i] = SQRT( FABS( A->val[A->start[i + 1] - 1] ) );
@@ -1155,10 +1194,12 @@ static real ILUT_PAR( const sparse_matrix * const A, const real * droptol,
}
/* to get convergence, A must have unit diagonal, so apply
- * transformation DAD, where D = D(1./sqrt(D(A))) */
+ * transformation DAD, where D = D(1./SQRT(D(A))) */
memcpy( DAD->start, A->start, sizeof(int) * (A->n + 1) );
+#ifdef _OPENMP
#pragma omp parallel for schedule(static) \
- default(none) shared(DAD, D) private(i, pj)
+ default(none) shared(DAD, D) private(i, pj)
+#endif
for ( i = 0; i < A->n; ++i )
{
/* non-diagonals */
@@ -1183,8 +1224,10 @@ static real ILUT_PAR( const sparse_matrix * const A, const real * droptol,
memcpy( U_temp->val, DAD->val, sizeof(real) * (DAD->start[DAD->n]) );
/* L has unit diagonal, by convention */
+#ifdef _OPENMP
#pragma omp parallel for schedule(static) \
- default(none) private(i) shared(L_temp)
+ default(none) private(i) shared(L_temp)
+#endif
for ( i = 0; i < A->n; ++i )
{
L_temp->val[L_temp->start[i + 1] - 1] = 1.0;
@@ -1193,8 +1236,10 @@ static real ILUT_PAR( const sparse_matrix * const A, const real * droptol,
for ( i = 0; i < sweeps; ++i )
{
/* for each nonzero in L */
+#ifdef _OPENMP
#pragma omp parallel for schedule(static) \
- default(none) shared(DAD, L_temp, U_temp) private(j, k, x, y, ei_x, ei_y, sum)
+ default(none) shared(DAD, L_temp, U_temp) private(j, k, x, y, ei_x, ei_y, sum)
+#endif
for ( j = 0; j < DAD->start[DAD->n]; ++j )
{
sum = ZERO;
@@ -1243,8 +1288,10 @@ static real ILUT_PAR( const sparse_matrix * const A, const real * droptol,
}
}
+#ifdef _OPENMP
#pragma omp parallel for schedule(static) \
- default(none) shared(DAD, L_temp, U_temp) private(j, k, x, y, ei_x, ei_y, sum)
+ default(none) shared(DAD, L_temp, U_temp) private(j, k, x, y, ei_x, ei_y, sum)
+#endif
for ( j = 0; j < DAD->start[DAD->n]; ++j )
{
sum = ZERO;
@@ -1294,8 +1341,10 @@ static real ILUT_PAR( const sparse_matrix * const A, const real * droptol,
/* apply inverse transformation:
* since DAD \approx LU, then
* D^{-1}DADD^{-1} = A \approx D^{-1}LUD^{-1} */
+#ifdef _OPENMP
#pragma omp parallel for schedule(static) \
- default(none) shared(DAD, L_temp, U_temp, D_inv) private(i, pj)
+ default(none) shared(DAD, L_temp, U_temp, D_inv) private(i, pj)
+#endif
for ( i = 0; i < DAD->n; ++i )
{
for ( pj = DAD->start[i]; pj < DAD->start[i + 1]; ++pj )
@@ -1374,8 +1423,10 @@ static void Extrapolate_Charges_QEq( const reax_system * const system,
/* extrapolation for s & t */
//TODO: good candidate for vectorization, avoid moving data with head pointer and circular buffer
+#ifdef _OPENMP
#pragma omp parallel for schedule(static) \
- default(none) private(i, s_tmp, t_tmp)
+ default(none) private(i, s_tmp, t_tmp)
+#endif
for ( i = 0; i < system->N_cm; ++i )
{
// no extrapolation
@@ -1426,8 +1477,10 @@ static void Extrapolate_Charges_EE( const reax_system * const system,
/* extrapolation for s */
//TODO: good candidate for vectorization, avoid moving data with head pointer and circular buffer
+#ifdef _OPENMP
#pragma omp parallel for schedule(static) \
default(none) private(i, s_tmp)
+#endif
for ( i = 0; i < system->N_cm; ++i )
{
// no extrapolation
@@ -2724,10 +2777,9 @@ static void ACKS2( reax_system * const system, control_params * const control,
void Compute_Charges( reax_system * const system, control_params * const control,
- simulation_data * const data, static_storage * const workspace,
- const list * const far_nbrs, const output_controls * const out_control )
+ simulation_data * const data, static_storage * const workspace,
+ const list * const far_nbrs, const output_controls * const out_control )
{
- int i;
#if defined(DEBUG_FOCUS)
char fname[200];
FILE * fp;
diff --git a/sPuReMD/src/control.c b/sPuReMD/src/control.c
index 16083739cd050f02ac465d5cefceba0bc0fbdca3..ad2d3d21a159fe0bf739a7910b24a795a3dfd866 100644
--- a/sPuReMD/src/control.c
+++ b/sPuReMD/src/control.c
@@ -95,9 +95,9 @@ char Read_Control_File( FILE* fp, reax_system *system, control_params* control,
control->P[0] = 0.000101325;
control->P[1] = 0.000101325;
control->P[2] = 0.000101325;
- control->Tau_P[0] = 500.0;
- control->Tau_P[1] = 500.0;
- control->Tau_P[2] = 500.0;
+ control->Tau_P[0] = 500.0;
+ control->Tau_P[1] = 500.0;
+ control->Tau_P[2] = 500.0;
control->Tau_PT = 500.0;
control->compressibility = 1.0;
control->press_mode = 0;
@@ -139,8 +139,10 @@ char Read_Control_File( FILE* fp, reax_system *system, control_params* control,
/* memory allocations */
s = (char*) malloc(sizeof(char) * MAX_LINE);
tmp = (char**) malloc(sizeof(char*)*MAX_TOKENS);
- for (i = 0; i < MAX_TOKENS; i++)
+ for ( i = 0; i < MAX_TOKENS; i++ )
+ {
tmp[i] = (char*) malloc(sizeof(char) * MAX_LINE);
+ }
/* read control parameters file */
while (fgets(s, MAX_LINE, fp))
@@ -319,7 +321,9 @@ char Read_Control_File( FILE* fp, reax_system *system, control_params* control,
control->T_init = val;
if ( control->T_init < 0.001 )
+ {
control->T_init = 0.001;
+ }
}
else if ( strcmp(tmp[0], "temp_final") == 0 )
{
@@ -327,12 +331,15 @@ char Read_Control_File( FILE* fp, reax_system *system, control_params* control,
control->T_final = val;
if ( control->T_final < 0.1 )
+ {
control->T_final = 0.1;
+ }
}
else if ( strcmp(tmp[0], "t_mass") == 0 )
{
val = atof(tmp[1]);
- control->Tau_T = val * 1.e-3; // convert t_mass from fs to ps
+ /* convert t_mass from fs to ps */
+ control->Tau_T = val * 1.e-3;
}
else if ( strcmp(tmp[0], "t_mode") == 0 )
{
@@ -549,9 +556,13 @@ char Read_Control_File( FILE* fp, reax_system *system, control_params* control,
/* determine target T */
if ( control->T_mode == 0 )
+ {
control->T = control->T_final;
- else control->T = control->T_init;
-
+ }
+ else
+ {
+ control->T = control->T_init;
+ }
/* near neighbor and far neighbor cutoffs */
control->bo_cut = 0.01 * system->reaxprm.gp.l[29];
diff --git a/sPuReMD/src/ffield.c b/sPuReMD/src/ffield.c
index 0fa59d4e07e34113d39f1a0f84b101dd63d8574a..a39aacf1588d6a53e0587cb1d616a1282e98b472 100644
--- a/sPuReMD/src/ffield.c
+++ b/sPuReMD/src/ffield.c
@@ -33,11 +33,12 @@ char Read_Force_Field( FILE* fp, reax_interaction* reax )
int c, i, j, k, l, m, n, o, p, cnt;
real val;
- s = (char*) malloc(sizeof(char) * MAX_LINE);
- tmp = (char**) malloc(sizeof(char*)*MAX_TOKENS);
+ s = (char*) malloc( sizeof(char) * MAX_LINE );
+ tmp = (char**) malloc( sizeof(char*) * MAX_TOKENS );
for (i = 0; i < MAX_TOKENS; i++)
- tmp[i] = (char*) malloc(sizeof(char) * MAX_TOKEN_LEN);
-
+ {
+ tmp[i] = (char*) malloc( sizeof(char) * MAX_TOKEN_LEN );
+ }
/* reading first header comment */
fgets( s, MAX_LINE, fp );
@@ -56,7 +57,7 @@ char Read_Force_Field( FILE* fp, reax_interaction* reax )
}
reax->gp.n_global = n;
- reax->gp.l = (real*) malloc(sizeof(real) * n);
+ reax->gp.l = (real*) malloc( sizeof(real) * n );
/* see mytypes.h for mapping between l[i] and the lambdas used in ff */
for (i = 0; i < n; i++)
@@ -397,55 +398,55 @@ char Read_Force_Field( FILE* fp, reax_interaction* reax )
(reax->sbp[j].r_pi_pi + reax->sbp[i].r_pi_pi);
reax->tbp[i][j].p_boc3 =
- sqrt(reax->sbp[i].b_o_132 *
+ SQRT(reax->sbp[i].b_o_132 *
reax->sbp[j].b_o_132);
reax->tbp[j][i].p_boc3 =
- sqrt(reax->sbp[j].b_o_132 *
+ SQRT(reax->sbp[j].b_o_132 *
reax->sbp[i].b_o_132);
reax->tbp[i][j].p_boc4 =
- sqrt(reax->sbp[i].b_o_131 *
+ SQRT(reax->sbp[i].b_o_131 *
reax->sbp[j].b_o_131);
reax->tbp[j][i].p_boc4 =
- sqrt(reax->sbp[j].b_o_131 *
+ SQRT(reax->sbp[j].b_o_131 *
reax->sbp[i].b_o_131);
reax->tbp[i][j].p_boc5 =
- sqrt(reax->sbp[i].b_o_133 *
+ SQRT(reax->sbp[i].b_o_133 *
reax->sbp[j].b_o_133);
reax->tbp[j][i].p_boc5 =
- sqrt(reax->sbp[j].b_o_133 *
+ SQRT(reax->sbp[j].b_o_133 *
reax->sbp[i].b_o_133);
reax->tbp[i][j].D =
- sqrt(reax->sbp[i].epsilon *
+ SQRT(reax->sbp[i].epsilon *
reax->sbp[j].epsilon);
reax->tbp[j][i].D =
- sqrt(reax->sbp[j].epsilon *
+ SQRT(reax->sbp[j].epsilon *
reax->sbp[i].epsilon);
reax->tbp[i][j].alpha =
- sqrt(reax->sbp[i].alpha *
+ SQRT(reax->sbp[i].alpha *
reax->sbp[j].alpha);
reax->tbp[j][i].alpha =
- sqrt(reax->sbp[j].alpha *
+ SQRT(reax->sbp[j].alpha *
reax->sbp[i].alpha);
reax->tbp[i][j].r_vdW =
- 2.0 * sqrt(reax->sbp[i].r_vdw * reax->sbp[j].r_vdw);
+ 2.0 * SQRT(reax->sbp[i].r_vdw * reax->sbp[j].r_vdw);
reax->tbp[j][i].r_vdW =
- 2.0 * sqrt(reax->sbp[j].r_vdw * reax->sbp[i].r_vdw);
+ 2.0 * SQRT(reax->sbp[j].r_vdw * reax->sbp[i].r_vdw);
reax->tbp[i][j].gamma_w =
- sqrt(reax->sbp[i].gamma_w *
+ SQRT(reax->sbp[i].gamma_w *
reax->sbp[j].gamma_w);
reax->tbp[j][i].gamma_w =
- sqrt(reax->sbp[j].gamma_w *
+ SQRT(reax->sbp[j].gamma_w *
reax->sbp[i].gamma_w);
reax->tbp[i][j].gamma =
@@ -717,7 +718,9 @@ char Read_Force_Field( FILE* fp, reax_interaction* reax )
/* deallocate helper storage */
for ( i = 0; i < MAX_TOKENS; i++ )
+ {
free( tmp[i] );
+ }
free( tmp );
free( s );
@@ -727,7 +730,9 @@ char Read_Force_Field( FILE* fp, reax_interaction* reax )
for ( j = 0; j < reax->num_atom_types; j++ )
{
for ( k = 0; k < reax->num_atom_types; k++ )
+ {
free( tor_flag[i][j][k] );
+ }
free( tor_flag[i][j] );
}
@@ -735,6 +740,8 @@ char Read_Force_Field( FILE* fp, reax_interaction* reax )
free( tor_flag[i] );
}
+ free( tor_flag );
+
#if defined(DEBUG_FOCUS)
fprintf( stderr, "force field read\n" );
#endif
diff --git a/sPuReMD/src/forces.c b/sPuReMD/src/forces.c
index 2b894c232f00a2b8764ba9bf6211cf5226f54f8d..b5c1a8304ed6c0f907b47b12d1f421fce6320284 100644
--- a/sPuReMD/src/forces.c
+++ b/sPuReMD/src/forces.c
@@ -34,6 +34,10 @@
#include "vector.h"
+/* File scope variables */
+static interaction_function Interaction_Functions[NO_OF_INTERACTIONS];
+
+
typedef enum
{
DIAGONAL = 0,
@@ -42,8 +46,8 @@ typedef enum
void Dummy_Interaction( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
}
@@ -56,9 +60,14 @@ void Init_Bonded_Force_Functions( control_params *control )
//*/Dummy_Interaction;
Interaction_Functions[3] = Three_Body_Interactions; //*/Dummy_Interaction;
Interaction_Functions[4] = Four_Body_Interactions; //*/Dummy_Interaction;
- if ( control->hb_cut > 0 )
+ if ( control->hb_cut > 0.0 )
+ {
Interaction_Functions[5] = Hydrogen_Bonds; //*/Dummy_Interaction;
- else Interaction_Functions[5] = Dummy_Interaction;
+ }
+ else
+ {
+ Interaction_Functions[5] = Dummy_Interaction;
+ }
Interaction_Functions[6] = Dummy_Interaction; //empty
Interaction_Functions[7] = Dummy_Interaction; //empty
Interaction_Functions[8] = Dummy_Interaction; //empty
@@ -67,12 +76,12 @@ void Init_Bonded_Force_Functions( control_params *control )
void Compute_Bonded_Forces( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
int i;
- // real t_start, t_end, t_elapsed;
+ //real t_start, t_end, t_elapsed;
#ifdef TEST_ENERGY
/* Mark beginning of a new timestep in each energy file */
@@ -107,11 +116,13 @@ void Compute_Bonded_Forces( reax_system *system, control_params *control,
/* Implement all the function calls as function pointers */
for ( i = 0; i < NO_OF_INTERACTIONS; i++ )
{
- (Interaction_Functions[i])(system, control, data, workspace,
- lists, out_control);
+ (Interaction_Functions[i])( system, control, data, workspace,
+ lists, out_control );
+
#if defined(DEBUG_FOCUS)
fprintf( stderr, "f%d-", i );
#endif
+
#ifdef TEST_FORCES
(Print_Interactions[i])(system, control, data, workspace,
lists, out_control);
@@ -121,10 +132,11 @@ void Compute_Bonded_Forces( reax_system *system, control_params *control,
void Compute_NonBonded_Forces( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list** lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list** lists, output_controls *out_control )
{
real t_start, t_elapsed;
+
#ifdef TEST_ENERGY
fprintf( out_control->evdw, "step: %d\n%6s%6s%12s%12s%12s\n",
data->step, "atom1", "atom2", "r12", "evdw", "total" );
@@ -148,7 +160,7 @@ void Compute_NonBonded_Forces( reax_system *system, control_params *control,
else
{
Tabulated_vdW_Coulomb_Energy( system, control, data, workspace,
- lists, out_control );
+ lists, out_control );
}
#if defined(DEBUG_FOCUS)
fprintf( stderr, "nonb forces - " );
@@ -156,7 +168,7 @@ void Compute_NonBonded_Forces( reax_system *system, control_params *control,
#ifdef TEST_FORCES
Print_vdW_Coulomb_Forces( system, control, data, workspace,
- lists, out_control );
+ lists, out_control );
#endif
}
@@ -164,26 +176,61 @@ void Compute_NonBonded_Forces( reax_system *system, control_params *control,
/* This version of Compute_Total_Force computes forces from coefficients
accumulated by all interaction functions. Saves enormous time & space! */
void Compute_Total_Force( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists )
+ simulation_data *data, static_storage *workspace, list **lists )
{
- int i, pj;
- list *bonds = (*lists) + BONDS;
+ int i;
+ list *bonds;
- for ( i = 0; i < system->N; ++i )
- for ( pj = Start_Index(i, bonds); pj < End_Index(i, bonds); ++pj )
- if ( i < bonds->select.bond_list[pj].nbr )
+ bonds = (*lists) + BONDS;
+
+#ifdef _OPENMP
+ #pragma omp parallel default(shared)
+#endif
+ {
+ int pj;
+#ifdef _OPENMP
+ int j;
+#endif
+
+#ifdef _OPENMP
+ #pragma omp for schedule(static)
+#endif
+ for ( i = 0; i < system->N; ++i )
+ {
+ for ( pj = Start_Index(i, bonds); pj < End_Index(i, bonds); ++pj )
{
- if ( control->ensemble == NVE || control->ensemble == NVT || control->ensemble == bNVT)
- Add_dBond_to_Forces( i, pj, system, data, workspace, lists );
- else
- Add_dBond_to_Forces_NPT( i, pj, system, data, workspace, lists );
+ if ( i < bonds->select.bond_list[pj].nbr )
+ {
+ if ( control->ensemble == NVE || control->ensemble == NVT || control->ensemble == bNVT)
+ {
+ Add_dBond_to_Forces( i, pj, system, data, workspace, lists );
+ }
+ else
+ {
+ Add_dBond_to_Forces_NPT( i, pj, system, data, workspace, lists );
+ }
+ }
+ }
+ }
+
+#ifdef _OPENMP
+ #pragma omp barrier
+
+ #pragma omp for schedule(static)
+ for ( i = 0; i < system->N; ++i )
+ {
+ for ( j = 0; j < control->num_threads; ++j )
+ {
+ rvec_Add( system->atoms[i].f, workspace->f_local[j * system->N + i] );
}
+ }
+#endif
+ }
}
void Validate_Lists( static_storage *workspace, list **lists, int step, int n,
- int Hmax, int Htop, int num_bonds, int num_hbonds )
+ int Hmax, int Htop, int num_bonds, int num_hbonds )
{
int i, flag;
list *bonds, *hbonds;
@@ -208,12 +255,16 @@ void Validate_Lists( static_storage *workspace, list **lists, int step, int n,
flag = -1;
workspace->realloc.num_bonds = num_bonds;
for ( i = 0; i < n - 1; ++i )
+ {
if ( End_Index(i, bonds) >= Start_Index(i + 1, bonds) - 2 )
{
workspace->realloc.bonds = 1;
if ( End_Index(i, bonds) > Start_Index(i + 1, bonds) )
+ {
flag = i;
+ }
}
+ }
if ( flag > -1 )
{
@@ -241,13 +292,17 @@ void Validate_Lists( static_storage *workspace, list **lists, int step, int n,
flag = -1;
workspace->realloc.num_hbonds = num_hbonds;
for ( i = 0; i < workspace->num_H - 1; ++i )
+ {
if ( Num_Entries(i, hbonds) >=
(Start_Index(i + 1, hbonds) - Start_Index(i, hbonds)) * DANGER_ZONE )
{
workspace->realloc.hbonds = 1;
if ( End_Index(i, hbonds) > Start_Index(i + 1, hbonds) )
+ {
flag = i;
+ }
}
+ }
if ( flag > -1 )
{
@@ -355,7 +410,9 @@ static inline real Init_Charge_Matrix_Entry( reax_system *system,
control_params *control, int i, int j,
real r_ij, MATRIX_ENTRY_POSITION pos )
{
- real Tap, gamij, dr3gamij_1, dr3gamij_3, ret = 0.0;
+ real Tap, gamij, dr3gamij_1, dr3gamij_3, ret;
+
+ ret = 0.0;
switch ( control->charge_method )
{
@@ -520,11 +577,11 @@ static void Init_Charge_Matrix_Remaining_Entries( reax_system *system,
for ( i = 0; i < system->N; ++i )
{
H->j[*Htop] = i;
- H->val[*Htop] = 1.0;
+ H->val[*Htop] = -1.0;
*Htop = *Htop + 1;
H_sp->j[*H_sp_top] = i;
- H_sp->val[*H_sp_top] = 1.0;
+ H_sp->val[*H_sp_top] = -1.0;
*H_sp_top = *H_sp_top + 1;
}
@@ -542,11 +599,11 @@ static void Init_Charge_Matrix_Remaining_Entries( reax_system *system,
H_sp->start[system->N + i + 1] = *H_sp_top;
H->j[*Htop] = i;
- H->val[*Htop] = 1.0;
+ H->val[*Htop] = -1.0;
*Htop = *Htop + 1;
H_sp->j[*H_sp_top] = i;
- H_sp->val[*H_sp_top] = 1.0;
+ H_sp->val[*H_sp_top] = -1.0;
*H_sp_top = *H_sp_top + 1;
for ( pj = Start_Index(i, far_nbrs); pj < End_Index(i, far_nbrs); ++pj )
@@ -615,11 +672,11 @@ static void Init_Charge_Matrix_Remaining_Entries( reax_system *system,
for ( i = system->N + 1; i < system->N_cm - 1; ++i )
{
H->j[*Htop] = i;
- H->val[*Htop] = 1.0;
+ H->val[*Htop] = -1.0;
*Htop = *Htop + 1;
H_sp->j[*H_sp_top] = i;
- H_sp->val[*H_sp_top] = 1.0;
+ H_sp->val[*H_sp_top] = -1.0;
*H_sp_top = *H_sp_top + 1;
}
@@ -641,8 +698,8 @@ static void Init_Charge_Matrix_Remaining_Entries( reax_system *system,
void Init_Forces( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
int i, j, pj;
int start_i, end_i;
@@ -654,7 +711,6 @@ void Init_Forces( reax_system *system, control_params *control,
real C12, C34, C56;
real Cln_BOp_s, Cln_BOp_pi, Cln_BOp_pi2;
real BO, BO_s, BO_pi, BO_pi2;
- real p_boc1, p_boc2;
sparse_matrix *H, *H_sp;
list *far_nbrs, *bonds, *hbonds;
single_body_parameters *sbp_i, *sbp_j;
@@ -667,7 +723,6 @@ void Init_Forces( reax_system *system, control_params *control,
far_nbrs = *lists + FAR_NBRS;
bonds = *lists + BONDS;
hbonds = *lists + HBONDS;
-
H = workspace->H;
H_sp = workspace->H_sp;
Htop = 0;
@@ -675,8 +730,6 @@ void Init_Forces( reax_system *system, control_params *control,
num_bonds = 0;
num_hbonds = 0;
btop_i = btop_j = 0;
- p_boc1 = system->reaxprm.gp.l[0];
- p_boc2 = system->reaxprm.gp.l[1];
for ( i = 0; i < system->N; ++i )
{
@@ -778,28 +831,40 @@ void Init_Forces( reax_system *system, control_params *control,
/* uncorrected bond orders */
if ( far_nbrs->select.far_nbr_list[pj].d <= control->nbr_cut )
{
- r2 = SQR(r_ij);
+ r2 = SQR( r_ij );
if ( sbp_i->r_s > 0.0 && sbp_j->r_s > 0.0)
{
C12 = twbp->p_bo1 * POW( r_ij / twbp->r_s, twbp->p_bo2 );
BO_s = (1.0 + control->bo_cut) * EXP( C12 );
}
- else BO_s = C12 = 0.0;
+ else
+ {
+ BO_s = 0.0;
+ C12 = 0.0;
+ }
if ( sbp_i->r_pi > 0.0 && sbp_j->r_pi > 0.0)
{
C34 = twbp->p_bo3 * POW( r_ij / twbp->r_p, twbp->p_bo4 );
BO_pi = EXP( C34 );
}
- else BO_pi = C34 = 0.0;
+ else
+ {
+ BO_pi = 0.0;
+ C34 = 0.0;
+ }
if ( sbp_i->r_pi_pi > 0.0 && sbp_j->r_pi_pi > 0.0)
{
C56 = twbp->p_bo5 * POW( r_ij / twbp->r_pp, twbp->p_bo6 );
BO_pi2 = EXP( C56 );
}
- else BO_pi2 = C56 = 0.0;
+ else
+ {
+ BO_pi2 = 0.0;
+ C56 = 0.0;
+ }
/* Initially BO values are the uncorrected ones, page 1 */
BO = BO_s + BO_pi + BO_pi2;
@@ -841,13 +906,13 @@ void Init_Forces( reax_system *system, control_params *control,
/* Only dln_BOp_xx wrt. dr_i is stored here, note that
dln_BOp_xx/dr_i = -dln_BOp_xx/dr_j and all others are 0 */
- rvec_Scale(bo_ij->dln_BOp_s, -bo_ij->BO_s * Cln_BOp_s, ibond->dvec);
- rvec_Scale(bo_ij->dln_BOp_pi, -bo_ij->BO_pi * Cln_BOp_pi, ibond->dvec);
- rvec_Scale(bo_ij->dln_BOp_pi2,
- -bo_ij->BO_pi2 * Cln_BOp_pi2, ibond->dvec);
- rvec_Scale(bo_ji->dln_BOp_s, -1., bo_ij->dln_BOp_s);
- rvec_Scale(bo_ji->dln_BOp_pi, -1., bo_ij->dln_BOp_pi );
- rvec_Scale(bo_ji->dln_BOp_pi2, -1., bo_ij->dln_BOp_pi2 );
+ rvec_Scale( bo_ij->dln_BOp_s, -bo_ij->BO_s * Cln_BOp_s, ibond->dvec );
+ rvec_Scale( bo_ij->dln_BOp_pi, -bo_ij->BO_pi * Cln_BOp_pi, ibond->dvec );
+ rvec_Scale( bo_ij->dln_BOp_pi2,
+ -bo_ij->BO_pi2 * Cln_BOp_pi2, ibond->dvec );
+ rvec_Scale( bo_ji->dln_BOp_s, -1., bo_ij->dln_BOp_s );
+ rvec_Scale( bo_ji->dln_BOp_pi, -1., bo_ij->dln_BOp_pi );
+ rvec_Scale( bo_ji->dln_BOp_pi2, -1., bo_ij->dln_BOp_pi2 );
/* Only dBOp wrt. dr_i is stored here, note that
dBOp/dr_i = -dBOp/dr_j and all others are 0 */
@@ -866,8 +931,12 @@ void Init_Forces( reax_system *system, control_params *control,
bo_ji->BO -= control->bo_cut;
workspace->total_bond_order[i] += bo_ij->BO; //currently total_BOp
workspace->total_bond_order[j] += bo_ji->BO; //currently total_BOp
- bo_ij->Cdbo = bo_ij->Cdbopi = bo_ij->Cdbopi2 = 0.0;
- bo_ji->Cdbo = bo_ji->Cdbopi = bo_ji->Cdbopi2 = 0.0;
+ bo_ij->Cdbo = 0.0;
+ bo_ij->Cdbopi = 0.0;
+ bo_ij->Cdbopi2 = 0.0;
+ bo_ji->Cdbo = 0.0;
+ bo_ji->Cdbopi = 0.0;
+ bo_ji->Cdbopi2 = 0.0;
/*fprintf( stderr, "%d %d %g %g %g\n",
i+1, j+1, bo_ij->BO, bo_ij->BO_pi, bo_ij->BO_pi2 );*/
@@ -906,7 +975,7 @@ void Init_Forces( reax_system *system, control_params *control,
/* diagonal entry */
H->j[Htop] = i;
- H->val[Htop] = Init_Charge_Matrix_Entry( system, control, i, j,
+ H->val[Htop] = Init_Charge_Matrix_Entry( system, control, i, i,
r_ij, DIAGONAL );
++Htop;
@@ -919,8 +988,6 @@ void Init_Forces( reax_system *system, control_params *control,
{
Set_End_Index( workspace->hbond_index[i], ihb_top, hbonds );
}
- //fprintf( stderr, "%d bonds start: %d, end: %d\n",
- // i, Start_Index( i, bonds ), End_Index( i, bonds ) );
}
Init_Charge_Matrix_Remaining_Entries( system, control, far_nbrs,
@@ -930,12 +997,9 @@ void Init_Forces( reax_system *system, control_params *control,
H->start[system->N_cm] = Htop;
H_sp->start[system->N_cm] = H_sp_top;
-// printf("Htop = %d\n", Htop);
-// printf("H_sp_top = %d\n", H_sp_top);
-
/* validate lists - decide if reallocation is required! */
Validate_Lists( workspace, lists,
- data->step, system->N, H->m, Htop, num_bonds, num_hbonds );
+ data->step, system->N, H->m, Htop, num_bonds, num_hbonds );
#if defined(DEBUG_FOCUS)
fprintf( stderr, "step%d: Htop = %d, num_bonds = %d, num_hbonds = %d\n",
@@ -946,8 +1010,8 @@ void Init_Forces( reax_system *system, control_params *control,
void Init_Forces_Tab( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
int i, j, pj;
int start_i, end_i;
@@ -959,7 +1023,6 @@ void Init_Forces_Tab( reax_system *system, control_params *control,
real C12, C34, C56;
real Cln_BOp_s, Cln_BOp_pi, Cln_BOp_pi2;
real BO, BO_s, BO_pi, BO_pi2;
- real p_boc1, p_boc2;
sparse_matrix *H, *H_sp;
list *far_nbrs, *bonds, *hbonds;
single_body_parameters *sbp_i, *sbp_j;
@@ -980,8 +1043,6 @@ void Init_Forces_Tab( reax_system *system, control_params *control,
num_bonds = 0;
num_hbonds = 0;
btop_i = btop_j = 0;
- p_boc1 = system->reaxprm.gp.l[0];
- p_boc2 = system->reaxprm.gp.l[1];
for ( i = 0; i < system->N; ++i )
{
@@ -1028,7 +1089,7 @@ void Init_Forces_Tab( reax_system *system, control_params *control,
{
flag_sp = 1;
}
- nbr_pj->d = sqrt(nbr_pj->d);
+ nbr_pj->d = SQRT( nbr_pj->d );
flag = 1;
}
@@ -1080,28 +1141,40 @@ void Init_Forces_Tab( reax_system *system, control_params *control,
/* uncorrected bond orders */
if ( far_nbrs->select.far_nbr_list[pj].d <= control->nbr_cut )
{
- r2 = SQR(r_ij);
+ r2 = SQR( r_ij );
if ( sbp_i->r_s > 0.0 && sbp_j->r_s > 0.0)
{
C12 = twbp->p_bo1 * POW( r_ij / twbp->r_s, twbp->p_bo2 );
BO_s = (1.0 + control->bo_cut) * EXP( C12 );
}
- else BO_s = C12 = 0.0;
+ else
+ {
+ BO_s = 0.0;
+ C12 = 0.0;
+ }
if ( sbp_i->r_pi > 0.0 && sbp_j->r_pi > 0.0)
{
C34 = twbp->p_bo3 * POW( r_ij / twbp->r_p, twbp->p_bo4 );
BO_pi = EXP( C34 );
}
- else BO_pi = C34 = 0.0;
+ else
+ {
+ BO_pi = 0.0;
+ C34 = 0.0;
+ }
if ( sbp_i->r_pi_pi > 0.0 && sbp_j->r_pi_pi > 0.0)
{
C56 = twbp->p_bo5 * POW( r_ij / twbp->r_pp, twbp->p_bo6 );
BO_pi2 = EXP( C56 );
}
- else BO_pi2 = C56 = 0.0;
+ else
+ {
+ BO_pi2 = 0.0;
+ C56 = 0.0;
+ }
/* Initially BO values are the uncorrected ones, page 1 */
BO = BO_s + BO_pi + BO_pi2;
@@ -1144,13 +1217,13 @@ void Init_Forces_Tab( reax_system *system, control_params *control,
/* Only dln_BOp_xx wrt. dr_i is stored here, note that
dln_BOp_xx/dr_i = -dln_BOp_xx/dr_j and all others are 0 */
- rvec_Scale(bo_ij->dln_BOp_s, -bo_ij->BO_s * Cln_BOp_s, ibond->dvec);
- rvec_Scale(bo_ij->dln_BOp_pi, -bo_ij->BO_pi * Cln_BOp_pi, ibond->dvec);
- rvec_Scale(bo_ij->dln_BOp_pi2,
- -bo_ij->BO_pi2 * Cln_BOp_pi2, ibond->dvec);
- rvec_Scale(bo_ji->dln_BOp_s, -1., bo_ij->dln_BOp_s);
- rvec_Scale(bo_ji->dln_BOp_pi, -1., bo_ij->dln_BOp_pi );
- rvec_Scale(bo_ji->dln_BOp_pi2, -1., bo_ij->dln_BOp_pi2 );
+ rvec_Scale( bo_ij->dln_BOp_s, -bo_ij->BO_s * Cln_BOp_s, ibond->dvec );
+ rvec_Scale( bo_ij->dln_BOp_pi, -bo_ij->BO_pi * Cln_BOp_pi, ibond->dvec );
+ rvec_Scale( bo_ij->dln_BOp_pi2,
+ -bo_ij->BO_pi2 * Cln_BOp_pi2, ibond->dvec );
+ rvec_Scale( bo_ji->dln_BOp_s, -1., bo_ij->dln_BOp_s );
+ rvec_Scale( bo_ji->dln_BOp_pi, -1., bo_ij->dln_BOp_pi );
+ rvec_Scale( bo_ji->dln_BOp_pi2, -1., bo_ij->dln_BOp_pi2 );
/* Only dBOp wrt. dr_i is stored here, note that
dBOp/dr_i = -dBOp/dr_j and all others are 0 */
@@ -1169,8 +1242,12 @@ void Init_Forces_Tab( reax_system *system, control_params *control,
bo_ji->BO -= control->bo_cut;
workspace->total_bond_order[i] += bo_ij->BO; //currently total_BOp
workspace->total_bond_order[j] += bo_ji->BO; //currently total_BOp
- bo_ij->Cdbo = bo_ij->Cdbopi = bo_ij->Cdbopi2 = 0.0;
- bo_ji->Cdbo = bo_ji->Cdbopi = bo_ji->Cdbopi2 = 0.0;
+ bo_ij->Cdbo = 0.0;
+ bo_ij->Cdbopi = 0.0;
+ bo_ij->Cdbopi2 = 0.0;
+ bo_ji->Cdbo = 0.0;
+ bo_ji->Cdbopi = 0.0;
+ bo_ji->Cdbopi2 = 0.0;
Set_End_Index( j, btop_j + 1, bonds );
}
@@ -1190,15 +1267,17 @@ void Init_Forces_Tab( reax_system *system, control_params *control,
Set_End_Index( i, btop_i, bonds );
if ( ihb == 1 )
+ {
Set_End_Index( workspace->hbond_index[i], ihb_top, hbonds );
+ }
}
// mark the end of j list
H->start[i] = Htop;
H_sp->start[i] = H_sp_top;
/* validate lists - decide if reallocation is required! */
- Validate_Lists( workspace, lists,
- data->step, system->N, H->m, Htop, num_bonds, num_hbonds );
+ Validate_Lists( workspace, lists, data->step, system->N,
+ H->m, Htop, num_bonds, num_hbonds );
#if defined(DEBUG_FOCUS)
fprintf( stderr, "step%d: Htop = %d, num_bonds = %d, num_hbonds = %d\n",
@@ -1217,10 +1296,9 @@ void Estimate_Storage_Sizes( reax_system *system, control_params *control,
int start_i, end_i;
int type_i, type_j;
int ihb, jhb;
- real r_ij, r2;
+ real r_ij;
real C12, C34, C56;
real BO, BO_s, BO_pi, BO_pi2;
- real p_boc1, p_boc2;
list *far_nbrs;
single_body_parameters *sbp_i, *sbp_j;
two_body_parameters *twbp;
@@ -1228,8 +1306,6 @@ void Estimate_Storage_Sizes( reax_system *system, control_params *control,
reax_atom *atom_i, *atom_j;
far_nbrs = *lists + FAR_NBRS;
- p_boc1 = system->reaxprm.gp.l[0];
- p_boc2 = system->reaxprm.gp.l[1];
for ( i = 0; i < system->N; ++i )
{
@@ -1268,7 +1344,6 @@ void Estimate_Storage_Sizes( reax_system *system, control_params *control,
if ( nbr_pj->d <= control->nbr_cut )
{
r_ij = nbr_pj->d;
- r2 = SQR(r_ij);
if ( sbp_i->r_s > 0.0 && sbp_j->r_s > 0.0)
{
@@ -1317,8 +1392,8 @@ void Estimate_Storage_Sizes( reax_system *system, control_params *control,
void Compute_Forces( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list** lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list** lists, output_controls *out_control )
{
real t_start, t_elapsed;
@@ -1342,21 +1417,23 @@ void Compute_Forces( reax_system *system, control_params *control,
Compute_Bonded_Forces( system, control, data, workspace, lists, out_control );
t_elapsed = Get_Timing_Info( t_start );
data->timing.bonded += t_elapsed;
+
#if defined(DEBUG_FOCUS)
fprintf( stderr, "bonded_forces - ");
#endif
t_start = Get_Time( );
Compute_NonBonded_Forces( system, control, data, workspace,
- lists, out_control );
+ lists, out_control );
t_elapsed = Get_Timing_Info( t_start );
data->timing.nonb += t_elapsed;
+
#if defined(DEBUG_FOCUS)
fprintf( stderr, "nonbondeds - ");
#endif
Compute_Total_Force( system, control, data, workspace, lists );
- //Print_Total_Force( system, control, data, workspace, lists, out_control );
+
#if defined(DEBUG_FOCUS)
fprintf( stderr, "totalforces - ");
//Print_Total_Force( system, control, data, workspace, lists, out_control );
@@ -1366,6 +1443,7 @@ void Compute_Forces( reax_system *system, control_params *control,
Print_Total_Force( system, control, data, workspace, lists, out_control );
Compare_Total_Forces( system, control, data, workspace, lists, out_control );
#endif
+
#if defined(DEBUG_FOCUS)
fprintf( stderr, "forces - ");
#endif
diff --git a/sPuReMD/src/four_body_interactions.c b/sPuReMD/src/four_body_interactions.c
index 1fc7e99c5e0b7d3738ac04cd23bccbbfba397b52..e0010e8cfc412f1e5224df36dd322eacbc95b64e 100644
--- a/sPuReMD/src/four_body_interactions.c
+++ b/sPuReMD/src/four_body_interactions.c
@@ -29,13 +29,14 @@
#define MIN_SINE 1e-10
+
real Calculate_Omega( rvec dvec_ij, real r_ij, rvec dvec_jk, real r_jk,
- rvec dvec_kl, real r_kl, rvec dvec_li, real r_li,
- three_body_interaction_data *p_ijk,
- three_body_interaction_data *p_jkl,
- rvec dcos_omega_di, rvec dcos_omega_dj,
- rvec dcos_omega_dk, rvec dcos_omega_dl,
- output_controls *out_control )
+ rvec dvec_kl, real r_kl, rvec dvec_li, real r_li,
+ three_body_interaction_data *p_ijk,
+ three_body_interaction_data *p_jkl,
+ rvec dcos_omega_di, rvec dcos_omega_dj,
+ rvec dcos_omega_dk, rvec dcos_omega_dl,
+ output_controls *out_control )
{
real unnorm_cos_omega, unnorm_sin_omega, omega;
real sin_ijk, cos_ijk, sin_jkl, cos_jkl;
@@ -50,7 +51,7 @@ real Calculate_Omega( rvec dvec_ij, real r_ij, rvec dvec_jk, real r_jk,
/* omega */
unnorm_cos_omega = -rvec_Dot( dvec_ij, dvec_jk ) * rvec_Dot( dvec_jk, dvec_kl ) +
- SQR( r_jk ) * rvec_Dot( dvec_ij, dvec_kl );
+ SQR( r_jk ) * rvec_Dot( dvec_ij, dvec_kl );
rvec_Cross( cross_jk_kl, dvec_jk, dvec_kl );
unnorm_sin_omega = -r_jk * rvec_Dot( dvec_ij, cross_jk_kl );
omega = atan2( unnorm_sin_omega, unnorm_cos_omega );
@@ -72,16 +73,24 @@ real Calculate_Omega( rvec dvec_ij, real r_ij, rvec dvec_jk, real r_jk,
poem = 2.0 * r_ij * r_kl * sin_ijk * sin_jkl;
- if ( poem < 1e-20 ) poem = 1e-20;
+ if ( poem < 1e-20 )
+ {
+ poem = 1e-20;
+ }
tel = (SQR(r_ij) + SQR(r_jk) + SQR(r_kl) - SQR(r_li)) -
- 2.0 * ( r_ij * r_jk * cos_ijk - r_ij * r_kl * cos_ijk * cos_jkl +
- r_jk * r_kl * cos_jkl );
+ 2.0 * ( r_ij * r_jk * cos_ijk - r_ij * r_kl * cos_ijk * cos_jkl +
+ r_jk * r_kl * cos_jkl );
arg = tel / poem;
- if ( arg > 1.0 ) arg = 1.0;
- if ( arg < -1.0 ) arg = -1.0;
-
+ if ( arg > 1.0 )
+ {
+ arg = 1.0;
+ }
+ if ( arg < -1.0 )
+ {
+ arg = -1.0;
+ }
/*fprintf( out_control->etor,
"%23.15e%23.15e%23.15e%23.15e%23.15e%23.15e%23.15e%23.15e%23.15e\n",
@@ -143,525 +152,613 @@ real Calculate_Omega( rvec dvec_ij, real r_ij, rvec dvec_jk, real r_jk,
}
-
-
-
void Four_Body_Interactions( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
- int i, j, k, l, pi, pj, pk, pl, pij, plk;
- int type_i, type_j, type_k, type_l;
- int start_j, end_j, start_k, end_k;
- int start_pj, end_pj, start_pk, end_pk;
- int num_frb_intrs = 0;
-
- real Delta_j, Delta_k;
- real r_ij, r_jk, r_kl, r_li;
- real BOA_ij, BOA_jk, BOA_kl;
-
- real exp_tor2_ij, exp_tor2_jk, exp_tor2_kl;
- real exp_tor1, exp_tor3_DjDk, exp_tor4_DjDk, exp_tor34_inv;
- real exp_cot2_jk, exp_cot2_ij, exp_cot2_kl;
- real fn10, f11_DjDk, dfn11, fn12;
-
- real theta_ijk, theta_jkl;
- real sin_ijk, sin_jkl;
- real cos_ijk, cos_jkl;
- real tan_ijk_i, tan_jkl_i;
-
- real omega, cos_omega, cos2omega, cos3omega;
- rvec dcos_omega_di, dcos_omega_dj, dcos_omega_dk, dcos_omega_dl;
-
- real CV, cmn, CEtors1, CEtors2, CEtors3, CEtors4;
- real CEtors5, CEtors6, CEtors7, CEtors8, CEtors9;
- real Cconj, CEconj1, CEconj2, CEconj3;
- real CEconj4, CEconj5, CEconj6;
-
- real e_tor, e_con;
- rvec dvec_li;
- rvec force, ext_press;
- ivec rel_box_jl;
- // rtensor total_rtensor, temp_rtensor;
-
- four_body_header *fbh;
- four_body_parameters *fbp;
- bond_data *pbond_ij, *pbond_jk, *pbond_kl;
- bond_order_data *bo_ij, *bo_jk, *bo_kl;
- three_body_interaction_data *p_ijk, *p_jkl;
-
- real p_tor2 = system->reaxprm.gp.l[23];
- real p_tor3 = system->reaxprm.gp.l[24];
- real p_tor4 = system->reaxprm.gp.l[25];
- real p_cot2 = system->reaxprm.gp.l[27];
-
- list *bonds = (*lists) + BONDS;
- list *thb_intrs = (*lists) + THREE_BODIES;
-
-
- for ( j = 0; j < system->N; ++j )
+ real p_tor2, p_tor3, p_tor4, p_cot2;
+ list *bonds, *thb_intrs;
+ real e_tor_total, e_con_total;
+
+ p_tor2 = system->reaxprm.gp.l[23];
+ p_tor3 = system->reaxprm.gp.l[24];
+ p_tor4 = system->reaxprm.gp.l[25];
+ p_cot2 = system->reaxprm.gp.l[27];
+ bonds = (*lists) + BONDS;
+ thb_intrs = (*lists) + THREE_BODIES;
+ e_tor_total = 0.0;
+ e_con_total = 0.0;
+
+#ifdef _OPENMP
+ #pragma omp parallel default(shared) reduction(+: e_tor_total, e_con_total)
+#endif
{
- type_j = system->atoms[j].type;
- Delta_j = workspace->Delta_boc[j];
- start_j = Start_Index(j, bonds);
- end_j = End_Index(j, bonds);
-
-
- for ( pk = start_j; pk < end_j; ++pk )
+ int i, j, k, l, pi, pj, pk, pl, pij, plk;
+ int type_i, type_j, type_k, type_l;
+ int start_j, end_j;
+ int start_pj, end_pj, start_pk, end_pk;
+#ifdef TEST_FORCES
+ int num_frb_intrs = 0;
+#endif
+ real Delta_j, Delta_k;
+ real r_ij, r_jk, r_kl, r_li;
+ real BOA_ij, BOA_jk, BOA_kl;
+ real exp_tor2_ij, exp_tor2_jk, exp_tor2_kl;
+ real exp_tor1, exp_tor3_DjDk, exp_tor4_DjDk, exp_tor34_inv;
+ real exp_cot2_jk, exp_cot2_ij, exp_cot2_kl;
+ real fn10, f11_DjDk, dfn11, fn12;
+ real theta_ijk, theta_jkl;
+ real sin_ijk, sin_jkl;
+ real cos_ijk, cos_jkl;
+ real tan_ijk_i, tan_jkl_i;
+ real omega, cos_omega, cos2omega, cos3omega;
+ rvec dcos_omega_di, dcos_omega_dj, dcos_omega_dk, dcos_omega_dl;
+ real CV, cmn, CEtors1, CEtors2, CEtors3, CEtors4;
+ real CEtors5, CEtors6, CEtors7, CEtors8, CEtors9;
+ real Cconj, CEconj1, CEconj2, CEconj3;
+ real CEconj4, CEconj5, CEconj6;
+ real e_tor, e_con;
+ rvec dvec_li;
+ rvec force, ext_press;
+ ivec rel_box_jl;
+ //rtensor total_rtensor, temp_rtensor;
+ four_body_header *fbh;
+ four_body_parameters *fbp;
+ bond_data *pbond_ij, *pbond_jk, *pbond_kl;
+ bond_order_data *bo_ij, *bo_jk, *bo_kl;
+ three_body_interaction_data *p_ijk, *p_jkl;
+ rvec *f_i, *f_j, *f_k, *f_l;
+#ifdef _OPENMP
+ int tid = omp_get_thread_num( );
+
+ #pragma omp for schedule(static)
+#endif
+ for ( j = 0; j < system->N; ++j )
{
- pbond_jk = &( bonds->select.bond_list[pk] );
- k = pbond_jk->nbr;
- bo_jk = &( pbond_jk->bo_data );
- BOA_jk = bo_jk->BO - control->thb_cut;
-
- /* see if there are any 3-body interactions involving j&k
- where j is the central atom. Otherwise there is no point in
- trying to form a 4-body interaction out of this neighborhood */
- if ( j < k && bo_jk->BO > control->thb_cut/*0*/ &&
- Num_Entries(pk, thb_intrs) )
+ type_j = system->atoms[j].type;
+ Delta_j = workspace->Delta_boc[j];
+ start_j = Start_Index(j, bonds);
+ end_j = End_Index(j, bonds);
+#ifdef _OPENMP
+ f_j = &(workspace->f_local[tid * system->N + j]);
+#else
+ f_j = &(system->atoms[j].f);
+#endif
+
+ for ( pk = start_j; pk < end_j; ++pk )
{
- start_k = Start_Index(k, bonds);
- end_k = End_Index(k, bonds);
- pj = pbond_jk->sym_index; // pj points to j on k's list
+ pbond_jk = &( bonds->select.bond_list[pk] );
+ k = pbond_jk->nbr;
+ bo_jk = &( pbond_jk->bo_data );
+ BOA_jk = bo_jk->BO - control->thb_cut;
+#ifdef _OPENMP
+ f_k = &(workspace->f_local[tid * system->N + k]);
+#else
+ f_k = &(system->atoms[k].f);
+#endif
- /* do the same check as above: are there any 3-body interactions
- involving k&j where k is the central atom */
- if ( Num_Entries(pj, thb_intrs) )
+ /* see if there are any 3-body interactions involving j&k
+ where j is the central atom. Otherwise there is no point in
+ trying to form a 4-body interaction out of this neighborhood */
+ if ( j < k && bo_jk->BO > control->thb_cut &&
+ Num_Entries(pk, thb_intrs) )
{
- type_k = system->atoms[k].type;
- Delta_k = workspace->Delta_boc[k];
- r_jk = pbond_jk->d;
+ pj = pbond_jk->sym_index; // pj points to j on k's list
- start_pk = Start_Index(pk, thb_intrs );
- end_pk = End_Index(pk, thb_intrs );
- start_pj = Start_Index(pj, thb_intrs );
- end_pj = End_Index(pj, thb_intrs );
-
- exp_tor2_jk = EXP( -p_tor2 * BOA_jk );
- exp_cot2_jk = EXP( -p_cot2 * SQR(BOA_jk - 1.5) );
- exp_tor3_DjDk = EXP( -p_tor3 * (Delta_j + Delta_k) );
- exp_tor4_DjDk = EXP( p_tor4 * (Delta_j + Delta_k) );
- exp_tor34_inv = 1.0 / (1.0 + exp_tor3_DjDk + exp_tor4_DjDk);
- f11_DjDk = (2.0 + exp_tor3_DjDk) * exp_tor34_inv;
+ /* do the same check as above: are there any 3-body interactions
+ involving k&j where k is the central atom */
+ if ( Num_Entries(pj, thb_intrs) )
+ {
+ type_k = system->atoms[k].type;
+ Delta_k = workspace->Delta_boc[k];
+ r_jk = pbond_jk->d;
+
+ start_pk = Start_Index(pk, thb_intrs );
+ end_pk = End_Index(pk, thb_intrs );
+ start_pj = Start_Index(pj, thb_intrs );
+ end_pj = End_Index(pj, thb_intrs );
+
+ exp_tor2_jk = EXP( -p_tor2 * BOA_jk );
+ exp_cot2_jk = EXP( -p_cot2 * SQR(BOA_jk - 1.5) );
+ exp_tor3_DjDk = EXP( -p_tor3 * (Delta_j + Delta_k) );
+ exp_tor4_DjDk = EXP( p_tor4 * (Delta_j + Delta_k) );
+ exp_tor34_inv = 1.0 / (1.0 + exp_tor3_DjDk + exp_tor4_DjDk);
+ f11_DjDk = (2.0 + exp_tor3_DjDk) * exp_tor34_inv;
+
+ /* pick i up from j-k interaction where j is the centre atom */
+ for ( pi = start_pk; pi < end_pk; ++pi )
+ {
+ p_ijk = &( thb_intrs->select.three_body_list[pi] );
+ pij = p_ijk->pthb; // pij is pointer to i on j's bond_list
+ pbond_ij = &( bonds->select.bond_list[pij] );
+ bo_ij = &( pbond_ij->bo_data );
+ if ( bo_ij->BO > control->thb_cut/*0*/ )
+ {
+ i = p_ijk->thb;
+ type_i = system->atoms[i].type;
+ r_ij = pbond_ij->d;
+ BOA_ij = bo_ij->BO - control->thb_cut;
+
+#ifdef _OPENMP
+ f_i = &(workspace->f_local[tid * system->N + i]);
+#else
+ f_i = &(system->atoms[i].f);
+#endif
- /* pick i up from j-k interaction where j is the centre atom */
- for ( pi = start_pk; pi < end_pk; ++pi )
- {
- p_ijk = &( thb_intrs->select.three_body_list[pi] );
- pij = p_ijk->pthb; // pij is pointer to i on j's bond_list
- pbond_ij = &( bonds->select.bond_list[pij] );
- bo_ij = &( pbond_ij->bo_data );
+ theta_ijk = p_ijk->theta;
+ sin_ijk = SIN( theta_ijk );
+ cos_ijk = COS( theta_ijk );
+ //tan_ijk_i = 1. / TAN( theta_ijk );
+ if ( sin_ijk >= 0 && sin_ijk <= MIN_SINE )
+ {
+ tan_ijk_i = cos_ijk / MIN_SINE;
+ }
+ else if ( sin_ijk <= 0 && sin_ijk >= -MIN_SINE )
+ {
+ tan_ijk_i = cos_ijk / -MIN_SINE;
+ }
+ else
+ {
+ tan_ijk_i = cos_ijk / sin_ijk;
+ }
+ exp_tor2_ij = EXP( -p_tor2 * BOA_ij );
+ exp_cot2_ij = EXP( -p_cot2 * SQR(BOA_ij - 1.5) );
- if ( bo_ij->BO > control->thb_cut/*0*/ )
- {
- i = p_ijk->thb;
- type_i = system->atoms[i].type;
- r_ij = pbond_ij->d;
- BOA_ij = bo_ij->BO - control->thb_cut;
-
- theta_ijk = p_ijk->theta;
- sin_ijk = SIN( theta_ijk );
- cos_ijk = COS( theta_ijk );
- //tan_ijk_i = 1. / TAN( theta_ijk );
- if ( sin_ijk >= 0 && sin_ijk <= MIN_SINE )
- tan_ijk_i = cos_ijk / MIN_SINE;
- else if ( sin_ijk <= 0 && sin_ijk >= -MIN_SINE )
- tan_ijk_i = cos_ijk / -MIN_SINE;
- else tan_ijk_i = cos_ijk / sin_ijk;
-
- exp_tor2_ij = EXP( -p_tor2 * BOA_ij );
- exp_cot2_ij = EXP( -p_cot2 * SQR(BOA_ij - 1.5) );
-
- /* pick l up from j-k intr. where k is the centre */
- for ( pl = start_pj; pl < end_pj; ++pl )
- {
- p_jkl = &( thb_intrs->select.three_body_list[pl] );
- l = p_jkl->thb;
- plk = p_jkl->pthb; //pointer to l on k's bond_list!
- pbond_kl = &( bonds->select.bond_list[plk] );
- bo_kl = &( pbond_kl->bo_data );
- type_l = system->atoms[l].type;
- fbh = &(system->reaxprm.fbp[type_i][type_j][type_k][type_l]);
- fbp = &(system->reaxprm.fbp[type_i][type_j]
- [type_k][type_l].prm[0]);
-
- if ( i != l && fbh->cnt && bo_kl->BO > control->thb_cut/*0*/ &&
- bo_ij->BO * bo_jk->BO * bo_kl->BO > control->thb_cut/*0*/ )
+ /* pick l up from j-k intr. where k is the centre */
+ for ( pl = start_pj; pl < end_pj; ++pl )
{
- ++num_frb_intrs;
- r_kl = pbond_kl->d;
- BOA_kl = bo_kl->BO - control->thb_cut;
-
- theta_jkl = p_jkl->theta;
- sin_jkl = SIN( theta_jkl );
- cos_jkl = COS( theta_jkl );
- //tan_jkl_i = 1. / TAN( theta_jkl );
- if ( sin_jkl >= 0 && sin_jkl <= MIN_SINE )
- tan_jkl_i = cos_jkl / MIN_SINE;
- else if ( sin_jkl <= 0 && sin_jkl >= -MIN_SINE )
- tan_jkl_i = cos_jkl / -MIN_SINE;
- else tan_jkl_i = cos_jkl / sin_jkl;
-
- Sq_Distance_on_T3( system->atoms[l].x, system->atoms[i].x,
- &(system->box), dvec_li );
- r_li = rvec_Norm( dvec_li );
-
-
- /* omega and its derivative */
- //cos_omega=Calculate_Omega(pbond_ij->dvec,r_ij,pbond_jk->dvec,
- omega = Calculate_Omega(pbond_ij->dvec, r_ij, pbond_jk->dvec,
- r_jk, pbond_kl->dvec, r_kl,
- dvec_li, r_li, p_ijk, p_jkl,
- dcos_omega_di, dcos_omega_dj,
- dcos_omega_dk, dcos_omega_dl,
- out_control);
- cos_omega = COS( omega );
- cos2omega = COS( 2. * omega );
- cos3omega = COS( 3. * omega );
- /* end omega calculations */
-
- /* torsion energy */
- exp_tor1 = EXP(fbp->p_tor1 * SQR(2. - bo_jk->BO_pi - f11_DjDk));
- exp_tor2_kl = EXP( -p_tor2 * BOA_kl );
- exp_cot2_kl = EXP( -p_cot2 * SQR(BOA_kl - 1.5) );
- fn10 = (1.0 - exp_tor2_ij) * (1.0 - exp_tor2_jk) *
- (1.0 - exp_tor2_kl);
-
- CV = 0.5 * ( fbp->V1 * (1.0 + cos_omega) +
- fbp->V2 * exp_tor1 * (1.0 - cos2omega) +
- fbp->V3 * (1.0 + cos3omega) );
- //CV = 0.5 * fbp->V1 * (1.0 + cos_omega) +
- // fbp->V2 * exp_tor1 * (1.0 - SQR(cos_omega)) +
- // fbp->V3 * (0.5 + 2.0*CUBE(cos_omega) - 1.5 * cos_omega);
-
- data->E_Tor += e_tor = fn10 * sin_ijk * sin_jkl * CV;
-
- dfn11 = (-p_tor3 * exp_tor3_DjDk +
- (p_tor3 * exp_tor3_DjDk - p_tor4 * exp_tor4_DjDk) *
- (2. + exp_tor3_DjDk) * exp_tor34_inv) * exp_tor34_inv;
-
- CEtors1 = sin_ijk * sin_jkl * CV;
-
- CEtors2 = -fn10 * 2.0 * fbp->p_tor1 * fbp->V2 * exp_tor1 *
- (2.0 - bo_jk->BO_pi - f11_DjDk) * (1.0 - SQR(cos_omega)) *
- sin_ijk * sin_jkl;
-
- CEtors3 = CEtors2 * dfn11;
-
- CEtors4 = CEtors1 * p_tor2 * exp_tor2_ij *
- (1.0 - exp_tor2_jk) * (1.0 - exp_tor2_kl);
-
- CEtors5 = CEtors1 * p_tor2 * exp_tor2_jk *
- (1.0 - exp_tor2_ij) * (1.0 - exp_tor2_kl);
-
- CEtors6 = CEtors1 * p_tor2 * exp_tor2_kl *
- (1.0 - exp_tor2_ij) * (1.0 - exp_tor2_jk);
-
- cmn = -fn10 * CV;
- CEtors7 = cmn * sin_jkl * tan_ijk_i;
- CEtors8 = cmn * sin_ijk * tan_jkl_i;
- CEtors9 = fn10 * sin_ijk * sin_jkl *
- (0.5 * fbp->V1 - 2.0 * fbp->V2 * exp_tor1 * cos_omega +
- 1.5 * fbp->V3 * (cos2omega + 2. * SQR(cos_omega)));
- //cmn = -fn10 * CV;
- //CEtors7 = cmn * sin_jkl * cos_ijk;
- //CEtors8 = cmn * sin_ijk * cos_jkl;
- //CEtors9 = fn10 * sin_ijk * sin_jkl *
- // (0.5 * fbp->V1 - 2.0 * fbp->V2 * exp_tor1 * cos_omega +
- // fbp->V3 * (6*SQR(cos_omega) - 1.50));
- /* end of torsion energy */
-
-
- /* 4-body conjugation energy */
- fn12 = exp_cot2_ij * exp_cot2_jk * exp_cot2_kl;
- data->E_Con += e_con = fbp->p_cot1 * fn12 *
- (1. + (SQR(cos_omega) - 1.) * sin_ijk * sin_jkl);
-
- Cconj = -2.0 * fn12 * fbp->p_cot1 * p_cot2 *
+ p_jkl = &( thb_intrs->select.three_body_list[pl] );
+ l = p_jkl->thb;
+ plk = p_jkl->pthb; //pointer to l on k's bond_list!
+ pbond_kl = &( bonds->select.bond_list[plk] );
+ bo_kl = &( pbond_kl->bo_data );
+ type_l = system->atoms[l].type;
+ fbh = &(system->reaxprm.fbp[type_i][type_j][type_k][type_l]);
+ fbp = &(system->reaxprm.fbp[type_i][type_j]
+ [type_k][type_l].prm[0]);
+
+ if ( i != l && fbh->cnt && bo_kl->BO > control->thb_cut &&
+ bo_ij->BO * bo_jk->BO * bo_kl->BO > control->thb_cut )
+ {
+#ifdef _OPENMP
+ f_l = &(workspace->f_local[tid * system->N + l]);
+#else
+ f_l = &(system->atoms[l].f);
+#endif
+
+#ifdef TEST_FORCES
+ ++num_frb_intrs;
+#endif
+
+ r_kl = pbond_kl->d;
+ BOA_kl = bo_kl->BO - control->thb_cut;
+
+ theta_jkl = p_jkl->theta;
+ sin_jkl = SIN( theta_jkl );
+ cos_jkl = COS( theta_jkl );
+ //tan_jkl_i = 1. / TAN( theta_jkl );
+ if ( sin_jkl >= 0 && sin_jkl <= MIN_SINE )
+ {
+ tan_jkl_i = cos_jkl / MIN_SINE;
+ }
+ else if ( sin_jkl <= 0 && sin_jkl >= -MIN_SINE )
+ {
+ tan_jkl_i = cos_jkl / -MIN_SINE;
+ }
+ else
+ {
+ tan_jkl_i = cos_jkl / sin_jkl;
+ }
+
+ Sq_Distance_on_T3( system->atoms[l].x, system->atoms[i].x,
+ &(system->box), dvec_li );
+ r_li = rvec_Norm( dvec_li );
+
+ /* omega and its derivative */
+ //cos_omega=Calculate_Omega(pbond_ij->dvec,r_ij,pbond_jk->dvec,
+ omega = Calculate_Omega( pbond_ij->dvec, r_ij, pbond_jk->dvec,
+ r_jk, pbond_kl->dvec, r_kl, dvec_li, r_li, p_ijk, p_jkl,
+ dcos_omega_di, dcos_omega_dj, dcos_omega_dk, dcos_omega_dl,
+ out_control );
+ cos_omega = COS( omega );
+ cos2omega = COS( 2. * omega );
+ cos3omega = COS( 3. * omega );
+ /* end omega calculations */
+
+ /* torsion energy */
+ exp_tor1 = EXP( fbp->p_tor1 * SQR(2. - bo_jk->BO_pi - f11_DjDk) );
+ exp_tor2_kl = EXP( -p_tor2 * BOA_kl );
+ exp_cot2_kl = EXP( -p_cot2 * SQR(BOA_kl - 1.5) );
+ fn10 = (1.0 - exp_tor2_ij) * (1.0 - exp_tor2_jk) *
+ (1.0 - exp_tor2_kl);
+
+ CV = 0.5 * ( fbp->V1 * (1.0 + cos_omega) +
+ fbp->V2 * exp_tor1 * (1.0 - cos2omega) +
+ fbp->V3 * (1.0 + cos3omega) );
+ //CV = 0.5 * fbp->V1 * (1.0 + cos_omega) +
+ // fbp->V2 * exp_tor1 * (1.0 - SQR(cos_omega)) +
+ // fbp->V3 * (0.5 + 2.0*CUBE(cos_omega) - 1.5 * cos_omega);
+
+ e_tor = fn10 * sin_ijk * sin_jkl * CV;
+ e_tor_total += e_tor;
+
+ dfn11 = (-p_tor3 * exp_tor3_DjDk +
+ (p_tor3 * exp_tor3_DjDk - p_tor4 * exp_tor4_DjDk) *
+ (2. + exp_tor3_DjDk) * exp_tor34_inv) * exp_tor34_inv;
+
+ CEtors1 = sin_ijk * sin_jkl * CV;
+
+ CEtors2 = -fn10 * 2.0 * fbp->p_tor1 * fbp->V2 * exp_tor1 *
+ (2.0 - bo_jk->BO_pi - f11_DjDk) * (1.0 - SQR(cos_omega)) *
+ sin_ijk * sin_jkl;
+
+ CEtors3 = CEtors2 * dfn11;
+
+ CEtors4 = CEtors1 * p_tor2 * exp_tor2_ij *
+ (1.0 - exp_tor2_jk) * (1.0 - exp_tor2_kl);
+
+ CEtors5 = CEtors1 * p_tor2 * exp_tor2_jk *
+ (1.0 - exp_tor2_ij) * (1.0 - exp_tor2_kl);
+
+ CEtors6 = CEtors1 * p_tor2 * exp_tor2_kl *
+ (1.0 - exp_tor2_ij) * (1.0 - exp_tor2_jk);
+
+ cmn = -fn10 * CV;
+ CEtors7 = cmn * sin_jkl * tan_ijk_i;
+ CEtors8 = cmn * sin_ijk * tan_jkl_i;
+ CEtors9 = fn10 * sin_ijk * sin_jkl *
+ (0.5 * fbp->V1 - 2.0 * fbp->V2 * exp_tor1 * cos_omega +
+ 1.5 * fbp->V3 * (cos2omega + 2. * SQR(cos_omega)));
+ //cmn = -fn10 * CV;
+ //CEtors7 = cmn * sin_jkl * cos_ijk;
+ //CEtors8 = cmn * sin_ijk * cos_jkl;
+ //CEtors9 = fn10 * sin_ijk * sin_jkl *
+ // (0.5 * fbp->V1 - 2.0 * fbp->V2 * exp_tor1 * cos_omega +
+ // fbp->V3 * (6*SQR(cos_omega) - 1.50));
+ /* end of torsion energy */
+
+ /* 4-body conjugation energy */
+ fn12 = exp_cot2_ij * exp_cot2_jk * exp_cot2_kl;
+ e_con = fbp->p_cot1 * fn12 *
(1. + (SQR(cos_omega) - 1.) * sin_ijk * sin_jkl);
+ e_con_total += e_con;
+
+ Cconj = -2.0 * fn12 * fbp->p_cot1 * p_cot2 *
+ (1. + (SQR(cos_omega) - 1.) * sin_ijk * sin_jkl);
+
+ CEconj1 = Cconj * (BOA_ij - 1.5e0);
+ CEconj2 = Cconj * (BOA_jk - 1.5e0);
+ CEconj3 = Cconj * (BOA_kl - 1.5e0);
+
+ CEconj4 = -fbp->p_cot1 * fn12 *
+ (SQR(cos_omega) - 1.0) * sin_jkl * tan_ijk_i;
+ CEconj5 = -fbp->p_cot1 * fn12 *
+ (SQR(cos_omega) - 1.0) * sin_ijk * tan_jkl_i;
+ //CEconj4 = -fbp->p_cot1 * fn12 *
+ // (SQR(cos_omega) - 1.0) * sin_jkl * cos_ijk;
+ //CEconj5 = -fbp->p_cot1 * fn12 *
+ // (SQR(cos_omega) - 1.0) * sin_ijk * cos_jkl;
+ CEconj6 = 2.0 * fbp->p_cot1 * fn12 *
+ cos_omega * sin_ijk * sin_jkl;
+ /* end 4-body conjugation energy */
+
+ //fprintf(stdout, "%6d %6d %6d %6d %7.3f %7.3f %7.3f %7.3f ",
+ // workspace->orig_id[i], workspace->orig_id[j],
+ // workspace->orig_id[k], workspace->orig_id[l],
+ // omega, cos_omega, cos2omega, cos3omega );
+ //fprintf(stdout,
+ // "%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f\n",
+ // CEtors2, CEtors3, CEtors4, CEtors5,
+ // CEtors6, CEtors7, CEtors8, CEtors9 );
+ //fprintf(stdout, "%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f\n",
+ // theta_ijk, theta_jkl, sin_ijk,
+ // sin_jkl, cos_jkl, tan_jkl_i );
+
+ /* forces */
+#ifdef _OPENMP
+ #pragma omp atomic
+#endif
+ bo_jk->Cdbopi += CEtors2;
+#ifdef _OPENMP
+ #pragma omp atomic
+#endif
+ workspace->CdDelta[j] += CEtors3;
+#ifdef _OPENMP
+ #pragma omp atomic
+#endif
+ workspace->CdDelta[k] += CEtors3;
+#ifdef _OPENMP
+ #pragma omp atomic
+#endif
+ bo_ij->Cdbo += (CEtors4 + CEconj1);
+#ifdef _OPENMP
+ #pragma omp atomic
+#endif
+ bo_jk->Cdbo += (CEtors5 + CEconj2);
+#ifdef _OPENMP
+ #pragma omp atomic
+#endif
+ bo_kl->Cdbo += (CEtors6 + CEconj3);
+
+ if ( control->ensemble == NVE || control->ensemble == NVT || control->ensemble == bNVT )
+ {
+ /* dcos_theta_ijk */
+ rvec_ScaledAdd( *f_i,
+ CEtors7 + CEconj4, p_ijk->dcos_dk );
+ rvec_ScaledAdd( *f_j,
+ CEtors7 + CEconj4, p_ijk->dcos_dj );
+ rvec_ScaledAdd( *f_k,
+ CEtors7 + CEconj4, p_ijk->dcos_di );
+
+ /* dcos_theta_jkl */
+ rvec_ScaledAdd( *f_j,
+ CEtors8 + CEconj5, p_jkl->dcos_di );
+ rvec_ScaledAdd( *f_k,
+ CEtors8 + CEconj5, p_jkl->dcos_dj );
+ rvec_ScaledAdd( *f_l,
+ CEtors8 + CEconj5, p_jkl->dcos_dk );
+
+ /* dcos_omega */
+ rvec_ScaledAdd( *f_i,
+ CEtors9 + CEconj6, dcos_omega_di );
+ rvec_ScaledAdd( *f_j,
+ CEtors9 + CEconj6, dcos_omega_dj );
+ rvec_ScaledAdd( *f_k,
+ CEtors9 + CEconj6, dcos_omega_dk );
+ rvec_ScaledAdd( *f_l,
+ CEtors9 + CEconj6, dcos_omega_dl );
+ }
+ else
+ {
+ ivec_Sum( rel_box_jl, pbond_jk->rel_box, pbond_kl->rel_box );
+
+ /* dcos_theta_ijk */
+ rvec_Scale( force, CEtors7 + CEconj4, p_ijk->dcos_dk );
+ rvec_Add( *f_i, force );
+ rvec_iMultiply( ext_press, pbond_ij->rel_box, force );
+#ifdef _OPENMP
+ #pragma omp critical (Four_Body_Interactions_ext_press)
+#endif
+ {
+ rvec_Add( data->ext_press, ext_press );
+ }
- CEconj1 = Cconj * (BOA_ij - 1.5e0);
- CEconj2 = Cconj * (BOA_jk - 1.5e0);
- CEconj3 = Cconj * (BOA_kl - 1.5e0);
-
- CEconj4 = -fbp->p_cot1 * fn12 *
- (SQR(cos_omega) - 1.0) * sin_jkl * tan_ijk_i;
- CEconj5 = -fbp->p_cot1 * fn12 *
- (SQR(cos_omega) - 1.0) * sin_ijk * tan_jkl_i;
- //CEconj4 = -fbp->p_cot1 * fn12 *
- // (SQR(cos_omega) - 1.0) * sin_jkl * cos_ijk;
- //CEconj5 = -fbp->p_cot1 * fn12 *
- // (SQR(cos_omega) - 1.0) * sin_ijk * cos_jkl;
- CEconj6 = 2.0 * fbp->p_cot1 * fn12 *
- cos_omega * sin_ijk * sin_jkl;
- /* end 4-body conjugation energy */
-
- //fprintf(stdout, "%6d %6d %6d %6d %7.3f %7.3f %7.3f %7.3f ",
- // workspace->orig_id[i], workspace->orig_id[j],
- // workspace->orig_id[k], workspace->orig_id[l],
- // omega, cos_omega, cos2omega, cos3omega );
- //fprintf(stdout,
- // "%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f\n",
- // CEtors2, CEtors3, CEtors4, CEtors5,
- // CEtors6, CEtors7, CEtors8, CEtors9 );
- //fprintf(stdout, "%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f\n",
- // theta_ijk, theta_jkl, sin_ijk,
- // sin_jkl, cos_jkl, tan_jkl_i );
-
- /* forces */
- bo_jk->Cdbopi += CEtors2;
- workspace->CdDelta[j] += CEtors3;
- workspace->CdDelta[k] += CEtors3;
- bo_ij->Cdbo += (CEtors4 + CEconj1);
- bo_jk->Cdbo += (CEtors5 + CEconj2);
- bo_kl->Cdbo += (CEtors6 + CEconj3);
-
- if ( control->ensemble == NVE || control->ensemble == NVT || control->ensemble == bNVT )
- {
- /* dcos_theta_ijk */
- rvec_ScaledAdd( system->atoms[i].f,
- CEtors7 + CEconj4, p_ijk->dcos_dk );
- rvec_ScaledAdd( system->atoms[j].f,
- CEtors7 + CEconj4, p_ijk->dcos_dj );
- rvec_ScaledAdd( system->atoms[k].f,
- CEtors7 + CEconj4, p_ijk->dcos_di );
-
- /* dcos_theta_jkl */
- rvec_ScaledAdd( system->atoms[j].f,
- CEtors8 + CEconj5, p_jkl->dcos_di );
- rvec_ScaledAdd( system->atoms[k].f,
- CEtors8 + CEconj5, p_jkl->dcos_dj );
- rvec_ScaledAdd( system->atoms[l].f,
- CEtors8 + CEconj5, p_jkl->dcos_dk );
-
- /* dcos_omega */
- rvec_ScaledAdd( system->atoms[i].f,
- CEtors9 + CEconj6, dcos_omega_di );
- rvec_ScaledAdd( system->atoms[j].f,
- CEtors9 + CEconj6, dcos_omega_dj );
- rvec_ScaledAdd( system->atoms[k].f,
- CEtors9 + CEconj6, dcos_omega_dk );
- rvec_ScaledAdd( system->atoms[l].f,
- CEtors9 + CEconj6, dcos_omega_dl );
- }
- else
- {
- ivec_Sum(rel_box_jl, pbond_jk->rel_box, pbond_kl->rel_box);
-
- /* dcos_theta_ijk */
- rvec_Scale( force, CEtors7 + CEconj4, p_ijk->dcos_dk );
- rvec_Add( system->atoms[i].f, force );
- rvec_iMultiply( ext_press, pbond_ij->rel_box, force );
- rvec_Add( data->ext_press, ext_press );
-
- rvec_ScaledAdd( system->atoms[j].f,
- CEtors7 + CEconj4, p_ijk->dcos_dj );
-
- rvec_Scale( force, CEtors7 + CEconj4, p_ijk->dcos_di );
- rvec_Add( system->atoms[k].f, force );
- rvec_iMultiply( ext_press, pbond_jk->rel_box, force );
- rvec_Add( data->ext_press, ext_press );
-
-
- /* dcos_theta_jkl */
- rvec_ScaledAdd( system->atoms[j].f,
- CEtors8 + CEconj5, p_jkl->dcos_di );
-
- rvec_Scale( force, CEtors8 + CEconj5, p_jkl->dcos_dj );
- rvec_Add( system->atoms[k].f, force );
- rvec_iMultiply( ext_press, pbond_jk->rel_box, force );
- rvec_Add( data->ext_press, ext_press );
-
- rvec_Scale( force, CEtors8 + CEconj5, p_jkl->dcos_dk );
- rvec_Add( system->atoms[l].f, force );
- rvec_iMultiply( ext_press, rel_box_jl, force );
- rvec_Add( data->ext_press, ext_press );
-
-
- /* dcos_omega */
- rvec_Scale( force, CEtors9 + CEconj6, dcos_omega_di );
- rvec_Add( system->atoms[i].f, force );
- rvec_iMultiply( ext_press, pbond_ij->rel_box, force );
- rvec_Add( data->ext_press, ext_press );
-
- rvec_ScaledAdd( system->atoms[j].f,
- CEtors9 + CEconj6, dcos_omega_dj );
-
- rvec_Scale( force, CEtors9 + CEconj6, dcos_omega_dk );
- rvec_Add( system->atoms[k].f, force );
- rvec_iMultiply( ext_press, pbond_jk->rel_box, force );
- rvec_Add( data->ext_press, ext_press );
-
- rvec_Scale( force, CEtors9 + CEconj6, dcos_omega_dl );
- rvec_Add( system->atoms[l].f, force );
- rvec_iMultiply( ext_press, rel_box_jl, force );
- rvec_Add( data->ext_press, ext_press );
-
-
- /* This part is intended for a fully-flexible box */
- /* rvec_ScaledSum( temp_rvec,
- CEtors7 + CEconj4, p_ijk->dcos_dk, // i
- CEtors9 + CEconj6, dcos_omega_di );
- rvec_OuterProduct( temp_rtensor,
- temp_rvec, system->atoms[i].x );
- rtensor_Copy( total_rtensor, temp_rtensor );
-
- rvec_ScaledSum( temp_rvec,
- CEtors7 + CEconj4, p_ijk->dcos_dj, // j
- CEtors8 + CEconj5, p_jkl->dcos_di );
- rvec_ScaledAdd( temp_rvec,
- CEtors9 + CEconj6, dcos_omega_dj );
- rvec_OuterProduct( temp_rtensor,
- temp_rvec, system->atoms[j].x );
- rtensor_Add( total_rtensor, temp_rtensor );
-
- rvec_ScaledSum( temp_rvec,
- CEtors7 + CEconj4, p_ijk->dcos_di, // k
- CEtors8 + CEconj5, p_jkl->dcos_dj );
- rvec_ScaledAdd( temp_rvec,
- CEtors9 + CEconj6, dcos_omega_dk );
- rvec_OuterProduct( temp_rtensor,
- temp_rvec, system->atoms[k].x );
- rtensor_Add( total_rtensor, temp_rtensor );
-
- rvec_ScaledSum( temp_rvec,
- CEtors8 + CEconj5, p_jkl->dcos_dk, // l
- CEtors9 + CEconj6, dcos_omega_dl );
- rvec_OuterProduct( temp_rtensor,
- temp_rvec, system->atoms[l].x );
- rtensor_Copy( total_rtensor, temp_rtensor );
-
- if( pbond_ij->imaginary || pbond_jk->imaginary ||
- pbond_kl->imaginary )
- rtensor_ScaledAdd( data->flex_bar.P, -1., total_rtensor );
- else
- rtensor_Add( data->flex_bar.P, total_rtensor ); */
- }
+ rvec_ScaledAdd( *f_j, CEtors7 + CEconj4, p_ijk->dcos_dj );
+
+ rvec_Scale( force, CEtors7 + CEconj4, p_ijk->dcos_di );
+ rvec_Add( *f_k, force );
+ rvec_iMultiply( ext_press, pbond_jk->rel_box, force );
+#ifdef _OPENMP
+ #pragma omp critical (Four_Body_Interactions_ext_press)
+#endif
+ {
+ rvec_Add( data->ext_press, ext_press );
+ }
+
+ /* dcos_theta_jkl */
+ rvec_ScaledAdd( *f_j, CEtors8 + CEconj5, p_jkl->dcos_di );
+
+ rvec_Scale( force, CEtors8 + CEconj5, p_jkl->dcos_dj );
+ rvec_Add( *f_k, force );
+ rvec_iMultiply( ext_press, pbond_jk->rel_box, force );
+#ifdef _OPENMP
+ #pragma omp critical (Four_Body_Interactions_ext_press)
+#endif
+ {
+ rvec_Add( data->ext_press, ext_press );
+ }
+
+ rvec_Scale( force, CEtors8 + CEconj5, p_jkl->dcos_dk );
+ rvec_Add( *f_l, force );
+ rvec_iMultiply( ext_press, rel_box_jl, force );
+#ifdef _OPENMP
+ #pragma omp critical (Four_Body_Interactions_ext_press)
+#endif
+ {
+ rvec_Add( data->ext_press, ext_press );
+ }
+
+ /* dcos_omega */
+ rvec_Scale( force, CEtors9 + CEconj6, dcos_omega_di );
+ rvec_Add( *f_i, force );
+ rvec_iMultiply( ext_press, pbond_ij->rel_box, force );
+#ifdef _OPENMP
+ #pragma omp critical (Four_Body_Interactions_ext_press)
+#endif
+ {
+ rvec_Add( data->ext_press, ext_press );
+ }
+
+ rvec_ScaledAdd( *f_j, CEtors9 + CEconj6, dcos_omega_dj );
+
+ rvec_Scale( force, CEtors9 + CEconj6, dcos_omega_dk );
+ rvec_Add( *f_k, force );
+ rvec_iMultiply( ext_press, pbond_jk->rel_box, force );
+#ifdef _OPENMP
+ #pragma omp critical (Four_Body_Interactions_ext_press)
+#endif
+ {
+ rvec_Add( data->ext_press, ext_press );
+ }
+
+ rvec_Scale( force, CEtors9 + CEconj6, dcos_omega_dl );
+ rvec_Add( *f_l, force );
+ rvec_iMultiply( ext_press, rel_box_jl, force );
+#ifdef _OPENMP
+ #pragma omp critical (Four_Body_Interactions_ext_press)
+#endif
+ {
+ rvec_Add( data->ext_press, ext_press );
+ }
+
+ /* This part is intended for a fully-flexible box */
+ /* rvec_ScaledSum( temp_rvec,
+ CEtors7 + CEconj4, p_ijk->dcos_dk, // i
+ CEtors9 + CEconj6, dcos_omega_di );
+ rvec_OuterProduct( temp_rtensor,
+ temp_rvec, system->atoms[i].x );
+ rtensor_Copy( total_rtensor, temp_rtensor );
+
+ rvec_ScaledSum( temp_rvec,
+ CEtors7 + CEconj4, p_ijk->dcos_dj, // j
+ CEtors8 + CEconj5, p_jkl->dcos_di );
+ rvec_ScaledAdd( temp_rvec,
+ CEtors9 + CEconj6, dcos_omega_dj );
+ rvec_OuterProduct( temp_rtensor,
+ temp_rvec, system->atoms[j].x );
+ rtensor_Add( total_rtensor, temp_rtensor );
+
+ rvec_ScaledSum( temp_rvec,
+ CEtors7 + CEconj4, p_ijk->dcos_di, // k
+ CEtors8 + CEconj5, p_jkl->dcos_dj );
+ rvec_ScaledAdd( temp_rvec,
+ CEtors9 + CEconj6, dcos_omega_dk );
+ rvec_OuterProduct( temp_rtensor,
+ temp_rvec, system->atoms[k].x );
+ rtensor_Add( total_rtensor, temp_rtensor );
+
+ rvec_ScaledSum( temp_rvec,
+ CEtors8 + CEconj5, p_jkl->dcos_dk, // l
+ CEtors9 + CEconj6, dcos_omega_dl );
+ rvec_OuterProduct( temp_rtensor,
+ temp_rvec, system->atoms[l].x );
+ rtensor_Copy( total_rtensor, temp_rtensor );
+
+ if( pbond_ij->imaginary || pbond_jk->imaginary ||
+ pbond_kl->imaginary )
+ rtensor_ScaledAdd( data->flex_bar.P, -1., total_rtensor );
+ else
+ rtensor_Add( data->flex_bar.P, total_rtensor ); */
+ }
#ifdef TEST_ENERGY
- /*fprintf( out_control->etor,
- //"%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f\n",
- //r_ij, r_jk, r_kl,
- "%12.8f%12.8f%12.8f%12.8f\n",
- cos_ijk, cos_jkl, sin_ijk, sin_jkl );*/
- // fprintf( out_control->etor, "%12.8f\n", dfn11 );
- fprintf( out_control->etor, "%12.8f%12.8f%12.8f\n",
- fn10, cos_omega, CV );
-
- fprintf( out_control->etor,
- "%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f\n",
- CEtors2, CEtors3, CEtors4, CEtors5,
- CEtors6, CEtors7, CEtors8, CEtors9 );
-
- /* fprintf( out_control->etor,
- "%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f\n",
- htra, htrb, htrc, hthd, hthe, hnra, hnrc, hnhd, hnhe ); */
-
- fprintf( out_control->etor,
- "%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f\n",
- CEconj1, CEconj2, CEconj3, CEconj4, CEconj5, CEconj6 );
- /* fprintf(out_control->etor,"%23.15e%23.15e%23.15e%23.15e\n",
- fbp->V1, fbp->V2, fbp->V3, fbp->p_tor1 );*/
-
- fprintf( out_control->etor,
- //"%6d%6d%6d%6d%23.15e%23.15e%23.15e%23.15e\n",
- "%6d%6d%6d%6d%12.8f%12.8f\n",
- workspace->orig_id[i], workspace->orig_id[j],
- workspace->orig_id[k], workspace->orig_id[l],
- e_tor, e_con );
- //RAD2DEG(omega), BOA_jk, e_tor, data->E_Tor );
-
- fprintf( out_control->econ,
- "%6d%6d%6d%6d%23.15e%23.15e%23.15e%23.15e%23.15e%23.15e\n",
- workspace->orig_id[i], workspace->orig_id[j],
- workspace->orig_id[k], workspace->orig_id[l],
- RAD2DEG(omega), BOA_ij, BOA_jk, BOA_kl,
- e_con, data->E_Con );
-
- /* fprintf( out_control->etor,
- "%12.8f%12.8f%12.8f\n%12.8f%12.8f%12.8f\n%12.8f%12.8f%12.8f\n",
- (CEtors7 + CEconj4)*p_ijk->dcos_dk[0],
- (CEtors7 + CEconj4)*p_ijk->dcos_dk[1],
- (CEtors7 + CEconj4)*p_ijk->dcos_dk[2],
- (CEtors7 + CEconj4)*p_ijk->dcos_dj[0],
- (CEtors7 + CEconj4)*p_ijk->dcos_dj[1],
- (CEtors7 + CEconj4)*p_ijk->dcos_dj[2],
- (CEtors7 + CEconj4)*p_ijk->dcos_di[0],
- (CEtors7 + CEconj4)*p_ijk->dcos_di[1],
- (CEtors7 + CEconj4)*p_ijk->dcos_di[2] ); */
-
-
- /* fprintf( out_control->etor,
- "%12.8f%12.8f%12.8f\n%12.8f%12.8f%12.8f\n%12.8f%12.8f%12.8f\n",
- (CEtors8 + CEconj5)*p_jkl->dcos_di[0],
- (CEtors8 + CEconj5)*p_jkl->dcos_di[1],
- (CEtors8 + CEconj5)*p_jkl->dcos_di[2],
- (CEtors8 + CEconj5)*p_jkl->dcos_dj[0],
- (CEtors8 + CEconj5)*p_jkl->dcos_dj[1],
- (CEtors8 + CEconj5)*p_jkl->dcos_dj[2],
- (CEtors8 + CEconj5)*p_jkl->dcos_dk[0],
- (CEtors8 + CEconj5)*p_jkl->dcos_dk[1],
- (CEtors8 + CEconj5)*p_jkl->dcos_dk[2] ); */
-
- fprintf( out_control->etor,
- "%12.8f%12.8f%12.8f\n%12.8f%12.8f%12.8f\n%12.8f%12.8f%12.8f\n%12.8f%12.8f%12.8f\n",
- dcos_omega_di[0], dcos_omega_di[1], dcos_omega_di[2],
- dcos_omega_dj[0], dcos_omega_dj[1], dcos_omega_dj[2],
- dcos_omega_dk[0], dcos_omega_dk[1], dcos_omega_dk[2],
- dcos_omega_dl[0], dcos_omega_dl[1], dcos_omega_dl[2] );
+ /*fprintf( out_control->etor,
+ //"%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f\n",
+ //r_ij, r_jk, r_kl,
+ "%12.8f%12.8f%12.8f%12.8f\n",
+ cos_ijk, cos_jkl, sin_ijk, sin_jkl );*/
+ // fprintf( out_control->etor, "%12.8f\n", dfn11 );
+ fprintf( out_control->etor, "%12.8f%12.8f%12.8f\n",
+ fn10, cos_omega, CV );
+
+ fprintf( out_control->etor,
+ "%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f\n",
+ CEtors2, CEtors3, CEtors4, CEtors5,
+ CEtors6, CEtors7, CEtors8, CEtors9 );
+
+ /* fprintf( out_control->etor,
+ "%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f\n",
+ htra, htrb, htrc, hthd, hthe, hnra, hnrc, hnhd, hnhe ); */
+
+ fprintf( out_control->etor,
+ "%12.8f%12.8f%12.8f%12.8f%12.8f%12.8f\n",
+ CEconj1, CEconj2, CEconj3, CEconj4, CEconj5, CEconj6 );
+ /* fprintf(out_control->etor,"%23.15e%23.15e%23.15e%23.15e\n",
+ fbp->V1, fbp->V2, fbp->V3, fbp->p_tor1 );*/
+
+ fprintf( out_control->etor,
+ //"%6d%6d%6d%6d%23.15e%23.15e%23.15e%23.15e\n",
+ "%6d%6d%6d%6d%12.8f%12.8f\n",
+ workspace->orig_id[i], workspace->orig_id[j],
+ workspace->orig_id[k], workspace->orig_id[l],
+ e_tor, e_con );
+ //RAD2DEG(omega), BOA_jk, e_tor, data->E_Tor );
+
+ fprintf( out_control->econ,
+ "%6d%6d%6d%6d%23.15e%23.15e%23.15e%23.15e%23.15e%23.15e\n",
+ workspace->orig_id[i], workspace->orig_id[j],
+ workspace->orig_id[k], workspace->orig_id[l],
+ RAD2DEG(omega), BOA_ij, BOA_jk, BOA_kl,
+ e_con, data->E_Con );
+
+ /* fprintf( out_control->etor,
+ "%12.8f%12.8f%12.8f\n%12.8f%12.8f%12.8f\n%12.8f%12.8f%12.8f\n",
+ (CEtors7 + CEconj4)*p_ijk->dcos_dk[0],
+ (CEtors7 + CEconj4)*p_ijk->dcos_dk[1],
+ (CEtors7 + CEconj4)*p_ijk->dcos_dk[2],
+ (CEtors7 + CEconj4)*p_ijk->dcos_dj[0],
+ (CEtors7 + CEconj4)*p_ijk->dcos_dj[1],
+ (CEtors7 + CEconj4)*p_ijk->dcos_dj[2],
+ (CEtors7 + CEconj4)*p_ijk->dcos_di[0],
+ (CEtors7 + CEconj4)*p_ijk->dcos_di[1],
+ (CEtors7 + CEconj4)*p_ijk->dcos_di[2] ); */
+
+
+ /* fprintf( out_control->etor,
+ "%12.8f%12.8f%12.8f\n%12.8f%12.8f%12.8f\n%12.8f%12.8f%12.8f\n",
+ (CEtors8 + CEconj5)*p_jkl->dcos_di[0],
+ (CEtors8 + CEconj5)*p_jkl->dcos_di[1],
+ (CEtors8 + CEconj5)*p_jkl->dcos_di[2],
+ (CEtors8 + CEconj5)*p_jkl->dcos_dj[0],
+ (CEtors8 + CEconj5)*p_jkl->dcos_dj[1],
+ (CEtors8 + CEconj5)*p_jkl->dcos_dj[2],
+ (CEtors8 + CEconj5)*p_jkl->dcos_dk[0],
+ (CEtors8 + CEconj5)*p_jkl->dcos_dk[1],
+ (CEtors8 + CEconj5)*p_jkl->dcos_dk[2] ); */
+
+ fprintf( out_control->etor,
+ "%12.8f%12.8f%12.8f\n%12.8f%12.8f%12.8f\n%12.8f%12.8f%12.8f\n%12.8f%12.8f%12.8f\n",
+ dcos_omega_di[0], dcos_omega_di[1], dcos_omega_di[2],
+ dcos_omega_dj[0], dcos_omega_dj[1], dcos_omega_dj[2],
+ dcos_omega_dk[0], dcos_omega_dk[1], dcos_omega_dk[2],
+ dcos_omega_dl[0], dcos_omega_dl[1], dcos_omega_dl[2] );
#endif
#ifdef TEST_FORCES
- /* Torsion Forces */
- Add_dBOpinpi2(system, lists, j, pk, CEtors2, 0.,
- workspace->f_tor, workspace->f_tor);
- Add_dDelta( system, lists, j, CEtors3, workspace->f_tor );
- Add_dDelta( system, lists, k, CEtors3, workspace->f_tor );
- Add_dBO( system, lists, j, pij, CEtors4, workspace->f_tor );
- Add_dBO( system, lists, j, pk, CEtors5, workspace->f_tor );
- Add_dBO( system, lists, k, plk, CEtors6, workspace->f_tor );
-
- rvec_ScaledAdd(workspace->f_tor[i], CEtors7, p_ijk->dcos_dk);
- rvec_ScaledAdd(workspace->f_tor[j], CEtors7, p_ijk->dcos_dj);
- rvec_ScaledAdd(workspace->f_tor[k], CEtors7, p_ijk->dcos_di);
-
- rvec_ScaledAdd(workspace->f_tor[j], CEtors8, p_jkl->dcos_di);
- rvec_ScaledAdd(workspace->f_tor[k], CEtors8, p_jkl->dcos_dj);
- rvec_ScaledAdd(workspace->f_tor[l], CEtors8, p_jkl->dcos_dk);
-
- rvec_ScaledAdd( workspace->f_tor[i], CEtors9, dcos_omega_di );
- rvec_ScaledAdd( workspace->f_tor[j], CEtors9, dcos_omega_dj );
- rvec_ScaledAdd( workspace->f_tor[k], CEtors9, dcos_omega_dk );
- rvec_ScaledAdd( workspace->f_tor[l], CEtors9, dcos_omega_dl );
-
- /* Conjugation Forces */
- Add_dBO( system, lists, j, pij, CEconj1, workspace->f_con );
- Add_dBO( system, lists, j, pk, CEconj2, workspace->f_con );
- Add_dBO( system, lists, k, plk, CEconj3, workspace->f_con );
-
- rvec_ScaledAdd(workspace->f_con[i], CEconj4, p_ijk->dcos_dk);
- rvec_ScaledAdd(workspace->f_con[j], CEconj4, p_ijk->dcos_dj);
- rvec_ScaledAdd(workspace->f_con[k], CEconj4, p_ijk->dcos_di);
-
- rvec_ScaledAdd(workspace->f_con[j], CEconj5, p_jkl->dcos_di);
- rvec_ScaledAdd(workspace->f_con[k], CEconj5, p_jkl->dcos_dj);
- rvec_ScaledAdd(workspace->f_con[l], CEconj5, p_jkl->dcos_dk);
-
- rvec_ScaledAdd( workspace->f_con[i], CEconj6, dcos_omega_di );
- rvec_ScaledAdd( workspace->f_con[j], CEconj6, dcos_omega_dj );
- rvec_ScaledAdd( workspace->f_con[k], CEconj6, dcos_omega_dk );
- rvec_ScaledAdd( workspace->f_con[l], CEconj6, dcos_omega_dl );
+ /* Torsion Forces */
+ Add_dBOpinpi2( system, lists, j, pk, CEtors2, 0.,
+ workspace->f_tor, workspace->f_tor );
+ Add_dDelta( system, lists, j, CEtors3, workspace->f_tor );
+ Add_dDelta( system, lists, k, CEtors3, workspace->f_tor );
+ Add_dBO( system, lists, j, pij, CEtors4, workspace->f_tor );
+ Add_dBO( system, lists, j, pk, CEtors5, workspace->f_tor );
+ Add_dBO( system, lists, k, plk, CEtors6, workspace->f_tor );
+
+ rvec_ScaledAdd( workspace->f_tor[i], CEtors7, p_ijk->dcos_dk );
+ rvec_ScaledAdd( workspace->f_tor[j], CEtors7, p_ijk->dcos_dj );
+ rvec_ScaledAdd( workspace->f_tor[k], CEtors7, p_ijk->dcos_di );
+
+ rvec_ScaledAdd( workspace->f_tor[j], CEtors8, p_jkl->dcos_di );
+ rvec_ScaledAdd( workspace->f_tor[k], CEtors8, p_jkl->dcos_dj );
+ rvec_ScaledAdd( workspace->f_tor[l], CEtors8, p_jkl->dcos_dk );
+
+ rvec_ScaledAdd( workspace->f_tor[i], CEtors9, dcos_omega_di );
+ rvec_ScaledAdd( workspace->f_tor[j], CEtors9, dcos_omega_dj );
+ rvec_ScaledAdd( workspace->f_tor[k], CEtors9, dcos_omega_dk );
+ rvec_ScaledAdd( workspace->f_tor[l], CEtors9, dcos_omega_dl );
+
+ /* Conjugation Forces */
+ Add_dBO( system, lists, j, pij, CEconj1, workspace->f_con );
+ Add_dBO( system, lists, j, pk, CEconj2, workspace->f_con );
+ Add_dBO( system, lists, k, plk, CEconj3, workspace->f_con );
+
+ rvec_ScaledAdd( workspace->f_con[i], CEconj4, p_ijk->dcos_dk );
+ rvec_ScaledAdd( workspace->f_con[j], CEconj4, p_ijk->dcos_dj );
+ rvec_ScaledAdd( workspace->f_con[k], CEconj4, p_ijk->dcos_di );
+
+ rvec_ScaledAdd( workspace->f_con[j], CEconj5, p_jkl->dcos_di );
+ rvec_ScaledAdd( workspace->f_con[k], CEconj5, p_jkl->dcos_dj );
+ rvec_ScaledAdd( workspace->f_con[l], CEconj5, p_jkl->dcos_dk );
+
+ rvec_ScaledAdd( workspace->f_con[i], CEconj6, dcos_omega_di );
+ rvec_ScaledAdd( workspace->f_con[j], CEconj6, dcos_omega_dj );
+ rvec_ScaledAdd( workspace->f_con[k], CEconj6, dcos_omega_dk );
+ rvec_ScaledAdd( workspace->f_con[l], CEconj6, dcos_omega_dl );
#endif
- } // pl check ends
- } // pl loop ends
- } // pi check ends
- } // pi loop ends
- } // k-j neighbor check ends
- } // j<k && j-k neighbor check ends
- } // pk loop ends
- } // j loop
+ } // pl check ends
+ } // pl loop ends
+ } // pi check ends
+ } // pi loop ends
+ } // k-j neighbor check ends
+ } // j<k && j-k neighbor check ends
+ } // pk loop ends
+ } // j loop
+ }
+
+ data->E_Tor += e_tor_total;
+ data->E_Con += e_con_total;
/* fprintf( stderr, "4body: ext_press (%23.15e %23.15e %23.15e)\n",
data->ext_press[0], data->ext_press[1], data->ext_press[2] );*/
diff --git a/sPuReMD/src/geo_tools.c b/sPuReMD/src/geo_tools.c
index f996af5e3dc3d3ff770afa8cbc6fd4530d0b46cb..442f1e0c7e09496d69840dba11fdc04f8274346e 100644
--- a/sPuReMD/src/geo_tools.c
+++ b/sPuReMD/src/geo_tools.c
@@ -214,21 +214,21 @@ void Count_PDB_Atoms( FILE *geo, reax_system *system )
char Read_PDB( char* pdb_file, reax_system* system, control_params *control,
- simulation_data *data, static_storage *workspace )
+ simulation_data *data, static_storage *workspace )
{
- FILE *pdb;
+ FILE *pdb;
char **tmp;
- char *s, *s1;
- char descriptor[9], serial[9];
- char atom_name[9], res_name[9], res_seq[9];
- char s_x[9], s_y[9], s_z[9];
- char occupancy[9], temp_factor[9];
- char seg_id[9], element[9], charge[9];
- char alt_loc, chain_id, icode;
- char *endptr = NULL;
- int i, c, c1, pdb_serial, top;
- rvec x;
+ char *s, *s1;
+ char descriptor[9], serial[9];
+ char atom_name[9], res_name[9], res_seq[9];
+ char s_x[9], s_y[9], s_z[9];
+ char occupancy[9], temp_factor[9];
+ char seg_id[9], element[9], charge[9];
+ char alt_loc, chain_id, icode;
+ char *endptr = NULL;
+ int i, c, c1, pdb_serial, top;
+ rvec x;
reax_atom *atom;
/* open pdb file */
@@ -266,8 +266,9 @@ char Read_PDB( char* pdb_file, reax_system* system, control_params *control,
#if defined(DEBUG_FOCUS)
fprintf( stderr, "starting to read the pdb file\n" );
#endif
+
fseek( pdb, 0, SEEK_SET );
- c = 0;
+ c = 0;
c1 = 0;
top = 0;
s[0] = 0;
@@ -424,7 +425,9 @@ char Read_PDB( char* pdb_file, reax_system* system, control_params *control,
/* clear previous input line */
s[0] = 0;
for ( i = 0; i < c1; ++i )
+ {
tmp[i][0] = 0;
+ }
}
if ( ferror( pdb ) )
{
@@ -433,6 +436,8 @@ char Read_PDB( char* pdb_file, reax_system* system, control_params *control,
fclose( pdb );
+ Deallocate_Tokenizer_Space( &s, &s1, &tmp );
+
#if defined(DEBUG_FOCUS)
fprintf( stderr, "finished reading the pdb file\n" );
#endif
@@ -483,7 +488,7 @@ char Write_PDB( reax_system* system, list* bonds, simulation_data *data,
(system->box.box_norms[2] * system->box.box_norms[1]) );
/*open pdb and write header*/
- sprintf(fname, "%s-%d.pdb", control->sim_name, data->step);
+ sprintf( fname, "%s-%d.pdb", control->sim_name, data->step );
pdb = fopen(fname, "w");
fprintf( pdb, PDB_CRYST1_FORMAT_O,
"CRYST1",
@@ -537,8 +542,8 @@ char Write_PDB( reax_system* system, list* bonds, simulation_data *data,
}
*/
- free(buffer);
- free(line);
+ free( buffer );
+ free( line );
return SUCCESS;
}
diff --git a/sPuReMD/src/grid.c b/sPuReMD/src/grid.c
index c422a48ae746f336cb0c3398c3990678d93ec35e..d48644f6628dc29bbf4899d03e8ce994ff7c4c49 100644
--- a/sPuReMD/src/grid.c
+++ b/sPuReMD/src/grid.c
@@ -69,7 +69,8 @@ void Allocate_Space_for_Grid( reax_system *system )
grid *g;
g = &(system->g);
- g->max_nbrs = (2 * g->spread[0] + 1) * (2 * g->spread[1] + 1) * (2 * g->spread[2] + 1) + 3;
+ g->max_nbrs = (2 * g->spread[0] + 1)
+ * (2 * g->spread[1] + 1) * (2 * g->spread[2] + 1) + 3;
/* allocate space for the new grid */
g->atoms = (int****) calloc( g->ncell[0], sizeof( int*** ));
@@ -156,6 +157,8 @@ void Deallocate_Grid_Space( grid *g )
free( g->atoms[i][j] );
free( g->top[i][j] );
+ free( g->start[i][j] );
+ free( g->end[i][j] );
free( g->mark[i][j] );
free( g->nbrs[i][j] );
free( g->nbrs_cp[i][j] );
@@ -163,6 +166,8 @@ void Deallocate_Grid_Space( grid *g )
free( g->atoms[i] );
free( g->top[i] );
+ free( g->start[i] );
+ free( g->end[i] );
free( g->mark[i] );
free( g->nbrs[i] );
free( g->nbrs_cp[i] );
@@ -170,6 +175,8 @@ void Deallocate_Grid_Space( grid *g )
free( g->atoms );
free( g->top );
+ free( g->start );
+ free( g->end );
free( g->mark );
free( g->nbrs );
free( g->nbrs_cp );
@@ -484,6 +491,12 @@ void Bin_Atoms( reax_system* system, static_storage *workspace )
}
+void Finalize_Grid( reax_system* system )
+{
+ Deallocate_Grid_Space( &( system->g ) );
+}
+
+
static inline void reax_atom_Copy( reax_atom *dest, reax_atom *src )
{
dest->type = src->type;
diff --git a/sPuReMD/src/grid.h b/sPuReMD/src/grid.h
index cab825018606dd56e9f2b057c89a7d43287ed1f7..6e83b740ed0a7f8035b45ad0423ef62e2ab0c850 100644
--- a/sPuReMD/src/grid.h
+++ b/sPuReMD/src/grid.h
@@ -24,10 +24,13 @@
#include "mytypes.h"
+
void Setup_Grid( reax_system* );
void Update_Grid( reax_system* );
+void Finalize_Grid( reax_system* );
+
int Shift( int, int, int, grid* );
void Cluster_Atoms( reax_system *, static_storage *, control_params * );
@@ -36,4 +39,5 @@ void Bin_Atoms( reax_system*, static_storage* );
void Reset_Marks( grid*, ivec*, int );
+
#endif
diff --git a/sPuReMD/src/init_md.c b/sPuReMD/src/init_md.c
index 3cbf575fc3215c45e6c4bde578036e0f243abb20..261214683414377ee829e33f31c1ad1e2f97eca0 100644
--- a/sPuReMD/src/init_md.c
+++ b/sPuReMD/src/init_md.c
@@ -41,11 +41,13 @@ void Generate_Initial_Velocities( reax_system *system, real T )
int i;
real scale, norm;
-
if ( T <= 0.1 )
{
- for (i = 0; i < system->N; i++)
+ for ( i = 0; i < system->N; i++ )
+ {
rvec_MakeZero( system->atoms[i].v );
+ }
+
#if defined(DEBUG)
fprintf( stderr, "no random velocities...\n" );
#endif
@@ -73,13 +75,15 @@ void Generate_Initial_Velocities( reax_system *system, real T )
void Init_System( reax_system *system, control_params *control,
- simulation_data *data )
+ simulation_data *data )
{
int i;
rvec dx;
if ( !control->restart )
+ {
Reset_Atoms( system );
+ }
Compute_Total_Mass( system, data );
Compute_Center_of_Mass( system, data, stderr );
@@ -117,21 +121,26 @@ void Init_System( reax_system *system, control_params *control,
/* Initialize velocities so that desired init T can be attained */
if ( !control->restart || (control->restart && control->random_vel) )
+ {
Generate_Initial_Velocities( system, control->T_init );
+ }
Setup_Grid( system );
}
void Init_Simulation_Data( reax_system *system, control_params *control,
- simulation_data *data, output_controls *out_control,
- evolve_function *Evolve )
+ simulation_data *data, output_controls *out_control,
+ evolve_function *Evolve )
{
Reset_Simulation_Data( data );
if ( !control->restart )
- data->step = data->prev_steps = 0;
+ {
+ data->step = 0;
+ data->prev_steps = 0;
+ }
switch ( control->ensemble )
{
@@ -169,9 +178,9 @@ void Init_Simulation_Data( reax_system *system, control_params *control,
if ( !control->restart )
{
data->therm.G_xi = control->Tau_T * (2.0 * data->E_Kin -
- data->N_f * K_B * control->T );
+ data->N_f * K_B * control->T);
data->therm.v_xi = data->therm.G_xi * control->dt;
- data->iso_bar.eps = 0.33333 * log(system->box.volume);
+ data->iso_bar.eps = 1.0 / 3.0 * LOG( system->box.volume );
//data->inv_W = 1. / (data->N_f*K_B*control->T*SQR(control->Tau_P));
//Compute_Pressure( system, data, workspace );
}
@@ -328,8 +337,6 @@ void Init_Workspace( reax_system *system, control_params *control,
workspace->b_t = (real *) calloc( system->N_cm, sizeof( real ) );
workspace->b_prc = (real *) calloc( system->N_cm * 2, sizeof( real ) );
workspace->b_prm = (real *) calloc( system->N_cm * 2, sizeof( real ) );
- //TODO: check if unused
- //workspace->s_t = (real *) calloc( cm_lin_sys_size * 2, sizeof( real ) );
workspace->s = (real**) calloc( 5, sizeof( real* ) );
workspace->t = (real**) calloc( 5, sizeof( real* ) );
for ( i = 0; i < 5; ++i )
@@ -444,6 +451,10 @@ void Init_Workspace( reax_system *system, control_params *control,
workspace->f_old = (rvec *) malloc( system->N * sizeof( rvec ) );
workspace->v_const = (rvec *) malloc( system->N * sizeof( rvec ) );
+#ifdef _OPENMP
+ workspace->f_local = (rvec *) malloc( control->num_threads * system->N * sizeof( rvec ) );
+#endif
+
/* storage for analysis */
if ( control->molec_anal || control->diffusion_coef )
{
@@ -496,11 +507,14 @@ void Init_Workspace( reax_system *system, control_params *control,
void Init_Lists( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
- int i, num_nbrs, num_hbonds, num_bonds, num_3body, Htop, max_nnz;
+ int i, num_nbrs, num_bonds, num_3body, Htop, max_nnz;
int *hb_top, *bond_top;
+#if defined(DEBUG_FOCUS)
+ int num_hbonds;
+#endif
num_nbrs = Estimate_NumNeighbors( system, control, workspace, lists );
@@ -579,9 +593,9 @@ void Init_Lists( reax_system *system, control_params *control,
Allocate_HBond_List( system->N, workspace->num_H, workspace->hbond_index,
hb_top, (*lists) + HBONDS );
- num_hbonds = hb_top[system->N - 1];
#if defined(DEBUG_FOCUS)
+ num_hbonds = hb_top[system->N - 1];
fprintf( stderr, "estimated storage - num_hbonds: %d\n", num_hbonds );
fprintf( stderr, "memory allocated: hbonds = %ldMB\n",
num_hbonds * sizeof(hbond_data) / (1024 * 1024) );
@@ -598,10 +612,6 @@ void Init_Lists( reax_system *system, control_params *control,
num_bonds * sizeof(bond_data) / (1024 * 1024) );
#endif
-//fprintf (stderr, " **** sizeof 3 body : %d \n", sizeof (three_body_interaction_data));
-//fprintf (stderr, " **** num_3body : %d \n", num_3body);
-//fprintf (stderr, " **** num_bonds : %d \n", num_bonds);
-
/* 3bodies list */
if (!Make_List(num_bonds, num_3body, TYP_THREE_BODY, (*lists) + THREE_BODIES))
{
@@ -634,8 +644,8 @@ void Init_Lists( reax_system *system, control_params *control,
}
-void Init_Out_Controls(reax_system *system, control_params *control,
- static_storage *workspace, output_controls *out_control)
+void Init_Out_Controls( reax_system *system, control_params *control,
+ static_storage *workspace, output_controls *out_control )
{
char temp[1000];
@@ -860,12 +870,23 @@ void Init_Out_Controls(reax_system *system, control_params *control,
}
-void Initialize(reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace, list **lists,
- output_controls *out_control, evolve_function *Evolve)
+void Initialize( reax_system *system, control_params *control,
+ simulation_data *data, static_storage *workspace, list **lists,
+ output_controls *out_control, evolve_function *Evolve )
{
+#if defined(DEBUG)
real start, end;
- Randomize();
+#endif
+
+#ifdef _OPENMP
+ #pragma omp parallel default(shared)
+ {
+ #pragma omp single
+ control->num_threads = omp_get_num_threads( );
+ }
+#endif
+
+ Randomize( );
Init_System( system, control, data );
@@ -879,20 +900,399 @@ void Initialize(reax_system *system, control_params *control,
/* These are done in forces.c, only forces.c can see all those functions */
Init_Bonded_Force_Functions( control );
+
#ifdef TEST_FORCES
Init_Force_Test_Functions( );
#endif
if ( control->tabulate )
{
- start = Get_Time ();
+#if defined(DEBUG)
+ start = Get_Time( );
+#endif
+
Make_LR_Lookup_Table( system, control );
- end = Get_Timing_Info (start);
- //fprintf (stderr, "Time for LR Lookup Table calculation is %f \n", end );
+#if defined(DEBUG)
+ end = Get_Timing_Info( start );
+
+ fprintf( stderr, "Time for LR Lookup Table calculation is %f \n", end );
+#endif
}
#if defined(DEBUG_FOCUS)
fprintf( stderr, "data structures have been initialized...\n" );
#endif
}
+
+
+void Finalize_System( reax_system *system, control_params *control,
+ simulation_data *data )
+{
+ int i, j, k;
+ reax_interaction *reax;
+
+ reax = &( system->reaxprm );
+
+ Finalize_Grid( system );
+
+ free( reax->gp.l );
+
+ for ( i = 0; i < reax->num_atom_types; i++ )
+ {
+ for ( j = 0; j < reax->num_atom_types; j++ )
+ {
+ for ( k = 0; k < reax->num_atom_types; k++ )
+ {
+ free( reax->fbp[i][j][k] );
+ }
+
+ free( reax->thbp[i][j] );
+ free( reax->hbp[i][j] );
+ free( reax->fbp[i][j] );
+ }
+
+ free( reax->tbp[i] );
+ free( reax->thbp[i] );
+ free( reax->hbp[i] );
+ free( reax->fbp[i] );
+ }
+
+ free( reax->sbp );
+ free( reax->tbp );
+ free( reax->thbp );
+ free( reax->hbp );
+ free( reax->fbp );
+
+ free( system->atoms );
+}
+
+
+void Finalize_Simulation_Data( reax_system *system, control_params *control,
+ simulation_data *data, output_controls *out_control )
+{
+}
+
+
+void Finalize_Workspace( reax_system *system, control_params *control,
+ static_storage *workspace )
+{
+ int i;
+
+ free( workspace->hbond_index );
+ free( workspace->total_bond_order );
+ free( workspace->Deltap );
+ free( workspace->Deltap_boc );
+ free( workspace->dDeltap_self );
+ free( workspace->Delta );
+ free( workspace->Delta_lp );
+ free( workspace->Delta_lp_temp );
+ free( workspace->dDelta_lp );
+ free( workspace->dDelta_lp_temp );
+ free( workspace->Delta_e );
+ free( workspace->Delta_boc );
+ free( workspace->nlp );
+ free( workspace->nlp_temp );
+ free( workspace->Clp );
+ free( workspace->CdDelta );
+ free( workspace->vlpex );
+
+ Deallocate_Matrix( workspace->H );
+ Deallocate_Matrix( workspace->H_sp );
+ if ( control->cm_solver_pre_comp_type == ICHOLT_PC ||
+ control->cm_solver_pre_comp_type == ILU_PAR_PC ||
+ control->cm_solver_pre_comp_type == ILUT_PAR_PC )
+ {
+ Deallocate_Matrix( workspace->L );
+ Deallocate_Matrix( workspace->U );
+ }
+
+ for ( i = 0; i < 5; ++i )
+ {
+ free( workspace->s[i] );
+ free( workspace->t[i] );
+ }
+
+ free( workspace->Hdia_inv );
+ if ( control->cm_solver_pre_comp_type == ICHOLT_PC ||
+ control->cm_solver_pre_comp_type == ILUT_PAR_PC )
+ {
+ free( workspace->droptol );
+ }
+ //TODO: check if unused
+ //free( workspace->w );
+ //TODO: check if unused
+ free( workspace->b );
+ free( workspace->b_s );
+ free( workspace->b_t );
+ free( workspace->b_prc );
+ free( workspace->b_prm );
+ free( workspace->s );
+ free( workspace->t );
+
+ switch ( control->cm_solver_type )
+ {
+ /* GMRES storage */
+ case GMRES_S:
+ case GMRES_H_S:
+ for ( i = 0; i < control->cm_solver_restart + 1; ++i )
+ {
+ free( workspace->h[i] );
+ free( workspace->rn[i] );
+ free( workspace->v[i] );
+ }
+
+ free( workspace->y );
+ free( workspace->z );
+ free( workspace->g );
+ free( workspace->h );
+ free( workspace->hs );
+ free( workspace->hc );
+ free( workspace->rn );
+ free( workspace->v );
+
+ free( workspace->r );
+ free( workspace->d );
+ free( workspace->q );
+ free( workspace->p );
+ break;
+
+ /* CG storage */
+ case CG_S:
+ free( workspace->r );
+ free( workspace->d );
+ free( workspace->q );
+ free( workspace->p );
+ break;
+
+ case SDM_S:
+ free( workspace->r );
+ free( workspace->d );
+ free( workspace->q );
+ break;
+
+ default:
+ fprintf( stderr, "Unknown charge method linear solver type. Terminating...\n" );
+ exit( INVALID_INPUT );
+ break;
+ }
+
+ /* integrator storage */
+ free( workspace->a );
+ free( workspace->f_old );
+ free( workspace->v_const );
+
+#ifdef _OPENMP
+ free( workspace->f_local );
+#endif
+
+ /* storage for analysis */
+ if ( control->molec_anal || control->diffusion_coef )
+ {
+ free( workspace->mark );
+ free( workspace->old_mark );
+ }
+ else
+ {
+ free( workspace->mark );
+ }
+
+ if ( control->diffusion_coef )
+ {
+ free( workspace->x_old );
+ }
+ else
+ {
+ free( workspace->x_old );
+ }
+
+ free( workspace->orig_id );
+
+ /* space for keeping restriction info, if any */
+ if ( control->restrict_bonds )
+ {
+ for ( i = 0; i < system->N; ++i )
+ {
+ free( workspace->restricted_list[i] );
+ }
+
+ free( workspace->restricted );
+ free( workspace->restricted_list );
+ }
+
+#ifdef TEST_FORCES
+ free( workspace->dDelta );
+ free( workspace->f_ele );
+ free( workspace->f_vdw );
+ free( workspace->f_bo );
+ free( workspace->f_be );
+ free( workspace->f_lp );
+ free( workspace->f_ov );
+ free( workspace->f_un );
+ free( workspace->f_ang );
+ free( workspace->f_coa );
+ free( workspace->f_pen );
+ free( workspace->f_hb );
+ free( workspace->f_tor );
+ free( workspace->f_con );
+#endif
+}
+
+
+void Finalize_Lists( list **lists )
+{
+ Delete_List( TYP_FAR_NEIGHBOR, (*lists) + FAR_NBRS );
+ Delete_List( TYP_HBOND, (*lists) + HBONDS );
+ Delete_List( TYP_BOND, (*lists) + BONDS );
+ Delete_List( TYP_THREE_BODY, (*lists) + THREE_BODIES );
+
+#ifdef TEST_FORCES
+ Delete_List( TYP_DDELTA, (*lists) + DDELTA );
+ Delete_List( TYP_DBO, (*lists) + DBO );
+#endif
+}
+
+
+void Finalize_Out_Controls( reax_system *system, control_params *control,
+ static_storage *workspace, output_controls *out_control )
+{
+ /* close trajectory file */
+ if ( out_control->write_steps > 0 )
+ {
+ fclose( out_control->trj );
+ }
+
+ if ( out_control->energy_update_freq > 0 )
+ {
+ /* close out file */
+ fclose( out_control->out );
+
+ /* close potentials file */
+ fclose( out_control->pot );
+
+ /* close log file */
+ fclose( out_control->log );
+ }
+
+ /* close pressure file */
+ if ( control->ensemble == NPT ||
+ control->ensemble == iNPT ||
+ control->ensemble == sNPT )
+ {
+ fclose( out_control->prs );
+ }
+
+ /* close molecular analysis file */
+ if ( control->molec_anal )
+ {
+ fclose( out_control->mol );
+ }
+
+ /* close electric dipole moment analysis file */
+ if ( control->dipole_anal )
+ {
+ fclose( out_control->dpl );
+ }
+
+ /* close diffusion coef analysis file */
+ if ( control->diffusion_coef )
+ {
+ fclose( out_control->drft );
+ }
+
+
+#ifdef TEST_ENERGY
+ /* close bond energy file */
+ fclose( out_control->ebond );
+
+ /* close lone-pair energy file */
+ fclose( out_control->elp );
+
+ /* close overcoordination energy file */
+ fclose( out_control->eov );
+
+ /* close undercoordination energy file */
+ fclose( out_control->eun );
+
+ /* close angle energy file */
+ fclose( out_control->eval );
+
+ /* close penalty energy file */
+ fclose( out_control->epen );
+
+ /* close coalition energy file */
+ fclose( out_control->ecoa );
+
+ /* close hydrogen bond energy file */
+ fclose( out_control->ehb );
+
+ /* close torsion energy file */
+ fclose( out_control->etor );
+
+ /* close conjugation energy file */
+ fclose( out_control->econ );
+
+ /* close vdWaals energy file */
+ fclose( out_control->evdw );
+
+ /* close coulomb energy file */
+ fclose( out_control->ecou );
+#endif
+
+
+#ifdef TEST_FORCES
+ /* close bond orders file */
+ fclose( out_control->fbo );
+
+ /* close bond orders derivatives file */
+ fclose( out_control->fdbo );
+
+ /* close bond forces file */
+ fclose( out_control->fbond );
+
+ /* close lone-pair forces file */
+ fclose( out_control->flp );
+
+ /* close overcoordination forces file */
+ fclose( out_control->fatom );
+
+ /* close angle forces file */
+ fclose( out_control->f3body );
+
+ /* close hydrogen bond forces file */
+ fclose( out_control->fhb );
+
+ /* close torsion forces file */
+ fclose( out_control->f4body );
+
+ /* close nonbonded forces file */
+ fclose( out_control->fnonb );
+
+ /* close total force file */
+ fclose( out_control->ftot );
+
+ /* close coulomb forces file */
+ fclose( out_control->ftot2 );
+#endif
+}
+
+
+void Finalize( reax_system *system, control_params *control,
+ simulation_data *data, static_storage *workspace, list **lists,
+ output_controls *out_control )
+{
+ if ( control->tabulate )
+ {
+// Finalize_LR_Lookup_Table( system, control );
+ }
+
+ Finalize_Out_Controls( system, control, workspace, out_control );
+
+ Finalize_Lists( lists );
+
+ Finalize_Workspace( system, control, workspace );
+
+ Finalize_Simulation_Data( system, control, data, out_control );
+
+ Finalize_System( system, control, data );
+}
diff --git a/sPuReMD/src/init_md.h b/sPuReMD/src/init_md.h
index 3fc59053a9d569623d0004e7b5b9a86a6cbf3cb0..3d31189315ea7f69699067c79882685fbfffdbf1 100644
--- a/sPuReMD/src/init_md.h
+++ b/sPuReMD/src/init_md.h
@@ -24,7 +24,12 @@
#include "mytypes.h"
+
void Initialize( reax_system*, control_params*, simulation_data*,
- static_storage*, list**, output_controls*, evolve_function* );
+ static_storage*, list**, output_controls*, evolve_function* );
+
+void Finalize( reax_system*, control_params*, simulation_data*,
+ static_storage*, list**, output_controls* );
+
#endif
diff --git a/sPuReMD/src/integrate.c b/sPuReMD/src/integrate.c
index 4e573d388b481e006fcf821333c8b43b38816018..7f42a36811bf1ad1eb8ff13adfadb6c3ef675f06 100644
--- a/sPuReMD/src/integrate.c
+++ b/sPuReMD/src/integrate.c
@@ -36,8 +36,8 @@
void Velocity_Verlet_NVE(reax_system* system, control_params* control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
int i, steps, renbr;
real inv_m, dt, dt_sqr;
@@ -47,6 +47,7 @@ void Velocity_Verlet_NVE(reax_system* system, control_params* control,
dt_sqr = SQR(dt);
steps = data->step - data->prev_steps;
renbr = (steps % control->reneighbor == 0);
+
#if defined(DEBUG_FOCUS)
fprintf( stderr, "step%d: ", data->step );
#endif
@@ -56,12 +57,13 @@ void Velocity_Verlet_NVE(reax_system* system, control_params* control,
inv_m = 1.0 / system->reaxprm.sbp[system->atoms[i].type].mass;
rvec_ScaledSum( dx, dt, system->atoms[i].v,
- 0.5 * dt_sqr * -F_CONV * inv_m, system->atoms[i].f );
+ 0.5 * dt_sqr * -F_CONV * inv_m, system->atoms[i].f );
Inc_on_T3( system->atoms[i].x, dx, &( system->box ) );
rvec_ScaledAdd( system->atoms[i].v,
- 0.5 * dt * -F_CONV * inv_m, system->atoms[i].f );
+ 0.5 * dt * -F_CONV * inv_m, system->atoms[i].f );
}
+
#if defined(DEBUG_FOCUS)
fprintf( stderr, "verlet1 - ");
#endif
@@ -69,16 +71,19 @@ void Velocity_Verlet_NVE(reax_system* system, control_params* control,
Reallocate( system, workspace, lists, renbr );
Reset( system, control, data, workspace, lists );
if ( renbr )
+ {
Generate_Neighbor_Lists( system, control, data, workspace,
- lists, out_control );
+ lists, out_control );
+ }
Compute_Forces( system, control, data, workspace, lists, out_control );
for ( i = 0; i < system->N; i++ )
{
inv_m = 1.0 / system->reaxprm.sbp[system->atoms[i].type].mass;
rvec_ScaledAdd( system->atoms[i].v,
- 0.5 * dt * -F_CONV * inv_m, system->atoms[i].f );
+ 0.5 * dt * -F_CONV * inv_m, system->atoms[i].f );
}
+
#if defined(DEBUG_FOCUS)
fprintf( stderr, "verlet2\n");
#endif
@@ -86,11 +91,8 @@ void Velocity_Verlet_NVE(reax_system* system, control_params* control,
-void Velocity_Verlet_Nose_Hoover_NVT_Klein(reax_system* system,
- control_params* control,
- simulation_data *data,
- static_storage *workspace,
- list **lists,
+void Velocity_Verlet_Nose_Hoover_NVT_Klein(reax_system* system, control_params* control,
+ simulation_data *data, static_storage *workspace, list **lists,
output_controls *out_control )
{
int i, itr, steps, renbr;
@@ -104,6 +106,7 @@ void Velocity_Verlet_Nose_Hoover_NVT_Klein(reax_system* system,
therm = &( data->therm );
steps = data->step - data->prev_steps;
renbr = (steps % control->reneighbor == 0);
+
#if defined(DEBUG_FOCUS)
fprintf( stderr, "step%d: ", data->step );
#endif
@@ -114,7 +117,7 @@ void Velocity_Verlet_Nose_Hoover_NVT_Klein(reax_system* system,
inv_m = 1.0 / system->reaxprm.sbp[system->atoms[i].type].mass;
rvec_ScaledSum( dx, dt - 0.5 * dt_sqr * therm->v_xi, system->atoms[i].v,
- 0.5 * dt_sqr * inv_m * -F_CONV, system->atoms[i].f );
+ 0.5 * dt_sqr * inv_m * -F_CONV, system->atoms[i].f );
Inc_on_T3( system->atoms[i].x, dx, &(system->box) );
@@ -122,6 +125,7 @@ void Velocity_Verlet_Nose_Hoover_NVT_Klein(reax_system* system,
}
/* Compute xi(t + dt) */
therm->xi += ( therm->v_xi * dt + 0.5 * dt_sqr * therm->G_xi );
+
#if defined(DEBUG_FOCUS)
fprintf( stderr, "verlet1 - " );
#endif
@@ -129,8 +133,10 @@ void Velocity_Verlet_Nose_Hoover_NVT_Klein(reax_system* system,
Reallocate( system, workspace, lists, renbr );
Reset( system, control, data, workspace, lists );
if ( renbr )
+ {
Generate_Neighbor_Lists( system, control, data, workspace,
- lists, out_control );
+ lists, out_control );
+ }
/* Calculate Forces at time (t + dt) */
Compute_Forces( system, control, data, workspace, lists, out_control );
@@ -184,7 +190,7 @@ void Velocity_Verlet_Nose_Hoover_NVT_Klein(reax_system* system,
itr, G_xi_new, v_xi_new, v_xi_old );
#endif
}
- while ( fabs(v_xi_new - v_xi_old ) > 1e-5 );
+ while ( FABS(v_xi_new - v_xi_old ) > 1e-5 );
therm->v_xi_old = therm->v_xi;
therm->v_xi = v_xi_new;
@@ -666,7 +672,7 @@ void Velocity_Verlet_Isotropic_NPT( reax_system* system,
"itr %d E_kin: %8.3f veps_n:%8.3f veps_o:%8.3f vxi_n:%8.3f vxi_o: %8.3f\n",
itr, E_kin, v_eps_new, v_eps_old, v_xi_new, v_xi_old );
}
- while ( fabs(v_eps_new - v_eps_old) + fabs(v_xi_new - v_xi_old) > 2e-3 );
+ while ( FABS(v_eps_new - v_eps_old) + FABS(v_xi_new - v_xi_old) > 2e-3 );
therm->v_xi_old = therm->v_xi;
diff --git a/sPuReMD/src/list.c b/sPuReMD/src/list.c
index f9044a6cc9e5ea7b625794c14c079582a4bc742b..e02b22fb1f7391d12ad79df2ec7d05ad4ae03d21 100644
--- a/sPuReMD/src/list.c
+++ b/sPuReMD/src/list.c
@@ -21,7 +21,8 @@
#include "list.h"
-char Make_List(int n, int num_intrs, int type, list* l)
+
+char Make_List( int n, int num_intrs, int type, list* l )
{
char success = 1;
@@ -31,10 +32,16 @@ char Make_List(int n, int num_intrs, int type, list* l)
l->index = (int*) malloc( n * sizeof(int) );
l->end_index = (int*) malloc( n * sizeof(int) );
- if (l->index == NULL) success = 0;
- if (l->end_index == NULL) success = 0;
+ if ( l->index == NULL )
+ {
+ success = 0;
+ }
+ if ( l->end_index == NULL )
+ {
+ success = 0;
+ }
- switch (type)
+ switch ( type )
{
case TYP_VOID:
l->select.v = (void *) malloc(l->num_intrs * sizeof(void));
@@ -86,7 +93,6 @@ char Make_List(int n, int num_intrs, int type, list* l)
default:
l->select.v = (void *) malloc(l->num_intrs * sizeof(void));
if (l->select.v == NULL) success = 0;
- l->type = TYP_VOID;
break;
}
@@ -94,46 +100,66 @@ char Make_List(int n, int num_intrs, int type, list* l)
}
-void Delete_List(list* l)
+void Delete_List( int type, list* l )
{
if ( l->index != NULL )
- free(l->index);
+ {
+ free( l->index );
+ }
if ( l->end_index != NULL )
- free(l->end_index);
+ {
+ free( l->end_index );
+ }
- switch (l->type)
+ switch ( type )
{
case TYP_VOID:
if ( l->select.v != NULL )
- free(l->select.v);
+ {
+ free( l->select.v );
+ }
break;
case TYP_THREE_BODY:
if ( l->select.three_body_list != NULL )
- free(l->select.three_body_list);
+ {
+ free( l->select.three_body_list );
+ }
break;
case TYP_BOND:
if ( l->select.bond_list != NULL )
- free(l->select.bond_list);
+ {
+ free( l->select.bond_list );
+ }
break;
case TYP_DBO:
if ( l->select.dbo_list != NULL )
- free(l->select.dbo_list);
+ {
+ free( l->select.dbo_list );
+ }
break;
case TYP_DDELTA:
if ( l->select.dDelta_list != NULL )
- free(l->select.dDelta_list);
+ {
+ free( l->select.dDelta_list );
+ }
break;
case TYP_FAR_NEIGHBOR:
if ( l->select.far_nbr_list != NULL )
- free(l->select.far_nbr_list);
+ {
+ free( l->select.far_nbr_list );
+ }
break;
case TYP_NEAR_NEIGHBOR:
if ( l->select.near_nbr_list != NULL )
- free(l->select.near_nbr_list);
+ {
+ free( l->select.near_nbr_list );
+ }
break;
case TYP_HBOND:
if ( l->select.hbond_list != NULL )
- free(l->select.hbond_list);
+ {
+ free( l->select.hbond_list );
+ }
break;
default:
@@ -143,27 +169,32 @@ void Delete_List(list* l)
}
-inline int Num_Entries(int i, list* l)
+
+inline int Num_Entries( int i, list* l )
{
return l->end_index[i] - l->index[i];
}
-inline int Start_Index(int i, list *l )
+
+inline int Start_Index( int i, list *l )
{
return l->index[i];
}
+
inline int End_Index( int i, list *l )
{
return l->end_index[i];
}
-inline void Set_Start_Index(int i, int val, list *l)
+
+inline void Set_Start_Index( int i, int val, list *l )
{
l->index[i] = val;
}
-inline void Set_End_Index(int i, int val, list *l)
+
+inline void Set_End_Index( int i, int val, list *l )
{
l->end_index[i] = val;
}
diff --git a/sPuReMD/src/list.h b/sPuReMD/src/list.h
index e3ecc584e865c419747886c590e15dc0709feccc..35a4b1debf03a02e3c6812320814a61a7d6db3cc 100644
--- a/sPuReMD/src/list.h
+++ b/sPuReMD/src/list.h
@@ -24,14 +24,20 @@
#include "mytypes.h"
+
char Make_List( int, int, int, list* );
-void Delete_List( list* );
-int Num_Entries(int, list*);
-int Start_Index( int, list* );
-int End_Index( int, list* );
+void Delete_List( int, list* );
+
+int Num_Entries( int, list* );
+
+int Start_Index( int, list* );
+
+int End_Index( int, list* );
+
+void Set_Start_Index( int, int, list* );
+
+void Set_End_Index( int, int, list* );
-void Set_Start_Index(int, int, list*);
-void Set_End_Index(int, int, list*);
#endif
diff --git a/sPuReMD/src/lookup.c b/sPuReMD/src/lookup.c
index 2ea39e3cd37f045153623bcf2616b56a0a02c526..973ba5faa22c0bd8bc7937416b3bf19beade0a1d 100644
--- a/sPuReMD/src/lookup.c
+++ b/sPuReMD/src/lookup.c
@@ -20,10 +20,12 @@
----------------------------------------------------------------------*/
#include "lookup.h"
+
#include "two_body_interactions.h"
-void Make_Lookup_Table(real xmin, real xmax, int n,
- lookup_function f, lookup_table* t)
+
+void Make_Lookup_Table( real xmin, real xmax, int n,
+ lookup_function f, lookup_table* t )
{
int i;
@@ -36,7 +38,9 @@ void Make_Lookup_Table(real xmin, real xmax, int n,
t->y = (real*) malloc(n * sizeof(real));
for (i = 0; i < n; i++)
+ {
t->y[i] = f(i * t->dx + t->xmin);
+ }
// fprintf(stdout,"dx = %lf\n",t->dx);
// for(i=0; i < n; i++)
@@ -363,20 +367,20 @@ void Make_LR_Lookup_Table( reax_system *system, control_params *control )
LR_vdW_Coulomb( system, control, i, j, rand_dist, &y );
LR_Lookup( &(LR[i][j]), rand_dist, &y_spline );
- evdw_abserr = fabs(y.e_vdW - y_spline.e_vdW);
- evdw_relerr = fabs(evdw_abserr / y.e_vdW);
- fvdw_abserr = fabs(y.CEvd - y_spline.CEvd);
- fvdw_relerr = fabs(fvdw_abserr / y.CEvd);
- eele_abserr = fabs(y.e_ele - y_spline.e_ele);
- eele_relerr = fabs(eele_abserr / y.e_ele);
- fele_abserr = fabs(y.CEclmb - y_spline.CEclmb);
- fele_relerr = fabs(fele_abserr / y.CEclmb);
+ evdw_abserr = FABS(y.e_vdW - y_spline.e_vdW);
+ evdw_relerr = FABS(evdw_abserr / y.e_vdW);
+ fvdw_abserr = FABS(y.CEvd - y_spline.CEvd);
+ fvdw_relerr = FABS(fvdw_abserr / y.CEvd);
+ eele_abserr = FABS(y.e_ele - y_spline.e_ele);
+ eele_relerr = FABS(eele_abserr / y.e_ele);
+ fele_abserr = FABS(y.CEclmb - y_spline.CEclmb);
+ fele_relerr = FABS(fele_abserr / y.CEclmb);
if( evdw_relerr > 1e-10 || eele_relerr > 1e-10 ){
fprintf( stderr, "rand_dist = %24.15e\n", rand_dist );
fprintf( stderr, "%24.15e %24.15e %24.15e %24.15e\n",
y.H, y_spline.H,
- fabs(y.H-y_spline.H), fabs((y.H-y_spline.H)/y.H) );
+ FABS(y.H-y_spline.H), FABS((y.H-y_spline.H)/y.H) );
fprintf( stderr, "%24.15e %24.15e %24.15e %24.15e\n",
y.e_vdW, y_spline.e_vdW, evdw_abserr, evdw_relerr );
diff --git a/sPuReMD/src/lookup.h b/sPuReMD/src/lookup.h
index a0b9e51620716aeae13ca7743f554f3704c01110..bb1ba46865d369f58839d5a801905a1b5406130f 100644
--- a/sPuReMD/src/lookup.h
+++ b/sPuReMD/src/lookup.h
@@ -24,10 +24,18 @@
#include "mytypes.h"
+
+/* Function pointer definitions */
+typedef real (*lookup_function)(real);
+
+
void Make_Lookup_Table( real, real, int, lookup_function, lookup_table* );
-int Lookup_Index_Of( real, lookup_table* );
+
+int Lookup_Index_Of( real, lookup_table* );
+
real Lookup( real, lookup_table* );
void Make_LR_Lookup_Table( reax_system*, control_params* );
+
#endif
diff --git a/sPuReMD/src/mytypes.h b/sPuReMD/src/mytypes.h
index 3833dff83359a5575750d38ec9c4d922f33b3479..91f411e27e319ca969a064891d281d20e7e26ed9 100644
--- a/sPuReMD/src/mytypes.h
+++ b/sPuReMD/src/mytypes.h
@@ -23,8 +23,8 @@
#define __MYTYPES_H_
#if (defined(HAVE_CONFIG_H) && !defined(__CONFIG_H_))
-#define __CONFIG_H_
-#include "config.h"
+ #define __CONFIG_H_
+ #include "config.h"
#endif
#include "math.h"
@@ -131,27 +131,42 @@
#define LOOSE_ZONE 0.75
-typedef double real;
-typedef real rvec[3];
-typedef int ivec[3];
-typedef real rtensor[3][3];
-
/* config params */
enum ensemble
{
- NVE = 0, NVT = 1, NPT = 2, sNPT = 3, iNPT = 4, ensNR = 5, bNVT = 6,
+ NVE = 0,
+ NVT = 1,
+ NPT = 2,
+ sNPT = 3,
+ iNPT = 4,
+ ensNR = 5,
+ bNVT = 6,
};
enum interaction_list_offets
{
- FAR_NBRS = 0, NEAR_NBRS = 1, THREE_BODIES = 2, BONDS = 3, OLD_BONDS = 4,
- HBONDS = 5, DBO = 6, DDELTA = 7, LIST_N = 8,
+ FAR_NBRS = 0,
+ NEAR_NBRS = 1,
+ THREE_BODIES = 2,
+ BONDS = 3,
+ OLD_BONDS = 4,
+ HBONDS = 5,
+ DBO = 6,
+ DDELTA = 7,
+ LIST_N = 8,
};
enum interaction_type
{
- TYP_VOID = 0, TYP_THREE_BODY = 1, TYP_BOND = 2, TYP_HBOND = 3, TYP_DBO = 4,
- TYP_DDELTA = 5, TYP_FAR_NEIGHBOR = 6, TYP_NEAR_NEIGHBOR = 7, TYP_N = 8,
+ TYP_VOID = 0,
+ TYP_THREE_BODY = 1,
+ TYP_BOND = 2,
+ TYP_HBOND = 3,
+ TYP_DBO = 4,
+ TYP_DDELTA = 5,
+ TYP_FAR_NEIGHBOR = 6,
+ TYP_NEAR_NEIGHBOR = 7,
+ TYP_N = 8,
};
enum errors
@@ -168,96 +183,112 @@ enum errors
RUNTIME_ERROR = -19,
};
-enum atoms
-{
- C_ATOM = 0, H_ATOM = 1, O_ATOM = 2, N_ATOM = 3,
- S_ATOM = 4, SI_ATOM = 5, GE_ATOM = 6, X_ATOM = 7,
-};
-
-enum molecule_type
-{
- UNKNOWN = 0, WATER = 1,
-};
-
enum molecular_analysis_type
{
- NO_ANALYSIS = 0, FRAGMENTS = 1, REACTIONS = 2, NUM_ANALYSIS = 3,
+ NO_ANALYSIS = 0,
+ FRAGMENTS = 1,
+ REACTIONS = 2,
+ NUM_ANALYSIS = 3,
};
enum restart_format
{
- WRITE_ASCII = 0, WRITE_BINARY = 1, RF_N = 2,
+ WRITE_ASCII = 0,
+ WRITE_BINARY = 1,
+ RF_N = 2,
};
enum geo_formats
{
- CUSTOM = 0, PDB = 1, BGF = 2, ASCII_RESTART = 3, BINARY_RESTART = 4, GF_N = 5,
+ CUSTOM = 0,
+ PDB = 1,
+ BGF = 2,
+ ASCII_RESTART = 3,
+ BINARY_RESTART = 4,
+ GF_N = 5,
};
enum charge_method
{
- QEQ_CM = 0, EE_CM = 1, ACKS2_CM = 2,
+ QEQ_CM = 0,
+ EE_CM = 1,
+ ACKS2_CM = 2,
};
enum solver
{
- GMRES_S = 0, GMRES_H_S = 1, CG_S = 2, SDM_S = 3,
+ GMRES_S = 0,
+ GMRES_H_S = 1,
+ CG_S = 2,
+ SDM_S = 3,
};
enum pre_comp
{
- NONE_PC = 0, DIAG_PC = 1, ICHOLT_PC = 2, ILU_PAR_PC = 3, ILUT_PAR_PC = 4, ILU_SUPERLU_MT_PC = 5,
+ NONE_PC = 0,
+ DIAG_PC = 1,
+ ICHOLT_PC = 2,
+ ILU_PAR_PC = 3,
+ ILUT_PAR_PC = 4,
+ ILU_SUPERLU_MT_PC = 5,
};
enum pre_app
{
- TRI_SOLVE_PA = 0, TRI_SOLVE_LEVEL_SCHED_PA = 1, TRI_SOLVE_GC_PA = 2, JACOBI_ITER_PA = 3,
+ TRI_SOLVE_PA = 0,
+ TRI_SOLVE_LEVEL_SCHED_PA = 1,
+ TRI_SOLVE_GC_PA = 2,
+ JACOBI_ITER_PA = 3,
};
-/* Force field global params mapping */
-/*
-l[0] = p_boc1
-l[1] = p_boc2
-l[2] = p_coa2
-l[3] = N/A
-l[4] = N/A
-l[5] = N/A
-l[6] = p_ovun6
-l[7] = N/A
-l[8] = p_ovun7
-l[9] = p_ovun8
-l[10] = N/A
-l[11] = N/A
-l[12] = N/A
-l[13] = N/A
-l[14] = p_val6
-l[15] = p_lp1
-l[16] = p_val9
-l[17] = p_val10
-l[18] = N/A
-l[19] = p_pen2
-l[20] = p_pen3
-l[21] = p_pen4
-l[22] = N/A
-l[23] = p_tor2
-l[24] = p_tor3
-l[25] = p_tor4
-l[26] = N/A
-l[27] = p_cot2
-l[28] = p_vdW1
-l[29] = v_par30
-l[30] = p_coa4
-l[31] = p_ovun4
-l[32] = p_ovun3
-l[33] = p_val8
-l[34] = ACKS2 bond softness
-l[35] = N/A
-l[36] = N/A
-l[37] = version number
-l[38] = p_coa3
-*/
+typedef double real;
+typedef real rvec[3];
+typedef int ivec[3];
+typedef real rtensor[3][3];
+
+/* Force field global params mapping:
+ *
+ * l[0] = p_boc1
+ * l[1] = p_boc2
+ * l[2] = p_coa2
+ * l[3] = N/A
+ * l[4] = N/A
+ * l[5] = N/A
+ * l[6] = p_ovun6
+ * l[7] = N/A
+ * l[8] = p_ovun7
+ * l[9] = p_ovun8
+ * l[10] = N/A
+ * l[11] = N/A
+ * l[12] = N/A
+ * l[13] = N/A
+ * l[14] = p_val6
+ * l[15] = p_lp1
+ * l[16] = p_val9
+ * l[17] = p_val10
+ * l[18] = N/A
+ * l[19] = p_pen2
+ * l[20] = p_pen3
+ * l[21] = p_pen4
+ * l[22] = N/A
+ * l[23] = p_tor2
+ * l[24] = p_tor3
+ * l[25] = p_tor4
+ * l[26] = N/A
+ * l[27] = p_cot2
+ * l[28] = p_vdW1
+ * l[29] = v_par30
+ * l[30] = p_coa4
+ * l[31] = p_ovun4
+ * l[32] = p_ovun3
+ * l[33] = p_val8
+ * l[34] = ACKS2 bond softness
+ * l[35] = N/A
+ * l[36] = N/A
+ * l[37] = version number
+ * l[38] = p_coa3 */
typedef struct
{
int n_global;
@@ -266,7 +297,6 @@ typedef struct
} global_parameters;
-
typedef struct
{
/* Line one in field file */
@@ -289,8 +319,9 @@ typedef struct
real p_ovun5;
real chi;
real eta;
- int p_hbond; /* Determines whether this type of atom participates in H_bonds.
- It is 1 for donor H, 2 for acceptors (O,S,N), 0 for others*/
+ /* Determines whether this type of atom participates in H_bonds.
+ * It is 1 for donor H, 2 for acceptors (O,S,N), 0 for others*/
+ int p_hbond;
/* Line three in field file */
real r_pi_pi;
@@ -298,7 +329,8 @@ typedef struct
real b_o_131;
real b_o_132;
real b_o_133;
- real b_s_acks2; /* bond softness for ACKS2 */
+ /* bond softness for ACKS2 */
+ real b_s_acks2;
/* Line four in the field file */
real p_ovun2;
@@ -311,18 +343,29 @@ typedef struct
} single_body_parameters;
-
/* Two Body Parameters */
typedef struct
{
/* Bond Order parameters */
- real p_bo1, p_bo2, p_bo3, p_bo4, p_bo5, p_bo6;
- real r_s, r_p, r_pp; /* r_o distances in BO formula */
- real p_boc3, p_boc4, p_boc5;
+ real p_bo1;
+ real p_bo2;
+ real p_bo3;
+ real p_bo4;
+ real p_bo5;
+ real p_bo6;
+ real r_s;
+ real r_p;
+ real r_pp; /* r_o distances in BO formula */
+ real p_boc3;
+ real p_boc4;
+ real p_boc5;
/* Bond Energy parameters */
- real p_be1, p_be2;
- real De_s, De_p, De_pp;
+ real p_be1;
+ real p_be2;
+ real De_s;
+ real De_p;
+ real De_pp;
/* Over/Under coordination parameters */
real p_ovun1;
@@ -332,7 +375,9 @@ typedef struct
real alpha;
real r_vdW;
real gamma_w;
- real rcore, ecore, acore;
+ real rcore;
+ real ecore;
+ real acore;
/* electrostatic parameters */
real gamma; // note: this parameter is gamma^-3 and not gamma.
@@ -341,13 +386,15 @@ typedef struct
} two_body_parameters;
-
/* 3-body parameters */
typedef struct
{
/* valence angle */
real theta_00;
- real p_val1, p_val2, p_val4, p_val7;
+ real p_val1;
+ real p_val2;
+ real p_val4;
+ real p_val7;
/* penalty */
real p_pen1;
@@ -364,19 +411,22 @@ typedef struct
} three_body_header;
-
/* hydrogen-bond parameters */
typedef struct
{
- real r0_hb, p_hb1, p_hb2, p_hb3;
+ real r0_hb;
+ real p_hb1;
+ real p_hb2;
+ real p_hb3;
} hbond_parameters;
-
/* 4-body parameters */
typedef struct
{
- real V1, V2, V3;
+ real V1;
+ real V2;
+ real V3;
/* torsion angle */
real p_tor1;
@@ -407,14 +457,18 @@ typedef struct
typedef struct
{
- int type; /* Type of this atom */
+ /* Type of this atom */
+ int type;
+ /**/
char name[8];
-
- rvec x; // position
- rvec v; // velocity
- rvec f; // force
-
- real q; /* Charge on the atom */
+ /* position */
+ rvec x;
+ /* velocity */
+ rvec v;
+ /* force */
+ rvec f;
+ /* Charge on the atom */
+ real q;
} reax_atom;
@@ -425,7 +479,6 @@ typedef struct
rvec box_norms;
rvec side_prop;
rvec nbr_box_press[27];
- // rvec lower_end;
rtensor box, box_inv, old_box;
rtensor trans, trans_inv;
@@ -435,9 +488,9 @@ typedef struct
typedef struct
{
- int max_atoms;
- int max_nbrs;
- int total;
+ int max_atoms;
+ int max_nbrs;
+ int total;
real cell_size;
ivec spread;
@@ -446,10 +499,10 @@ typedef struct
rvec inv_len;
int**** atoms;
- int*** top;
- int*** mark;
- int*** start;
- int*** end;
+ int*** top;
+ int*** mark;
+ int*** start;
+ int*** end;
ivec**** nbrs;
rvec**** nbrs_cp;
} grid;
@@ -477,10 +530,10 @@ typedef struct
{
char sim_name[MAX_STR];
char restart_from[MAX_STR];
- int restart;
- int random_vel;
+ int restart;
+ int random_vel;
- int reposition_atoms;
+ int reposition_atoms;
/* ensemble values:
0 : NVE
@@ -488,32 +541,45 @@ typedef struct
2 : NPT (Parrinello-Rehman-Nose-Hoover) Anisotropic
3 : sNPT (Parrinello-Rehman-Nose-Hoover) semiisotropic
4 : iNPT (Parrinello-Rehman-Nose-Hoover) isotropic */
- int ensemble;
- int nsteps;
- int periodic_boundaries;
- int restrict_bonds;
- int tabulate;
+ int ensemble;
+ int nsteps;
+ int periodic_boundaries;
+ int restrict_bonds;
+ int tabulate;
ivec periodic_images;
real dt;
int reneighbor;
real vlist_cut;
real nbr_cut;
- real r_cut, r_sp_cut, r_low; // upper and lower taper
+ real r_cut;
+ real r_sp_cut;
+ real r_low; // upper and lower taper
real bo_cut;
real thb_cut;
real hb_cut;
- real Tap7, Tap6, Tap5, Tap4, Tap3, Tap2, Tap1, Tap0;
- int max_far_nbrs;
-
- real T_init, T_final, T;
+ real Tap7;
+ real Tap6;
+ real Tap5;
+ real Tap4;
+ real Tap3;
+ real Tap2;
+ real Tap1;
+ real Tap0;
+ int max_far_nbrs;
+
+ real T_init;
+ real T_final;
+ real T;
real Tau_T;
- int T_mode;
- real T_rate, T_freq;
+ int T_mode;
+ real T_rate;
+ real T_freq;
real Tau_PT;
- rvec P, Tau_P;
- int press_mode;
+ rvec P;
+ rvec Tau_P;
+ int press_mode;
real compressibility;
int remove_CoM_vel;
@@ -546,7 +612,11 @@ typedef struct
int freq_molec_anal;
real bg_cut;
int num_ignored;
- int ignore[MAX_ATOM_TYPES];
+ int ignore[MAX_ATOM_TYPES];
+
+#ifdef _OPENMP
+ int num_threads;
+#endif
} control_params;
@@ -670,9 +740,13 @@ typedef struct
typedef struct
{
int thb;
- int pthb; /* pointer to the third body on the central atom's nbrlist */
- real theta, cos_theta;
- rvec dcos_di, dcos_dj, dcos_dk;
+ /* pointer to the third body on the central atom's nbrlist */
+ int pthb;
+ real theta;
+ real cos_theta;
+ rvec dcos_di;
+ rvec dcos_dj;
+ rvec dcos_dk;
} three_body_interaction_data;
@@ -680,7 +754,7 @@ typedef struct
{
int nbr;
ivec rel_box;
- // rvec ext_factor;
+// rvec ext_factor;
real d;
rvec dvec;
} near_neighbor_data;
@@ -690,10 +764,9 @@ typedef struct
{
int nbr;
ivec rel_box;
- // rvec ext_factor;
+// rvec ext_factor;
real d;
rvec dvec;
- // real H; //, Tap, inv_dr3gamij_1, inv_dr3gamij_3;
} far_neighbor_data;
@@ -715,26 +788,46 @@ typedef struct
typedef struct
{
int wrt;
- rvec dBO, dBOpi, dBOpi2;
+ rvec dBO;
+ rvec dBOpi;
+ rvec dBOpi2;
} dbond_data;
+
typedef struct
{
- real BO, BO_s, BO_pi, BO_pi2;
- real Cdbo, Cdbopi, Cdbopi2;
- real C1dbo, C2dbo, C3dbo;
- real C1dbopi, C2dbopi, C3dbopi, C4dbopi;
- real C1dbopi2, C2dbopi2, C3dbopi2, C4dbopi2;
- rvec dBOp, dln_BOp_s, dln_BOp_pi, dln_BOp_pi2;
+ real BO;
+ real BO_s;
+ real BO_pi;
+ real BO_pi2;
+ real Cdbo;
+ real Cdbopi;
+ real Cdbopi2;
+ real C1dbo;
+ real C2dbo;
+ real C3dbo;
+ real C1dbopi;
+ real C2dbopi;
+ real C3dbopi;
+ real C4dbopi;
+ real C1dbopi2;
+ real C2dbopi2;
+ real C3dbopi2;
+ real C4dbopi2;
+ rvec dBOp;
+ rvec dln_BOp_s;
+ rvec dln_BOp_pi;
+ rvec dln_BOp_pi2;
} bond_order_data;
+
typedef struct
{
int nbr;
int sym_index;
int dbond_index;
ivec rel_box;
- // rvec ext_factor;
+// rvec ext_factor;
real d;
rvec dvec;
bond_order_data bo_data;
@@ -749,11 +842,11 @@ typedef struct
* n: number of rows
* start: row pointer (last element contains ACTUAL NNZ)
* j: column index for corresponding matrix entry
- * val: matrix entry
- * */
+ * val: matrix entry */
typedef struct
{
- unsigned int n, m;
+ unsigned int n;
+ unsigned int m;
unsigned int *start;
unsigned int *j;
real *val;
@@ -772,49 +865,81 @@ typedef struct
int gcell_atoms;
} reallocate_data;
+
typedef struct
{
/* bond order related storage */
real *total_bond_order;
- real *Deltap, *Deltap_boc;
- real *Delta, *Delta_lp, *Delta_lp_temp, *Delta_e, *Delta_boc;
- real *dDelta_lp, *dDelta_lp_temp;
- real *nlp, *nlp_temp, *Clp, *vlpex;
+ real *Deltap;
+ real *Deltap_boc;
+ real *Delta;
+ real *Delta_lp;
+ real *Delta_lp_temp;
+ real *Delta_e;
+ real *Delta_boc;
+ real *dDelta_lp;
+ real *dDelta_lp_temp;
+ real *nlp;
+ real *nlp_temp;
+ real *Clp;
+ real *vlpex;
rvec *dDeltap_self;
/* charge method storage */
- sparse_matrix *H, *H_sp, *L, *U;
+ sparse_matrix *H;
+ sparse_matrix *H_sp;
+ sparse_matrix *L;
+ sparse_matrix *U;
real *droptol;
real *w;
real *Hdia_inv;
- real *b, *b_s, *b_t, *b_prc, *b_prm;
- real **s, **t;
- real *s_t; //, *s_old, *t_old, *s_oldest, *t_oldest;
+ real *b;
+ real *b_s;
+ real *b_t;
+ real *b_prc;
+ real *b_prm;
+ real **s;
+ real **t;
/* GMRES related storage */
- real *y, *z, *g;
- real *hc, *hs;
- real **h, **rn, **v;
+ real *y;
+ real *z;
+ real *g;
+ real *hc;
+ real *hs;
+ real **h;
+ real **rn;
+ real **v;
/* CG related storage */
- real *r, *d, *q, *p;
- int s_dims, t_dims;
+ real *r;
+ real *d;
+ real *q;
+ real *p;
int num_H;
int *hbond_index; // for hydrogen bonds
- rvec *v_const, *f_old, *a; // used in integrators
+ rvec *v_const;
+ rvec *f_old;
+ rvec *a; // used in integrators
real *CdDelta; // coefficient of dDelta for force calculations
- int *mark, *old_mark; // storage for analysis
+ int *mark;
+ int *old_mark; // storage for analysis
rvec *x_old;
/* storage space for bond restrictions */
- int *map_serials;
- int *orig_id;
- int *restricted;
+ int *map_serials;
+ int *orig_id;
+ int *restricted;
int **restricted_list;
+#ifdef _OPENMP
+ /* local forces per thread */
+ rvec *f_local;
+#endif
+
reallocate_data realloc;
#ifdef TEST_FORCES
@@ -831,7 +956,8 @@ typedef struct
rvec *f_hb;
rvec *f_tor;
rvec *f_con;
- rvec *dDelta; /* Calculated on the fly in bond_orders.c */
+ /* Calculated on the fly in bond_orders.c */
+ rvec *dDelta;
#endif
} static_storage;
@@ -843,7 +969,6 @@ typedef struct
int num_intrs;
int *index;
int *end_index;
- int type;
union
{
void *v;
@@ -864,45 +989,54 @@ typedef struct
FILE *out;
FILE *pot;
FILE *log;
- FILE *mol, *ign;
+ FILE *mol;
+ FILE *ign;
FILE *dpl;
FILE *drft;
FILE *pdb;
FILE *prs;
- int write_steps;
- int traj_compress;
- int traj_format;
+ int write_steps;
+ int traj_compress;
+ int traj_format;
char traj_title[81];
- int atom_format;
- int bond_info;
- int angle_info;
+ int atom_format;
+ int bond_info;
+ int angle_info;
- int restart_format;
- int restart_freq;
- int debug_level;
- int energy_update_freq;
+ int restart_format;
+ int restart_freq;
+ int debug_level;
+ int energy_update_freq;
- // trajectory output functions
+ /* trajectory output function pointer definitions */
int (* write_header)( reax_system*, control_params*, static_storage*, void* );
int (* append_traj_frame)(reax_system*, control_params*,
- simulation_data*, static_storage*, list **, void* );
+ simulation_data*, static_storage*, list **, void* );
int (* write)( FILE *, const char *, ... );
#ifdef TEST_ENERGY
FILE *ebond;
- FILE *elp, *eov, *eun;
- FILE *eval, *epen, *ecoa;
+ FILE *elp;
+ FILE *eov;
+ FILE *eun;
+ FILE *eval;
+ FILE *epen;
+ FILE *ecoa;
FILE *ehb;
- FILE *etor, *econ;
- FILE *evdw, *ecou;
+ FILE *etor;
+ FILE *econ;
+ FILE *evdw;
+ FILE *ecou;
#endif
FILE *ftot;
#ifdef TEST_FORCES
- FILE *fbo, *fdbo;
+ FILE *fbo;
+ FILE *fdbo;
FILE *fbond;
- FILE *flp, *fatom;
+ FILE *flp;
+ FILE *fatom;
FILE *f3body;
FILE *fhb;
FILE *f4body;
@@ -912,33 +1046,32 @@ typedef struct
} output_controls;
-typedef struct
-{
- int atom_count;
- int atom_list[MAX_MOLECULE_SIZE];
- int mtypes[MAX_ATOM_TYPES];
-} molecule;
-
-
typedef struct
{
real H;
- real e_vdW, CEvd;
- real e_ele, CEclmb;
+ real e_vdW;
+ real CEvd;
+ real e_ele;
+ real CEclmb;
} LR_data;
-
typedef struct
{
- real a, b, c, d;
+ real a;
+ real b;
+ real c;
+ real d;
} cubic_spline_coef;
+
typedef struct
{
- real xmin, xmax;
+ real xmin;
+ real xmax;
int n;
- real dx, inv_dx;
+ real dx;
+ real inv_dx;
real a;
real m;
@@ -950,36 +1083,35 @@ typedef struct
typedef struct
{
- real xmin, xmax;
+ real xmin;
+ real xmax;
int n;
- real dx, inv_dx;
+ real dx;
+ real inv_dx;
real a;
real m;
real c;
LR_data *y;
cubic_spline_coef *H;
- cubic_spline_coef *vdW, *CEvd;
- cubic_spline_coef *ele, *CEclmb;
+ cubic_spline_coef *vdW;
+ cubic_spline_coef *CEvd;
+ cubic_spline_coef *ele;
+ cubic_spline_coef *CEclmb;
} LR_lookup_table;
+/* Function pointer definitions */
typedef void (*interaction_function)(reax_system*, control_params*,
simulation_data*, static_storage*, list**, output_controls*);
-interaction_function Interaction_Functions[NO_OF_INTERACTIONS];
-
typedef void (*evolve_function)(reax_system*, control_params*,
simulation_data*, static_storage*,
list**, output_controls*);
-typedef real (*lookup_function)(real);
-lookup_table Exp, Sqrt, Cube_Root, Four_Third_Root, Cos, Sin, ACos;
+/* Global variables */
LR_lookup_table **LR;
-typedef void (*get_far_neighbors_function)(rvec, rvec, simulation_box*,
- control_params*, far_neighbor_data*, int*);
-
#endif
diff --git a/sPuReMD/src/neighbors.c b/sPuReMD/src/neighbors.c
index 1208c826606e61bf912d3623a9d4011eb95f99ee..1963bd14580fffb3cd4895dfcee0df4d50c55985 100644
--- a/sPuReMD/src/neighbors.c
+++ b/sPuReMD/src/neighbors.c
@@ -20,6 +20,7 @@
----------------------------------------------------------------------*/
#include "neighbors.h"
+
#include "box.h"
#include "grid.h"
#include "list.h"
@@ -28,6 +29,10 @@
#include "vector.h"
+/* Function pointer definitions */
+typedef void (*get_far_neighbors_function)(rvec, rvec, simulation_box*,
+ control_params*, far_neighbor_data*, int*);
+
static inline real DistSqr_to_CP( rvec cp, rvec x )
{
@@ -47,14 +52,14 @@ static inline real DistSqr_to_CP( rvec cp, rvec x )
void Generate_Neighbor_Lists( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
- int i, j, k, l, m, itr;
- int x, y, z;
- int atom1, atom2, max;
- int num_far;
- int *nbr_atoms;
+ int i, j, k, l, m, itr;
+ int x, y, z;
+ int atom1, atom2, max;
+ int num_far;
+ int *nbr_atoms;
ivec *nbrs;
rvec *nbrs_cp;
grid *g;
diff --git a/sPuReMD/src/print_utils.c b/sPuReMD/src/print_utils.c
index 06b7d63dfbf0420a1b062ebc39a6c5bfee0f9234..9ff0f571be830e29591aaeee2695b8f441077fda 100644
--- a/sPuReMD/src/print_utils.c
+++ b/sPuReMD/src/print_utils.c
@@ -20,6 +20,7 @@
----------------------------------------------------------------------*/
#include "print_utils.h"
+
#include "list.h"
#include "geo_tools.h"
#include "system_props.h"
@@ -28,15 +29,15 @@
#ifdef TEST_FORCES
void Dummy_Printer( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
}
void Print_Bond_Orders( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
int i, pj, pk;
bond_order_data *bo_ij;
@@ -44,12 +45,12 @@ void Print_Bond_Orders( reax_system *system, control_params *control,
list *dBOs = (*lists) + DBO;
dbond_data *dbo_k;
-
/* bond orders */
fprintf( out_control->fbo, "%6s%6s%12s%12s%12s%12s%12s\n",
"atom1", "atom2", "r_ij", "total_bo", "bo_s", "bo_p", "bo_pp" );
for ( i = 0; i < system->N; ++i )
+ {
for ( pj = Start_Index(i, bonds); pj < End_Index(i, bonds); ++pj )
{
bo_ij = &(bonds->select.bond_list[pj].bo_data);
@@ -61,12 +62,14 @@ void Print_Bond_Orders( reax_system *system, control_params *control,
bonds->select.bond_list[pj].d,
bo_ij->BO, bo_ij->BO_s, bo_ij->BO_pi, bo_ij->BO_pi2 );
}
+ }
/* derivatives of bond orders */
/* fprintf( out_control->fbo, "%6s%6s%10s%10s%10s%10s\n",
"atom1", "atom2", "total_bo", "bo_s", "bo_p", "bo_pp"\n ); */
for ( i = 0; i < system->N; ++i )
+ {
for ( pj = Start_Index(i, bonds); pj < End_Index(i, bonds); ++pj )
{
/*fprintf( out_control->fdbo, "%6d %6d\tstart: %6d\tend: %6d\n",
@@ -98,14 +101,15 @@ void Print_Bond_Orders( reax_system *system, control_params *control,
dbo_k->dBOpi2[0], dbo_k->dBOpi2[1], dbo_k->dBOpi2[2] );
}
}
+ }
- fflush(out_control->fdbo);
+ fflush( out_control->fdbo );
}
void Print_Bond_Forces( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
int i;
@@ -113,15 +117,17 @@ void Print_Bond_Forces( reax_system *system, control_params *control,
fprintf( out_control->fbond, "%6s\t%s\n", "atom", "fbond" );
for ( i = 0; i < system->N; ++i )
+ {
fprintf(out_control->fbond, "%6d %23.15e%23.15e%23.15e\n",
workspace->orig_id[i],
workspace->f_be[i][0], workspace->f_be[i][1], workspace->f_be[i][2]);
+ }
}
void Print_LonePair_Forces( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
int i;
@@ -129,18 +135,19 @@ void Print_LonePair_Forces( reax_system *system, control_params *control,
fprintf( out_control->flp, "%6s\t%s\n", "atom", "f_lonepair" );
for ( i = 0; i < system->N; ++i )
+ {
fprintf(out_control->flp, "%6d %23.15e%23.15e%23.15e\n",
workspace->orig_id[i],
workspace->f_lp[i][0], workspace->f_lp[i][1], workspace->f_lp[i][2]);
+ }
- fflush(out_control->flp);
+ fflush( out_control->flp );
}
void Print_OverUnderCoor_Forces( reax_system *system, control_params *control,
- simulation_data *data,
- static_storage *workspace, list **lists,
- output_controls *out_control )
+ simulation_data *data, static_storage *workspace, list **lists,
+ output_controls *out_control )
{
int i;
@@ -151,11 +158,14 @@ void Print_OverUnderCoor_Forces( reax_system *system, control_params *control,
for ( i = 0; i < system->N; ++i )
{
if ( rvec_isZero( workspace->f_un[i] ) )
+ {
fprintf( out_control->fatom,
"%6d %23.15e%23.15e%23.15e 0 0 0\n",
workspace->orig_id[i], workspace->f_ov[i][0],
workspace->f_ov[i][1], workspace->f_ov[i][2] );
+ }
else
+ {
fprintf( out_control->fatom,
"%6d %23.15e%23.15e%23.15e %23.15e%23.15e%23.15e"\
"%23.15e%23.15e%23.15e\n",
@@ -167,15 +177,16 @@ void Print_OverUnderCoor_Forces( reax_system *system, control_params *control,
workspace->f_ov[i][2],
workspace->f_un[i][0], workspace->f_un[i][1],
workspace->f_un[i][2] );
+ }
}
- fflush(out_control->fatom);
+ fflush( out_control->fatom );
}
void Print_Three_Body_Forces( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
int j;
@@ -186,10 +197,13 @@ void Print_Three_Body_Forces( reax_system *system, control_params *control,
for ( j = 0; j < system->N; ++j )
{
if ( rvec_isZero(workspace->f_pen[j]) && rvec_isZero(workspace->f_coa[j]) )
+ {
fprintf( out_control->f3body, "%6d %23.15e%23.15e%23.15e 0 0 0 0 0 0\n",
workspace->orig_id[j], workspace->f_ang[j][0],
workspace->f_ang[j][1], workspace->f_ang[j][2] );
+ }
else if ( rvec_isZero(workspace->f_coa[j]) )
+ {
fprintf( out_control->f3body,
"%6d %23.15e%23.15e%23.15e %23.15e%23.15e%23.15e "\
"%23.15e%23.15e%23.15e\n",
@@ -201,6 +215,7 @@ void Print_Three_Body_Forces( reax_system *system, control_params *control,
workspace->f_ang[j][2],
workspace->f_pen[j][0], workspace->f_pen[j][1],
workspace->f_pen[j][2] );
+ }
else
{
fprintf( out_control->f3body, "%6d %23.15e%23.15e%23.15e ",
@@ -224,14 +239,13 @@ void Print_Three_Body_Forces( reax_system *system, control_params *control,
}
}
- fflush(out_control->f3body);
+ fflush( out_control->f3body );
}
void Print_Hydrogen_Bond_Forces( reax_system *system, control_params *control,
- simulation_data *data,
- static_storage *workspace, list **lists,
- output_controls *out_control )
+ simulation_data *data, static_storage *workspace, list **lists,
+ output_controls *out_control )
{
int j;
@@ -239,17 +253,19 @@ void Print_Hydrogen_Bond_Forces( reax_system *system, control_params *control,
fprintf( out_control->fhb, "%6s\t%-38s\n", "atom", "f_hb" );
for ( j = 0; j < system->N; ++j )
+ {
fprintf(out_control->fhb, "%6d\t[%23.15e%23.15e%23.15e]\n",
workspace->orig_id[j],
workspace->f_hb[j][0], workspace->f_hb[j][1], workspace->f_hb[j][2]);
+ }
fflush(out_control->fhb);
}
void Print_Four_Body_Forces( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
int j;
@@ -259,6 +275,7 @@ void Print_Four_Body_Forces( reax_system *system, control_params *control,
for ( j = 0; j < system->N; ++j )
{
if ( !rvec_isZero( workspace->f_con[j] ) )
+ {
fprintf( out_control->f4body,
"%6d %23.15e%23.15e%23.15e %23.15e%23.15e%23.15e "\
"%23.15e%23.15e%23.15e\n",
@@ -270,20 +287,23 @@ void Print_Four_Body_Forces( reax_system *system, control_params *control,
workspace->f_tor[j][2],
workspace->f_con[j][0], workspace->f_con[j][1],
workspace->f_con[j][2] );
+ }
else
+ {
fprintf( out_control->f4body,
"%6d %23.15e%23.15e%23.15e 0 0 0\n",
workspace->orig_id[j], workspace->f_tor[j][0],
workspace->f_tor[j][1], workspace->f_tor[j][2] );
+ }
}
- fflush(out_control->f4body);
+ fflush( out_control->f4body );
}
void Print_vdW_Coulomb_Forces( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
int i;
@@ -292,7 +312,9 @@ void Print_vdW_Coulomb_Forces( reax_system *system, control_params *control,
"atom", "nonbonded total", "f_vdw", "f_ele" );
for ( i = 0; i < system->N; ++i )
+ {
if ( !rvec_isZero(workspace->f_ele[i]) )
+ {
fprintf(out_control->fnonb,
"%6d %23.15e%23.15e%23.15e %23.15e%23.15e%23.15e "\
"%23.15e%23.15e%23.15e\n",
@@ -304,19 +326,23 @@ void Print_vdW_Coulomb_Forces( reax_system *system, control_params *control,
workspace->f_vdw[i][2],
workspace->f_ele[i][0], workspace->f_ele[i][1],
workspace->f_ele[i][2] );
+ }
else
+ {
fprintf(out_control->fnonb,
"%6d %23.15e%23.15e%23.15e 0 0 0\n",
workspace->orig_id[i], workspace->f_vdw[i][0],
workspace->f_vdw[i][1], workspace->f_vdw[i][2] );
+ }
+ }
- fflush(out_control->fnonb);
+ fflush( out_control->fnonb );
}
void Compare_Total_Forces( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
int i;
@@ -325,6 +351,7 @@ void Compare_Total_Forces( reax_system *system, control_params *control,
"atom", "f_total", "test_force total" );
for ( i = 0; i < system->N; ++i )
+ {
fprintf( out_control->ftot2,
"%6d %23.15e%23.15e%23.15e vs %23.15e%23.15e%23.15e\n",
workspace->orig_id[i],
@@ -347,8 +374,9 @@ void Compare_Total_Forces( reax_system *system, control_params *control,
workspace->f_coa[i][2] + workspace->f_hb[i][2] +
workspace->f_tor[i][2] + workspace->f_con[i][2] +
workspace->f_vdw[i][2] + workspace->f_ele[i][2] );
+ }
- fflush(out_control->ftot2);
+ fflush( out_control->ftot2 );
}
@@ -370,18 +398,16 @@ void Init_Force_Test_Functions( )
/* near nbrs contain both i-j, j-i nbrhood info */
void Print_Near_Neighbors( reax_system *system, control_params *control,
- static_storage *workspace, list **lists )
+ static_storage *workspace, list **lists )
{
- int i, j, id_i, id_j;
- char fname[MAX_STR];
+ int i, j, id_i, id_j;
+ char fname[MAX_STR];
FILE *fout;
list *near_nbrs = &((*lists)[NEAR_NBRS]);
sprintf( fname, "%s.near_nbrs", control->sim_name );
fout = fopen( fname, "w" );
- fprintf( fout, "hello:!\n" );
-
for ( i = 0; i < system->N; ++i )
{
id_i = workspace->orig_id[i];
@@ -406,10 +432,10 @@ void Print_Near_Neighbors( reax_system *system, control_params *control,
/* near nbrs contain both i-j, j-i nbrhood info */
void Print_Near_Neighbors2( reax_system *system, control_params *control,
- static_storage *workspace, list **lists )
+ static_storage *workspace, list **lists )
{
- int i, j, id_i, id_j;
- char fname[MAX_STR];
+ int i, j, id_i, id_j;
+ char fname[MAX_STR];
FILE *fout;
list *near_nbrs = &((*lists)[NEAR_NBRS]);
@@ -441,10 +467,10 @@ void Print_Near_Neighbors2( reax_system *system, control_params *control,
/* far nbrs contain only i-j nbrhood info, no j-i. */
void Print_Far_Neighbors( reax_system *system, control_params *control,
- static_storage *workspace, list **lists )
+ static_storage *workspace, list **lists )
{
- int i, j, id_i, id_j;
- char fname[MAX_STR];
+ int i, j, id_i, id_j;
+ char fname[MAX_STR];
FILE *fout;
list *far_nbrs = &((*lists)[FAR_NBRS]);
@@ -486,10 +512,10 @@ int fn_qsort_intcmp( const void *a, const void *b )
void Print_Far_Neighbors2( reax_system *system, control_params *control,
- static_storage *workspace, list **lists )
+ static_storage *workspace, list **lists )
{
- int i, j, id_i, id_j;
- char fname[MAX_STR];
+ int i, j, id_i, id_j;
+ char fname[MAX_STR];
FILE *fout;
list *far_nbrs = &((*lists)[FAR_NBRS]);
@@ -514,13 +540,14 @@ void Print_Far_Neighbors2( reax_system *system, control_params *control,
fprintf(fout, "%6d", temp[j]);
fprintf( fout, "\n");
}
+
fclose( fout );
}
void Print_Total_Force( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
int i;
#if !defined(TEST_FORCES)
@@ -530,51 +557,54 @@ void Print_Total_Force( reax_system *system, control_params *control,
#endif
for ( i = 0; i < system->N; ++i )
- fprintf(out_control->ftot, "%6d %23.15e %23.15e %23.15e\n",
+ {
+ fprintf( out_control->ftot, "%6d %23.15e %23.15e %23.15e\n",
//fprintf(out_control->ftot, "%6d %19.9e %19.9e %19.9e\n",
//fprintf(out_control->ftot, "%3d %12.6f %12.6f %12.6f\n",
workspace->orig_id[i],
- system->atoms[i].f[0], system->atoms[i].f[1], system->atoms[i].f[2]);
+ system->atoms[i].f[0], system->atoms[i].f[1], system->atoms[i].f[2] );
+ }
- fflush(out_control->ftot);
+ fflush( out_control->ftot );
#if !defined(TEST_FORCES)
- fclose(out_control->ftot);
+ fclose( out_control->ftot );
#endif
}
void Output_Results( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
- int i, type_i, f_update;
- real q;
- real t_elapsed = 0;;
-
+ int i, type_i;
+ real e_pol, q, f_update;
+ real t_elapsed = 0;
/* Compute Polarization Energy */
- data->E_Pol = 0.0;
+ e_pol = 0.0;
+
+#ifdef _OPENMP
+ #pragma omp parallel for default(none) private(q, type_i,) shared(system) \
+ reduction(+: e_pol) schedule(static)
+#endif
for ( i = 0; i < system->N; i++ )
{
q = system->atoms[i].q;
type_i = system->atoms[i].type;
- data->E_Pol += ( system->reaxprm.sbp[ type_i ].chi * q +
- (system->reaxprm.sbp[ type_i ].eta / 2.0) * SQR(q) ) *
- KCALpMOL_to_EV;
- /* fprintf( stderr, "%6d%23.15e%23.15e%23.15e%23.15e\n",
- i, q, system->reaxprm.sbp[ type_i ].chi,
- system->reaxprm.sbp[ type_i ].eta, data->E_Pol ); */
+ e_pol += ( system->reaxprm.sbp[ type_i ].chi * q +
+ (system->reaxprm.sbp[ type_i ].eta / 2.0) * SQR( q ) ) *
+ KCALpMOL_to_EV;
}
+ data->E_Pol = e_pol;
+
data->E_Pot = data->E_BE + data->E_Ov + data->E_Un + data->E_Lp +
- data->E_Ang + data->E_Pen + data->E_Coa + data->E_HB +
- data->E_Tor + data->E_Con +
- data->E_vdW + data->E_Ele + data->E_Pol;
+ data->E_Ang + data->E_Pen + data->E_Coa + data->E_HB +
+ data->E_Tor + data->E_Con + data->E_vdW + data->E_Ele + data->E_Pol;
data->E_Tot = data->E_Pot + E_CONV * data->E_Kin;
-
/* output energies if it is the time */
if ( out_control->energy_update_freq > 0 &&
data->step % out_control->energy_update_freq == 0 )
@@ -584,7 +614,7 @@ void Output_Results( reax_system *system, control_params *control,
"%-6d%24.15e%24.15e%24.15e%13.5f%13.5f%16.5f%13.5f%13.5f\n",
data->step, data->E_Tot, data->E_Pot, E_CONV * data->E_Kin,
data->therm.T, control->T, system->box.volume, data->iso_bar.P,
- (control->P[0] + control->P[1] + control->P[2]) / 3 );
+ (control->P[0] + control->P[1] + control->P[2]) / 3.0 );
fprintf( out_control->pot,
"%-6d%24.15e%24.15e%24.15e%24.15e%24.15e%24.15e%24.15e%24.15e%24.15e%24.15e%24.15e\n",
@@ -599,7 +629,7 @@ void Output_Results( reax_system *system, control_params *control,
"%-6d%16.2f%16.2f%16.2f%11.2f%11.2f%13.2f%13.5f%13.5f\n",
data->step, data->E_Tot, data->E_Pot, E_CONV * data->E_Kin,
data->therm.T, control->T, system->box.volume, data->iso_bar.P,
- (control->P[0] + control->P[1] + control->P[2]) / 3 );
+ (control->P[0] + control->P[1] + control->P[2]) / 3.0 );
fprintf( out_control->pot,
"%-6d%13.2f%13.2f%13.2f%13.2f%13.2f%13.2f%13.2f%13.2f%13.2f%13.2f%13.2f\n",
@@ -613,24 +643,29 @@ void Output_Results( reax_system *system, control_params *control,
t_elapsed = Get_Timing_Info( data->timing.total );
if ( data->step == data->prev_steps )
- f_update = 1;
- else f_update = out_control->energy_update_freq;
+ {
+ f_update = 1.0;
+ }
+ else
+ {
+ f_update = 1.0 / out_control->energy_update_freq;
+ }
fprintf( out_control->log, "%6d %10.2f %10.2f %10.2f %10.2f %10.2f %10.4f %10.4f %10.2f %10.4f %10.4f %10.4f %10.4f %10.4f %10.4f\n",
- data->step, t_elapsed / f_update,
- data->timing.nbrs / f_update,
- data->timing.init_forces / f_update,
- data->timing.bonded / f_update,
- data->timing.nonb / f_update,
- data->timing.cm / f_update,
- data->timing.cm_sort_mat_rows / f_update,
- (double)data->timing.cm_solver_iters / f_update,
- data->timing.cm_solver_pre_comp / f_update,
- data->timing.cm_solver_pre_app / f_update,
- data->timing.cm_solver_spmv / f_update,
- data->timing.cm_solver_vector_ops / f_update,
- data->timing.cm_solver_orthog / f_update,
- data->timing.cm_solver_tri_solve / f_update );
+ data->step, t_elapsed * f_update,
+ data->timing.nbrs * f_update,
+ data->timing.init_forces * f_update,
+ data->timing.bonded * f_update,
+ data->timing.nonb * f_update,
+ data->timing.cm * f_update,
+ data->timing.cm_sort_mat_rows * f_update,
+ (double)data->timing.cm_solver_iters * f_update,
+ data->timing.cm_solver_pre_comp * f_update,
+ data->timing.cm_solver_pre_app * f_update,
+ data->timing.cm_solver_spmv * f_update,
+ data->timing.cm_solver_vector_ops * f_update,
+ data->timing.cm_solver_orthog * f_update,
+ data->timing.cm_solver_tri_solve * f_update );
data->timing.total = Get_Time( );
data->timing.nbrs = 0;
@@ -672,23 +707,21 @@ void Output_Results( reax_system *system, control_params *control,
system->box.box_norms[2],
data->tot_press[0], data->tot_press[1], data->tot_press[2],
control->P[0], control->P[1], control->P[2], system->box.volume );
- fflush( out_control->prs);
+ fflush( out_control->prs );
}
}
if ( out_control->write_steps > 0 &&
data->step % out_control->write_steps == 0 )
{
- // t_start = Get_Time( );
+ //t_start = Get_Time( );
out_control->append_traj_frame( system, control, data,
- workspace, lists, out_control );
+ workspace, lists, out_control );
//Write_PDB( system, *lists+BONDS, data, control, workspace, out_control );
- // t_elapsed = Get_Timing_Info( t_start );
- // fprintf(stdout, "append_frame took %.6f seconds\n", t_elapsed );
+ //t_elapsed = Get_Timing_Info( t_start );
+ //fprintf(stdout, "append_frame took %.6f seconds\n", t_elapsed );
}
-
- // fprintf( stderr, "output_results... done\n" );
}
@@ -780,9 +813,9 @@ void Print_Linear_System( reax_system *system, control_params *control,
void Print_Charges( reax_system *system, control_params *control,
- static_storage *workspace, int step )
+ static_storage *workspace, int step )
{
- int i;
+ int i;
char fname[100];
FILE *fout;
@@ -790,24 +823,28 @@ void Print_Charges( reax_system *system, control_params *control,
fout = fopen( fname, "w" );
for ( i = 0; i < system->N; ++i )
+ {
fprintf( fout, "%6d%12.7f%12.7f%12.7f\n",
workspace->orig_id[i],
workspace->s[0][i], workspace->t[0][i], system->atoms[i].q );
+ }
fclose( fout );
}
void Print_Soln( static_storage *workspace,
- real *x, real *b_prm, real *b, int N )
+ real *x, real *b_prm, real *b, int N )
{
int i;
fprintf( stdout, "%6s%10s%10s%10s\n", "id", "x", "b_prm", "b" );
for ( i = 0; i < N; ++i )
+ {
fprintf( stdout, "%6d%10.4f%10.4f%10.4f\n",
workspace->orig_id[i], x[i], b_prm[i], b[i] );
+ }
fflush( stdout );
}
@@ -821,7 +858,9 @@ void Print_Sparse_Matrix( sparse_matrix *A )
{
fprintf( stderr, "i:%d j(val):", i );
for ( j = A->start[i]; j < A->start[i + 1]; ++j )
+ {
fprintf( stderr, "%d(%.4f) ", A->j[j], A->val[j] );
+ }
fprintf( stderr, "\n" );
}
}
@@ -843,15 +882,20 @@ void Print_Sparse_Matrix2( sparse_matrix *A, char *fname, char *mode )
for ( i = 0; i < A->n; ++i )
{
- for ( j = A->start[i]; j < A->start[i + 1]; ++j )
+ /* off-diagonals */
+ for ( j = A->start[i]; j < A->start[i + 1] - 1; ++j )
{
- //fprintf( f, "%d%d %.15e\n", A->entries[j].j, i, A->entries[j].val );
//Convert 0-based to 1-based (for Matlab)
- fprintf( f, "%6d %6d %24.15e\n", i+1, A->j[j]+1, A->val[j] );
+ fprintf( f, "%6d %6d %24.15e\n", i + 1, A->j[j] + 1, A->val[j] );
+ /* print symmetric entry */
+// fprintf( f, "%6d %6d %24.15e\n", A->j[j] + 1, i + 1, A->val[j] );
}
+
+ /* diagonal */
+ fprintf( f, "%6d %6d %24.15e\n", i + 1, A->j[A->start[i + 1] - 1] + 1, A->val[A->start[i + 1] - 1] );
}
- fclose(f);
+ fclose( f );
}
@@ -900,6 +944,7 @@ void Print_Bonds( reax_system *system, list *bonds, char *fname )
FILE *f = fopen( fname, "w" );
for ( i = 0; i < system->N; ++i )
+ {
for ( pj = Start_Index(i, bonds); pj < End_Index(i, bonds); ++pj )
{
pbond = &(bonds->select.bond_list[pj]);
@@ -910,7 +955,9 @@ void Print_Bonds( reax_system *system, list *bonds, char *fname )
fprintf( f, "%6d%6d %9.5f %9.5f\n",
i + 1, pbond->nbr + 1, pbond->d, bo_ij->BO );
}
- fclose(f);
+ }
+
+ fclose( f );
}
@@ -931,35 +978,41 @@ void Print_Bond_List2( reax_system *system, list *bonds, char *fname )
nbr = bonds->select.bond_list[pj].nbr;
id_j = nbr + 1; //system->my_atoms[nbr].orig_id;
if ( id_i < id_j )
+ {
temp[num++] = id_j;
+ }
}
qsort(&temp, num, sizeof(int), fn_qsort_intcmp);
- for (j = 0; j < num; j++)
- fprintf(f, "%6d", temp[j] );
- fprintf(f, "\n");
+ for ( j = 0; j < num; j++ )
+ {
+ fprintf( f, "%6d", temp[j] );
+ }
+ fprintf( f, "\n" );
}
}
#ifdef LGJ
-Print_XYZ_Serial(reax_system* system, static_storage *workspace)
+Print_XYZ_Serial( reax_system* system, static_storage *workspace )
{
rvec p;
-
- char fname[100];
+ char fname[100];
FILE *fout;
- sprintf( fname, "READ_PDB.0" );
- fout = fopen( fname, "w" );
int i;
- for (i = 0; i < system->N; i++)
+
+ sprintf( fname, "READ_PDB.0" );
+ fout = fopen( fname, "w" );
+
+ for ( i = 0; i < system->N; i++ )
+ {
fprintf( fout, "%6d%24.15e%24.15e%24.15e\n",
workspace->orig_id[i],
p[0] = system->atoms[i].x[0],
p[1] = system->atoms[i].x[1],
- p[2] = system->atoms[i].x[2]);
-
+ p[2] = system->atoms[i].x[2] );
+ }
- fclose(fout);
+ fclose( fout );
}
#endif
diff --git a/sPuReMD/src/reset_utils.c b/sPuReMD/src/reset_utils.c
index 36d6b414063c4c37a7399c07b039cdc0b80d8a85..0a364e69c003f8c4c1b637f390103e44d35ee6da 100644
--- a/sPuReMD/src/reset_utils.c
+++ b/sPuReMD/src/reset_utils.c
@@ -20,6 +20,7 @@
----------------------------------------------------------------------*/
#include "reset_utils.h"
+
#include "list.h"
#include "vector.h"
@@ -29,36 +30,36 @@ void Reset_Atoms( reax_system* system )
int i;
for ( i = 0; i < system->N; ++i )
+ {
memset( system->atoms[i].f, 0.0, sizeof(rvec) );
+ }
}
void Reset_Pressures( simulation_data *data )
{
rtensor_MakeZero( data->flex_bar.P );
- data->iso_bar.P = 0;
+ data->iso_bar.P = 0.0;
rvec_MakeZero( data->int_press );
rvec_MakeZero( data->ext_press );
- /* fprintf( stderr, "reset: ext_press (%12.6f %12.6f %12.6f)\n",
- data->ext_press[0], data->ext_press[1], data->ext_press[2] ); */
}
void Reset_Simulation_Data( simulation_data* data )
{
- data->E_BE = 0;
- data->E_Ov = 0;
- data->E_Un = 0;
- data->E_Lp = 0;
- data->E_Ang = 0;
- data->E_Pen = 0;
- data->E_Coa = 0;
- data->E_HB = 0;
- data->E_Tor = 0;
- data->E_Con = 0;
- data->E_vdW = 0;
- data->E_Ele = 0;
- data->E_Kin = 0;
+ data->E_BE = 0.0;
+ data->E_Ov = 0.0;
+ data->E_Un = 0.0;
+ data->E_Lp = 0.0;
+ data->E_Ang = 0.0;
+ data->E_Pen = 0.0;
+ data->E_Coa = 0.0;
+ data->E_HB = 0.0;
+ data->E_Tor = 0.0;
+ data->E_Con = 0.0;
+ data->E_vdW = 0.0;
+ data->E_Ele = 0.0;
+ data->E_Kin = 0.0;
}
@@ -84,12 +85,28 @@ void Reset_Test_Forces( reax_system *system, static_storage *workspace )
void Reset_Workspace( reax_system *system, static_storage *workspace )
{
+#ifdef _OPENMP
+ int i, tid;
+#endif
+
memset( workspace->total_bond_order, 0, system->N * sizeof( real ) );
memset( workspace->dDeltap_self, 0, system->N * sizeof( rvec ) );
memset( workspace->CdDelta, 0, system->N * sizeof( real ) );
//memset( workspace->virial_forces, 0, system->N * sizeof( rvec ) );
+#ifdef _OPENMP
+ #pragma omp parallel private(i, tid)
+ {
+ tid = omp_get_thread_num( );
+
+ for ( i = 0; i < system->N; ++i )
+ {
+ rvec_MakeZero( workspace->f_local[tid * system->N + i] );
+ }
+ }
+#endif
+
#ifdef TEST_FORCES
memset( workspace->dDelta, 0, sizeof(rvec) * system->N );
Reset_Test_Forces( system, workspace );
@@ -111,7 +128,9 @@ void Reset_Neighbor_Lists( reax_system *system, control_params *control,
}
if ( control->hb_cut > 0 )
+ {
for ( i = 0; i < system->N; ++i )
+ {
if ( system->reaxprm.sbp[system->atoms[i].type].p_hbond == 1)
{
tmp = Start_Index( workspace->hbond_index[i], hbonds );
@@ -120,19 +139,19 @@ void Reset_Neighbor_Lists( reax_system *system, control_params *control,
i, Start_Index( workspace->hbond_index[i], hbonds ),
End_Index( workspace->hbond_index[i], hbonds ) );*/
}
+ }
+ }
}
void Reset( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace, list **lists )
+ simulation_data *data, static_storage *workspace, list **lists )
{
Reset_Atoms( system );
Reset_Simulation_Data( data );
- if ( control->ensemble == NPT || control->ensemble == sNPT ||
- control->ensemble == iNPT )
- Reset_Pressures( data );
+ Reset_Pressures( data );
Reset_Workspace( system, workspace );
diff --git a/sPuReMD/src/single_body_interactions.c b/sPuReMD/src/single_body_interactions.c
index 484104a8d8dff533ab12c7033e35969d69f0a60d..9da3e21aace9d38063b9343f486ae6495b6e8f78 100644
--- a/sPuReMD/src/single_body_interactions.c
+++ b/sPuReMD/src/single_body_interactions.c
@@ -26,11 +26,8 @@
#include "vector.h"
-void LonePair_OverUnder_Coordination_Energy( reax_system *system,
- control_params *control,
- simulation_data *data,
- static_storage *workspace,
- list **lists,
+void LonePair_OverUnder_Coordination_Energy( reax_system *system, control_params *control,
+ simulation_data *data, static_storage *workspace, list **lists,
output_controls *out_control )
{
int i, j, pj, type_i, type_j;
@@ -44,8 +41,7 @@ void LonePair_OverUnder_Coordination_Energy( reax_system *system,
real e_un, CEunder1, CEunder2, CEunder3, CEunder4;
real p_lp1, p_lp2, p_lp3;
real p_ovun2, p_ovun3, p_ovun4, p_ovun5, p_ovun6, p_ovun7, p_ovun8;
-
- single_body_parameters *sbp_i, *sbp_j;
+ single_body_parameters *sbp_i;
two_body_parameters *twbp;
bond_data *pbond;
bond_order_data *bo_ij;
@@ -152,18 +148,11 @@ void LonePair_OverUnder_Coordination_Energy( reax_system *system,
j = bonds->select.bond_list[pj].nbr;
type_j = system->atoms[j].type;
bo_ij = &(bonds->select.bond_list[pj].bo_data);
- sbp_j = &(system->reaxprm.sbp[ type_j ]);
twbp = &(system->reaxprm.tbp[ type_i ][ type_j ]);
sum_ovun1 += twbp->p_ovun1 * twbp->De_s * bo_ij->BO;
sum_ovun2 += (workspace->Delta[j] - dfvl * workspace->Delta_lp_temp[j]) *
( bo_ij->BO_pi + bo_ij->BO_pi2 );
-
- /*fprintf( stdout, "%4d%4d%23.15e%23.15e%23.15e\n",
- i+1, j+1,
- dfvl * workspace->Delta_lp_temp[j],
- sbp_j->nlp_opt,
- workspace->nlp_temp[j] );*/
}
exp_ovun1 = p_ovun3 * EXP( p_ovun4 * sum_ovun2 );
diff --git a/sPuReMD/src/system_props.c b/sPuReMD/src/system_props.c
index fc93a474cf378f1a382d0ae017cf15a9b23eb17a..fad302b4c08b46a8b9d92d18f9a2a24a73e66e2f 100644
--- a/sPuReMD/src/system_props.c
+++ b/sPuReMD/src/system_props.c
@@ -25,7 +25,7 @@
void Temperature_Control( control_params *control, simulation_data *data,
- output_controls *out_control )
+ output_controls *out_control )
{
real tmp;
@@ -34,17 +34,24 @@ void Temperature_Control( control_params *control, simulation_data *data,
if ( (data->step - data->prev_steps) %
((int)(control->T_freq / control->dt)) == 0 )
{
- if ( fabs( control->T - control->T_final ) >= fabs( control->T_rate ) )
+ if ( FABS( control->T - control->T_final ) >= FABS( control->T_rate ) )
+ {
control->T += control->T_rate;
- else control->T = control->T_final;
+ }
+ else
+ {
+ control->T = control->T_final;
+ }
}
}
else if ( control->T_mode == 2 ) // constant slope control
{
tmp = control->T_rate * control->dt / control->T_freq;
- if ( fabs( control->T - control->T_final ) >= fabs( tmp ) )
+ if ( FABS( control->T - control->T_final ) >= FABS( tmp ) )
+ {
control->T += tmp;
+ }
}
}
@@ -53,18 +60,19 @@ void Compute_Total_Mass( reax_system *system, simulation_data *data )
{
int i;
- data->M = 0;
+ data->M = 0.0;
for ( i = 0; i < system->N; i++ )
+ {
data->M += system->reaxprm.sbp[ system->atoms[i].type ].mass;
+ }
- //fprintf ( stderr, "Compute_total_Mass -->%f<-- \n", data->M );
- data->inv_M = 1. / data->M;
+ data->inv_M = 1.0 / data->M;
}
void Compute_Center_of_Mass( reax_system *system, simulation_data *data,
- FILE *fout )
+ FILE *fout )
{
int i;
real m, xx, xy, xz, yy, yz, zz, det;
@@ -76,7 +84,6 @@ void Compute_Center_of_Mass( reax_system *system, simulation_data *data,
rvec_MakeZero( data->amcm ); // angular momentum of CoM
rvec_MakeZero( data->avcm ); // angular velocity of CoM
-
/* Compute the position, velocity and angular momentum about the CoM */
for ( i = 0; i < system->N; ++i )
{
@@ -87,15 +94,6 @@ void Compute_Center_of_Mass( reax_system *system, simulation_data *data,
rvec_Cross( tvec, system->atoms[i].x, system->atoms[i].v );
rvec_ScaledAdd( data->amcm, m, tvec );
-
- /*fprintf( fout,"%3d %g %g %g\n",
- i+1,
- system->atoms[i].v[0], system->atoms[i].v[1], system->atoms[i].v[2] );
- fprintf( fout, "vcm: %g %g %g\n",
- data->vcm[0], data->vcm[1], data->vcm[2] );
- */
- /* fprintf( stderr, "amcm: %12.6f %12.6f %12.6f\n",
- data->amcm[0], data->amcm[1], data->amcm[2] ); */
}
rvec_Scale( data->xcm, data->inv_M, data->xcm );
@@ -147,10 +145,14 @@ void Compute_Center_of_Mass( reax_system *system, simulation_data *data,
inv[2][1] = mat[2][0] * mat[0][1] - mat[0][0] * mat[2][1];
inv[2][2] = mat[0][0] * mat[1][1] - mat[1][0] * mat[0][1];
- if ( fabs(det) > ALMOST_ZERO )
+ if ( FABS(det) > ALMOST_ZERO )
+ {
rtensor_Scale( inv, 1. / det, inv );
+ }
else
+ {
rtensor_MakeZero( inv );
+ }
/* Compute the angular velocity about the centre of mass */
rtensor_MatVec( data->avcm, inv, data->amcm );
@@ -186,7 +188,7 @@ void Compute_Kinetic_Energy( reax_system* system, simulation_data* data )
data->E_Kin = 0.0;
- for (i = 0; i < system->N; i++)
+ for ( i = 0; i < system->N; i++ )
{
m = system->reaxprm.sbp[system->atoms[i].type].mass;
@@ -200,8 +202,10 @@ void Compute_Kinetic_Energy( reax_system* system, simulation_data* data )
data->therm.T = (2. * data->E_Kin) / (data->N_f * K_B);
- if ( fabs(data->therm.T) < ALMOST_ZERO ) /* avoid T being an absolute zero! */
+ if ( FABS(data->therm.T) < ALMOST_ZERO ) /* avoid T being an absolute zero! */
+ {
data->therm.T = ALMOST_ZERO;
+ }
}
@@ -214,8 +218,7 @@ void Compute_Kinetic_Energy( reax_system* system, simulation_data* data )
* We may want to add that for more accuracy.
*/
void Compute_Pressure_Isotropic( reax_system* system, control_params *control,
- simulation_data* data,
- output_controls *out_control )
+ simulation_data* data, output_controls *out_control )
{
int i;
reax_atom *p_atom;
@@ -273,8 +276,7 @@ void Compute_Pressure_Isotropic( reax_system* system, control_params *control,
}
-void Compute_Pressure_Isotropic_Klein( reax_system* system,
- simulation_data* data )
+void Compute_Pressure_Isotropic_Klein( reax_system* system, simulation_data* data )
{
int i;
reax_atom *p_atom;
@@ -301,7 +303,7 @@ void Compute_Pressure_Isotropic_Klein( reax_system* system,
void Compute_Pressure( reax_system* system, simulation_data* data,
- static_storage *workspace )
+ static_storage *workspace )
{
int i;
reax_atom *p_atom;
diff --git a/sPuReMD/src/testmd.c b/sPuReMD/src/testmd.c
index 9ff007a91b77a1844d10d43cf045ca2e3ba91b3a..d1159ef12df83940476f795498d04b35159b997c 100644
--- a/sPuReMD/src/testmd.c
+++ b/sPuReMD/src/testmd.c
@@ -135,6 +135,9 @@ void static Read_System( char * const geo_file,
exit( INVALID_GEO );
}
+ fclose( ffield );
+ fclose( ctrl );
+
#if defined(DEBUG_FOCUS)
fprintf( stderr, "input files have been read...\n" );
Print_Box( &(system->box), stderr );
@@ -168,10 +171,10 @@ int main(int argc, char* argv[])
lists = (list*) malloc( sizeof(list) * LIST_N );
Read_System( argv[1], argv[2], argv[3], &system, &control,
- &data, &workspace, &out_control );
+ &data, &workspace, &out_control );
Initialize( &system, &control, &data, &workspace, &lists,
- &out_control, &Evolve );
+ &out_control, &Evolve );
/* compute f_0 */
//if( control.restart == 0 ) {
@@ -195,13 +198,15 @@ int main(int argc, char* argv[])
}
Evolve( &system, &control, &data, &workspace, &lists, &out_control );
Post_Evolve( &system, &control, &data, &workspace, &lists, &out_control );
- Output_Results(&system, &control, &data, &workspace, &lists, &out_control);
+ Output_Results( &system, &control, &data, &workspace, &lists, &out_control );
Analysis( &system, &control, &data, &workspace, &lists, &out_control );
steps = data.step - data.prev_steps;
if ( steps && out_control.restart_freq &&
steps % out_control.restart_freq == 0 )
+ {
Write_Restart( &system, &control, &data, &workspace, &out_control );
+ }
}
if ( out_control.write_steps > 0 )
@@ -214,5 +219,10 @@ int main(int argc, char* argv[])
data.timing.elapsed = Get_Timing_Info( data.timing.start );
fprintf( out_control.log, "total: %.2f secs\n", data.timing.elapsed );
+ Finalize( &system, &control, &data, &workspace, &lists,
+ &out_control );
+
+ free( lists );
+
return SUCCESS;
}
diff --git a/sPuReMD/src/three_body_interactions.c b/sPuReMD/src/three_body_interactions.c
index 078d951a159f7c11c1d13a8345dc25ce7b055620..c54def418822fc7c2fb325ecf571b7c7940bd8b6 100644
--- a/sPuReMD/src/three_body_interactions.c
+++ b/sPuReMD/src/three_body_interactions.c
@@ -28,11 +28,17 @@
/* calculates the theta angle between i-j-k */
void Calculate_Theta( rvec dvec_ji, real d_ji, rvec dvec_jk, real d_jk,
- real *theta, real *cos_theta )
+ real *theta, real *cos_theta )
{
(*cos_theta) = rvec_Dot( dvec_ji, dvec_jk ) / ( d_ji * d_jk );
- if ( *cos_theta > 1. ) *cos_theta = 1.0;
- if ( *cos_theta < -1. ) *cos_theta = -1.0;
+ if ( *cos_theta > 1.0 )
+ {
+ *cos_theta = 1.0;
+ }
+ if ( *cos_theta < -1.0 )
+ {
+ *cos_theta = -1.0;
+ }
(*theta) = ACOS( *cos_theta );
}
@@ -40,27 +46,28 @@ void Calculate_Theta( rvec dvec_ji, real d_ji, rvec dvec_jk, real d_jk,
/* calculates the derivative of the cosine of the angle between i-j-k */
void Calculate_dCos_Theta( rvec dvec_ji, real d_ji, rvec dvec_jk, real d_jk,
- rvec* dcos_theta_di, rvec* dcos_theta_dj,
- rvec* dcos_theta_dk )
+ rvec* dcos_theta_di, rvec* dcos_theta_dj, rvec* dcos_theta_dk )
{
- int t;
- real sqr_d_ji = SQR(d_ji);
- real sqr_d_jk = SQR(d_jk);
- real inv_dists = 1.0 / (d_ji * d_jk);
- real inv_dists3 = POW( inv_dists, 3 );
- real dot_dvecs = rvec_Dot( dvec_ji, dvec_jk );
- real Cdot_inv3 = dot_dvecs * inv_dists3;
+ int t;
+ real sqr_d_ji, sqr_d_jk, inv_dists, inv_dists3, dot_dvecs, Cdot_inv3;
+
+ sqr_d_ji = SQR( d_ji );
+ sqr_d_jk = SQR( d_jk );
+ inv_dists = 1.0 / (d_ji * d_jk);
+ inv_dists3 = POW( inv_dists, 3 );
+ dot_dvecs = rvec_Dot( dvec_ji, dvec_jk );
+ Cdot_inv3 = dot_dvecs * inv_dists3;
for ( t = 0; t < 3; ++t )
{
(*dcos_theta_di)[t] = dvec_jk[t] * inv_dists -
- Cdot_inv3 * sqr_d_jk * dvec_ji[t];
+ Cdot_inv3 * sqr_d_jk * dvec_ji[t];
(*dcos_theta_dj)[t] = -(dvec_jk[t] + dvec_ji[t]) * inv_dists +
- Cdot_inv3 * ( sqr_d_jk * dvec_ji[t] + sqr_d_ji * dvec_jk[t] );
+ Cdot_inv3 * ( sqr_d_jk * dvec_ji[t] + sqr_d_ji * dvec_jk[t] );
(*dcos_theta_dk)[t] = dvec_ji[t] * inv_dists -
- Cdot_inv3 * sqr_d_ji * dvec_jk[t];
+ Cdot_inv3 * sqr_d_ji * dvec_jk[t];
}
/*fprintf( stderr,
@@ -72,497 +79,566 @@ void Calculate_dCos_Theta( rvec dvec_ji, real d_ji, rvec dvec_jk, real d_jk,
/* this is a 3-body interaction in which the main role is
played by j which sits in the middle of the other two. */
void Three_Body_Interactions( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
- int i, j, pi, k, pk, t;
- int type_i, type_j, type_k;
- int start_j, end_j, start_pk, end_pk;
- int flag, cnt, num_thb_intrs;
-
- real temp, temp_bo_jt, pBOjt7;
- real p_val1, p_val2, p_val3, p_val4, p_val5;
- real p_val6, p_val7, p_val8, p_val9, p_val10;
- real p_pen1, p_pen2, p_pen3, p_pen4;
- real p_coa1, p_coa2, p_coa3, p_coa4;
- real trm8, expval6, expval7, expval2theta, expval12theta, exp3ij, exp3jk;
- real exp_pen2ij, exp_pen2jk, exp_pen3, exp_pen4, trm_pen34, exp_coa2;
- real dSBO1, dSBO2, SBO, SBO2, CSBO2, SBOp, prod_SBO;
- real CEval1, CEval2, CEval3, CEval4, CEval5, CEval6, CEval7, CEval8;
- real CEpen1, CEpen2, CEpen3;
- real e_ang, e_coa, e_pen;
- real CEcoa1, CEcoa2, CEcoa3, CEcoa4, CEcoa5;
- real Cf7ij, Cf7jk, Cf8j, Cf9j;
- real f7_ij, f7_jk, f8_Dj, f9_Dj;
- real Ctheta_0, theta_0, theta_00, theta, cos_theta, sin_theta;
- real r_ij, r_jk;
- real BOA_ij, BOA_jk;
- real vlpadj;
- rvec force, ext_press;
- // rtensor temp_rtensor, total_rtensor;
real *total_bo;
- three_body_header *thbh;
- three_body_parameters *thbp;
- three_body_interaction_data *p_ijk, *p_kji;
- bond_data *pbond_ij, *pbond_jk, *pbond_jt;
- bond_order_data *bo_ij, *bo_jk, *bo_jt;
list *bonds, *thb_intrs;
bond_data *bond_list;
three_body_interaction_data *thb_list;
+ real p_pen2, p_pen3, p_pen4;
+ real p_coa2, p_coa3, p_coa4;
+ real p_val6, p_val8, p_val9, p_val10;
+ int num_thb_intrs;
+ real e_ang_total, e_pen_total, e_coa_total;
total_bo = workspace->total_bond_order;
bonds = (*lists) + BONDS;
bond_list = bonds->select.bond_list;
thb_intrs = (*lists) + THREE_BODIES;
thb_list = thb_intrs->select.three_body_list;
-
/* global parameters used in these calculations */
+ p_pen2 = system->reaxprm.gp.l[19];
+ p_pen3 = system->reaxprm.gp.l[20];
+ p_pen4 = system->reaxprm.gp.l[21];
+ p_coa2 = system->reaxprm.gp.l[2];
+ p_coa3 = system->reaxprm.gp.l[38];
+ p_coa4 = system->reaxprm.gp.l[30];
p_val6 = system->reaxprm.gp.l[14];
p_val8 = system->reaxprm.gp.l[33];
p_val9 = system->reaxprm.gp.l[16];
p_val10 = system->reaxprm.gp.l[17];
num_thb_intrs = 0;
+ e_ang_total = 0.0;
+ e_pen_total = 0.0;
+ e_coa_total = 0.0;
- for ( j = 0; j < system->N; ++j )
+ //TODO: change interaction lists for parallelization
+#ifdef _OPENMP
+// #pragma omp parallel default(shared) reduction(+:total_Eang, total_Epen, total_Ecoa, num_thb_intrs)
+#endif
{
- // fprintf( out_control->eval, "j: %d\n", j );
- type_j = system->atoms[j].type;
- start_j = Start_Index(j, bonds);
- end_j = End_Index(j, bonds);
-
- p_val3 = system->reaxprm.sbp[ type_j ].p_val3;
- p_val5 = system->reaxprm.sbp[ type_j ].p_val5;
-
- SBOp = 0, prod_SBO = 1;
- for ( t = start_j; t < end_j; ++t )
- {
- bo_jt = &(bond_list[t].bo_data);
- SBOp += (bo_jt->BO_pi + bo_jt->BO_pi2);
- temp = SQR( bo_jt->BO );
- temp *= temp;
- temp *= temp;
- prod_SBO *= EXP( -temp );
- }
+ int i, j, pi, k, pk, t;
+ int type_i, type_j, type_k;
+ int start_j, end_j, start_pk, end_pk;
+ int cnt;
+ real temp, temp_bo_jt, pBOjt7;
+ real p_val1, p_val2, p_val3, p_val4, p_val5, p_val7;
+ real p_pen1;
+ real p_coa1;
+ real trm8, expval6, expval7, expval2theta, expval12theta, exp3ij, exp3jk;
+ real exp_pen2ij, exp_pen2jk, exp_pen3, exp_pen4, trm_pen34, exp_coa2;
+ real dSBO1, dSBO2, SBO, SBO2, CSBO2, SBOp, prod_SBO;
+ real CEval1, CEval2, CEval3, CEval4, CEval5, CEval6, CEval7, CEval8;
+ real CEpen1, CEpen2, CEpen3;
+ real e_ang, e_coa, e_pen;
+ real CEcoa1, CEcoa2, CEcoa3, CEcoa4, CEcoa5;
+ real Cf7ij, Cf7jk, Cf8j, Cf9j;
+ real f7_ij, f7_jk, f8_Dj, f9_Dj;
+ real Ctheta_0, theta_0, theta_00, theta, cos_theta, sin_theta;
+ real BOA_ij, BOA_jk;
+ real vlpadj;
+ rvec force, ext_press;
+ //rtensor temp_rtensor, total_rtensor;
+ three_body_header *thbh;
+ three_body_parameters *thbp;
+ three_body_interaction_data *p_ijk, *p_kji;
+ bond_data *pbond_ij, *pbond_jk, *pbond_jt;
+ bond_order_data *bo_ij, *bo_jk, *bo_jt;
+ rvec *f_i, *f_j, *f_k;
+#ifdef _OPENMP
+// int tid = omp_get_thread_num( );
+#endif
- /* modifications to match Adri's code - 09/01/09 */
- if ( workspace->vlpex[j] >= 0 )
+ for ( j = 0; j < system->N; ++j )
{
- vlpadj = 0;
- dSBO2 = prod_SBO - 1;
- }
- else
- {
- vlpadj = workspace->nlp[j];
- dSBO2 = (prod_SBO - 1) * (1 - p_val8 * workspace->dDelta_lp[j]);
- }
-
- SBO = SBOp + (1 - prod_SBO) * (-workspace->Delta_boc[j] - p_val8 * vlpadj);
- dSBO1 = -8 * prod_SBO * ( workspace->Delta_boc[j] + p_val8 * vlpadj );
+ // fprintf( out_control->eval, "j: %d\n", j );
+ type_j = system->atoms[j].type;
+ start_j = Start_Index(j, bonds);
+ end_j = End_Index(j, bonds);
+//#ifdef _OPENMP
+// f_j = &(workspace->f_local[tid * system->N + j]);
+//#else
+ f_j = &(system->atoms[j].f);
+//#endif
+
+ p_val3 = system->reaxprm.sbp[ type_j ].p_val3;
+ p_val5 = system->reaxprm.sbp[ type_j ].p_val5;
+
+ SBOp = 0.0;
+ prod_SBO = 1.0;
+ for ( t = start_j; t < end_j; ++t )
+ {
+ bo_jt = &(bond_list[t].bo_data);
+ SBOp += (bo_jt->BO_pi + bo_jt->BO_pi2);
+ temp = SQR( bo_jt->BO );
+ temp *= temp;
+ temp *= temp;
+ prod_SBO *= EXP( -temp );
+ }
- if ( SBO <= 0 )
- SBO2 = 0, CSBO2 = 0;
- else if ( SBO > 0 && SBO <= 1 )
- {
- SBO2 = POW( SBO, p_val9 );
- CSBO2 = p_val9 * POW( SBO, p_val9 - 1 );
- }
- else if ( SBO > 1 && SBO < 2 )
- {
- SBO2 = 2 - POW( 2 - SBO, p_val9 );
- CSBO2 = p_val9 * POW( 2 - SBO, p_val9 - 1 );
- }
- else
- SBO2 = 2, CSBO2 = 0;
+ /* modifications to match Adri's code - 09/01/09 */
+ if ( workspace->vlpex[j] >= 0.0 )
+ {
+ vlpadj = 0.0;
+ dSBO2 = prod_SBO - 1.0;
+ }
+ else
+ {
+ vlpadj = workspace->nlp[j];
+ dSBO2 = (prod_SBO - 1.0) * (1.0 - p_val8 * workspace->dDelta_lp[j]);
+ }
- expval6 = EXP( p_val6 * workspace->Delta_boc[j] );
+ SBO = SBOp + (1.0 - prod_SBO) * (-workspace->Delta_boc[j] - p_val8 * vlpadj);
+ dSBO1 = -8.0 * prod_SBO * ( workspace->Delta_boc[j] + p_val8 * vlpadj );
- /* unlike 2-body intrs where we enforce i<j, we cannot put any such
- restrictions here. such a restriction would prevent us from producing
- all 4-body intrs correctly */
- for ( pi = start_j; pi < end_j; ++pi )
- {
- Set_Start_Index( pi, num_thb_intrs, thb_intrs );
- pbond_ij = &(bond_list[pi]);
- bo_ij = &(pbond_ij->bo_data);
- BOA_ij = bo_ij->BO - control->thb_cut;
+ if ( SBO <= 0.0 )
+ {
+ SBO2 = 0.0;
+ CSBO2 = 0.0;
+ }
+ else if ( SBO > 0.0 && SBO <= 1.0 )
+ {
+ SBO2 = POW( SBO, p_val9 );
+ CSBO2 = p_val9 * POW( SBO, p_val9 - 1.0 );
+ }
+ else if ( SBO > 1.0 && SBO < 2.0 )
+ {
+ SBO2 = 2.0 - POW( 2.0 - SBO, p_val9 );
+ CSBO2 = p_val9 * POW( 2.0 - SBO, p_val9 - 1.0 );
+ }
+ else
+ {
+ SBO2 = 2.0;
+ CSBO2 = 0.0;
+ }
+ expval6 = EXP( p_val6 * workspace->Delta_boc[j] );
- if ( BOA_ij/*bo_ij->BO*/ > 0.0 )
+ /* unlike 2-body intrs where we enforce i<j, we cannot put any such
+ restrictions here. such a restriction would prevent us from producing
+ all 4-body intrs correctly */
+ for ( pi = start_j; pi < end_j; ++pi )
{
- i = pbond_ij->nbr;
- r_ij = pbond_ij->d;
- type_i = system->atoms[i].type;
- // fprintf( out_control->eval, "i: %d\n", i );
-
-
- /* first copy 3-body intrs from previously computed ones where i>k.
- IMPORTANT: if it is less costly to compute theta and its
- derivative, we should definitely re-compute them,
- instead of copying!
- in the second for-loop below, we compute only new 3-body intrs
- where i < k */
- for ( pk = start_j; pk < pi; ++pk )
+ Set_Start_Index( pi, num_thb_intrs, thb_intrs );
+ pbond_ij = &(bond_list[pi]);
+ bo_ij = &(pbond_ij->bo_data);
+ BOA_ij = bo_ij->BO - control->thb_cut;
+
+ if ( BOA_ij > 0.0 )
{
- // fprintf( out_control->eval, "pk: %d\n", pk );
- start_pk = Start_Index( pk, thb_intrs );
- end_pk = End_Index( pk, thb_intrs );
+ i = pbond_ij->nbr;
+ type_i = system->atoms[i].type;
+//#ifdef _OPENMP
+// f_i = &(workspace->f_local[tid * system->N + i]);
+//#else
+ f_i = &(system->atoms[i].f);
+//#endif
+
+ /* first copy 3-body intrs from previously computed ones where i>k.
+ IMPORTANT: if it is less costly to compute theta and its
+ derivative, we should definitely re-compute them,
+ instead of copying!
+ in the second for-loop below, we compute only new 3-body intrs
+ where i < k */
+ for ( pk = start_j; pk < pi; ++pk )
+ {
+ // fprintf( out_control->eval, "pk: %d\n", pk );
+ start_pk = Start_Index( pk, thb_intrs );
+ end_pk = End_Index( pk, thb_intrs );
- for ( t = start_pk; t < end_pk; ++t )
- if ( thb_list[t].thb == i )
+ for ( t = start_pk; t < end_pk; ++t )
{
- p_ijk = &(thb_list[num_thb_intrs]);
- p_kji = &(thb_list[t]);
-
- p_ijk->thb = bond_list[pk].nbr;
- p_ijk->pthb = pk;
- p_ijk->theta = p_kji->theta;
- rvec_Copy( p_ijk->dcos_di, p_kji->dcos_dk );
- rvec_Copy( p_ijk->dcos_dj, p_kji->dcos_dj );
- rvec_Copy( p_ijk->dcos_dk, p_kji->dcos_di );
-
- ++num_thb_intrs;
- break;
+ if ( thb_list[t].thb == i )
+ {
+ p_ijk = &(thb_list[num_thb_intrs]);
+ p_kji = &(thb_list[t]);
+
+ p_ijk->thb = bond_list[pk].nbr;
+ p_ijk->pthb = pk;
+ p_ijk->theta = p_kji->theta;
+ rvec_Copy( p_ijk->dcos_di, p_kji->dcos_dk );
+ rvec_Copy( p_ijk->dcos_dj, p_kji->dcos_dj );
+ rvec_Copy( p_ijk->dcos_dk, p_kji->dcos_di );
+
+ ++num_thb_intrs;
+ break;
+ }
}
- }
-
-
- /* and this is the second for loop mentioned above */
- for ( pk = pi + 1; pk < end_j; ++pk )
- {
- pbond_jk = &(bond_list[pk]);
- bo_jk = &(pbond_jk->bo_data);
- BOA_jk = bo_jk->BO - control->thb_cut;
- k = pbond_jk->nbr;
- type_k = system->atoms[k].type;
- p_ijk = &( thb_list[num_thb_intrs] );
-
- //CHANGE ORIGINAL
- if (BOA_jk <= 0) continue;
- //CHANGE ORIGINAL
-
-
- Calculate_Theta( pbond_ij->dvec, pbond_ij->d,
- pbond_jk->dvec, pbond_jk->d,
- &theta, &cos_theta );
-
- Calculate_dCos_Theta( pbond_ij->dvec, pbond_ij->d,
- pbond_jk->dvec, pbond_jk->d,
- &(p_ijk->dcos_di), &(p_ijk->dcos_dj),
- &(p_ijk->dcos_dk) );
+ }
- p_ijk->thb = k;
- p_ijk->pthb = pk;
- p_ijk->theta = theta;
- sin_theta = SIN( theta );
- if ( sin_theta < 1.0e-5 )
- sin_theta = 1.0e-5;
+ /* and this is the second for loop mentioned above */
+ for ( pk = pi + 1; pk < end_j; ++pk )
+ {
+ pbond_jk = &(bond_list[pk]);
+ bo_jk = &(pbond_jk->bo_data);
+ BOA_jk = bo_jk->BO - control->thb_cut;
+ k = pbond_jk->nbr;
+ type_k = system->atoms[k].type;
+ p_ijk = &( thb_list[num_thb_intrs] );
+//#ifdef _OPENMP
+// f_k = &(workspace->f_local[tid * system->N + k]);
+//#else
+ f_k = &(system->atoms[k].f);
+//#endif
+
+ //CHANGE ORIGINAL
+ if ( BOA_jk <= 0 )
+ {
+ continue;
+ }
+ //CHANGE ORIGINAL
- ++num_thb_intrs;
+ Calculate_Theta( pbond_ij->dvec, pbond_ij->d,
+ pbond_jk->dvec, pbond_jk->d,
+ &theta, &cos_theta );
+ Calculate_dCos_Theta( pbond_ij->dvec, pbond_ij->d,
+ pbond_jk->dvec, pbond_jk->d,
+ &(p_ijk->dcos_di), &(p_ijk->dcos_dj),
+ &(p_ijk->dcos_dk) );
- if ( BOA_jk > 0.0 &&
- (bo_ij->BO * bo_jk->BO) > SQR(control->thb_cut)/*0*/)
- {
- r_jk = pbond_jk->d;
- thbh = &( system->reaxprm.thbp[type_i][type_j][type_k] );
- flag = 0;
+ p_ijk->thb = k;
+ p_ijk->pthb = pk;
+ p_ijk->theta = theta;
- /* if( workspace->orig_id[i] < workspace->orig_id[k] )
- fprintf( stdout, "%6d %6d %6d %7.3f %7.3f %7.3f\n",
- workspace->orig_id[i], workspace->orig_id[j],
- workspace->orig_id[k], bo_ij->BO, bo_jk->BO, p_ijk->theta );
- else
- fprintf( stdout, "%6d %6d %6d %7.3f %7.3f %7.3f\n",
- workspace->orig_id[k], workspace->orig_id[j],
- workspace->orig_id[i], bo_jk->BO, bo_ij->BO, p_ijk->theta ); */
+ sin_theta = SIN( theta );
+ if ( sin_theta < 1.0e-5 )
+ {
+ sin_theta = 1.0e-5;
+ }
+ ++num_thb_intrs;
- for ( cnt = 0; cnt < thbh->cnt; ++cnt )
+ if ( BOA_jk > 0.0 &&
+ (bo_ij->BO * bo_jk->BO) > SQR(control->thb_cut)/*0*/)
{
- // fprintf( out_control->eval,
- // "%6d%6d%6d -- exists in thbp\n", i+1, j+1, k+1 );
+ thbh = &( system->reaxprm.thbp[type_i][type_j][type_k] );
- if ( fabs(thbh->prm[cnt].p_val1) > 0.001 )
+ /* if( workspace->orig_id[i] < workspace->orig_id[k] )
+ fprintf( stdout, "%6d %6d %6d %7.3f %7.3f %7.3f\n",
+ workspace->orig_id[i], workspace->orig_id[j],
+ workspace->orig_id[k], bo_ij->BO, bo_jk->BO, p_ijk->theta );
+ else
+ fprintf( stdout, "%6d %6d %6d %7.3f %7.3f %7.3f\n",
+ workspace->orig_id[k], workspace->orig_id[j],
+ workspace->orig_id[i], bo_jk->BO, bo_ij->BO, p_ijk->theta ); */
+
+ for ( cnt = 0; cnt < thbh->cnt; ++cnt )
{
- thbp = &( thbh->prm[cnt] );
-
- /* ANGLE ENERGY */
- p_val1 = thbp->p_val1;
- p_val2 = thbp->p_val2;
- p_val4 = thbp->p_val4;
- p_val7 = thbp->p_val7;
- theta_00 = thbp->theta_00;
-
- exp3ij = EXP( -p_val3 * POW( BOA_ij, p_val4 ) );
- f7_ij = 1.0 - exp3ij;
- Cf7ij = p_val3 * p_val4 *
+ if ( FABS(thbh->prm[cnt].p_val1) > 0.001 )
+ {
+ thbp = &( thbh->prm[cnt] );
+
+ /* ANGLE ENERGY */
+ p_val1 = thbp->p_val1;
+ p_val2 = thbp->p_val2;
+ p_val4 = thbp->p_val4;
+ p_val7 = thbp->p_val7;
+ theta_00 = thbp->theta_00;
+
+ exp3ij = EXP( -p_val3 * POW( BOA_ij, p_val4 ) );
+ f7_ij = 1.0 - exp3ij;
+ Cf7ij = p_val3 * p_val4 *
POW( BOA_ij, p_val4 - 1.0 ) * exp3ij;
- exp3jk = EXP( -p_val3 * POW( BOA_jk, p_val4 ) );
- f7_jk = 1.0 - exp3jk;
- Cf7jk = p_val3 * p_val4 *
+ exp3jk = EXP( -p_val3 * POW( BOA_jk, p_val4 ) );
+ f7_jk = 1.0 - exp3jk;
+ Cf7jk = p_val3 * p_val4 *
POW( BOA_jk, p_val4 - 1.0 ) * exp3jk;
- expval7 = EXP( -p_val7 * workspace->Delta_boc[j] );
- trm8 = 1.0 + expval6 + expval7;
- f8_Dj = p_val5 - ( (p_val5 - 1.0) * (2.0 + expval6) / trm8 );
- Cf8j = ( (1.0 - p_val5) / SQR(trm8) ) *
- (p_val6 * expval6 * trm8 -
- (2.0 + expval6) * ( p_val6 * expval6 - p_val7 * expval7 ));
-
- theta_0 = 180.0 -
- theta_00 * (1.0 - EXP(-p_val10 * (2.0 - SBO2)));
- theta_0 = DEG2RAD( theta_0 );
-
- expval2theta = EXP(-p_val2 * SQR(theta_0 - theta));
- if ( p_val1 >= 0 )
- expval12theta = p_val1 * (1.0 - expval2theta);
- else // To avoid linear Me-H-Me angles (6/6/06)
- expval12theta = p_val1 * -expval2theta;
-
- CEval1 = Cf7ij * f7_jk * f8_Dj * expval12theta;
- CEval2 = Cf7jk * f7_ij * f8_Dj * expval12theta;
- CEval3 = Cf8j * f7_ij * f7_jk * expval12theta;
- CEval4 = -2.0 * p_val1 * p_val2 * f7_ij * f7_jk * f8_Dj *
- expval2theta * (theta_0 - theta);
-
- Ctheta_0 = p_val10 * DEG2RAD(theta_00) *
- exp( -p_val10 * (2.0 - SBO2) );
-
- CEval5 = -CEval4 * Ctheta_0 * CSBO2;
- CEval6 = CEval5 * dSBO1;
- CEval7 = CEval5 * dSBO2;
- CEval8 = -CEval4 / sin_theta;
-
- data->E_Ang += e_ang = f7_ij * f7_jk * f8_Dj * expval12theta;
- /* END ANGLE ENERGY*/
-
-
- /* PENALTY ENERGY */
- p_pen1 = thbp->p_pen1;
- p_pen2 = system->reaxprm.gp.l[19];
- p_pen3 = system->reaxprm.gp.l[20];
- p_pen4 = system->reaxprm.gp.l[21];
-
- exp_pen2ij = EXP( -p_pen2 * SQR( BOA_ij - 2.0 ) );
- exp_pen2jk = EXP( -p_pen2 * SQR( BOA_jk - 2.0 ) );
- exp_pen3 = EXP( -p_pen3 * workspace->Delta[j] );
- exp_pen4 = EXP( p_pen4 * workspace->Delta[j] );
- trm_pen34 = 1.0 + exp_pen3 + exp_pen4;
- f9_Dj = ( 2.0 + exp_pen3 ) / trm_pen34;
- Cf9j = (-p_pen3 * exp_pen3 * trm_pen34 -
- (2.0 + exp_pen3) * ( -p_pen3 * exp_pen3 +
- p_pen4 * exp_pen4 )) /
- SQR( trm_pen34 );
-
- data->E_Pen += e_pen =
- p_pen1 * f9_Dj * exp_pen2ij * exp_pen2jk;
-
- CEpen1 = e_pen * Cf9j / f9_Dj;
- temp = -2.0 * p_pen2 * e_pen;
- CEpen2 = temp * (BOA_ij - 2.0);
- CEpen3 = temp * (BOA_jk - 2.0);
- /* END PENALTY ENERGY */
-
-
- /* COALITION ENERGY */
- p_coa1 = thbp->p_coa1;
- p_coa2 = system->reaxprm.gp.l[2];
- p_coa3 = system->reaxprm.gp.l[38];
- p_coa4 = system->reaxprm.gp.l[30];
-
- exp_coa2 = EXP( p_coa2 * workspace->Delta_boc[j] );
- data->E_Coa += e_coa =
- p_coa1 / (1. + exp_coa2) *
- EXP( -p_coa3 * SQR(total_bo[i] - BOA_ij) ) *
- EXP( -p_coa3 * SQR(total_bo[k] - BOA_jk) ) *
- EXP( -p_coa4 * SQR(BOA_ij - 1.5) ) *
- EXP( -p_coa4 * SQR(BOA_jk - 1.5) );
-
- CEcoa1 = -2 * p_coa4 * (BOA_ij - 1.5) * e_coa;
- CEcoa2 = -2 * p_coa4 * (BOA_jk - 1.5) * e_coa;
- CEcoa3 = -p_coa2 * exp_coa2 * e_coa / (1 + exp_coa2);
- CEcoa4 = -2 * p_coa3 * (total_bo[i] - BOA_ij) * e_coa;
- CEcoa5 = -2 * p_coa3 * (total_bo[k] - BOA_jk) * e_coa;
- /* END COALITION ENERGY */
-
- /* FORCES */
- bo_ij->Cdbo += (CEval1 + CEpen2 + (CEcoa1 - CEcoa4));
- bo_jk->Cdbo += (CEval2 + CEpen3 + (CEcoa2 - CEcoa5));
- workspace->CdDelta[j] += ((CEval3 + CEval7) +
- CEpen1 + CEcoa3);
- workspace->CdDelta[i] += CEcoa4;
- workspace->CdDelta[k] += CEcoa5;
-
- for ( t = start_j; t < end_j; ++t )
- {
- pbond_jt = &( bond_list[t] );
- bo_jt = &(pbond_jt->bo_data);
- temp_bo_jt = bo_jt->BO;
- temp = CUBE( temp_bo_jt );
- pBOjt7 = temp * temp * temp_bo_jt;
-
- // fprintf( out_control->eval, "%6d%12.8f\n",
- // workspace->orig_id[ bond_list[t].nbr ],
- // (CEval6 * pBOjt7) );
-
- bo_jt->Cdbo += (CEval6 * pBOjt7);
- bo_jt->Cdbopi += CEval5;
- bo_jt->Cdbopi2 += CEval5;
- }
+ expval7 = EXP( -p_val7 * workspace->Delta_boc[j] );
+ trm8 = 1.0 + expval6 + expval7;
+ f8_Dj = p_val5 - ( (p_val5 - 1.0) * (2.0 + expval6) / trm8 );
+ Cf8j = ( (1.0 - p_val5) / SQR(trm8) ) *
+ (p_val6 * expval6 * trm8 -
+ (2.0 + expval6) * ( p_val6 * expval6 - p_val7 * expval7 ));
+
+ theta_0 = 180.0 - theta_00 * (1.0 - EXP(-p_val10 * (2.0 - SBO2)));
+ theta_0 = DEG2RAD( theta_0 );
+
+ expval2theta = EXP(-p_val2 * SQR(theta_0 - theta));
+ if ( p_val1 >= 0 )
+ {
+ expval12theta = p_val1 * (1.0 - expval2theta);
+ }
+ /* To avoid linear Me-H-Me angles (6/6/06) */
+ else
+ {
+ expval12theta = p_val1 * -expval2theta;
+ }
+
+ CEval1 = Cf7ij * f7_jk * f8_Dj * expval12theta;
+ CEval2 = Cf7jk * f7_ij * f8_Dj * expval12theta;
+ CEval3 = Cf8j * f7_ij * f7_jk * expval12theta;
+ CEval4 = -2.0 * p_val1 * p_val2 * f7_ij * f7_jk * f8_Dj *
+ expval2theta * (theta_0 - theta);
+
+ Ctheta_0 = p_val10 * DEG2RAD(theta_00) *
+ EXP( -p_val10 * (2.0 - SBO2) );
+
+ CEval5 = -CEval4 * Ctheta_0 * CSBO2;
+ CEval6 = CEval5 * dSBO1;
+ CEval7 = CEval5 * dSBO2;
+ CEval8 = -CEval4 / sin_theta;
+
+ e_ang = f7_ij * f7_jk * f8_Dj * expval12theta;
+ e_ang_total += e_ang;
+ /* END ANGLE ENERGY*/
+
+ /* PENALTY ENERGY */
+ p_pen1 = thbp->p_pen1;
+
+ exp_pen2ij = EXP( -p_pen2 * SQR( BOA_ij - 2.0 ) );
+ exp_pen2jk = EXP( -p_pen2 * SQR( BOA_jk - 2.0 ) );
+ exp_pen3 = EXP( -p_pen3 * workspace->Delta[j] );
+ exp_pen4 = EXP( p_pen4 * workspace->Delta[j] );
+ trm_pen34 = 1.0 + exp_pen3 + exp_pen4;
+ f9_Dj = ( 2.0 + exp_pen3 ) / trm_pen34;
+ Cf9j = (-p_pen3 * exp_pen3 * trm_pen34 -
+ (2.0 + exp_pen3) * ( -p_pen3 * exp_pen3 +
+ p_pen4 * exp_pen4 )) / SQR( trm_pen34 );
+
+ e_pen = p_pen1 * f9_Dj * exp_pen2ij * exp_pen2jk;
+ e_pen_total += e_pen;
+
+ CEpen1 = e_pen * Cf9j / f9_Dj;
+ temp = -2.0 * p_pen2 * e_pen;
+ CEpen2 = temp * (BOA_ij - 2.0);
+ CEpen3 = temp * (BOA_jk - 2.0);
+ /* END PENALTY ENERGY */
+
+ /* COALITION ENERGY */
+ p_coa1 = thbp->p_coa1;
+
+ exp_coa2 = EXP( p_coa2 * workspace->Delta_boc[j] );
+ e_coa = p_coa1 / (1. + exp_coa2) *
+ EXP( -p_coa3 * SQR(total_bo[i] - BOA_ij) ) *
+ EXP( -p_coa3 * SQR(total_bo[k] - BOA_jk) ) *
+ EXP( -p_coa4 * SQR(BOA_ij - 1.5) ) *
+ EXP( -p_coa4 * SQR(BOA_jk - 1.5) );
+ e_coa_total += e_coa;
+
+ CEcoa1 = -2 * p_coa4 * (BOA_ij - 1.5) * e_coa;
+ CEcoa2 = -2 * p_coa4 * (BOA_jk - 1.5) * e_coa;
+ CEcoa3 = -p_coa2 * exp_coa2 * e_coa / (1 + exp_coa2);
+ CEcoa4 = -2 * p_coa3 * (total_bo[i] - BOA_ij) * e_coa;
+ CEcoa5 = -2 * p_coa3 * (total_bo[k] - BOA_jk) * e_coa;
+ /* END COALITION ENERGY */
+
+ /* FORCES */
+#ifdef _OPENMP
+// #pragma omp atomic
+#endif
+ bo_ij->Cdbo += (CEval1 + CEpen2 + (CEcoa1 - CEcoa4));
+#ifdef _OPENMP
+// #pragma omp atomic
+#endif
+ bo_jk->Cdbo += (CEval2 + CEpen3 + (CEcoa2 - CEcoa5));
+#ifdef _OPENMP
+// #pragma omp atomic
+#endif
+ workspace->CdDelta[j] += ((CEval3 + CEval7) + CEpen1 + CEcoa3);
+#ifdef _OPENMP
+// #pragma omp atomic
+#endif
+ workspace->CdDelta[i] += CEcoa4;
+#ifdef _OPENMP
+// #pragma omp atomic
+#endif
+ workspace->CdDelta[k] += CEcoa5;
+
+ for ( t = start_j; t < end_j; ++t )
+ {
+ pbond_jt = &( bond_list[t] );
+ bo_jt = &(pbond_jt->bo_data);
+ temp_bo_jt = bo_jt->BO;
+ temp = CUBE( temp_bo_jt );
+ pBOjt7 = temp * temp * temp_bo_jt;
+
+ // fprintf( out_control->eval, "%6d%12.8f\n",
+ // workspace->orig_id[ bond_list[t].nbr ],
+ // (CEval6 * pBOjt7) );
+
+#ifdef _OPENMP
+// #pragma omp atomic
+#endif
+ bo_jt->Cdbo += (CEval6 * pBOjt7);
+#ifdef _OPENMP
+// #pragma omp atomic
+#endif
+ bo_jt->Cdbopi += CEval5;
+#ifdef _OPENMP
+// #pragma omp atomic
+#endif
+ bo_jt->Cdbopi2 += CEval5;
+ }
+
+
+ if ( control->ensemble == NVE || control->ensemble == NVT || control->ensemble == bNVT)
+ {
+ rvec_ScaledAdd( *f_i, CEval8, p_ijk->dcos_di );
+ rvec_ScaledAdd( *f_j, CEval8, p_ijk->dcos_dj );
+ rvec_ScaledAdd( *f_k, CEval8, p_ijk->dcos_dk );
+ }
+ else
+ {
+ /* terms not related to bond order derivatives
+ are added directly into
+ forces and pressure vector/tensor */
+ rvec_Scale( force, CEval8, p_ijk->dcos_di );
+ rvec_Add( *f_i, force );
+ rvec_iMultiply( ext_press, pbond_ij->rel_box, force );
+#ifdef _OPENMP
+// #pragma omp critical (Three_Body_Interactions_ext_press)
+#endif
+ {
+ rvec_Add( data->ext_press, ext_press );
+ }
+ rvec_ScaledAdd( *f_j, CEval8, p_ijk->dcos_dj );
- if ( control->ensemble == NVE || control->ensemble == NVT || control->ensemble == bNVT)
- {
- rvec_ScaledAdd( system->atoms[i].f, CEval8, p_ijk->dcos_di );
- rvec_ScaledAdd( system->atoms[j].f, CEval8, p_ijk->dcos_dj );
- rvec_ScaledAdd( system->atoms[k].f, CEval8, p_ijk->dcos_dk );
- }
- else
- {
- /* terms not related to bond order derivatives
- are added directly into
- forces and pressure vector/tensor */
- rvec_Scale( force, CEval8, p_ijk->dcos_di );
- rvec_Add( system->atoms[i].f, force );
- rvec_iMultiply( ext_press, pbond_ij->rel_box, force );
- rvec_Add( data->ext_press, ext_press );
-
- rvec_ScaledAdd( system->atoms[j].f,
- CEval8, p_ijk->dcos_dj );
-
- rvec_Scale( force, CEval8, p_ijk->dcos_dk );
- rvec_Add( system->atoms[k].f, force );
- rvec_iMultiply( ext_press, pbond_jk->rel_box, force );
- rvec_Add( data->ext_press, ext_press );
-
-
- /* This part is for a fully-flexible box */
- /* rvec_OuterProduct( temp_rtensor,
- p_ijk->dcos_di, system->atoms[i].x );
- rtensor_Scale( total_rtensor, +CEval8, temp_rtensor );
-
- rvec_OuterProduct( temp_rtensor,
- p_ijk->dcos_dj, system->atoms[j].x );
- rtensor_ScaledAdd(total_rtensor, CEval8, temp_rtensor);
-
- rvec_OuterProduct( temp_rtensor,
- p_ijk->dcos_dk, system->atoms[k].x );
- rtensor_ScaledAdd(total_rtensor, CEval8, temp_rtensor);
-
- if( pbond_ij->imaginary || pbond_jk->imaginary )
- rtensor_ScaledAdd( data->flex_bar.P,
- -1.0, total_rtensor );
- else
- rtensor_Add( data->flex_bar.P, total_rtensor ); */
- }
+ rvec_Scale( force, CEval8, p_ijk->dcos_dk );
+ rvec_Add( *f_k, force );
+ rvec_iMultiply( ext_press, pbond_jk->rel_box, force );
+#ifdef _OPENMP
+// #pragma omp critical (Three_Body_Interactions_ext_press)
+#endif
+ {
+ rvec_Add( data->ext_press, ext_press );
+ }
+
+ /* This part is for a fully-flexible box */
+ /* rvec_OuterProduct( temp_rtensor,
+ p_ijk->dcos_di, system->atoms[i].x );
+ rtensor_Scale( total_rtensor, +CEval8, temp_rtensor );
+
+ rvec_OuterProduct( temp_rtensor,
+ p_ijk->dcos_dj, system->atoms[j].x );
+ rtensor_ScaledAdd(total_rtensor, CEval8, temp_rtensor);
+
+ rvec_OuterProduct( temp_rtensor,
+ p_ijk->dcos_dk, system->atoms[k].x );
+ rtensor_ScaledAdd(total_rtensor, CEval8, temp_rtensor);
+
+ if( pbond_ij->imaginary || pbond_jk->imaginary )
+ rtensor_ScaledAdd( data->flex_bar.P,
+ -1.0, total_rtensor );
+ else
+ rtensor_Add( data->flex_bar.P, total_rtensor ); */
+ }
#ifdef TEST_ENERGY
- fprintf( out_control->eval,
- //"%6d%6d%6d%23.15e%23.15e%23.15e%23.15e%23.15e%23.15e",
- "%6d%6d%6d%23.15e%23.15e%23.15e\n",
- i + 1, j + 1, k + 1,
- //workspace->orig_id[i]+1,
- //workspace->orig_id[j]+1,
- //workspace->orig_id[k]+1,
- //workspace->Delta_boc[j],
- RAD2DEG(theta), /*BOA_ij, BOA_jk, */
- e_ang, data->E_Ang );
-
- /*fprintf( out_control->eval,
- "%23.15e%23.15e%23.15e%23.15e",
- p_val3, p_val4, BOA_ij, BOA_jk );
- fprintf( out_control->eval,
- "%23.15e%23.15e%23.15e%23.15e",
- f7_ij, f7_jk, f8_Dj, expval12theta );
- fprintf( out_control->eval,
- "%23.15e%23.15e%23.15e%23.15e%23.15e\n",
- CEval1, CEval2, CEval3, CEval4, CEval5
- //CEval6, CEval7, CEval8 );*/
-
- /*fprintf( out_control->eval,
- "%23.15e%23.15e%23.15e%23.15e%23.15e%23.15e%23.15e%23.15e%23.15e\n",
- -p_ijk->dcos_di[0]/sin_theta,
- -p_ijk->dcos_di[1]/sin_theta,
- -p_ijk->dcos_di[2]/sin_theta,
- -p_ijk->dcos_dj[0]/sin_theta,
- -p_ijk->dcos_dj[1]/sin_theta,
- -p_ijk->dcos_dj[2]/sin_theta,
- -p_ijk->dcos_dk[0]/sin_theta,
- -p_ijk->dcos_dk[1]/sin_theta,
- -p_ijk->dcos_dk[2]/sin_theta );*/
-
- /* fprintf( out_control->epen,
- "%23.15e%23.15e%23.15e\n",
- CEpen1, CEpen2, CEpen3 );
- fprintf( out_control->epen,
- "%6d%6d%6d%23.15e%23.15e%23.15e%23.15e%23.15e\n",
- workspace->orig_id[i], workspace->orig_id[j],
- workspace->orig_id[k], RAD2DEG(theta),
- BOA_ij, BOA_jk, e_pen, data->E_Pen ); */
-
- fprintf( out_control->ecoa,
- "%6d%6d%6d%23.15e%23.15e%23.15e%23.15e%23.15e\n",
- workspace->orig_id[i],
- workspace->orig_id[j],
- workspace->orig_id[k],
- RAD2DEG(theta), BOA_ij, BOA_jk,
- e_coa, data->E_Coa );
+ fprintf( out_control->eval,
+ //"%6d%6d%6d%23.15e%23.15e%23.15e%23.15e%23.15e%23.15e",
+ "%6d%6d%6d%23.15e%23.15e%23.15e\n",
+ i + 1, j + 1, k + 1,
+ //workspace->orig_id[i]+1,
+ //workspace->orig_id[j]+1,
+ //workspace->orig_id[k]+1,
+ //workspace->Delta_boc[j],
+ RAD2DEG(theta), /*BOA_ij, BOA_jk, */
+ e_ang, data->E_Ang );
+
+ /*fprintf( out_control->eval,
+ "%23.15e%23.15e%23.15e%23.15e",
+ p_val3, p_val4, BOA_ij, BOA_jk );
+ fprintf( out_control->eval,
+ "%23.15e%23.15e%23.15e%23.15e",
+ f7_ij, f7_jk, f8_Dj, expval12theta );
+ fprintf( out_control->eval,
+ "%23.15e%23.15e%23.15e%23.15e%23.15e\n",
+ CEval1, CEval2, CEval3, CEval4, CEval5
+ //CEval6, CEval7, CEval8 );*/
+
+ /*fprintf( out_control->eval,
+ "%23.15e%23.15e%23.15e%23.15e%23.15e%23.15e%23.15e%23.15e%23.15e\n",
+ -p_ijk->dcos_di[0]/sin_theta,
+ -p_ijk->dcos_di[1]/sin_theta,
+ -p_ijk->dcos_di[2]/sin_theta,
+ -p_ijk->dcos_dj[0]/sin_theta,
+ -p_ijk->dcos_dj[1]/sin_theta,
+ -p_ijk->dcos_dj[2]/sin_theta,
+ -p_ijk->dcos_dk[0]/sin_theta,
+ -p_ijk->dcos_dk[1]/sin_theta,
+ -p_ijk->dcos_dk[2]/sin_theta );*/
+
+ /* fprintf( out_control->epen,
+ "%23.15e%23.15e%23.15e\n",
+ CEpen1, CEpen2, CEpen3 );
+ fprintf( out_control->epen,
+ "%6d%6d%6d%23.15e%23.15e%23.15e%23.15e%23.15e\n",
+ workspace->orig_id[i], workspace->orig_id[j],
+ workspace->orig_id[k], RAD2DEG(theta),
+ BOA_ij, BOA_jk, e_pen, data->E_Pen ); */
+
+ fprintf( out_control->ecoa,
+ "%6d%6d%6d%23.15e%23.15e%23.15e%23.15e%23.15e\n",
+ workspace->orig_id[i],
+ workspace->orig_id[j],
+ workspace->orig_id[k],
+ RAD2DEG(theta), BOA_ij, BOA_jk,
+ e_coa, data->E_Coa );
#endif
-#ifdef TEST_FORCES /* angle forces */
- Add_dBO( system, lists, j, pi, CEval1, workspace->f_ang );
- Add_dBO( system, lists, j, pk, CEval2, workspace->f_ang );
- Add_dDelta( system, lists,
- j, CEval3 + CEval7, workspace->f_ang );
-
- for ( t = start_j; t < end_j; ++t )
- {
- pbond_jt = &( bond_list[t] );
- bo_jt = &(pbond_jt->bo_data);
- temp_bo_jt = bo_jt->BO;
- temp = CUBE( temp_bo_jt );
- pBOjt7 = temp * temp * temp_bo_jt;
-
- Add_dBO( system, lists, j, t, pBOjt7 * CEval6,
- workspace->f_ang );
- Add_dBOpinpi2( system, lists, j, t,
- CEval5, CEval5,
- workspace->f_ang, workspace->f_ang );
- }
-
- rvec_ScaledAdd( workspace->f_ang[i], CEval8, p_ijk->dcos_di );
- rvec_ScaledAdd( workspace->f_ang[j], CEval8, p_ijk->dcos_dj );
- rvec_ScaledAdd( workspace->f_ang[k], CEval8, p_ijk->dcos_dk );
- /* end angle forces */
-
- /* penalty forces */
- Add_dDelta( system, lists, j, CEpen1, workspace->f_pen );
- Add_dBO( system, lists, j, pi, CEpen2, workspace->f_pen );
- Add_dBO( system, lists, j, pk, CEpen3, workspace->f_pen );
- /* end penalty forces */
-
- /* coalition forces */
- Add_dBO( system, lists,
- j, pi, CEcoa1 - CEcoa4, workspace->f_coa );
- Add_dBO( system, lists,
- j, pk, CEcoa2 - CEcoa5, workspace->f_coa );
- Add_dDelta( system, lists, j, CEcoa3, workspace->f_coa );
- Add_dDelta( system, lists, i, CEcoa4, workspace->f_coa );
- Add_dDelta( system, lists, k, CEcoa5, workspace->f_coa );
- /* end coalition forces */
+#ifdef TEST_FORCES
+ /* angle forces */
+ Add_dBO( system, lists, j, pi, CEval1, workspace->f_ang );
+ Add_dBO( system, lists, j, pk, CEval2, workspace->f_ang );
+ Add_dDelta( system, lists,
+ j, CEval3 + CEval7, workspace->f_ang );
+
+ for ( t = start_j; t < end_j; ++t )
+ {
+ pbond_jt = &( bond_list[t] );
+ bo_jt = &(pbond_jt->bo_data);
+ temp_bo_jt = bo_jt->BO;
+ temp = CUBE( temp_bo_jt );
+ pBOjt7 = temp * temp * temp_bo_jt;
+
+ Add_dBO( system, lists, j, t, pBOjt7 * CEval6,
+ workspace->f_ang );
+ Add_dBOpinpi2( system, lists, j, t,
+ CEval5, CEval5,
+ workspace->f_ang, workspace->f_ang );
+ }
+
+ rvec_ScaledAdd( workspace->f_ang[i], CEval8, p_ijk->dcos_di );
+ rvec_ScaledAdd( workspace->f_ang[j], CEval8, p_ijk->dcos_dj );
+ rvec_ScaledAdd( workspace->f_ang[k], CEval8, p_ijk->dcos_dk );
+ /* end angle forces */
+
+ /* penalty forces */
+ Add_dDelta( system, lists, j, CEpen1, workspace->f_pen );
+ Add_dBO( system, lists, j, pi, CEpen2, workspace->f_pen );
+ Add_dBO( system, lists, j, pk, CEpen3, workspace->f_pen );
+ /* end penalty forces */
+
+ /* coalition forces */
+ Add_dBO( system, lists,
+ j, pi, CEcoa1 - CEcoa4, workspace->f_coa );
+ Add_dBO( system, lists,
+ j, pk, CEcoa2 - CEcoa5, workspace->f_coa );
+ Add_dDelta( system, lists, j, CEcoa3, workspace->f_coa );
+ Add_dDelta( system, lists, i, CEcoa4, workspace->f_coa );
+ Add_dDelta( system, lists, k, CEcoa5, workspace->f_coa );
+ /* end coalition forces */
#endif
+ }
}
}
}
}
- }
- Set_End_Index(pi, num_thb_intrs, thb_intrs );
+ Set_End_Index( pi, num_thb_intrs, thb_intrs );
+ }
}
}
+ data->E_Ang += e_ang_total;
+ data->E_Pen += e_pen_total;
+ data->E_Coa += e_coa_total;
if ( num_thb_intrs >= thb_intrs->num_intrs * DANGER_ZONE )
{
@@ -589,212 +665,272 @@ void Three_Body_Interactions( reax_system *system, control_params *control,
}
-
void Hydrogen_Bonds( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
- int i, j, k, pi, pk, itr, top;
- int type_i, type_j, type_k;
- int start_j, end_j, hb_start_j, hb_end_j;
- int hblist[MAX_BONDS];
- int num_hb_intrs = 0;
- real r_ij, r_jk, theta, cos_theta, sin_xhz4, cos_xhz1, sin_theta2;
- real e_hb, exp_hb2, exp_hb3, CEhb1, CEhb2, CEhb3;
- rvec dcos_theta_di, dcos_theta_dj, dcos_theta_dk;
- rvec dvec_jk, force, ext_press;
- ivec rel_jk;
- // rtensor temp_rtensor, total_rtensor;
- hbond_parameters *hbp;
- bond_order_data *bo_ij;
- bond_data *pbond_ij;
- far_neighbor_data *nbr_jk;
- list *bonds, *hbonds;
- bond_data *bond_list;
- hbond_data *hbond_list;
+ real e_hb_total;
- bonds = (*lists) + BONDS;
- bond_list = bonds->select.bond_list;
+ e_hb_total = 0.0;
- hbonds = (*lists) + HBONDS;
- hbond_list = hbonds->select.hbond_list;
+#ifdef _OPENMP
+ #pragma omp parallel default(shared) reduction(+: e_hb_total)
+#endif
+ {
+ int i, j, k, pi, pk, itr, top;
+ int type_i, type_j, type_k;
+ int start_j, end_j, hb_start_j, hb_end_j;
+ int hblist[MAX_BONDS];
+#ifdef TEST_FORCES
+ int num_hb_intrs;
+#endif
+ real r_ij, r_jk, theta, cos_theta, sin_xhz4, cos_xhz1, sin_theta2;
+ real e_hb, exp_hb2, exp_hb3, CEhb1, CEhb2, CEhb3;
+ rvec dcos_theta_di, dcos_theta_dj, dcos_theta_dk;
+ rvec dvec_jk, force, ext_press;
+ ivec rel_jk;
+ //rtensor temp_rtensor, total_rtensor;
+ hbond_parameters *hbp;
+ bond_order_data *bo_ij;
+ bond_data *pbond_ij;
+ far_neighbor_data *nbr_jk;
+ list *bonds, *hbonds;
+ bond_data *bond_list;
+ hbond_data *hbond_list;
+ rvec *f_i, *f_j, *f_k;
+#ifdef _OPENMP
+ int tid = omp_get_thread_num( );
+#endif
- /* loops below discover the Hydrogen bonds between i-j-k triplets.
- here j is H atom and there has to be some bond between i and j.
- Hydrogen bond is between j and k.
- so in this function i->X, j->H, k->Z when we map
- variables onto the ones in the handout.*/
- for ( j = 0; j < system->N; ++j )
- if ( system->reaxprm.sbp[system->atoms[j].type].p_hbond == 1 ) // j must be H
+#ifdef TEST_FORCES
+ num_hb_intrs = 0;
+#endif
+ bonds = (*lists) + BONDS;
+ bond_list = bonds->select.bond_list;
+ hbonds = (*lists) + HBONDS;
+ hbond_list = hbonds->select.hbond_list;
+
+ /* loops below discover the Hydrogen bonds between i-j-k triplets.
+ here j is H atom and there has to be some bond between i and j.
+ Hydrogen bond is between j and k.
+ so in this function i->X, j->H, k->Z when we map
+ variables onto the ones in the handout.*/
+#ifdef _OPENMP
+ #pragma omp for schedule(guided)
+#endif
+ for ( j = 0; j < system->N; ++j )
{
- /*set j's variables */
- type_j = system->atoms[j].type;
- start_j = Start_Index(j, bonds);
- end_j = End_Index(j, bonds);
- hb_start_j = Start_Index( workspace->hbond_index[j], hbonds );
- hb_end_j = End_Index ( workspace->hbond_index[j], hbonds );
-
- top = 0;
- for ( pi = start_j; pi < end_j; ++pi )
+ /* j must be H */
+ if ( system->reaxprm.sbp[system->atoms[j].type].p_hbond == 1 )
{
- pbond_ij = &( bond_list[pi] );
- i = pbond_ij->nbr;
- bo_ij = &(pbond_ij->bo_data);
- type_i = system->atoms[i].type;
-
- if ( system->reaxprm.sbp[type_i].p_hbond == 2 &&
- bo_ij->BO >= HB_THRESHOLD )
- hblist[top++] = pi;
- }
-
- // fprintf( stderr, "j: %d, top: %d, hb_start_j: %d, hb_end_j:%d\n",
- // j, top, hb_start_j, hb_end_j );
+ /* set j's variables */
+ type_j = system->atoms[j].type;
+ start_j = Start_Index( j, bonds );
+ end_j = End_Index( j, bonds );
+ hb_start_j = Start_Index( workspace->hbond_index[j], hbonds );
+ hb_end_j = End_Index( workspace->hbond_index[j], hbonds );
+#ifdef _OPENMP
+ f_j = &(workspace->f_local[tid * system->N + j]);
+#else
+ f_j = &(system->atoms[j].f);
+#endif
- for ( pk = hb_start_j; pk < hb_end_j; ++pk )
- {
- /* set k's varibles */
- k = hbond_list[pk].nbr;
- type_k = system->atoms[k].type;
- nbr_jk = hbond_list[pk].ptr;
- r_jk = nbr_jk->d;
- rvec_Scale( dvec_jk, hbond_list[pk].scl, nbr_jk->dvec );
-
- for ( itr = 0; itr < top; ++itr )
+ top = 0;
+ for ( pi = start_j; pi < end_j; ++pi )
{
- pi = hblist[itr];
pbond_ij = &( bond_list[pi] );
i = pbond_ij->nbr;
+ bo_ij = &(pbond_ij->bo_data);
+ type_i = system->atoms[i].type;
- if ( i != k )
+ if ( system->reaxprm.sbp[type_i].p_hbond == 2 &&
+ bo_ij->BO >= HB_THRESHOLD )
{
- bo_ij = &(pbond_ij->bo_data);
- type_i = system->atoms[i].type;
- r_ij = pbond_ij->d;
- hbp = &(system->reaxprm.hbp[ type_i ][ type_j ][ type_k ]);
- ++num_hb_intrs;
-
- Calculate_Theta( pbond_ij->dvec, pbond_ij->d, dvec_jk, r_jk,
- &theta, &cos_theta );
- /* the derivative of cos(theta) */
- Calculate_dCos_Theta( pbond_ij->dvec, pbond_ij->d, dvec_jk, r_jk,
- &dcos_theta_di, &dcos_theta_dj,
- &dcos_theta_dk );
-
- /* hydrogen bond energy*/
- sin_theta2 = SIN( theta / 2.0 );
- sin_xhz4 = SQR(sin_theta2);
- sin_xhz4 *= sin_xhz4;
- cos_xhz1 = ( 1.0 - cos_theta );
- exp_hb2 = EXP( -hbp->p_hb2 * bo_ij->BO );
- exp_hb3 = EXP( -hbp->p_hb3 * ( hbp->r0_hb / r_jk +
- r_jk / hbp->r0_hb - 2.0 ) );
-
- data->E_HB += e_hb =
- hbp->p_hb1 * (1.0 - exp_hb2) * exp_hb3 * sin_xhz4;
-
- CEhb1 = hbp->p_hb1 * hbp->p_hb2 * exp_hb2 * exp_hb3 * sin_xhz4;
- CEhb2 = -hbp->p_hb1 / 2.0 * (1.0 - exp_hb2) * exp_hb3 * cos_xhz1;
- CEhb3 = -hbp->p_hb3 * e_hb * (-hbp->r0_hb / SQR(r_jk) +
- 1.0 / hbp->r0_hb);
-
- /* hydrogen bond forces */
- bo_ij->Cdbo += CEhb1; // dbo term
-
- if ( control->ensemble == NVE || control->ensemble == NVT || control->ensemble == bNVT)
- {
- rvec_ScaledAdd( system->atoms[i].f,
- +CEhb2, dcos_theta_di ); //dcos terms
- rvec_ScaledAdd( system->atoms[j].f,
- +CEhb2, dcos_theta_dj );
- rvec_ScaledAdd( system->atoms[k].f,
- +CEhb2, dcos_theta_dk );
- //dr terms
- rvec_ScaledAdd( system->atoms[j].f, -CEhb3 / r_jk, dvec_jk );
- rvec_ScaledAdd( system->atoms[k].f, +CEhb3 / r_jk, dvec_jk );
- }
- else
+ hblist[top++] = pi;
+ }
+ }
+
+ for ( pk = hb_start_j; pk < hb_end_j; ++pk )
+ {
+ /* set k's varibles */
+ k = hbond_list[pk].nbr;
+ type_k = system->atoms[k].type;
+ nbr_jk = hbond_list[pk].ptr;
+ r_jk = nbr_jk->d;
+ rvec_Scale( dvec_jk, hbond_list[pk].scl, nbr_jk->dvec );
+#ifdef _OPENMP
+ f_k = &(workspace->f_local[tid * system->N + k]);
+#else
+ f_k = &(system->atoms[k].f);
+#endif
+
+ for ( itr = 0; itr < top; ++itr )
+ {
+ pi = hblist[itr];
+ pbond_ij = &( bond_list[pi] );
+ i = pbond_ij->nbr;
+
+ if ( i != k )
{
- /* for pressure coupling, terms that are not related
- to bond order derivatives are added directly into
- pressure vector/tensor */
- rvec_Scale( force, +CEhb2, dcos_theta_di ); // dcos terms
- rvec_Add( system->atoms[i].f, force );
- rvec_iMultiply( ext_press, pbond_ij->rel_box, force );
- rvec_ScaledAdd( data->ext_press, 1.0, ext_press );
-
- rvec_ScaledAdd( system->atoms[j].f, +CEhb2, dcos_theta_dj );
-
- ivec_Scale( rel_jk, hbond_list[pk].scl, nbr_jk->rel_box );
- rvec_Scale( force, +CEhb2, dcos_theta_dk );
- rvec_Add( system->atoms[k].f, force );
- rvec_iMultiply( ext_press, rel_jk, force );
- rvec_ScaledAdd( data->ext_press, 1.0, ext_press );
-
- //dr terms
- rvec_ScaledAdd( system->atoms[j].f, -CEhb3 / r_jk, dvec_jk );
-
- rvec_Scale( force, CEhb3 / r_jk, dvec_jk );
- rvec_Add( system->atoms[k].f, force );
- rvec_iMultiply( ext_press, rel_jk, force );
- rvec_ScaledAdd( data->ext_press, 1.0, ext_press );
-
- /* This part is intended for a fully-flexible box */
- /* rvec_OuterProduct( temp_rtensor,
- dcos_theta_di, system->atoms[i].x );
- rtensor_Scale( total_rtensor, -CEhb2, temp_rtensor );
-
- rvec_ScaledSum( temp_rvec, -CEhb2, dcos_theta_dj,
- -CEhb3/r_jk, pbond_jk->dvec );
- rvec_OuterProduct( temp_rtensor,
- temp_rvec, system->atoms[j].x );
- rtensor_Add( total_rtensor, temp_rtensor );
-
- rvec_ScaledSum( temp_rvec, -CEhb2, dcos_theta_dk,
- +CEhb3/r_jk, pbond_jk->dvec );
- rvec_OuterProduct( temp_rtensor,
- temp_rvec, system->atoms[k].x );
- rtensor_Add( total_rtensor, temp_rtensor );
-
- if( pbond_ij->imaginary || pbond_jk->imaginary )
- rtensor_ScaledAdd( data->flex_bar.P, -1.0, total_rtensor );
- else
- rtensor_Add( data->flex_bar.P, total_rtensor ); */
- }
+ bo_ij = &(pbond_ij->bo_data);
+ type_i = system->atoms[i].type;
+ r_ij = pbond_ij->d;
+ hbp = &(system->reaxprm.hbp[ type_i ][ type_j ][ type_k ]);
+#ifdef _OPENMP
+ f_i = &(workspace->f_local[tid * system->N + i]);
+#else
+ f_i = &(system->atoms[i].f);
+#endif
-#ifdef TEST_ENERGY
- /*fprintf( out_control->ehb,
- "%23.15e%23.15e%23.15e\n%23.15e%23.15e%23.15e\n%23.15e%23.15e%23.15e\n",
- dcos_theta_di[0], dcos_theta_di[1], dcos_theta_di[2],
- dcos_theta_dj[0], dcos_theta_dj[1], dcos_theta_dj[2],
- dcos_theta_dk[0], dcos_theta_dk[1], dcos_theta_dk[2]);
- fprintf( out_control->ehb, "%23.15e%23.15e%23.15e\n",
- CEhb1, CEhb2, CEhb3 ); */
- fprintf( stderr, //out_control->ehb,
- "%6d%6d%6d%23.15e%23.15e%23.15e%23.15e%23.15e\n",
- workspace->orig_id[i],
- workspace->orig_id[j],
- workspace->orig_id[k],
- r_jk, theta, bo_ij->BO, e_hb, data->E_HB );
+#ifdef TEST_FORCES
+ ++num_hb_intrs;
+#endif
+
+ Calculate_Theta( pbond_ij->dvec, pbond_ij->d, dvec_jk, r_jk,
+ &theta, &cos_theta );
+ /* the derivative of cos(theta) */
+ Calculate_dCos_Theta( pbond_ij->dvec, pbond_ij->d, dvec_jk, r_jk,
+ &dcos_theta_di, &dcos_theta_dj, &dcos_theta_dk );
+
+ /* hydrogen bond energy */
+ sin_theta2 = SIN( theta / 2.0 );
+ sin_xhz4 = SQR( sin_theta2 );
+ sin_xhz4 *= sin_xhz4;
+ cos_xhz1 = ( 1.0 - cos_theta );
+ exp_hb2 = EXP( -hbp->p_hb2 * bo_ij->BO );
+ exp_hb3 = EXP( -hbp->p_hb3 * ( hbp->r0_hb / r_jk +
+ r_jk / hbp->r0_hb - 2.0 ) );
+
+ e_hb = hbp->p_hb1 * (1.0 - exp_hb2) * exp_hb3 * sin_xhz4;
+ e_hb_total += e_hb;
+
+ CEhb1 = hbp->p_hb1 * hbp->p_hb2 * exp_hb2 * exp_hb3 * sin_xhz4;
+ CEhb2 = -hbp->p_hb1 / 2.0 * (1.0 - exp_hb2) * exp_hb3 * cos_xhz1;
+ CEhb3 = -hbp->p_hb3 * e_hb * (-hbp->r0_hb / SQR( r_jk ) +
+ 1.0 / hbp->r0_hb);
+
+ /* hydrogen bond forces */
+ /* dbo term,
+ * note: safe to update across threads as this points
+ * to the bond_order_data struct inside atom j's list,
+ * and threads are partitioned across all j's */
+#ifdef _OPENMP
+ #pragma omp atomic
+#endif
+ bo_ij->Cdbo += CEhb1;
+
+ if ( control->ensemble == NVE || control->ensemble == NVT || control->ensemble == bNVT)
+ {
+ /* dcos terms */
+ rvec_ScaledAdd( *f_i, +CEhb2, dcos_theta_di );
+ rvec_ScaledAdd( *f_j, +CEhb2, dcos_theta_dj );
+ rvec_ScaledAdd( *f_k, +CEhb2, dcos_theta_dk );
+
+ /* dr terms */
+ rvec_ScaledAdd( *f_j, -CEhb3 / r_jk, dvec_jk );
+ rvec_ScaledAdd( *f_k, +CEhb3 / r_jk, dvec_jk );
+ }
+ else
+ {
+ /* for pressure coupling, terms that are not related
+ to bond order derivatives are added directly into
+ pressure vector/tensor */
+
+ /* dcos terms */
+ rvec_Scale( force, +CEhb2, dcos_theta_di );
+ rvec_Add( *f_i, force );
+ rvec_iMultiply( ext_press, pbond_ij->rel_box, force );
+#ifdef _OPENMP
+ #pragma omp critical (Hydrogen_Bonds_ext_press)
+#endif
+ {
+ rvec_ScaledAdd( data->ext_press, 1.0, ext_press );
+ }
+
+ rvec_ScaledAdd( *f_j, +CEhb2, dcos_theta_dj );
+
+ ivec_Scale( rel_jk, hbond_list[pk].scl, nbr_jk->rel_box );
+ rvec_Scale( force, +CEhb2, dcos_theta_dk );
+ rvec_Add( *f_k, force );
+ rvec_iMultiply( ext_press, rel_jk, force );
+#ifdef _OPENMP
+ #pragma omp critical (Hydrogen_Bonds_ext_press)
+#endif
+ {
+ rvec_ScaledAdd( data->ext_press, 1.0, ext_press );
+ }
+
+ /* dr terms */
+ rvec_ScaledAdd( *f_j, -CEhb3 / r_jk, dvec_jk );
+
+ rvec_Scale( force, CEhb3 / r_jk, dvec_jk );
+ rvec_Add( *f_k, force );
+ rvec_iMultiply( ext_press, rel_jk, force );
+#ifdef _OPENMP
+ #pragma omp critical (Hydrogen_Bonds_ext_press)
+#endif
+ {
+ rvec_ScaledAdd( data->ext_press, 1.0, ext_press );
+ }
+
+ /* This part is intended for a fully-flexible box */
+ /* rvec_OuterProduct( temp_rtensor,
+ dcos_theta_di, system->atoms[i].x );
+ rtensor_Scale( total_rtensor, -CEhb2, temp_rtensor );
+
+ rvec_ScaledSum( temp_rvec, -CEhb2, dcos_theta_dj,
+ -CEhb3/r_jk, pbond_jk->dvec );
+ rvec_OuterProduct( temp_rtensor,
+ temp_rvec, system->atoms[j].x );
+ rtensor_Add( total_rtensor, temp_rtensor );
+
+ rvec_ScaledSum( temp_rvec, -CEhb2, dcos_theta_dk,
+ +CEhb3/r_jk, pbond_jk->dvec );
+ rvec_OuterProduct( temp_rtensor,
+ temp_rvec, system->atoms[k].x );
+ rtensor_Add( total_rtensor, temp_rtensor );
+
+ if( pbond_ij->imaginary || pbond_jk->imaginary )
+ rtensor_ScaledAdd( data->flex_bar.P, -1.0, total_rtensor );
+ else
+ rtensor_Add( data->flex_bar.P, total_rtensor ); */
+ }
+#ifdef TEST_ENERGY
+ /*fprintf( out_control->ehb,
+ "%23.15e%23.15e%23.15e\n%23.15e%23.15e%23.15e\n%23.15e%23.15e%23.15e\n",
+ dcos_theta_di[0], dcos_theta_di[1], dcos_theta_di[2],
+ dcos_theta_dj[0], dcos_theta_dj[1], dcos_theta_dj[2],
+ dcos_theta_dk[0], dcos_theta_dk[1], dcos_theta_dk[2]);
+ fprintf( out_control->ehb, "%23.15e%23.15e%23.15e\n",
+ CEhb1, CEhb2, CEhb3 ); */
+ fprintf( stderr, //out_control->ehb,
+ "%6d%6d%6d%23.15e%23.15e%23.15e%23.15e%23.15e\n",
+ workspace->orig_id[i],
+ workspace->orig_id[j],
+ workspace->orig_id[k],
+ r_jk, theta, bo_ij->BO, e_hb, data->E_HB );
#endif
+
#ifdef TEST_FORCES
- // dbo term
- Add_dBO( system, lists, j, pi, +CEhb1, workspace->f_hb );
- // dcos terms
- rvec_ScaledAdd( workspace->f_hb[i], +CEhb2, dcos_theta_di );
- rvec_ScaledAdd( workspace->f_hb[j], +CEhb2, dcos_theta_dj );
- rvec_ScaledAdd( workspace->f_hb[k], +CEhb2, dcos_theta_dk );
- // dr terms
- rvec_ScaledAdd( workspace->f_hb[j], -CEhb3 / r_jk, dvec_jk );
- rvec_ScaledAdd( workspace->f_hb[k], +CEhb3 / r_jk, dvec_jk );
+ /* dbo term */
+ Add_dBO( system, lists, j, pi, +CEhb1, workspace->f_hb );
+ /* dcos terms */
+ rvec_ScaledAdd( workspace->f_hb[i], +CEhb2, dcos_theta_di );
+ rvec_ScaledAdd( workspace->f_hb[j], +CEhb2, dcos_theta_dj );
+ rvec_ScaledAdd( workspace->f_hb[k], +CEhb2, dcos_theta_dk );
+ /* dr terms */
+ rvec_ScaledAdd( workspace->f_hb[j], -CEhb3 / r_jk, dvec_jk );
+ rvec_ScaledAdd( workspace->f_hb[k], +CEhb3 / r_jk, dvec_jk );
#endif
+ }
}
}
}
}
+ }
- /* fprintf( stderr, "hydbonds: ext_press (%23.15e %23.15e %23.15e)\n",
- data->ext_press[0], data->ext_press[1], data->ext_press[2] ); */
+ data->E_HB += e_hb_total;
#ifdef TEST_FORCES
fprintf( stderr, "Number of hydrogen bonds: %d\n", num_hb_intrs );
diff --git a/sPuReMD/src/tool_box.c b/sPuReMD/src/tool_box.c
index cc1da28a9786923260f9eb9bb75251cd6127629a..245a4b766853fca40c71ce14ad866a1b7d977402 100644
--- a/sPuReMD/src/tool_box.c
+++ b/sPuReMD/src/tool_box.c
@@ -383,6 +383,21 @@ int Allocate_Tokenizer_Space( char **line, char **backup, char ***tokens )
}
+void Deallocate_Tokenizer_Space( char **line, char **backup, char ***tokens )
+{
+ int i;
+
+ for ( i = 0; i < MAX_TOKENS; i++ )
+ {
+ free( (*tokens)[i] );
+ }
+
+ free( *line );
+ free( *backup );
+ free( *tokens );
+}
+
+
int Tokenize( char* s, char*** tok )
{
char test[MAX_LINE];
diff --git a/sPuReMD/src/tool_box.h b/sPuReMD/src/tool_box.h
index aec68895612e529ccd8175103ee782c7a49ad10d..38e6ba0c674d37d982bf54ca1ea83045dbaa9df9 100644
--- a/sPuReMD/src/tool_box.h
+++ b/sPuReMD/src/tool_box.h
@@ -57,6 +57,7 @@ int Get_Atom_Type( reax_interaction*, char* );
char *Get_Element( reax_system*, int );
char *Get_Atom_Name( reax_system*, int );
int Allocate_Tokenizer_Space( char**, char**, char*** );
+void Deallocate_Tokenizer_Space( char **, char **, char *** );
int Tokenize( char*, char*** );
/* from lammps */
diff --git a/sPuReMD/src/two_body_interactions.c b/sPuReMD/src/two_body_interactions.c
index cd005cfe4b0ec9dfe7b75edb2a20e756d7147f51..d53797776dc4f16e0f7e213fe1d287f9a7ca5287 100644
--- a/sPuReMD/src/two_body_interactions.c
+++ b/sPuReMD/src/two_body_interactions.c
@@ -20,6 +20,7 @@
----------------------------------------------------------------------*/
#include "two_body_interactions.h"
+
#include "bond_orders.h"
#include "list.h"
#include "lookup.h"
@@ -27,19 +28,11 @@
void Bond_Energy( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
- int i, j, pj;
- int start_i, end_i;
- int type_i, type_j;
- real ebond, pow_BOs_be2, exp_be12, CEbo;
- real gp3, gp4, gp7, gp10, gp37;
- real exphu, exphua1, exphub1, exphuov, hulpov, estriph;
- real decobdbo, decobdboua, decobdboub;
- single_body_parameters *sbp_i, *sbp_j;
- two_body_parameters *twbp;
- bond_order_data *bo_ij;
+ int i;
+ real gp3, gp4, gp7, gp10, gp37, ebond_total;
list *bonds;
bonds = (*lists) + BONDS;
@@ -48,300 +41,360 @@ void Bond_Energy( reax_system *system, control_params *control,
gp7 = system->reaxprm.gp.l[7];
gp10 = system->reaxprm.gp.l[10];
gp37 = (int) system->reaxprm.gp.l[37];
+ ebond_total = 0.0;
- for ( i = 0; i < system->N; ++i )
- {
- start_i = Start_Index(i, bonds);
- end_i = End_Index(i, bonds);
- //fprintf( stderr, "i=%d start=%d end=%d\n", i, start_i, end_i );
- for ( pj = start_i; pj < end_i; ++pj )
- if ( i < bonds->select.bond_list[pj].nbr )
+#ifdef _OPENMP
+// #pragma omp parallel default(shared) reduction(+: ebond_total)
+#endif
+ {
+ int j, pj;
+ int start_i, end_i;
+ int type_i, type_j;
+ real ebond, pow_BOs_be2, exp_be12, CEbo;
+ real exphu, exphua1, exphub1, exphuov, hulpov, estriph;
+ real decobdbo, decobdboua, decobdboub;
+ single_body_parameters *sbp_i, *sbp_j;
+ two_body_parameters *twbp;
+ bond_order_data *bo_ij;
+
+#ifdef _OPENMP
+// #pragma omp for schedule(guided)
+#endif
+ for ( i = 0; i < system->N; ++i )
+ {
+ start_i = Start_Index(i, bonds);
+ end_i = End_Index(i, bonds);
+
+ for ( pj = start_i; pj < end_i; ++pj )
{
- /* set the pointers */
- j = bonds->select.bond_list[pj].nbr;
- type_i = system->atoms[i].type;
- type_j = system->atoms[j].type;
- sbp_i = &( system->reaxprm.sbp[type_i] );
- sbp_j = &( system->reaxprm.sbp[type_j] );
- twbp = &( system->reaxprm.tbp[type_i][type_j] );
- bo_ij = &( bonds->select.bond_list[pj].bo_data );
-
- /* calculate the constants */
- pow_BOs_be2 = POW( bo_ij->BO_s, twbp->p_be2 );
- exp_be12 = EXP( twbp->p_be1 * ( 1.0 - pow_BOs_be2 ) );
- CEbo = -twbp->De_s * exp_be12 *
- ( 1.0 - twbp->p_be1 * twbp->p_be2 * pow_BOs_be2 );
-
- /* calculate the Bond Energy */
- data->E_BE += ebond =
- -twbp->De_s * bo_ij->BO_s * exp_be12
- - twbp->De_p * bo_ij->BO_pi
- - twbp->De_pp * bo_ij->BO_pi2;
-
- /* calculate derivatives of Bond Orders */
- bo_ij->Cdbo += CEbo;
- bo_ij->Cdbopi -= (CEbo + twbp->De_p);
- bo_ij->Cdbopi2 -= (CEbo + twbp->De_pp);
+ if ( i < bonds->select.bond_list[pj].nbr )
+ {
+ /* set the pointers */
+ j = bonds->select.bond_list[pj].nbr;
+ type_i = system->atoms[i].type;
+ type_j = system->atoms[j].type;
+ sbp_i = &( system->reaxprm.sbp[type_i] );
+ sbp_j = &( system->reaxprm.sbp[type_j] );
+ twbp = &( system->reaxprm.tbp[type_i][type_j] );
+ bo_ij = &( bonds->select.bond_list[pj].bo_data );
+
+ /* calculate the constants */
+ pow_BOs_be2 = POW( bo_ij->BO_s, twbp->p_be2 );
+ exp_be12 = EXP( twbp->p_be1 * ( 1.0 - pow_BOs_be2 ) );
+ CEbo = -twbp->De_s * exp_be12 *
+ ( 1.0 - twbp->p_be1 * twbp->p_be2 * pow_BOs_be2 );
+
+ /* calculate the Bond Energy */
+ ebond = -twbp->De_s * bo_ij->BO_s * exp_be12
+ - twbp->De_p * bo_ij->BO_pi
+ - twbp->De_pp * bo_ij->BO_pi2;
+ ebond_total += ebond;
+
+ /* calculate derivatives of Bond Orders */
+ bo_ij->Cdbo += CEbo;
+ bo_ij->Cdbopi -= (CEbo + twbp->De_p);
+ bo_ij->Cdbopi2 -= (CEbo + twbp->De_pp);
#ifdef TEST_ENERGY
- fprintf( out_control->ebond, "%6d%6d%24.15e%24.15e\n",
- workspace->orig_id[i], workspace->orig_id[j],
- // i+1, j+1,
- bo_ij->BO, ebond/*, data->E_BE*/ );
- /* fprintf( out_control->ebond, "%6d%6d%12.6f%12.6f%12.6f\n",
- workspace->orig_id[i], workspace->orig_id[j],
- CEbo, -twbp->De_p, -twbp->De_pp );*/
+ fprintf( out_control->ebond, "%6d%6d%24.15e%24.15e\n",
+ workspace->orig_id[i], workspace->orig_id[j],
+ // i+1, j+1,
+ bo_ij->BO, ebond );
#endif
+
#ifdef TEST_FORCES
- Add_dBO( system, lists, i, pj, CEbo, workspace->f_be );
- Add_dBOpinpi2( system, lists, i, pj,
- -(CEbo + twbp->De_p), -(CEbo + twbp->De_pp),
- workspace->f_be, workspace->f_be );
+ Add_dBO( system, lists, i, pj, CEbo, workspace->f_be );
+ Add_dBOpinpi2( system, lists, i, pj,
+ -(CEbo + twbp->De_p), -(CEbo + twbp->De_pp),
+ workspace->f_be, workspace->f_be );
#endif
- /* Stabilisation terminal triple bond */
- if ( bo_ij->BO >= 1.00 )
- {
- if ( gp37 == 2 ||
- (sbp_i->mass == 12.0000 && sbp_j->mass == 15.9990) ||
- (sbp_j->mass == 12.0000 && sbp_i->mass == 15.9990) )
+ /* Stabilisation terminal triple bond */
+ if ( bo_ij->BO >= 1.00 )
{
- // ba = SQR(bo_ij->BO - 2.50);
- exphu = EXP( -gp7 * SQR(bo_ij->BO - 2.50) );
- //oboa=abo(j1)-boa;
- //obob=abo(j2)-boa;
- exphua1 = EXP(-gp3 * (workspace->total_bond_order[i] - bo_ij->BO));
- exphub1 = EXP(-gp3 * (workspace->total_bond_order[j] - bo_ij->BO));
- //ovoab=abo(j1)-aval(it1)+abo(j2)-aval(it2);
- exphuov = EXP(gp4 * (workspace->Delta[i] + workspace->Delta[j]));
- hulpov = 1.0 / (1.0 + 25.0 * exphuov);
-
- estriph = gp10 * exphu * hulpov * (exphua1 + exphub1);
- //estrain(j1) = estrain(j1) + 0.50*estriph;
- //estrain(j2) = estrain(j2) + 0.50*estriph;
- data->E_BE += estriph;
-
- decobdbo = gp10 * exphu * hulpov * (exphua1 + exphub1) *
- ( gp3 - 2.0 * gp7 * (bo_ij->BO - 2.50) );
- decobdboua = -gp10 * exphu * hulpov *
- (gp3 * exphua1 + 25.0 * gp4 * exphuov * hulpov * (exphua1 + exphub1));
- decobdboub = -gp10 * exphu * hulpov *
- (gp3 * exphub1 + 25.0 * gp4 * exphuov * hulpov * (exphua1 + exphub1));
-
- bo_ij->Cdbo += decobdbo;
- workspace->CdDelta[i] += decobdboua;
- workspace->CdDelta[j] += decobdboub;
+ if ( gp37 == 2 ||
+ (sbp_i->mass == 12.0000 && sbp_j->mass == 15.9990) ||
+ (sbp_j->mass == 12.0000 && sbp_i->mass == 15.9990) )
+ {
+ //ba = SQR(bo_ij->BO - 2.50);
+ exphu = EXP( -gp7 * SQR(bo_ij->BO - 2.50) );
+ //oboa=abo(j1)-boa;
+ //obob=abo(j2)-boa;
+ exphua1 = EXP(-gp3 * (workspace->total_bond_order[i] - bo_ij->BO));
+ exphub1 = EXP(-gp3 * (workspace->total_bond_order[j] - bo_ij->BO));
+ //ovoab=abo(j1)-aval(it1)+abo(j2)-aval(it2);
+ exphuov = EXP(gp4 * (workspace->Delta[i] + workspace->Delta[j]));
+ hulpov = 1.0 / (1.0 + 25.0 * exphuov);
+
+ estriph = gp10 * exphu * hulpov * (exphua1 + exphub1);
+ //estrain(j1) = estrain(j1) + 0.50*estriph;
+ //estrain(j2) = estrain(j2) + 0.50*estriph;
+ ebond_total += estriph;
+
+ decobdbo = gp10 * exphu * hulpov * (exphua1 + exphub1) *
+ ( gp3 - 2.0 * gp7 * (bo_ij->BO - 2.50) );
+ decobdboua = -gp10 * exphu * hulpov *
+ (gp3 * exphua1 + 25.0 * gp4 * exphuov * hulpov * (exphua1 + exphub1));
+ decobdboub = -gp10 * exphu * hulpov *
+ (gp3 * exphub1 + 25.0 * gp4 * exphuov * hulpov * (exphua1 + exphub1));
+
+ bo_ij->Cdbo += decobdbo;
+ workspace->CdDelta[i] += decobdboua;
+ workspace->CdDelta[j] += decobdboub;
+
#ifdef TEST_ENERGY
- fprintf( out_control->ebond,
- "%6d%6d%24.15e%24.15e%24.15e%24.15e\n",
- workspace->orig_id[i], workspace->orig_id[j],
- //i+1, j+1,
- estriph, decobdbo, decobdboua, decobdboub );
+ fprintf( out_control->ebond,
+ "%6d%6d%24.15e%24.15e%24.15e%24.15e\n",
+ workspace->orig_id[i], workspace->orig_id[j],
+ //i+1, j+1,
+ estriph, decobdbo, decobdboua, decobdboub );
#endif
+
#ifdef TEST_FORCES
- Add_dBO( system, lists, i, pj, decobdbo, workspace->f_be );
- Add_dDelta( system, lists, i, decobdboua, workspace->f_be );
- Add_dDelta( system, lists, j, decobdboub, workspace->f_be );
+ Add_dBO( system, lists, i, pj, decobdbo, workspace->f_be );
+ Add_dDelta( system, lists, i, decobdboua, workspace->f_be );
+ Add_dDelta( system, lists, j, decobdboub, workspace->f_be );
#endif
+ }
}
}
}
+ }
}
+
+ data->E_BE += ebond_total;
}
void vdW_Coulomb_Energy( reax_system *system, control_params *control,
- simulation_data *data, static_storage *workspace,
- list **lists, output_controls *out_control )
+ simulation_data *data, static_storage *workspace,
+ list **lists, output_controls *out_control )
{
- int i, j, pj;
- int start_i, end_i;
- real self_coef;
+ int i;
real p_vdW1, p_vdW1i;
- real powr_vdW1, powgi_vdW1;
- real tmp, r_ij, fn13, exp1, exp2;
- real Tap, dTap, dfn13, CEvd, CEclmb;
- real dr3gamij_1, dr3gamij_3;
- real e_ele, e_vdW, e_core, de_core;
- rvec temp, ext_press;
- // rtensor temp_rtensor, total_rtensor;
- two_body_parameters *twbp;
- far_neighbor_data *nbr_pj;
list *far_nbrs;
+ real e_vdW_total, e_ele_total;
p_vdW1 = system->reaxprm.gp.l[28];
p_vdW1i = 1.0 / p_vdW1;
far_nbrs = (*lists) + FAR_NBRS;
- e_ele = 0;
- e_vdW = 0;
- e_core = 0;
- de_core = 0;
+ e_vdW_total = 0.0;
+ e_ele_total = 0.0;
- for ( i = 0; i < system->N; ++i )
+#ifdef _OPENMP
+ #pragma omp parallel default(shared) reduction(+: e_vdW_total, e_ele_total)
+#endif
{
- start_i = Start_Index(i, far_nbrs);
- end_i = End_Index(i, far_nbrs);
- // fprintf( stderr, "i: %d, start: %d, end: %d\n",
- // i, start_i, end_i );
+ int j, pj;
+ int start_i, end_i;
+ real self_coef;
+ real powr_vdW1, powgi_vdW1;
+ real tmp, r_ij, fn13, exp1, exp2;
+ real Tap, dTap, dfn13, CEvd, CEclmb;
+ real dr3gamij_1, dr3gamij_3;
+ real e_ele, e_vdW, e_core, de_core;
+ rvec temp, ext_press;
+ //rtensor temp_rtensor, total_rtensor;
+ two_body_parameters *twbp;
+ far_neighbor_data *nbr_pj;
+#ifdef _OPENMP
+ int tid;
+
+ tid = omp_get_thread_num( );
+#endif
+
+ e_ele = 0.0;
+ e_vdW = 0.0;
+ e_core = 0.0;
+ de_core = 0.0;
- for ( pj = start_i; pj < end_i; ++pj )
- if ( far_nbrs->select.far_nbr_list[pj].d <= control->r_cut )
+#ifdef _OPENMP
+ #pragma omp for schedule(guided)
+#endif
+ for ( i = 0; i < system->N; ++i )
+ {
+ start_i = Start_Index( i, far_nbrs );
+ end_i = End_Index( i, far_nbrs );
+
+ for ( pj = start_i; pj < end_i; ++pj )
{
- nbr_pj = &( far_nbrs->select.far_nbr_list[pj] );
- j = nbr_pj->nbr;
- r_ij = nbr_pj->d;
- twbp = &(system->reaxprm.tbp[ system->atoms[i].type ]
- [ system->atoms[j].type ]);
- self_coef = (i == j) ? 0.5 : 1.0; // for supporting small boxes!
-
- /* Calculate Taper and its derivative */
- // Tap = nbr_pj->Tap; -- precomputed during compte_H
- Tap = control->Tap7 * r_ij + control->Tap6;
- Tap = Tap * r_ij + control->Tap5;
- Tap = Tap * r_ij + control->Tap4;
- Tap = Tap * r_ij + control->Tap3;
- Tap = Tap * r_ij + control->Tap2;
- Tap = Tap * r_ij + control->Tap1;
- Tap = Tap * r_ij + control->Tap0;
-
- dTap = 7 * control->Tap7 * r_ij + 6 * control->Tap6;
- dTap = dTap * r_ij + 5 * control->Tap5;
- dTap = dTap * r_ij + 4 * control->Tap4;
- dTap = dTap * r_ij + 3 * control->Tap3;
- dTap = dTap * r_ij + 2 * control->Tap2;
- dTap += control->Tap1 / r_ij;
-
- /*vdWaals Calculations*/
- if (system->reaxprm.gp.vdw_type == 1 || system->reaxprm.gp.vdw_type == 3)
+ if ( far_nbrs->select.far_nbr_list[pj].d <= control->r_cut )
{
- // shielding
- powr_vdW1 = POW(r_ij, p_vdW1);
- powgi_vdW1 = POW( 1.0 / twbp->gamma_w, p_vdW1);
-
- fn13 = POW( powr_vdW1 + powgi_vdW1, p_vdW1i );
- exp1 = EXP( twbp->alpha * (1.0 - fn13 / twbp->r_vdW) );
- exp2 = EXP( 0.5 * twbp->alpha * (1.0 - fn13 / twbp->r_vdW) );
+ nbr_pj = &( far_nbrs->select.far_nbr_list[pj] );
+ j = nbr_pj->nbr;
+ r_ij = nbr_pj->d;
+ twbp = &(system->reaxprm.tbp[ system->atoms[i].type ]
+ [ system->atoms[j].type ]);
+ self_coef = (i == j) ? 0.5 : 1.0; // for supporting small boxes!
+
+ /* Calculate Taper and its derivative */
+ // Tap = nbr_pj->Tap; -- precomputed during compte_H
+ Tap = control->Tap7 * r_ij + control->Tap6;
+ Tap = Tap * r_ij + control->Tap5;
+ Tap = Tap * r_ij + control->Tap4;
+ Tap = Tap * r_ij + control->Tap3;
+ Tap = Tap * r_ij + control->Tap2;
+ Tap = Tap * r_ij + control->Tap1;
+ Tap = Tap * r_ij + control->Tap0;
+
+ dTap = 7 * control->Tap7 * r_ij + 6 * control->Tap6;
+ dTap = dTap * r_ij + 5 * control->Tap5;
+ dTap = dTap * r_ij + 4 * control->Tap4;
+ dTap = dTap * r_ij + 3 * control->Tap3;
+ dTap = dTap * r_ij + 2 * control->Tap2;
+ dTap += control->Tap1 / r_ij;
+
+ /* vdWaals Calculations */
+ if ( system->reaxprm.gp.vdw_type == 1 || system->reaxprm.gp.vdw_type == 3 )
+ {
+ /* shielding */
+ powr_vdW1 = POW( r_ij, p_vdW1 );
+ powgi_vdW1 = POW( 1.0 / twbp->gamma_w, p_vdW1 );
- data->E_vdW += e_vdW =
- self_coef * Tap * twbp->D * (exp1 - 2.0 * exp2);
+ fn13 = POW( powr_vdW1 + powgi_vdW1, p_vdW1i );
+ exp1 = EXP( twbp->alpha * (1.0 - fn13 / twbp->r_vdW) );
+ exp2 = EXP( 0.5 * twbp->alpha * (1.0 - fn13 / twbp->r_vdW) );
- dfn13 = POW( powr_vdW1 + powgi_vdW1, p_vdW1i - 1.0) *
- POW(r_ij, p_vdW1 - 2.0);
+ e_vdW = self_coef * Tap * twbp->D * (exp1 - 2.0 * exp2);
+ e_vdW_total += e_vdW;
- CEvd = self_coef * ( dTap * twbp->D * (exp1 - 2 * exp2) -
- Tap * twbp->D * (twbp->alpha / twbp->r_vdW) *
- (exp1 - exp2) * dfn13 );
- }
- else // no shielding
- {
- exp1 = EXP( twbp->alpha * (1.0 - r_ij / twbp->r_vdW) );
- exp2 = EXP( 0.5 * twbp->alpha * (1.0 - r_ij / twbp->r_vdW) );
+ dfn13 = POW( powr_vdW1 + powgi_vdW1, p_vdW1i - 1.0) *
+ POW( r_ij, p_vdW1 - 2.0 );
- data->E_vdW += e_vdW =
- self_coef * Tap * twbp->D * (exp1 - 2.0 * exp2);
+ CEvd = self_coef * ( dTap * twbp->D * (exp1 - 2 * exp2) -
+ Tap * twbp->D * (twbp->alpha / twbp->r_vdW) *
+ (exp1 - exp2) * dfn13 );
+ }
+ /* no shielding */
+ else
+ {
+ exp1 = EXP( twbp->alpha * (1.0 - r_ij / twbp->r_vdW) );
+ exp2 = EXP( 0.5 * twbp->alpha * (1.0 - r_ij / twbp->r_vdW) );
- CEvd = self_coef * ( dTap * twbp->D * (exp1 - 2.0 * exp2) -
- Tap * twbp->D * (twbp->alpha / twbp->r_vdW) *
- (exp1 - exp2) );
- }
+ e_vdW = self_coef * Tap * twbp->D * (exp1 - 2.0 * exp2);
+ e_vdW_total += e_vdW;
- if (system->reaxprm.gp.vdw_type == 2 || system->reaxprm.gp.vdw_type == 3)
- {
- // innner wall
- e_core = twbp->ecore * EXP(twbp->acore * (1.0 - (r_ij / twbp->rcore)));
- e_vdW += self_coef * Tap * e_core;
- data->E_vdW += self_coef * Tap * e_core;
+ CEvd = self_coef * ( dTap * twbp->D * (exp1 - 2.0 * exp2) -
+ Tap * twbp->D * (twbp->alpha / twbp->r_vdW) *
+ (exp1 - exp2) );
+ }
- de_core = -(twbp->acore / twbp->rcore) * e_core;
- CEvd += self_coef * ( dTap * e_core + Tap * de_core );
- }
+ if ( system->reaxprm.gp.vdw_type == 2 || system->reaxprm.gp.vdw_type == 3 )
+ {
+ /* innner wall */
+ e_core = twbp->ecore * EXP( twbp->acore * (1.0 - (r_ij / twbp->rcore)) );
+ e_vdW += self_coef * Tap * e_core;
+ e_vdW_total += self_coef * Tap * e_core;
- /*Coulomb Calculations*/
- dr3gamij_1 = ( r_ij * r_ij * r_ij + twbp->gamma );
- dr3gamij_3 = POW( dr3gamij_1 , 0.33333333333333 );
+ de_core = -(twbp->acore / twbp->rcore) * e_core;
+ CEvd += self_coef * ( dTap * e_core + Tap * de_core );
+ }
- tmp = Tap / dr3gamij_3;
- //tmp = Tap * nbr_pj->inv_dr3gamij_3; -- precomputed during compte_H
- data->E_Ele += e_ele =
- self_coef * C_ele * system->atoms[i].q * system->atoms[j].q * tmp;
+ /* Coulomb Calculations */
+ dr3gamij_1 = ( r_ij * r_ij * r_ij + twbp->gamma );
+ dr3gamij_3 = POW( dr3gamij_1 , 1.0 / 3.0 );
+ tmp = Tap / dr3gamij_3;
+ e_ele = self_coef * C_ele * system->atoms[i].q * system->atoms[j].q * tmp;
+ e_ele_total += e_ele;
- CEclmb = self_coef * C_ele * system->atoms[i].q * system->atoms[j].q *
- ( dTap - Tap * r_ij / dr3gamij_1 ) / dr3gamij_3;
- /*CEclmb = self_coef*C_ele*system->atoms[i].q*system->atoms[j].q*
- ( dTap- Tap*r_ij*nbr_pj->inv_dr3gamij_1 )*nbr_pj->inv_dr3gamij_3;*/
+ CEclmb = self_coef * C_ele * system->atoms[i].q * system->atoms[j].q *
+ ( dTap - Tap * r_ij / dr3gamij_1 ) / dr3gamij_3;
+ if ( control->ensemble == NVE || control->ensemble == NVT || control->ensemble == bNVT )
+ {
+#ifndef _OPENMP
+ rvec_ScaledAdd( system->atoms[i].f,
+ -(CEvd + CEclmb), nbr_pj->dvec );
+ rvec_ScaledAdd( system->atoms[j].f,
+ +(CEvd + CEclmb), nbr_pj->dvec );
+#else
+ rvec_ScaledAdd( workspace->f_local[tid * system->N + i],
+ -(CEvd + CEclmb), nbr_pj->dvec );
+ rvec_ScaledAdd( workspace->f_local[tid * system->N + j],
+ +(CEvd + CEclmb), nbr_pj->dvec );
+#endif
+ }
+ /* NPT, iNPT or sNPT */
+ else
+ {
+ /* for pressure coupling, terms not related to bond order
+ derivatives are added directly into pressure vector/tensor */
+ rvec_Scale( temp, CEvd + CEclmb, nbr_pj->dvec );
+
+#ifndef _OPENMP
+ rvec_ScaledAdd( system->atoms[i].f, -1., temp );
+ rvec_Add( system->atoms[j].f, temp );
+#else
+ rvec_ScaledAdd( workspace->f_local[tid * system->N + i], -1., temp );
+ rvec_Add( workspace->f_local[tid * system->N + j], temp );
+#endif
- if ( control->ensemble == NVE || control->ensemble == NVT || control->ensemble == bNVT )
- {
- rvec_ScaledAdd( system->atoms[i].f,
- -(CEvd + CEclmb), nbr_pj->dvec );
- rvec_ScaledAdd( system->atoms[j].f,
- +(CEvd + CEclmb), nbr_pj->dvec );
- }
- else // NPT, iNPT or sNPT
- {
- /* for pressure coupling, terms not related to bond order
- derivatives are added directly into pressure vector/tensor */
- rvec_Scale( temp, CEvd + CEclmb, nbr_pj->dvec );
-
- rvec_ScaledAdd( system->atoms[i].f, -1., temp );
- rvec_Add( system->atoms[j].f, temp );
-
- rvec_iMultiply( ext_press, nbr_pj->rel_box, temp );
- rvec_Add( data->ext_press, ext_press );
-
- /*fprintf( stderr, "nonbonded(%d,%d): rel_box (%f %f %f)",
- i,j,nbr_pj->rel_box[0],nbr_pj->rel_box[1],nbr_pj->rel_box[2] );
-
- fprintf( stderr, "force(%f %f %f)", temp[0], temp[1], temp[2] );
-
- fprintf( stderr, "ext_press (%12.6f %12.6f %12.6f)\n",
- data->ext_press[0], data->ext_press[1], data->ext_press[2] );*/
-
- /* This part is intended for a fully-flexible box */
- /* rvec_OuterProduct( temp_rtensor, nbr_pj->dvec,
- system->atoms[i].x );
- rtensor_Scale( total_rtensor,
- F_C * -(CEvd + CEclmb), temp_rtensor );
- rvec_OuterProduct( temp_rtensor,
- nbr_pj->dvec, system->atoms[j].x );
- rtensor_ScaledAdd( total_rtensor,
- F_C * +(CEvd + CEclmb), temp_rtensor );
-
- if( nbr_pj->imaginary )
- // This is an external force due to an imaginary nbr
- rtensor_ScaledAdd( data->flex_bar.P, -1.0, total_rtensor );
- else
- // This interaction is completely internal
- rtensor_Add( data->flex_bar.P, total_rtensor ); */
- }
+ rvec_iMultiply( ext_press, nbr_pj->rel_box, temp );
+#ifdef _OPENMP
+ #pragma omp critical (vdW_Coulomb_Energy_ext_press)
+#endif
+ {
+ rvec_Add( data->ext_press, ext_press );
+ }
+
+ /*fprintf( stderr, "nonbonded(%d,%d): rel_box (%f %f %f)",
+ i,j,nbr_pj->rel_box[0],nbr_pj->rel_box[1],nbr_pj->rel_box[2] );
+
+ fprintf( stderr, "force(%f %f %f)", temp[0], temp[1], temp[2] );
+
+ fprintf( stderr, "ext_press (%12.6f %12.6f %12.6f)\n",
+ data->ext_press[0], data->ext_press[1], data->ext_press[2] );*/
+
+ /* This part is intended for a fully-flexible box */
+ /* rvec_OuterProduct( temp_rtensor, nbr_pj->dvec,
+ system->atoms[i].x );
+ rtensor_Scale( total_rtensor,
+ F_C * -(CEvd + CEclmb), temp_rtensor );
+ rvec_OuterProduct( temp_rtensor,
+ nbr_pj->dvec, system->atoms[j].x );
+ rtensor_ScaledAdd( total_rtensor,
+ F_C * +(CEvd + CEclmb), temp_rtensor );
+
+ if( nbr_pj->imaginary )
+ // This is an external force due to an imaginary nbr
+ rtensor_ScaledAdd( data->flex_bar.P, -1.0, total_rtensor );
+ else
+ // This interaction is completely internal
+ rtensor_Add( data->flex_bar.P, total_rtensor ); */
+ }
#ifdef TEST_ENERGY
- rvec_MakeZero( temp );
- rvec_ScaledAdd( temp, +CEvd, nbr_pj->dvec );
- fprintf( out_control->evdw,
- "%6d%6d%24.15e%24.15e%24.15e%24.15e%24.15e\n",
- //i+1, j+1,
- MIN( workspace->orig_id[i], workspace->orig_id[j] ),
- MAX( workspace->orig_id[i], workspace->orig_id[j] ),
- r_ij, e_vdW, temp[0], temp[1], temp[2]/*, data->E_vdW*/ );
-
- fprintf( out_control->ecou, "%6d%6d%24.15e%24.15e%24.15e%24.15e\n",
- MIN( workspace->orig_id[i], workspace->orig_id[j] ),
- MAX( workspace->orig_id[i], workspace->orig_id[j] ),
- r_ij, system->atoms[i].q, system->atoms[j].q,
- e_ele/*, data->E_Ele*/ );
+ rvec_MakeZero( temp );
+ rvec_ScaledAdd( temp, +CEvd, nbr_pj->dvec );
+ fprintf( out_control->evdw,
+ "%6d%6d%24.15e%24.15e%24.15e%24.15e%24.15e\n",
+ //i+1, j+1,
+ MIN( workspace->orig_id[i], workspace->orig_id[j] ),
+ MAX( workspace->orig_id[i], workspace->orig_id[j] ),
+ r_ij, e_vdW, temp[0], temp[1], temp[2]/*, e_vdW_total*/ );
+
+ fprintf( out_control->ecou, "%6d%6d%24.15e%24.15e%24.15e%24.15e\n",
+ MIN( workspace->orig_id[i], workspace->orig_id[j] ),
+ MAX( workspace->orig_id[i], workspace->orig_id[j] ),
+ r_ij, system->atoms[i].q, system->atoms[j].q,
+ e_ele/*, e_ele_total*/ );
#endif
+
#ifdef TEST_FORCES
- rvec_ScaledAdd( workspace->f_vdw[i], -CEvd, nbr_pj->dvec );
- rvec_ScaledAdd( workspace->f_vdw[j], +CEvd, nbr_pj->dvec );
- rvec_ScaledAdd( workspace->f_ele[i], -CEclmb, nbr_pj->dvec );
- rvec_ScaledAdd( workspace->f_ele[j], +CEclmb, nbr_pj->dvec );
+ rvec_ScaledAdd( workspace->f_vdw[i], -CEvd, nbr_pj->dvec );
+ rvec_ScaledAdd( workspace->f_vdw[j], +CEvd, nbr_pj->dvec );
+ rvec_ScaledAdd( workspace->f_ele[i], -CEclmb, nbr_pj->dvec );
+ rvec_ScaledAdd( workspace->f_ele[j], +CEclmb, nbr_pj->dvec );
#endif
+ }
}
+ }
}
+ data->E_vdW = e_vdW_total;
+ data->E_Ele = e_ele_total;
+
// fclose( fout );
// fprintf( stderr, "nonbonded: ext_press (%24.15e %24.15e %24.15e)\n",
@@ -350,7 +403,7 @@ void vdW_Coulomb_Energy( reax_system *system, control_params *control,
void LR_vdW_Coulomb( reax_system *system, control_params *control,
- int i, int j, real r_ij, LR_data *lr )
+ int i, int j, real r_ij, LR_data *lr )
{
real p_vdW1 = system->reaxprm.gp.l[28];
real p_vdW1i = 1.0 / p_vdW1;
@@ -399,14 +452,14 @@ void LR_vdW_Coulomb( reax_system *system, control_params *control,
dfn13 = POW( powr_vdW1 + powgi_vdW1, p_vdW1i - 1.0) * POW(r_ij, p_vdW1 - 2.0);
lr->CEvd = dTap * twbp->D * (exp1 - 2 * exp2) -
- Tap * twbp->D * (twbp->alpha / twbp->r_vdW) * (exp1 - exp2) * dfn13;
+ Tap * twbp->D * (twbp->alpha / twbp->r_vdW) * (exp1 - exp2) * dfn13;
- /*vdWaals Calculations*/
- if (system->reaxprm.gp.vdw_type == 1 || system->reaxprm.gp.vdw_type == 3)
+ /* vdWaals Calculations */
+ if ( system->reaxprm.gp.vdw_type == 1 || system->reaxprm.gp.vdw_type == 3 )
{
// shielding
- powr_vdW1 = POW(r_ij, p_vdW1);
- powgi_vdW1 = POW( 1.0 / twbp->gamma_w, p_vdW1);
+ powr_vdW1 = POW( r_ij, p_vdW1 );
+ powgi_vdW1 = POW( 1.0 / twbp->gamma_w, p_vdW1 );
fn13 = POW( powr_vdW1 + powgi_vdW1, p_vdW1i );
exp1 = EXP( twbp->alpha * (1.0 - fn13 / twbp->r_vdW) );
@@ -415,12 +468,13 @@ void LR_vdW_Coulomb( reax_system *system, control_params *control,
lr->e_vdW = Tap * twbp->D * (exp1 - 2.0 * exp2);
dfn13 = POW( powr_vdW1 + powgi_vdW1, p_vdW1i - 1.0) *
- POW(r_ij, p_vdW1 - 2.0);
+ POW( r_ij, p_vdW1 - 2.0 );
lr->CEvd = dTap * twbp->D * (exp1 - 2.0 * exp2) -
- Tap * twbp->D * (twbp->alpha / twbp->r_vdW) * (exp1 - exp2) * dfn13;
+ Tap * twbp->D * (twbp->alpha / twbp->r_vdW) * (exp1 - exp2) * dfn13;
}
- else // no shielding
+ /* no shielding */
+ else
{
exp1 = EXP( twbp->alpha * (1.0 - r_ij / twbp->r_vdW) );
exp2 = EXP( 0.5 * twbp->alpha * (1.0 - r_ij / twbp->r_vdW) );
@@ -428,10 +482,10 @@ void LR_vdW_Coulomb( reax_system *system, control_params *control,
lr->e_vdW = Tap * twbp->D * (exp1 - 2.0 * exp2);
lr->CEvd = dTap * twbp->D * (exp1 - 2.0 * exp2) -
- Tap * twbp->D * (twbp->alpha / twbp->r_vdW) * (exp1 - exp2);
+ Tap * twbp->D * (twbp->alpha / twbp->r_vdW) * (exp1 - exp2);
}
- if (system->reaxprm.gp.vdw_type == 2 || system->reaxprm.gp.vdw_type == 3)
+ if ( system->reaxprm.gp.vdw_type == 2 || system->reaxprm.gp.vdw_type == 3 )
{
// innner wall
e_core = twbp->ecore * EXP(twbp->acore * (1.0 - (r_ij / twbp->rcore)));
@@ -443,7 +497,7 @@ void LR_vdW_Coulomb( reax_system *system, control_params *control,
/* Coulomb calculations */
dr3gamij_1 = ( r_ij * r_ij * r_ij + twbp->gamma );
- dr3gamij_3 = POW( dr3gamij_1 , 0.33333333333333 );
+ dr3gamij_3 = POW( dr3gamij_1 , 1.0 / 3.0 );
tmp = Tap / dr3gamij_3;
lr->H = EV_to_KCALpMOL * tmp;
@@ -465,106 +519,148 @@ void LR_vdW_Coulomb( reax_system *system, control_params *control,
void Tabulated_vdW_Coulomb_Energy( reax_system *system, control_params *control,
- simulation_data *data,
- static_storage *workspace, list **lists,
- output_controls *out_control )
+ simulation_data *data, static_storage *workspace, list **lists,
+ output_controls *out_control )
{
- int i, j, pj, r, steps, update_freq, update_energies;
- int type_i, type_j, tmin, tmax;
- int start_i, end_i;
- real r_ij, self_coef, base, dif;
- real e_vdW, e_ele;
- real CEvd, CEclmb;
- rvec temp, ext_press;
- far_neighbor_data *nbr_pj;
- list *far_nbrs = (*lists) + FAR_NBRS;
- LR_lookup_table *t;
+ int steps, update_freq, update_energies;
+ list *far_nbrs;
+ real e_vdW_total, e_ele_total;
+ far_nbrs = (*lists) + FAR_NBRS;
steps = data->step - data->prev_steps;
update_freq = out_control->energy_update_freq;
update_energies = update_freq > 0 && steps % update_freq == 0;
+ e_vdW_total = 0.0;
+ e_ele_total = 0.0;
- for ( i = 0; i < system->N; ++i )
+#ifdef _OPENMP
+ #pragma omp parallel default(shared) reduction(+: e_vdW_total, e_ele_total)
+#endif
{
- type_i = system->atoms[i].type;
- start_i = Start_Index(i, far_nbrs);
- end_i = End_Index(i, far_nbrs);
+ int i, j, pj, r;
+ int type_i, type_j, tmin, tmax;
+ int start_i, end_i;
+ real r_ij, self_coef, base, dif;
+ real e_vdW, e_ele;
+ real CEvd, CEclmb;
+ rvec temp, ext_press;
+ far_neighbor_data *nbr_pj;
+ LR_lookup_table *t;
+#ifdef _OPENMP
+ int tid;
+
+ tid = omp_get_thread_num( );
+
+ #pragma omp for schedule(guided)
+#endif
+ for ( i = 0; i < system->N; ++i )
+ {
+ type_i = system->atoms[i].type;
+ start_i = Start_Index(i, far_nbrs);
+ end_i = End_Index(i, far_nbrs);
- for ( pj = start_i; pj < end_i; ++pj )
- if ( far_nbrs->select.far_nbr_list[pj].d <= control->r_cut )
+ for ( pj = start_i; pj < end_i; ++pj )
{
- nbr_pj = &( far_nbrs->select.far_nbr_list[pj] );
- j = nbr_pj->nbr;
- type_j = system->atoms[j].type;
- r_ij = nbr_pj->d;
- self_coef = (i == j) ? 0.5 : 1.0;
- tmin = MIN( type_i, type_j );
- tmax = MAX( type_i, type_j );
- t = &( LR[tmin][tmax] );
-
- /* Cubic Spline Interpolation */
- r = (int)(r_ij * t->inv_dx);
- if ( r == 0 ) ++r;
- base = (real)(r + 1) * t->dx;
- dif = r_ij - base;
- //fprintf(stderr, "r: %f, i: %d, base: %f, dif: %f\n", r, i, base, dif);
-
- if ( update_energies )
+ if ( far_nbrs->select.far_nbr_list[pj].d <= control->r_cut )
{
- e_vdW = ((t->vdW[r].d * dif + t->vdW[r].c) * dif + t->vdW[r].b) * dif +
- t->vdW[r].a;
- e_vdW *= self_coef;
+ nbr_pj = &( far_nbrs->select.far_nbr_list[pj] );
+ j = nbr_pj->nbr;
+ type_j = system->atoms[j].type;
+ r_ij = nbr_pj->d;
+ self_coef = (i == j) ? 0.5 : 1.0;
+ tmin = MIN( type_i, type_j );
+ tmax = MAX( type_i, type_j );
+ t = &( LR[tmin][tmax] );
+
+ /* Cubic Spline Interpolation */
+ r = (int)(r_ij * t->inv_dx);
+ if ( r == 0 )
+ {
+ ++r;
+ }
+ base = (real)(r + 1) * t->dx;
+ dif = r_ij - base;
+ //fprintf(stderr, "r: %f, i: %d, base: %f, dif: %f\n", r, i, base, dif);
- e_ele = ((t->ele[r].d * dif + t->ele[r].c) * dif + t->ele[r].b) * dif +
- t->ele[r].a;
- e_ele *= self_coef * system->atoms[i].q * system->atoms[j].q;
+ if ( update_energies )
+ {
+ e_vdW = ((t->vdW[r].d * dif + t->vdW[r].c) * dif + t->vdW[r].b) * dif +
+ t->vdW[r].a;
+ e_vdW *= self_coef;
- data->E_vdW += e_vdW;
- data->E_Ele += e_ele;
- }
+ e_ele = ((t->ele[r].d * dif + t->ele[r].c) * dif + t->ele[r].b) * dif +
+ t->ele[r].a;
+ e_ele *= self_coef * system->atoms[i].q * system->atoms[j].q;
- CEvd = ((t->CEvd[r].d * dif + t->CEvd[r].c) * dif + t->CEvd[r].b) * dif +
- t->CEvd[r].a;
- CEvd *= self_coef;
- //CEvd = (3*t->vdW[r].d*dif + 2*t->vdW[r].c)*dif + t->vdW[r].b;
+ e_vdW_total += e_vdW;
+ e_ele_total += e_ele;
+ }
- CEclmb = ((t->CEclmb[r].d * dif + t->CEclmb[r].c) * dif + t->CEclmb[r].b) * dif +
- t->CEclmb[r].a;
- CEclmb *= self_coef * system->atoms[i].q * system->atoms[j].q;
+ CEvd = ((t->CEvd[r].d * dif + t->CEvd[r].c) * dif + t->CEvd[r].b) * dif +
+ t->CEvd[r].a;
+ CEvd *= self_coef;
+ //CEvd = (3*t->vdW[r].d*dif + 2*t->vdW[r].c)*dif + t->vdW[r].b;
- if ( control->ensemble == NVE || control->ensemble == NVT || control->ensemble == bNVT)
- {
- rvec_ScaledAdd( system->atoms[i].f, -(CEvd + CEclmb), nbr_pj->dvec );
- rvec_ScaledAdd( system->atoms[j].f, +(CEvd + CEclmb), nbr_pj->dvec );
- }
- else // NPT, iNPT or sNPT
- {
- /* for pressure coupling, terms not related to bond order
- derivatives are added directly into pressure vector/tensor */
- rvec_Scale( temp, CEvd + CEclmb, nbr_pj->dvec );
- rvec_ScaledAdd( system->atoms[i].f, -1., temp );
- rvec_Add( system->atoms[j].f, temp );
- rvec_iMultiply( ext_press, nbr_pj->rel_box, temp );
- rvec_Add( data->ext_press, ext_press );
- }
+ CEclmb = ((t->CEclmb[r].d * dif + t->CEclmb[r].c) * dif + t->CEclmb[r].b) * dif +
+ t->CEclmb[r].a;
+ CEclmb *= self_coef * system->atoms[i].q * system->atoms[j].q;
+
+ if ( control->ensemble == NVE || control->ensemble == NVT || control->ensemble == bNVT)
+ {
+#ifndef _OPENMP
+ rvec_ScaledAdd( system->atoms[i].f, -(CEvd + CEclmb), nbr_pj->dvec );
+ rvec_ScaledAdd( system->atoms[j].f, +(CEvd + CEclmb), nbr_pj->dvec );
+#else
+ rvec_ScaledAdd( workspace->f_local[tid * system->N + i],
+ -(CEvd + CEclmb), nbr_pj->dvec );
+ rvec_ScaledAdd( workspace->f_local[tid * system->N + j],
+ +(CEvd + CEclmb), nbr_pj->dvec );
+#endif
+ }
+ else // NPT, iNPT or sNPT
+ {
+ /* for pressure coupling, terms not related to bond order
+ derivatives are added directly into pressure vector/tensor */
+ rvec_Scale( temp, CEvd + CEclmb, nbr_pj->dvec );
+#ifndef _OPENMP
+ rvec_ScaledAdd( system->atoms[i].f, -1., temp );
+ rvec_Add( system->atoms[j].f, temp );
+#else
+ rvec_ScaledAdd( workspace->f_local[tid * system->N + i], -1., temp );
+ rvec_Add( workspace->f_local[tid * system->N + j], temp );
+#endif
+ rvec_iMultiply( ext_press, nbr_pj->rel_box, temp );
+#ifdef _OPENMP
+ #pragma omp critical (Tabulated_vdW_Coulomb_Energy_ext_press)
+#endif
+ {
+ rvec_Add( data->ext_press, ext_press );
+ }
+ }
#ifdef TEST_ENERGY
- fprintf(out_control->evdw, "%6d%6d%24.15e%24.15e%24.15e\n",
- workspace->orig_id[i], workspace->orig_id[j],
- r_ij, e_vdW, data->E_vdW );
- fprintf(out_control->ecou, "%6d%6d%24.15e%24.15e%24.15e%24.15e%24.15e\n",
- workspace->orig_id[i], workspace->orig_id[j],
- r_ij, system->atoms[i].q, system->atoms[j].q,
- e_ele, data->E_Ele );
+ fprintf( out_control->evdw, "%6d%6d%24.15e%24.15e%24.15e\n",
+ workspace->orig_id[i], workspace->orig_id[j],
+ r_ij, e_vdW, data->E_vdW );
+ fprintf( out_control->ecou, "%6d%6d%24.15e%24.15e%24.15e%24.15e%24.15e\n",
+ workspace->orig_id[i], workspace->orig_id[j],
+ r_ij, system->atoms[i].q, system->atoms[j].q,
+ e_ele, data->E_Ele );
#endif
+
#ifdef TEST_FORCES
- rvec_ScaledAdd( workspace->f_vdw[i], -CEvd, nbr_pj->dvec );
- rvec_ScaledAdd( workspace->f_vdw[j], +CEvd, nbr_pj->dvec );
- rvec_ScaledAdd( workspace->f_ele[i], -CEclmb, nbr_pj->dvec );
- rvec_ScaledAdd( workspace->f_ele[j], +CEclmb, nbr_pj->dvec );
+ rvec_ScaledAdd( workspace->f_vdw[i], -CEvd, nbr_pj->dvec );
+ rvec_ScaledAdd( workspace->f_vdw[j], +CEvd, nbr_pj->dvec );
+ rvec_ScaledAdd( workspace->f_ele[i], -CEclmb, nbr_pj->dvec );
+ rvec_ScaledAdd( workspace->f_ele[j], +CEclmb, nbr_pj->dvec );
#endif
+ }
}
+ }
}
+
+ data->E_vdW += e_vdW_total;
+ data->E_Ele += e_ele_total;
}
diff --git a/sPuReMD/src/vector.c b/sPuReMD/src/vector.c
index 5329aea717a6d00b542df5527eb03a6684ec5f18..f320d857bc42c3731204c3b41639d6460d398526 100644
--- a/sPuReMD/src/vector.c
+++ b/sPuReMD/src/vector.c
@@ -32,12 +32,18 @@ inline int Vector_isZero( const real * const v, const unsigned int k )
{
unsigned int i;
+#ifdef _OPENMP
#pragma omp single
+#endif
{
ret = TRUE;
}
+#ifdef _OPENMP
+ #pragma omp barrier
+
#pragma omp for reduction(&&: ret) schedule(static)
+#endif
for ( i = 0; i < k; ++i )
{
if ( FABS( v[i] ) > ALMOST_ZERO )
@@ -46,6 +52,10 @@ inline int Vector_isZero( const real * const v, const unsigned int k )
}
}
+#ifdef _OPENMP
+ #pragma omp barrier
+#endif
+
return ret;
}
@@ -54,7 +64,9 @@ inline void Vector_MakeZero( real * const v, const unsigned int k )
{
unsigned int i;
+#ifdef _OPENMP
#pragma omp for schedule(static)
+#endif
for ( i = 0; i < k; ++i )
{
v[i] = ZERO;
@@ -66,7 +78,9 @@ inline void Vector_Copy( real * const dest, const real * const v, const unsigned
{
unsigned int i;
+#ifdef _OPENMP
#pragma omp for schedule(static)
+#endif
for ( i = 0; i < k; ++i )
{
dest[i] = v[i];
@@ -78,7 +92,9 @@ inline void Vector_Scale( real * const dest, const real c, const real * const v,
{
unsigned int i;
+#ifdef _OPENMP
#pragma omp for schedule(static)
+#endif
for ( i = 0; i < k; ++i )
{
dest[i] = c * v[i];
@@ -91,7 +107,9 @@ inline void Vector_Sum( real * const dest, const real c, const real * const v, c
{
unsigned int i;
+#ifdef _OPENMP
#pragma omp for schedule(static)
+#endif
for ( i = 0; i < k; ++i )
{
dest[i] = c * v[i] + d * y[i];
@@ -103,7 +121,9 @@ inline void Vector_Add( real * const dest, const real c, const real * const v, c
{
unsigned int i;
+#ifdef _OPENMP
#pragma omp for schedule(static)
+#endif
for ( i = 0; i < k; ++i )
{
dest[i] += c * v[i];
@@ -132,17 +152,27 @@ inline real Dot( const real * const v1, const real * const v2, const unsigned in
{
unsigned int i;
+#ifdef _OPENMP
#pragma omp single
+#endif
{
ret2 = ZERO;
}
+#ifdef _OPENMP
+ #pragma omp barrier
+
#pragma omp for reduction(+: ret2) schedule(static)
+#endif
for ( i = 0; i < k; ++i )
{
ret2 += v1[i] * v2[i];
}
+#ifdef _OPENMP
+ #pragma omp barrier
+#endif
+
return ret2;
}
@@ -151,18 +181,37 @@ inline real Norm( const real * const v1, const unsigned int k )
{
unsigned int i;
+#ifdef _OPENMP
#pragma omp single
+#endif
{
ret2 = ZERO;
}
+#ifdef _OPENMP
+ #pragma omp barrier
+
#pragma omp for reduction(+: ret2) schedule(static)
+#endif
for ( i = 0; i < k; ++i )
{
ret2 += SQR( v1[i] );
}
- return SQRT( ret2 );
+#ifdef _OPENMP
+ #pragma omp barrier
+
+ #pragma omp single
+#endif
+ {
+ ret2 = SQRT( ret2 );
+ }
+
+#ifdef _OPENMP
+ #pragma omp barrier
+#endif
+
+ return ret2;
}
@@ -303,9 +352,9 @@ inline real rvec_Norm( const rvec v )
inline int rvec_isZero( const rvec v )
{
- if ( fabs(v[0]) > ALMOST_ZERO ||
- fabs(v[1]) > ALMOST_ZERO ||
- fabs(v[2]) > ALMOST_ZERO )
+ if ( FABS(v[0]) > ALMOST_ZERO ||
+ FABS(v[1]) > ALMOST_ZERO ||
+ FABS(v[2]) > ALMOST_ZERO )
{
return FALSE;
}
@@ -315,7 +364,9 @@ inline int rvec_isZero( const rvec v )
inline void rvec_MakeZero( rvec v )
{
- v[0] = v[1] = v[2] = ZERO;
+ v[0] = ZERO;
+ v[1] = ZERO;
+ v[2] = ZERO;
}
diff --git a/sPuReMD/src/vector.h b/sPuReMD/src/vector.h
index 98ba7dd8c74203902646bb4711e99152df747b2d..27ceb241150bc98c7dcf65ef37fc8262d77303dc 100644
--- a/sPuReMD/src/vector.h
+++ b/sPuReMD/src/vector.h
@@ -24,6 +24,7 @@
#include "mytypes.h"
+
int Vector_isZero( const real * const, const unsigned int );
void Vector_MakeZero( real * const, const unsigned int );
void Vector_Copy( real * const, const real * const, const unsigned int );
@@ -80,4 +81,5 @@ void ivec_Scale( ivec, const real, const ivec );
void ivec_rScale( ivec, const real, const rvec );
void ivec_Sum( ivec, const ivec, const ivec );
+
#endif
diff --git a/sPuReMD/tests/test_vector.cpp b/sPuReMD/tests/test_vector.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..b58ff7df532dff2916642a6ce75d6c08b705354b
--- /dev/null
+++ b/sPuReMD/tests/test_vector.cpp
@@ -0,0 +1,74 @@
+#include <gtest/gtest.h>
+
+#include "mytypes.h"
+#include "vector.c"
+
+
+#define VEC_SIZE (100)
+
+
+namespace
+{
+ class VectorTest : public ::testing::Test
+ {
+ protected:
+ real *a;
+ real *b;
+
+ VectorTest( )
+ {
+ if ( (a = (real *) malloc( VEC_SIZE * sizeof(real))) == NULL ||
+ (b = (real *) malloc( VEC_SIZE * sizeof(real))) == NULL )
+ {
+ throw new std::bad_alloc( );
+ }
+ }
+
+ virtual ~VectorTest( )
+ {
+ if ( a != NULL )
+ {
+ free( a );
+ }
+ if ( b != NULL )
+ {
+ free( b );
+ }
+ }
+
+ virtual void SetUp( )
+ {
+ for ( int i = 0; i < VEC_SIZE; ++i )
+ {
+ a[i] = i + 1.0;
+ b[i] = 1.0;
+ }
+ }
+
+ virtual void TearDown( )
+ {
+
+ }
+ };
+
+
+ TEST_F(VectorTest, Dot)
+ {
+ ASSERT_EQ( Dot(a, b, VEC_SIZE), (VEC_SIZE * (VEC_SIZE + 1.0)) / 2.0 );
+ ASSERT_EQ( Dot(b, b, VEC_SIZE), (real) VEC_SIZE );
+ }
+
+
+ TEST_F(VectorTest, Norm)
+ {
+ ASSERT_EQ( Norm(a, VEC_SIZE), sqrt( VEC_SIZE * (VEC_SIZE + 1.0) * (2.0 * VEC_SIZE + 1.0) / 6.0 ) );
+ ASSERT_EQ( Norm(b, VEC_SIZE), sqrt( (real) VEC_SIZE ) );
+ }
+}
+
+
+int main( int argc, char **argv )
+{
+ ::testing::InitGoogleTest( &argc, argv );
+ return RUN_ALL_TESTS( );
+}