summaryrefslogtreecommitdiffstats
path: root/libvtv
diff options
context:
space:
mode:
authorRainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>2015-11-25 10:30:25 +0000
committerRainer Orth <ro@gcc.gnu.org>2015-11-25 10:30:25 +0000
commite5ef217c3e12ddab9e50843ce322702e8b9d1686 (patch)
tree9216240eb09617c83cf72cd69f1d6971f33b581d /libvtv
parentRemove broken ifcvt code for speculating memory writes (diff)
downloadgcc-e5ef217c3e12ddab9e50843ce322702e8b9d1686.tar.gz
gcc-e5ef217c3e12ddab9e50843ce322702e8b9d1686.tar.bz2
gcc-e5ef217c3e12ddab9e50843ce322702e8b9d1686.tar.xz
Port libvtv to Solaris
libstdc++-v3: * acinclude.m4 (GLIBCXX_ENABLE_VTABLE_VERIFY) <solaris2*>: Use -Wl,-R in VTV_CXXLINKFLAGS. * configure: Regenerate. * testsuite/18_support/bad_exception/23591_thread-1.c: Use -fvtable-verify=none on Solaris 12+. libgcc: * Makefile.in (VTV_CFLAGS): New variable. (vtv_start$(objext), vtv_end$(objext), vtv_end$(objext)) (vtv_start_preinit$(objext), vtv_end_preinit$(objext)): Use it. * config.host (*-*-solaris2*): Add t-crtstuff-pic to tmake_file. Add vtv_start.o, vtv_end.o, vtv_start_preinit.o, vtv_end_preinit.o to extra_parts if $enable_vtable_verify = yes. libvtv: * configure.tgt (*-*-solaris2.[1-9]*): Declare supported. * configure.ac: Call AC_USE_SYSTEM_EXTENSIONS. <*-*-solaris2*>: Check for init priority support. Check for getexecname, __fortify_fail, _obstack_begin. (VTV_NO_OBSTACK): New conditional. * configure: Regenerate. * Makefile.am [VTV_NO_OBSTACK] (obstack.c): Use new condition. Create empty config.h * Makefile.in: Regenerate. * vtv_rts.cc [HAVE_GETEXECNAME] (program_invocation_name): New variable. (read_section_offset_and_length) [HAVE_GETEXECNAME]: Set it. (dl_iterate_phdr_callback) [HAVE_GETEXECNAME]: Set it. (__fortify_fail): Wrap in HAVE___FORTIFY_FAIL [!HAVE___FORTIFY_FAIL]: Provide non-Cygwin implementation. (read_section_offset_and_length): Assert sh_size >= VTV_PAGE_SIZE. (iterate_modules): Fix typo. Use VTV_PAGE_SIZE. (dl_iterate_phdr_callback): Fix typo. Use VTV_PAGE_SIZE. (__VLTChangePermission): Fix typos. include: * vtv-change-permission.h (VTV_PAGE_SIZE) [__sun__ && __svr4__ && __sparc__]: Define. gcc: * config/sol2.h (SUPPORTS_INIT_PRIORITY): Move up. (STARTFILE_VTV_SPEC, ENDFILE_VTV_SPEC): Define. (STARTFILE_SPEC): Use %(startfile_vtv). (ENDFILE_SPEC): Use %(endfile_vtv). (SUBTARGET_EXTRA_SPECS): Handle STARTFILE_VTV_SPEC, ENDFILE_VTV_SPEC. * gcc.c (LINK_COMMAND_SPEC): Move VTABLE_VERIFICATION_SPEC after %{L*}. From-SVN: r230865
Diffstat (limited to 'libvtv')
-rw-r--r--libvtv/ChangeLog27
-rw-r--r--libvtv/Makefile.am14
-rw-r--r--libvtv/Makefile.in25
-rwxr-xr-xlibvtv/configure1938
-rw-r--r--libvtv/configure.ac22
-rw-r--r--libvtv/configure.tgt6
-rw-r--r--libvtv/vtv_rts.cc53
7 files changed, 1055 insertions, 1030 deletions
diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog
index 4f216ac7703..02dba258e16 100644
--- a/libvtv/ChangeLog
+++ b/libvtv/ChangeLog
@@ -1,3 +1,30 @@
12015-11-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
2
3 * configure.tgt (*-*-solaris2.[1-9]*): Declare supported.
4 * configure.ac: Call AC_USE_SYSTEM_EXTENSIONS.
5 <*-*-solaris2*>: Check for init priority support.
6 Check for getexecname, __fortify_fail, _obstack_begin.
7 (VTV_NO_OBSTACK): New conditional.
8 * configure: Regenerate.
9 * Makefile.am [VTV_NO_OBSTACK] (obstack.c): Use new condition.
10 Create empty config.h
11 * Makefile.in: Regenerate.
12
13 * vtv_rts.cc [HAVE_GETEXECNAME] (program_invocation_name): New
14 variable.
15 (read_section_offset_and_length) [HAVE_GETEXECNAME]: Set it.
16 (dl_iterate_phdr_callback) [HAVE_GETEXECNAME]: Set it.
17
18 (__fortify_fail): Wrap in HAVE___FORTIFY_FAIL
19 [!HAVE___FORTIFY_FAIL]: Provide non-Cygwin implementation.
20
21 (read_section_offset_and_length): Assert sh_size >= VTV_PAGE_SIZE.
22 (iterate_modules): Fix typo.
23 Use VTV_PAGE_SIZE.
24 (dl_iterate_phdr_callback): Fix typo.
25 Use VTV_PAGE_SIZE.
26 (__VLTChangePermission): Fix typos.
27
12015-11-09 Alan Modra <amodra@gmail.com> 282015-11-09 Alan Modra <amodra@gmail.com>
2 29
3 * vtv_malloc.cc (obstack_chunk_free): Correct param type. 30 * vtv_malloc.cc (obstack_chunk_free): Correct param type.
diff --git a/libvtv/Makefile.am b/libvtv/Makefile.am
index 24ee90158e8..edfd5ae13d7 100644
--- a/libvtv/Makefile.am
+++ b/libvtv/Makefile.am
@@ -76,11 +76,14 @@ vtv_end.c:
76 rm -f $@ 76 rm -f $@
77 $(LN_S) $(toplevel_srcdir)/libgcc/vtv_end.c $@ 77 $(LN_S) $(toplevel_srcdir)/libgcc/vtv_end.c $@
78 78
79if VTV_CYGMIN 79if VTV_NO_OBSTACK
80 obstack.c: 80 obstack.c:
81 rm -f $@ 81 rm -f $@
82 $(LN_S) $(toplevel_srcdir)/libiberty/obstack.c $@ 82 $(LN_S) $(toplevel_srcdir)/libiberty/obstack.c $@
83 83 > config.h
84endif
85
86if VTV_CYGMIN
84 vtv_stubs.cc: 87 vtv_stubs.cc:
85 rm -f $@ 88 rm -f $@
86 $(LN_S) $(toplevel_srcdir)/libstdc++-v3/libsupc++/vtv_stubs.cc $@ 89 $(LN_S) $(toplevel_srcdir)/libstdc++-v3/libsupc++/vtv_stubs.cc $@
@@ -93,11 +96,12 @@ if VTV_CYGMIN
93endif 96endif
94 97
95if ENABLE_VTABLE_VERIFY 98if ENABLE_VTABLE_VERIFY
99 libvtv_la_SOURCES = $(vtv_sources)
100if VTV_NO_OBSTACK
101 libvtv_la_SOURCES += obstack.c
102endif
96if VTV_CYGMIN 103if VTV_CYGMIN
97 libvtv_la_SOURCES = $(vtv_sources) obstack.c
98 libvtv_stubs_la_SOURCES = $(vtv_stubs_sources) 104 libvtv_stubs_la_SOURCES = $(vtv_stubs_sources)
99else
100 libvtv_la_SOURCES = $(vtv_sources)
101endif 105endif
102 libvtv_include_HEADERS = $(vtv_headers) 106 libvtv_include_HEADERS = $(vtv_headers)
103else 107else
diff --git a/libvtv/Makefile.in b/libvtv/Makefile.in
index 13c6afd6fce..4c8c3fb078e 100644
--- a/libvtv/Makefile.in
+++ b/libvtv/Makefile.in
@@ -53,6 +53,7 @@ POST_UNINSTALL = :
53build_triplet = @build@ 53build_triplet = @build@
54host_triplet = @host@ 54host_triplet = @host@
55target_triplet = @target@ 55target_triplet = @target@
56@ENABLE_VTABLE_VERIFY_TRUE@@VTV_NO_OBSTACK_TRUE@am__append_1 = obstack.c
56subdir = . 57subdir = .
57DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ 58DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
58 $(top_srcdir)/configure $(am__configure_deps) \ 59 $(top_srcdir)/configure $(am__configure_deps) \
@@ -110,11 +111,10 @@ LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
110libvtv_la_DEPENDENCIES = 111libvtv_la_DEPENDENCIES =
111am__objects_1 = vtv_start.lo vtv_malloc.lo vtv_rts.lo vtv_utils.lo \ 112am__objects_1 = vtv_start.lo vtv_malloc.lo vtv_rts.lo vtv_utils.lo \
112 vtv_end.lo 113 vtv_end.lo
113@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_FALSE@am_libvtv_la_OBJECTS = \ 114@ENABLE_VTABLE_VERIFY_TRUE@@VTV_NO_OBSTACK_TRUE@am__objects_2 = \
114@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_FALSE@ $(am__objects_1) 115@ENABLE_VTABLE_VERIFY_TRUE@@VTV_NO_OBSTACK_TRUE@ obstack.lo
115@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@am_libvtv_la_OBJECTS = \ 116@ENABLE_VTABLE_VERIFY_TRUE@am_libvtv_la_OBJECTS = $(am__objects_1) \
116@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@ $(am__objects_1) \ 117@ENABLE_VTABLE_VERIFY_TRUE@ $(am__objects_2)
117@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@ obstack.lo
118libvtv_la_OBJECTS = $(am_libvtv_la_OBJECTS) 118libvtv_la_OBJECTS = $(am_libvtv_la_OBJECTS)
119libvtv_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ 119libvtv_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
120 $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ 120 $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@ -122,9 +122,9 @@ libvtv_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
122@VTV_CYGMIN_FALSE@am_libvtv_la_rpath = -rpath $(toolexeclibdir) 122@VTV_CYGMIN_FALSE@am_libvtv_la_rpath = -rpath $(toolexeclibdir)
123@VTV_CYGMIN_TRUE@am_libvtv_la_rpath = -rpath $(toolexeclibdir) 123@VTV_CYGMIN_TRUE@am_libvtv_la_rpath = -rpath $(toolexeclibdir)
124libvtv_stubs_la_LIBADD = 124libvtv_stubs_la_LIBADD =
125am__objects_2 = vtv_start.lo vtv_stubs.lo vtv_end.lo 125am__objects_3 = vtv_start.lo vtv_stubs.lo vtv_end.lo
126@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@am_libvtv_stubs_la_OBJECTS = \ 126@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@am_libvtv_stubs_la_OBJECTS = \
127@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@ $(am__objects_2) 127@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@ $(am__objects_3)
128libvtv_stubs_la_OBJECTS = $(am_libvtv_stubs_la_OBJECTS) 128libvtv_stubs_la_OBJECTS = $(am_libvtv_stubs_la_OBJECTS)
129libvtv_stubs_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ 129libvtv_stubs_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
130 $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ 130 $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@@ -353,8 +353,8 @@ BUILT_SOURCES = vtv_start.c vtv_end.c
353@VTV_CYGMIN_TRUE@libvtv_la_LDFLAGS = $(lt_host_flags) 353@VTV_CYGMIN_TRUE@libvtv_la_LDFLAGS = $(lt_host_flags)
354@VTV_CYGMIN_TRUE@libvtv_stubs_la_LDFLAGS = $(lt_host_flags) 354@VTV_CYGMIN_TRUE@libvtv_stubs_la_LDFLAGS = $(lt_host_flags)
355@ENABLE_VTABLE_VERIFY_FALSE@libvtv_la_SOURCES = 355@ENABLE_VTABLE_VERIFY_FALSE@libvtv_la_SOURCES =
356@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_FALSE@libvtv_la_SOURCES = $(vtv_sources) 356@ENABLE_VTABLE_VERIFY_TRUE@libvtv_la_SOURCES = $(vtv_sources) \
357@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@libvtv_la_SOURCES = $(vtv_sources) obstack.c 357@ENABLE_VTABLE_VERIFY_TRUE@ $(am__append_1)
358@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@libvtv_stubs_la_SOURCES = $(vtv_stubs_sources) 358@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@libvtv_stubs_la_SOURCES = $(vtv_stubs_sources)
359@ENABLE_VTABLE_VERIFY_FALSE@libvtv_include_HEADERS = 359@ENABLE_VTABLE_VERIFY_FALSE@libvtv_include_HEADERS =
360@ENABLE_VTABLE_VERIFY_TRUE@libvtv_include_HEADERS = $(vtv_headers) 360@ENABLE_VTABLE_VERIFY_TRUE@libvtv_include_HEADERS = $(vtv_headers)
@@ -832,9 +832,10 @@ vtv_end.c:
832 rm -f $@ 832 rm -f $@
833 $(LN_S) $(toplevel_srcdir)/libgcc/vtv_end.c $@ 833 $(LN_S) $(toplevel_srcdir)/libgcc/vtv_end.c $@
834 834
835@VTV_CYGMIN_TRUE@ obstack.c: 835@VTV_NO_OBSTACK_TRUE@ obstack.c:
836@VTV_CYGMIN_TRUE@ rm -f $@ 836@VTV_NO_OBSTACK_TRUE@ rm -f $@
837@VTV_CYGMIN_TRUE@ $(LN_S) $(toplevel_srcdir)/libiberty/obstack.c $@ 837@VTV_NO_OBSTACK_TRUE@ $(LN_S) $(toplevel_srcdir)/libiberty/obstack.c $@
838@VTV_NO_OBSTACK_TRUE@ > config.h
838 839
839@VTV_CYGMIN_TRUE@ vtv_stubs.cc: 840@VTV_CYGMIN_TRUE@ vtv_stubs.cc:
840@VTV_CYGMIN_TRUE@ rm -f $@ 841@VTV_CYGMIN_TRUE@ rm -f $@
diff --git a/libvtv/configure b/libvtv/configure
index c38118cf843..64439f0906b 100755
--- a/libvtv/configure
+++ b/libvtv/configure
@@ -602,6 +602,8 @@ ac_subst_vars='am__EXEEXT_FALSE
602am__EXEEXT_TRUE 602am__EXEEXT_TRUE
603LTLIBOBJS 603LTLIBOBJS
604LIBOBJS 604LIBOBJS
605VTV_NO_OBSTACK_FALSE
606VTV_NO_OBSTACK_TRUE
605VTV_CYGMIN_FALSE 607VTV_CYGMIN_FALSE
606VTV_CYGMIN_TRUE 608VTV_CYGMIN_TRUE
607XCFLAGS 609XCFLAGS
@@ -635,26 +637,6 @@ CXXDEPMODE
635ac_ct_CXX 637ac_ct_CXX
636CXXFLAGS 638CXXFLAGS
637CXX 639CXX
638EGREP
639GREP
640CPP
641am__fastdepCC_FALSE
642am__fastdepCC_TRUE
643CCDEPMODE
644am__nodep
645AMDEPBACKSLASH
646AMDEP_FALSE
647AMDEP_TRUE
648am__quote
649am__include
650DEPDIR
651OBJEXT
652EXEEXT
653ac_ct_CC
654CPPFLAGS
655LDFLAGS
656CFLAGS
657CC
658toolexeclibdir 640toolexeclibdir
659toolexecdir 641toolexecdir
660toplevel_srcdir 642toplevel_srcdir
@@ -665,6 +647,16 @@ MAINT
665MAINTAINER_MODE_FALSE 647MAINTAINER_MODE_FALSE
666MAINTAINER_MODE_TRUE 648MAINTAINER_MODE_TRUE
667multi_basedir 649multi_basedir
650am__fastdepCC_FALSE
651am__fastdepCC_TRUE
652CCDEPMODE
653am__nodep
654AMDEPBACKSLASH
655AMDEP_FALSE
656AMDEP_TRUE
657am__quote
658am__include
659DEPDIR
668am__untar 660am__untar
669am__tar 661am__tar
670AMTAR 662AMTAR
@@ -690,6 +682,16 @@ INSTALL_SCRIPT
690INSTALL_PROGRAM 682INSTALL_PROGRAM
691ENABLE_VTABLE_VERIFY_FALSE 683ENABLE_VTABLE_VERIFY_FALSE
692ENABLE_VTABLE_VERIFY_TRUE 684ENABLE_VTABLE_VERIFY_TRUE
685EGREP
686GREP
687CPP
688OBJEXT
689EXEEXT
690ac_ct_CC
691CPPFLAGS
692LDFLAGS
693CFLAGS
694CC
693LIBSTDCXX_RAW_CXX_LDFLAGS 695LIBSTDCXX_RAW_CXX_LDFLAGS
694LIBSTDCXX_RAW_CXX_CXXFLAGS 696LIBSTDCXX_RAW_CXX_CXXFLAGS
695target_noncanonical 697target_noncanonical
@@ -748,9 +750,9 @@ ac_user_opts='
748enable_option_checking 750enable_option_checking
749enable_version_specific_runtime_libs 751enable_version_specific_runtime_libs
750enable_vtable_verify 752enable_vtable_verify
753enable_dependency_tracking
751enable_multilib 754enable_multilib
752enable_maintainer_mode 755enable_maintainer_mode
753enable_dependency_tracking
754enable_shared 756enable_shared
755enable_static 757enable_static
756with_pic 758with_pic
@@ -1390,11 +1392,11 @@ Optional Features:
1390 --enable-FEATURE[=ARG] include FEATURE [ARG=yes] 1392 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1391 --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory 1393 --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory
1392 --enable-vtable-verify Enable vtable verification feature 1394 --enable-vtable-verify Enable vtable verification feature
1395 --disable-dependency-tracking speeds up one-time build
1396 --enable-dependency-tracking do not reject slow dependency extractors
1393 --enable-multilib build many library versions (default) 1397 --enable-multilib build many library versions (default)
1394 --enable-maintainer-mode enable make rules and dependencies not useful 1398 --enable-maintainer-mode enable make rules and dependencies not useful
1395 (and sometimes confusing) to the casual installer 1399 (and sometimes confusing) to the casual installer
1396 --disable-dependency-tracking speeds up one-time build
1397 --enable-dependency-tracking do not reject slow dependency extractors
1398 --enable-shared[=PKGS] build shared libraries [default=yes] 1400 --enable-shared[=PKGS] build shared libraries [default=yes]
1399 --enable-static[=PKGS] build static libraries [default=yes] 1401 --enable-static[=PKGS] build static libraries [default=yes]
1400 --enable-fast-install[=PKGS] 1402 --enable-fast-install[=PKGS]
@@ -2514,699 +2516,6 @@ esac
2514 2516
2515 2517
2516 2518
2517# Use same top-level configure hooks in libgcc/libstdc++/libvtv.
2518{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-vtable-verify" >&5
2519$as_echo_n "checking for --enable-vtable-verify... " >&6; }
2520# Check whether --enable-vtable-verify was given.
2521if test "${enable_vtable_verify+set}" = set; then :
2522 enableval=$enable_vtable_verify; case "$enableval" in
2523 yes) enable_vtable_verify=yes ;;
2524 no) enable_vtable_verify=no ;;
2525 *) enable_vtable_verify=no;;
2526 esac
2527else
2528 enable_vtable_verify=no
2529fi
2530
2531{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_vtable_verify" >&5
2532$as_echo "$enable_vtable_verify" >&6; }
2533
2534# See if supported.
2535unset VTV_SUPPORTED
2536{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for host support for vtable verification" >&5
2537$as_echo_n "checking for host support for vtable verification... " >&6; }
2538. ${srcdir}/configure.tgt
2539{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $VTV_SUPPORTED" >&5
2540$as_echo "$VTV_SUPPORTED" >&6; }
2541
2542# Decide if it's usable.
2543use_vtable_verify=no
2544if test "x$VTV_SUPPORTED" = "xyes"; then
2545 if test "x$enable_vtable_verify" = "xyes"; then
2546 use_vtable_verify=yes
2547 { $as_echo "$as_me:${as_lineno-$LINENO}: using vtable verification" >&5
2548$as_echo "$as_me: using vtable verification" >&6;}
2549 fi
2550fi
2551 if test $use_vtable_verify = yes; then
2552 ENABLE_VTABLE_VERIFY_TRUE=
2553 ENABLE_VTABLE_VERIFY_FALSE='#'
2554else
2555 ENABLE_VTABLE_VERIFY_TRUE='#'
2556 ENABLE_VTABLE_VERIFY_FALSE=
2557fi
2558
2559
2560am__api_version='1.11'
2561
2562# Find a good install program. We prefer a C program (faster),
2563# so one script is as good as another. But avoid the broken or
2564# incompatible versions:
2565# SysV /etc/install, /usr/sbin/install
2566# SunOS /usr/etc/install
2567# IRIX /sbin/install
2568# AIX /bin/install
2569# AmigaOS /C/install, which installs bootblocks on floppy discs
2570# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
2571# AFS /usr/afsws/bin/install, which mishandles nonexistent args
2572# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
2573# OS/2's system install, which has a completely different semantic
2574# ./install, which can be erroneously created by make from ./install.sh.
2575# Reject install programs that cannot install multiple files.
2576{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
2577$as_echo_n "checking for a BSD-compatible install... " >&6; }
2578if test -z "$INSTALL"; then
2579if test "${ac_cv_path_install+set}" = set; then :
2580 $as_echo_n "(cached) " >&6
2581else
2582 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2583for as_dir in $PATH
2584do
2585 IFS=$as_save_IFS
2586 test -z "$as_dir" && as_dir=.
2587 # Account for people who put trailing slashes in PATH elements.
2588case $as_dir/ in #((
2589 ./ | .// | /[cC]/* | \
2590 /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
2591 ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
2592 /usr/ucb/* ) ;;
2593 *)
2594 # OSF1 and SCO ODT 3.0 have their own names for install.
2595 # Don't use installbsd from OSF since it installs stuff as root
2596 # by default.
2597 for ac_prog in ginstall scoinst install; do
2598 for ac_exec_ext in '' $ac_executable_extensions; do
2599 if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
2600 if test $ac_prog = install &&
2601 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
2602 # AIX install. It has an incompatible calling convention.
2603 :
2604 elif test $ac_prog = install &&
2605 grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
2606 # program-specific install script used by HP pwplus--don't use.
2607 :
2608 else
2609 rm -rf conftest.one conftest.two conftest.dir
2610 echo one > conftest.one
2611 echo two > conftest.two
2612 mkdir conftest.dir
2613 if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
2614 test -s conftest.one && test -s conftest.two &&
2615 test -s conftest.dir/conftest.one &&
2616 test -s conftest.dir/conftest.two
2617 then
2618 ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
2619 break 3
2620 fi
2621 fi
2622 fi
2623 done
2624 done
2625 ;;
2626esac
2627
2628 done
2629IFS=$as_save_IFS
2630
2631rm -rf conftest.one conftest.two conftest.dir
2632
2633fi
2634 if test "${ac_cv_path_install+set}" = set; then
2635 INSTALL=$ac_cv_path_install
2636 else
2637 # As a last resort, use the slow shell script. Don't cache a
2638 # value for INSTALL within a source directory, because that will
2639 # break other packages using the cache if that directory is
2640 # removed, or if the value is a relative name.
2641 INSTALL=$ac_install_sh
2642 fi
2643fi
2644{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
2645$as_echo "$INSTALL" >&6; }
2646
2647# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
2648# It thinks the first close brace ends the variable substitution.
2649test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
2650
2651test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
2652
2653test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
2654
2655{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
2656$as_echo_n "checking whether build environment is sane... " >&6; }
2657# Just in case
2658sleep 1
2659echo timestamp > conftest.file
2660# Reject unsafe characters in $srcdir or the absolute working directory
2661# name. Accept space and tab only in the latter.
2662am_lf='
2663'
2664case `pwd` in
2665 *[\\\"\#\$\&\'\`$am_lf]*)
2666 as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
2667esac
2668case $srcdir in
2669 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
2670 as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
2671esac
2672
2673# Do `set' in a subshell so we don't clobber the current shell's
2674# arguments. Must try -L first in case configure is actually a
2675# symlink; some systems play weird games with the mod time of symlinks
2676# (eg FreeBSD returns the mod time of the symlink's containing
2677# directory).
2678if (
2679 set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
2680 if test "$*" = "X"; then
2681 # -L didn't work.
2682 set X `ls -t "$srcdir/configure" conftest.file`
2683 fi
2684 rm -f conftest.file
2685 if test "$*" != "X $srcdir/configure conftest.file" \
2686 && test "$*" != "X conftest.file $srcdir/configure"; then
2687
2688 # If neither matched, then we have a broken ls. This can happen
2689 # if, for instance, CONFIG_SHELL is bash and it inherits a
2690 # broken ls alias from the environment. This has actually
2691 # happened. Such a system could not be considered "sane".
2692 as_fn_error "ls -t appears to fail. Make sure there is not a broken
2693alias in your environment" "$LINENO" 5
2694 fi
2695
2696 test "$2" = conftest.file
2697 )
2698then
2699 # Ok.
2700 :
2701else
2702 as_fn_error "newly created file is older than distributed files!
2703Check your system clock" "$LINENO" 5
2704fi
2705{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2706$as_echo "yes" >&6; }
2707test "$program_prefix" != NONE &&
2708 program_transform_name="s&^&$program_prefix&;$program_transform_name"
2709# Use a double $ so make ignores it.
2710test "$program_suffix" != NONE &&
2711 program_transform_name="s&\$&$program_suffix&;$program_transform_name"
2712# Double any \ or $.
2713# By default was `s,x,x', remove it if useless.
2714ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
2715program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
2716
2717# expand $ac_aux_dir to an absolute path
2718am_aux_dir=`cd $ac_aux_dir && pwd`
2719
2720if test x"${MISSING+set}" != xset; then
2721 case $am_aux_dir in
2722 *\ * | *\ *)
2723 MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
2724 *)
2725 MISSING="\${SHELL} $am_aux_dir/missing" ;;
2726 esac
2727fi
2728# Use eval to expand $SHELL
2729if eval "$MISSING --run true"; then
2730 am_missing_run="$MISSING --run "
2731else
2732 am_missing_run=
2733 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
2734$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
2735fi
2736
2737if test x"${install_sh}" != xset; then
2738 case $am_aux_dir in
2739 *\ * | *\ *)
2740 install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
2741 *)
2742 install_sh="\${SHELL} $am_aux_dir/install-sh"
2743 esac
2744fi
2745
2746# Installed binaries are usually stripped using `strip' when the user
2747# run `make install-strip'. However `strip' might not be the right
2748# tool to use in cross-compilation environments, therefore Automake
2749# will honor the `STRIP' environment variable to overrule this program.
2750if test "$cross_compiling" != no; then
2751 if test -n "$ac_tool_prefix"; then
2752 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
2753set dummy ${ac_tool_prefix}strip; ac_word=$2
2754{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2755$as_echo_n "checking for $ac_word... " >&6; }
2756if test "${ac_cv_prog_STRIP+set}" = set; then :
2757 $as_echo_n "(cached) " >&6
2758else
2759 if test -n "$STRIP"; then
2760 ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
2761else
2762as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2763for as_dir in $PATH
2764do
2765 IFS=$as_save_IFS
2766 test -z "$as_dir" && as_dir=.
2767 for ac_exec_ext in '' $ac_executable_extensions; do
2768 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2769 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
2770 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2771 break 2
2772 fi
2773done
2774 done
2775IFS=$as_save_IFS
2776
2777fi
2778fi
2779STRIP=$ac_cv_prog_STRIP
2780if test -n "$STRIP"; then
2781 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
2782$as_echo "$STRIP" >&6; }
2783else
2784 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2785$as_echo "no" >&6; }
2786fi
2787
2788
2789fi
2790if test -z "$ac_cv_prog_STRIP"; then
2791 ac_ct_STRIP=$STRIP
2792 # Extract the first word of "strip", so it can be a program name with args.
2793set dummy strip; ac_word=$2
2794{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2795$as_echo_n "checking for $ac_word... " >&6; }
2796if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
2797 $as_echo_n "(cached) " >&6
2798else
2799 if test -n "$ac_ct_STRIP"; then
2800 ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
2801else
2802as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2803for as_dir in $PATH
2804do
2805 IFS=$as_save_IFS
2806 test -z "$as_dir" && as_dir=.
2807 for ac_exec_ext in '' $ac_executable_extensions; do
2808 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2809 ac_cv_prog_ac_ct_STRIP="strip"
2810 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2811 break 2
2812 fi
2813done
2814 done
2815IFS=$as_save_IFS
2816
2817fi
2818fi
2819ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
2820if test -n "$ac_ct_STRIP"; then
2821 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
2822$as_echo "$ac_ct_STRIP" >&6; }
2823else
2824 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2825$as_echo "no" >&6; }
2826fi
2827
2828 if test "x$ac_ct_STRIP" = x; then
2829 STRIP=":"
2830 else
2831 case $cross_compiling:$ac_tool_warned in
2832yes:)
2833{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
2834$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
2835ac_tool_warned=yes ;;
2836esac
2837 STRIP=$ac_ct_STRIP
2838 fi
2839else
2840 STRIP="$ac_cv_prog_STRIP"
2841fi
2842
2843fi
2844INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
2845
2846{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
2847$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
2848if test -z "$MKDIR_P"; then
2849 if test "${ac_cv_path_mkdir+set}" = set; then :
2850 $as_echo_n "(cached) " >&6
2851else
2852 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2853for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
2854do
2855 IFS=$as_save_IFS
2856 test -z "$as_dir" && as_dir=.
2857 for ac_prog in mkdir gmkdir; do
2858 for ac_exec_ext in '' $ac_executable_extensions; do
2859 { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
2860 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
2861 'mkdir (GNU coreutils) '* | \
2862 'mkdir (coreutils) '* | \
2863 'mkdir (fileutils) '4.1*)
2864 ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
2865 break 3;;
2866 esac
2867 done
2868 done
2869 done
2870IFS=$as_save_IFS
2871
2872fi
2873
2874 if test "${ac_cv_path_mkdir+set}" = set; then
2875 MKDIR_P="$ac_cv_path_mkdir -p"
2876 else
2877 # As a last resort, use the slow shell script. Don't cache a
2878 # value for MKDIR_P within a source directory, because that will
2879 # break other packages using the cache if that directory is
2880 # removed, or if the value is a relative name.
2881 test -d ./--version && rmdir ./--version
2882 MKDIR_P="$ac_install_sh -d"
2883 fi
2884fi
2885{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
2886$as_echo "$MKDIR_P" >&6; }
2887
2888mkdir_p="$MKDIR_P"
2889case $mkdir_p in
2890 [\\/$]* | ?:[\\/]*) ;;
2891 */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
2892esac
2893
2894for ac_prog in gawk mawk nawk awk
2895do
2896 # Extract the first word of "$ac_prog", so it can be a program name with args.
2897set dummy $ac_prog; ac_word=$2
2898{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
2899$as_echo_n "checking for $ac_word... " >&6; }
2900if test "${ac_cv_prog_AWK+set}" = set; then :
2901 $as_echo_n "(cached) " >&6
2902else
2903 if test -n "$AWK"; then
2904 ac_cv_prog_AWK="$AWK" # Let the user override the test.
2905else
2906as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
2907for as_dir in $PATH
2908do
2909 IFS=$as_save_IFS
2910 test -z "$as_dir" && as_dir=.
2911 for ac_exec_ext in '' $ac_executable_extensions; do
2912 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
2913 ac_cv_prog_AWK="$ac_prog"
2914 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
2915 break 2
2916 fi
2917done
2918 done
2919IFS=$as_save_IFS
2920
2921fi
2922fi
2923AWK=$ac_cv_prog_AWK
2924if test -n "$AWK"; then
2925 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
2926$as_echo "$AWK" >&6; }
2927else
2928 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2929$as_echo "no" >&6; }
2930fi
2931
2932
2933 test -n "$AWK" && break
2934done
2935
2936{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
2937$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
2938set x ${MAKE-make}
2939ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
2940if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
2941 $as_echo_n "(cached) " >&6
2942else
2943 cat >conftest.make <<\_ACEOF
2944SHELL = /bin/sh
2945all:
2946 @echo '@@@%%%=$(MAKE)=@@@%%%'
2947_ACEOF
2948# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
2949case `${MAKE-make} -f conftest.make 2>/dev/null` in
2950 *@@@%%%=?*=@@@%%%*)
2951 eval ac_cv_prog_make_${ac_make}_set=yes;;
2952 *)
2953 eval ac_cv_prog_make_${ac_make}_set=no;;
2954esac
2955rm -f conftest.make
2956fi
2957if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
2958 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
2959$as_echo "yes" >&6; }
2960 SET_MAKE=
2961else
2962 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
2963$as_echo "no" >&6; }
2964 SET_MAKE="MAKE=${MAKE-make}"
2965fi
2966
2967rm -rf .tst 2>/dev/null
2968mkdir .tst 2>/dev/null
2969if test -d .tst; then
2970 am__leading_dot=.
2971else
2972 am__leading_dot=_
2973fi
2974rmdir .tst 2>/dev/null
2975
2976if test "`cd $srcdir && pwd`" != "`pwd`"; then
2977 # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
2978 # is not polluted with repeated "-I."
2979 am__isrc=' -I$(srcdir)'
2980 # test to see if srcdir already configured
2981 if test -f $srcdir/config.status; then
2982 as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
2983 fi
2984fi
2985
2986# test whether we have cygpath
2987if test -z "$CYGPATH_W"; then
2988 if (cygpath --version) >/dev/null 2>/dev/null; then
2989 CYGPATH_W='cygpath -w'
2990 else
2991 CYGPATH_W=echo
2992 fi
2993fi
2994
2995
2996# Define the identity of the package.
2997 PACKAGE='libvtv'
2998 VERSION='1.0'
2999
3000
3001cat >>confdefs.h <<_ACEOF
3002#define PACKAGE "$PACKAGE"
3003_ACEOF
3004
3005
3006cat >>confdefs.h <<_ACEOF
3007#define VERSION "$VERSION"
3008_ACEOF
3009
3010# Some tools Automake needs.
3011
3012ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
3013
3014
3015AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
3016
3017
3018AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
3019
3020
3021AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
3022
3023
3024MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
3025
3026# We need awk for the "check" target. The system "awk" is bad on
3027# some platforms.
3028# Always define AMTAR for backward compatibility. Yes, it's still used
3029# in the wild :-( We should find a proper way to deprecate it ...
3030AMTAR='$${TAR-tar}'
3031
3032am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
3033
3034
3035
3036
3037
3038# Default to --enable-multilib
3039# Check whether --enable-multilib was given.
3040if test "${enable_multilib+set}" = set; then :
3041 enableval=$enable_multilib; case "$enableval" in
3042 yes) multilib=yes ;;
3043 no) multilib=no ;;
3044 *) as_fn_error "bad value $enableval for multilib option" "$LINENO" 5 ;;
3045 esac
3046else
3047 multilib=yes
3048fi
3049
3050
3051# We may get other options which we leave undocumented:
3052# --with-target-subdir, --with-multisrctop, --with-multisubdir
3053# See config-ml.in if you want the gory details.
3054
3055if test "$srcdir" = "."; then
3056 if test "$with_target_subdir" != "."; then
3057 multi_basedir="$srcdir/$with_multisrctop../.."
3058 else
3059 multi_basedir="$srcdir/$with_multisrctop.."
3060 fi
3061else
3062 multi_basedir="$srcdir/.."
3063fi
3064
3065
3066# Even if the default multilib is not a cross compilation,
3067# it may be that some of the other multilibs are.
3068if test $cross_compiling = no && test $multilib = yes \
3069 && test "x${with_multisubdir}" != x ; then
3070 cross_compiling=maybe
3071fi
3072
3073ac_config_commands="$ac_config_commands default-1"
3074
3075
3076{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
3077$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
3078 # Check whether --enable-maintainer-mode was given.
3079if test "${enable_maintainer_mode+set}" = set; then :
3080 enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
3081else
3082 USE_MAINTAINER_MODE=no
3083fi
3084
3085 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
3086$as_echo "$USE_MAINTAINER_MODE" >&6; }
3087 if test $USE_MAINTAINER_MODE = yes; then
3088 MAINTAINER_MODE_TRUE=
3089 MAINTAINER_MODE_FALSE='#'
3090else
3091 MAINTAINER_MODE_TRUE='#'
3092 MAINTAINER_MODE_FALSE=
3093fi
3094
3095 MAINT=$MAINTAINER_MODE_TRUE
3096
3097
3098
3099
3100
3101 # These need to be absolute paths, yet at the same time need to
3102 # canonicalize only relative paths, because then amd will not unmount
3103 # drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.
3104 libvtv_builddir=`${PWDCMD-pwd}`
3105 case $srcdir in
3106 \\/$* | ?:\\/*) libvtv_srcdir=${srcdir} ;;
3107 *) libvtv_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
3108 esac
3109 toplevel_builddir=${libvtv_builddir}/..
3110 toplevel_srcdir=${libvtv_srcdir}/..
3111
3112
3113
3114
3115
3116
3117# Calculate toolexeclibdir
3118# Also toolexecdir, though it's only used in toolexeclibdir
3119case ${version_specific_libs} in
3120 yes)
3121 # Need the gcc compiler version to know where to install libraries
3122 # and header files if --enable-version-specific-runtime-libs option
3123 # is selected.
3124 toolexecdir='$(libdir)/gcc/$(target_alias)'
3125 toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
3126 ;;
3127 no)
3128 if test -n "$with_cross_host" &&
3129 test x"$with_cross_host" != x"no"; then
3130 # Install a library built with a cross compiler in tooldir, not libdir.
3131 toolexecdir='$(exec_prefix)/$(target_alias)'
3132 toolexeclibdir='$(toolexecdir)/lib'
3133 else
3134 toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
3135 toolexeclibdir='$(libdir)'
3136 fi
3137 multi_os_directory=`$CC -print-multi-os-directory`
3138 case $multi_os_directory in
3139 .) ;; # Avoid trailing /.
3140 *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
3141 esac
3142 ;;
3143esac
3144
3145
3146
3147DEPDIR="${am__leading_dot}deps"
3148
3149ac_config_commands="$ac_config_commands depfiles"
3150
3151
3152am_make=${MAKE-make}
3153cat > confinc << 'END'
3154am__doit:
3155 @echo this is the am__doit target
3156.PHONY: am__doit
3157END
3158# If we don't find an include directive, just comment out the code.
3159{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
3160$as_echo_n "checking for style of include used by $am_make... " >&6; }
3161am__include="#"
3162am__quote=
3163_am_result=none
3164# First try GNU make style include.
3165echo "include confinc" > confmf
3166# Ignore all kinds of additional output from `make'.
3167case `$am_make -s -f confmf 2> /dev/null` in #(
3168*the\ am__doit\ target*)
3169 am__include=include
3170 am__quote=
3171 _am_result=GNU
3172 ;;
3173esac
3174# Now try BSD make style include.
3175if test "$am__include" = "#"; then
3176 echo '.include "confinc"' > confmf
3177 case `$am_make -s -f confmf 2> /dev/null` in #(
3178 *the\ am__doit\ target*)
3179 am__include=.include
3180 am__quote="\""
3181 _am_result=BSD
3182 ;;
3183 esac
3184fi
3185
3186
3187{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
3188$as_echo "$_am_result" >&6; }
3189rm -f confinc confmf
3190
3191# Check whether --enable-dependency-tracking was given.
3192if test "${enable_dependency_tracking+set}" = set; then :
3193 enableval=$enable_dependency_tracking;
3194fi
3195
3196if test "x$enable_dependency_tracking" != xno; then
3197 am_depcomp="$ac_aux_dir/depcomp"
3198 AMDEPBACKSLASH='\'
3199 am__nodep='_no'
3200fi
3201 if test "x$enable_dependency_tracking" != xno; then
3202 AMDEP_TRUE=
3203 AMDEP_FALSE='#'
3204else
3205 AMDEP_TRUE='#'
3206 AMDEP_FALSE=
3207fi
3208
3209
3210ac_ext=c 2519ac_ext=c
3211ac_cpp='$CPP $CPPFLAGS' 2520ac_cpp='$CPP $CPPFLAGS'
3212ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5' 2521ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -3972,134 +3281,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
3972ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 3281ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
3973ac_compiler_gnu=$ac_cv_c_compiler_gnu 3282ac_compiler_gnu=$ac_cv_c_compiler_gnu
3974 3283
3975depcc="$CC" am_compiler_list=
3976
3977{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
3978$as_echo_n "checking dependency style of $depcc... " >&6; }
3979if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
3980 $as_echo_n "(cached) " >&6
3981else
3982 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
3983 # We make a subdir and do the tests there. Otherwise we can end up
3984 # making bogus files that we don't know about and never remove. For
3985 # instance it was reported that on HP-UX the gcc test will end up
3986 # making a dummy file named `D' -- because `-MD' means `put the output
3987 # in D'.
3988 rm -rf conftest.dir
3989 mkdir conftest.dir
3990 # Copy depcomp to subdir because otherwise we won't find it if we're
3991 # using a relative directory.
3992 cp "$am_depcomp" conftest.dir
3993 cd conftest.dir
3994 # We will build objects and dependencies in a subdirectory because
3995 # it helps to detect inapplicable dependency modes. For instance
3996 # both Tru64's cc and ICC support -MD to output dependencies as a
3997 # side effect of compilation, but ICC will put the dependencies in
3998 # the current directory while Tru64 will put them in the object
3999 # directory.
4000 mkdir sub
4001
4002 am_cv_CC_dependencies_compiler_type=none
4003 if test "$am_compiler_list" = ""; then
4004 am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
4005 fi
4006 am__universal=false
4007 case " $depcc " in #(
4008 *\ -arch\ *\ -arch\ *) am__universal=true ;;
4009 esac
4010
4011 for depmode in $am_compiler_list; do
4012 # Setup a source with many dependencies, because some compilers
4013 # like to wrap large dependency lists on column 80 (with \), and
4014 # we should not choose a depcomp mode which is confused by this.
4015 #
4016 # We need to recreate these files for each test, as the compiler may
4017 # overwrite some of them when testing with obscure command lines.
4018 # This happens at least with the AIX C compiler.
4019 : > sub/conftest.c
4020 for i in 1 2 3 4 5 6; do
4021 echo '#include "conftst'$i'.h"' >> sub/conftest.c
4022 # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
4023 # Solaris 8's {/usr,}/bin/sh.
4024 touch sub/conftst$i.h
4025 done
4026 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
4027
4028 # We check with `-c' and `-o' for the sake of the "dashmstdout"
4029 # mode. It turns out that the SunPro C++ compiler does not properly
4030 # handle `-M -o', and we need to detect this. Also, some Intel
4031 # versions had trouble with output in subdirs
4032 am__obj=sub/conftest.${OBJEXT-o}
4033 am__minus_obj="-o $am__obj"
4034 case $depmode in
4035 gcc)
4036 # This depmode causes a compiler race in universal mode.
4037 test "$am__universal" = false || continue
4038 ;;
4039 nosideeffect)
4040 # after this tag, mechanisms are not by side-effect, so they'll
4041 # only be used when explicitly requested
4042 if test "x$enable_dependency_tracking" = xyes; then
4043 continue
4044 else
4045 break
4046 fi
4047 ;;
4048 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
4049 # This compiler won't grok `-c -o', but also, the minuso test has
4050 # not run yet. These depmodes are late enough in the game, and
4051 # so weak that their functioning should not be impacted.
4052 am__obj=conftest.${OBJEXT-o}
4053 am__minus_obj=
4054 ;;
4055 none) break ;;
4056 esac
4057 if depmode=$depmode \
4058 source=sub/conftest.c object=$am__obj \
4059 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
4060 $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
4061 >/dev/null 2>conftest.err &&
4062 grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
4063 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
4064 grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
4065 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
4066 # icc doesn't choke on unknown options, it will just issue warnings
4067 # or remarks (even with -Werror). So we grep stderr for any message
4068 # that says an option was ignored or not supported.
4069 # When given -MP, icc 7.0 and 7.1 complain thusly:
4070 # icc: Command line warning: ignoring option '-M'; no argument required
4071 # The diagnosis changed in icc 8.0:
4072 # icc: Command line remark: option '-MP' not supported
4073 if (grep 'ignoring option' conftest.err ||
4074 grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
4075 am_cv_CC_dependencies_compiler_type=$depmode
4076 break
4077 fi
4078 fi
4079 done
4080
4081 cd ..
4082 rm -rf conftest.dir
4083else
4084 am_cv_CC_dependencies_compiler_type=none
4085fi
4086
4087fi
4088{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
4089$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
4090CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
4091
4092 if
4093 test "x$enable_dependency_tracking" != xno \
4094 && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
4095 am__fastdepCC_TRUE=
4096 am__fastdepCC_FALSE='#'
4097else
4098 am__fastdepCC_TRUE='#'
4099 am__fastdepCC_FALSE=
4100fi
4101
4102
4103 3284
4104ac_ext=c 3285ac_ext=c
4105ac_cpp='$CPP $CPPFLAGS' 3286ac_cpp='$CPP $CPPFLAGS'
@@ -4561,6 +3742,865 @@ $as_echo "$ac_cv_safe_to_define___extensions__" >&6; }
4561 3742
4562 3743
4563 3744
3745# Use same top-level configure hooks in libgcc/libstdc++/libvtv.
3746{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for --enable-vtable-verify" >&5
3747$as_echo_n "checking for --enable-vtable-verify... " >&6; }
3748# Check whether --enable-vtable-verify was given.
3749if test "${enable_vtable_verify+set}" = set; then :
3750 enableval=$enable_vtable_verify; case "$enableval" in
3751 yes) enable_vtable_verify=yes ;;
3752 no) enable_vtable_verify=no ;;
3753 *) enable_vtable_verify=no;;
3754 esac
3755else
3756 enable_vtable_verify=no
3757fi
3758
3759{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_vtable_verify" >&5
3760$as_echo "$enable_vtable_verify" >&6; }
3761
3762# See if supported.
3763unset VTV_SUPPORTED
3764{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for host support for vtable verification" >&5
3765$as_echo_n "checking for host support for vtable verification... " >&6; }
3766. ${srcdir}/configure.tgt
3767case ${host} in
3768 *-*-solaris2*)
3769 # libvtv requires init priority support, which depends on the linker
3770 # used on Solaris.
3771 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for init priority support" >&5
3772$as_echo_n "checking for init priority support... " >&6; }
3773if test "${libvtv_cv_init_priority+set}" = set; then :
3774 $as_echo_n "(cached) " >&6
3775else
3776
3777 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
3778/* end confdefs.h. */
3779
3780int
3781main ()
3782{
3783void ip (void) __attribute__ ((constructor (1)));
3784 ;
3785 return 0;
3786}
3787_ACEOF
3788if ac_fn_c_try_compile "$LINENO"; then :
3789 libgcc_cv_init_priority=yes
3790else
3791 libgcc_cv_init_priority=no
3792fi
3793rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
3794fi
3795{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $libvtv_cv_init_priority" >&5
3796$as_echo "$libvtv_cv_init_priority" >&6; }
3797 if test x$libvtv_cv_init_priority = xno; then
3798 VTV_SUPPORTED=no
3799 fi
3800 # FIXME: Maybe check for dl_iterate_phdr, too? Should be covered by
3801 # configure.tgt restricting to libvtv to Solaris 11+.
3802 ;;
3803esac
3804{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $VTV_SUPPORTED" >&5
3805$as_echo "$VTV_SUPPORTED" >&6; }
3806
3807# Decide if it's usable.
3808use_vtable_verify=no
3809if test "x$VTV_SUPPORTED" = "xyes"; then
3810 if test "x$enable_vtable_verify" = "xyes"; then
3811 use_vtable_verify=yes
3812 { $as_echo "$as_me:${as_lineno-$LINENO}: using vtable verification" >&5
3813$as_echo "$as_me: using vtable verification" >&6;}
3814 fi
3815fi
3816 if test $use_vtable_verify = yes; then
3817 ENABLE_VTABLE_VERIFY_TRUE=
3818 ENABLE_VTABLE_VERIFY_FALSE='#'
3819else
3820 ENABLE_VTABLE_VERIFY_TRUE='#'
3821 ENABLE_VTABLE_VERIFY_FALSE=
3822fi
3823
3824
3825am__api_version='1.11'
3826
3827# Find a good install program. We prefer a C program (faster),
3828# so one script is as good as another. But avoid the broken or
3829# incompatible versions:
3830# SysV /etc/install, /usr/sbin/install
3831# SunOS /usr/etc/install
3832# IRIX /sbin/install
3833# AIX /bin/install
3834# AmigaOS /C/install, which installs bootblocks on floppy discs
3835# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag
3836# AFS /usr/afsws/bin/install, which mishandles nonexistent args
3837# SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
3838# OS/2's system install, which has a completely different semantic
3839# ./install, which can be erroneously created by make from ./install.sh.
3840# Reject install programs that cannot install multiple files.
3841{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
3842$as_echo_n "checking for a BSD-compatible install... " >&6; }
3843if test -z "$INSTALL"; then
3844if test "${ac_cv_path_install+set}" = set; then :
3845 $as_echo_n "(cached) " >&6
3846else
3847 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
3848for as_dir in $PATH
3849do
3850 IFS=$as_save_IFS
3851 test -z "$as_dir" && as_dir=.
3852 # Account for people who put trailing slashes in PATH elements.
3853case $as_dir/ in #((
3854 ./ | .// | /[cC]/* | \
3855 /etc/* | /usr/sbin/* | /usr/etc/* | /sbin/* | /usr/afsws/bin/* | \
3856 ?:[\\/]os2[\\/]install[\\/]* | ?:[\\/]OS2[\\/]INSTALL[\\/]* | \
3857 /usr/ucb/* ) ;;
3858 *)
3859 # OSF1 and SCO ODT 3.0 have their own names for install.
3860 # Don't use installbsd from OSF since it installs stuff as root
3861 # by default.
3862 for ac_prog in ginstall scoinst install; do
3863 for ac_exec_ext in '' $ac_executable_extensions; do
3864 if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
3865 if test $ac_prog = install &&
3866 grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
3867 # AIX install. It has an incompatible calling convention.
3868 :
3869 elif test $ac_prog = install &&
3870 grep pwplus "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
3871 # program-specific install script used by HP pwplus--don't use.
3872 :
3873 else
3874 rm -rf conftest.one conftest.two conftest.dir
3875 echo one > conftest.one
3876 echo two > conftest.two
3877 mkdir conftest.dir
3878 if "$as_dir/$ac_prog$ac_exec_ext" -c conftest.one conftest.two "`pwd`/conftest.dir" &&
3879 test -s conftest.one && test -s conftest.two &&
3880 test -s conftest.dir/conftest.one &&
3881 test -s conftest.dir/conftest.two
3882 then
3883 ac_cv_path_install="$as_dir/$ac_prog$ac_exec_ext -c"
3884 break 3
3885 fi
3886 fi
3887 fi
3888 done
3889 done
3890 ;;
3891esac
3892
3893 done
3894IFS=$as_save_IFS
3895
3896rm -rf conftest.one conftest.two conftest.dir
3897
3898fi
3899 if test "${ac_cv_path_install+set}" = set; then
3900 INSTALL=$ac_cv_path_install
3901 else
3902 # As a last resort, use the slow shell script. Don't cache a
3903 # value for INSTALL within a source directory, because that will
3904 # break other packages using the cache if that directory is
3905 # removed, or if the value is a relative name.
3906 INSTALL=$ac_install_sh
3907 fi
3908fi
3909{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $INSTALL" >&5
3910$as_echo "$INSTALL" >&6; }
3911
3912# Use test -z because SunOS4 sh mishandles braces in ${var-val}.
3913# It thinks the first close brace ends the variable substitution.
3914test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}'
3915
3916test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL}'
3917
3918test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644'
3919
3920{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether build environment is sane" >&5
3921$as_echo_n "checking whether build environment is sane... " >&6; }
3922# Just in case
3923sleep 1
3924echo timestamp > conftest.file
3925# Reject unsafe characters in $srcdir or the absolute working directory
3926# name. Accept space and tab only in the latter.
3927am_lf='
3928'
3929case `pwd` in
3930 *[\\\"\#\$\&\'\`$am_lf]*)
3931 as_fn_error "unsafe absolute working directory name" "$LINENO" 5;;
3932esac
3933case $srcdir in
3934 *[\\\"\#\$\&\'\`$am_lf\ \ ]*)
3935 as_fn_error "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
3936esac
3937
3938# Do `set' in a subshell so we don't clobber the current shell's
3939# arguments. Must try -L first in case configure is actually a
3940# symlink; some systems play weird games with the mod time of symlinks
3941# (eg FreeBSD returns the mod time of the symlink's containing
3942# directory).
3943if (
3944 set X `ls -Lt "$srcdir/configure" conftest.file 2> /dev/null`
3945 if test "$*" = "X"; then
3946 # -L didn't work.
3947 set X `ls -t "$srcdir/configure" conftest.file`
3948 fi
3949 rm -f conftest.file
3950 if test "$*" != "X $srcdir/configure conftest.file" \
3951 && test "$*" != "X conftest.file $srcdir/configure"; then
3952
3953 # If neither matched, then we have a broken ls. This can happen
3954 # if, for instance, CONFIG_SHELL is bash and it inherits a
3955 # broken ls alias from the environment. This has actually
3956 # happened. Such a system could not be considered "sane".
3957 as_fn_error "ls -t appears to fail. Make sure there is not a broken
3958alias in your environment" "$LINENO" 5
3959 fi
3960
3961 test "$2" = conftest.file
3962 )
3963then
3964 # Ok.
3965 :
3966else
3967 as_fn_error "newly created file is older than distributed files!
3968Check your system clock" "$LINENO" 5
3969fi
3970{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
3971$as_echo "yes" >&6; }
3972test "$program_prefix" != NONE &&
3973 program_transform_name="s&^&$program_prefix&;$program_transform_name"
3974# Use a double $ so make ignores it.
3975test "$program_suffix" != NONE &&
3976 program_transform_name="s&\$&$program_suffix&;$program_transform_name"
3977# Double any \ or $.
3978# By default was `s,x,x', remove it if useless.
3979ac_script='s/[\\$]/&&/g;s/;s,x,x,$//'
3980program_transform_name=`$as_echo "$program_transform_name" | sed "$ac_script"`
3981
3982# expand $ac_aux_dir to an absolute path
3983am_aux_dir=`cd $ac_aux_dir && pwd`
3984
3985if test x"${MISSING+set}" != xset; then
3986 case $am_aux_dir in
3987 *\ * | *\ *)
3988 MISSING="\${SHELL} \"$am_aux_dir/missing\"" ;;
3989 *)
3990 MISSING="\${SHELL} $am_aux_dir/missing" ;;
3991 esac
3992fi
3993# Use eval to expand $SHELL
3994if eval "$MISSING --run true"; then
3995 am_missing_run="$MISSING --run "
3996else
3997 am_missing_run=
3998 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: \`missing' script is too old or missing" >&5
3999$as_echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
4000fi
4001
4002if test x"${install_sh}" != xset; then
4003 case $am_aux_dir in
4004 *\ * | *\ *)
4005 install_sh="\${SHELL} '$am_aux_dir/install-sh'" ;;
4006 *)
4007 install_sh="\${SHELL} $am_aux_dir/install-sh"
4008 esac
4009fi
4010
4011# Installed binaries are usually stripped using `strip' when the user
4012# run `make install-strip'. However `strip' might not be the right
4013# tool to use in cross-compilation environments, therefore Automake
4014# will honor the `STRIP' environment variable to overrule this program.
4015if test "$cross_compiling" != no; then
4016 if test -n "$ac_tool_prefix"; then
4017 # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
4018set dummy ${ac_tool_prefix}strip; ac_word=$2
4019{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4020$as_echo_n "checking for $ac_word... " >&6; }
4021if test "${ac_cv_prog_STRIP+set}" = set; then :
4022 $as_echo_n "(cached) " >&6
4023else
4024 if test -n "$STRIP"; then
4025 ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
4026else
4027as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4028for as_dir in $PATH
4029do
4030 IFS=$as_save_IFS
4031 test -z "$as_dir" && as_dir=.
4032 for ac_exec_ext in '' $ac_executable_extensions; do
4033 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4034 ac_cv_prog_STRIP="${ac_tool_prefix}strip"
4035 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4036 break 2
4037 fi
4038done
4039 done
4040IFS=$as_save_IFS
4041
4042fi
4043fi
4044STRIP=$ac_cv_prog_STRIP
4045if test -n "$STRIP"; then
4046 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
4047$as_echo "$STRIP" >&6; }
4048else
4049 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4050$as_echo "no" >&6; }
4051fi
4052
4053
4054fi
4055if test -z "$ac_cv_prog_STRIP"; then
4056 ac_ct_STRIP=$STRIP
4057 # Extract the first word of "strip", so it can be a program name with args.
4058set dummy strip; ac_word=$2
4059{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4060$as_echo_n "checking for $ac_word... " >&6; }
4061if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
4062 $as_echo_n "(cached) " >&6
4063else
4064 if test -n "$ac_ct_STRIP"; then
4065 ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
4066else
4067as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4068for as_dir in $PATH
4069do
4070 IFS=$as_save_IFS
4071 test -z "$as_dir" && as_dir=.
4072 for ac_exec_ext in '' $ac_executable_extensions; do
4073 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4074 ac_cv_prog_ac_ct_STRIP="strip"
4075 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4076 break 2
4077 fi
4078done
4079 done
4080IFS=$as_save_IFS
4081
4082fi
4083fi
4084ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
4085if test -n "$ac_ct_STRIP"; then
4086 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
4087$as_echo "$ac_ct_STRIP" >&6; }
4088else
4089 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4090$as_echo "no" >&6; }
4091fi
4092
4093 if test "x$ac_ct_STRIP" = x; then
4094 STRIP=":"
4095 else
4096 case $cross_compiling:$ac_tool_warned in
4097yes:)
4098{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
4099$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
4100ac_tool_warned=yes ;;
4101esac
4102 STRIP=$ac_ct_STRIP
4103 fi
4104else
4105 STRIP="$ac_cv_prog_STRIP"
4106fi
4107
4108fi
4109INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
4110
4111{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
4112$as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
4113if test -z "$MKDIR_P"; then
4114 if test "${ac_cv_path_mkdir+set}" = set; then :
4115 $as_echo_n "(cached) " >&6
4116else
4117 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4118for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
4119do
4120 IFS=$as_save_IFS
4121 test -z "$as_dir" && as_dir=.
4122 for ac_prog in mkdir gmkdir; do
4123 for ac_exec_ext in '' $ac_executable_extensions; do
4124 { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
4125 case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
4126 'mkdir (GNU coreutils) '* | \
4127 'mkdir (coreutils) '* | \
4128 'mkdir (fileutils) '4.1*)
4129 ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
4130 break 3;;
4131 esac
4132 done
4133 done
4134 done
4135IFS=$as_save_IFS
4136
4137fi
4138
4139 if test "${ac_cv_path_mkdir+set}" = set; then
4140 MKDIR_P="$ac_cv_path_mkdir -p"
4141 else
4142 # As a last resort, use the slow shell script. Don't cache a
4143 # value for MKDIR_P within a source directory, because that will
4144 # break other packages using the cache if that directory is
4145 # removed, or if the value is a relative name.
4146 test -d ./--version && rmdir ./--version
4147 MKDIR_P="$ac_install_sh -d"
4148 fi
4149fi
4150{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $MKDIR_P" >&5
4151$as_echo "$MKDIR_P" >&6; }
4152
4153mkdir_p="$MKDIR_P"
4154case $mkdir_p in
4155 [\\/$]* | ?:[\\/]*) ;;
4156 */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
4157esac
4158
4159for ac_prog in gawk mawk nawk awk
4160do
4161 # Extract the first word of "$ac_prog", so it can be a program name with args.
4162set dummy $ac_prog; ac_word=$2
4163{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
4164$as_echo_n "checking for $ac_word... " >&6; }
4165if test "${ac_cv_prog_AWK+set}" = set; then :
4166 $as_echo_n "(cached) " >&6
4167else
4168 if test -n "$AWK"; then
4169 ac_cv_prog_AWK="$AWK" # Let the user override the test.
4170else
4171as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
4172for as_dir in $PATH
4173do
4174 IFS=$as_save_IFS
4175 test -z "$as_dir" && as_dir=.
4176 for ac_exec_ext in '' $ac_executable_extensions; do
4177 if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
4178 ac_cv_prog_AWK="$ac_prog"
4179 $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
4180 break 2
4181 fi
4182done
4183 done
4184IFS=$as_save_IFS
4185
4186fi
4187fi
4188AWK=$ac_cv_prog_AWK
4189if test -n "$AWK"; then
4190 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AWK" >&5
4191$as_echo "$AWK" >&6; }
4192else
4193 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4194$as_echo "no" >&6; }
4195fi
4196
4197
4198 test -n "$AWK" && break
4199done
4200
4201{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether ${MAKE-make} sets \$(MAKE)" >&5
4202$as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
4203set x ${MAKE-make}
4204ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
4205if { as_var=ac_cv_prog_make_${ac_make}_set; eval "test \"\${$as_var+set}\" = set"; }; then :
4206 $as_echo_n "(cached) " >&6
4207else
4208 cat >conftest.make <<\_ACEOF
4209SHELL = /bin/sh
4210all:
4211 @echo '@@@%%%=$(MAKE)=@@@%%%'
4212_ACEOF
4213# GNU make sometimes prints "make[1]: Entering...", which would confuse us.
4214case `${MAKE-make} -f conftest.make 2>/dev/null` in
4215 *@@@%%%=?*=@@@%%%*)
4216 eval ac_cv_prog_make_${ac_make}_set=yes;;
4217 *)
4218 eval ac_cv_prog_make_${ac_make}_set=no;;
4219esac
4220rm -f conftest.make
4221fi
4222if eval test \$ac_cv_prog_make_${ac_make}_set = yes; then
4223 { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
4224$as_echo "yes" >&6; }
4225 SET_MAKE=
4226else
4227 { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
4228$as_echo "no" >&6; }
4229 SET_MAKE="MAKE=${MAKE-make}"
4230fi
4231
4232rm -rf .tst 2>/dev/null
4233mkdir .tst 2>/dev/null
4234if test -d .tst; then
4235 am__leading_dot=.
4236else
4237 am__leading_dot=_
4238fi
4239rmdir .tst 2>/dev/null
4240
4241DEPDIR="${am__leading_dot}deps"
4242
4243ac_config_commands="$ac_config_commands depfiles"
4244
4245
4246am_make=${MAKE-make}
4247cat > confinc << 'END'
4248am__doit:
4249 @echo this is the am__doit target
4250.PHONY: am__doit
4251END
4252# If we don't find an include directive, just comment out the code.
4253{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for style of include used by $am_make" >&5
4254$as_echo_n "checking for style of include used by $am_make... " >&6; }
4255am__include="#"
4256am__quote=
4257_am_result=none
4258# First try GNU make style include.
4259echo "include confinc" > confmf
4260# Ignore all kinds of additional output from `make'.
4261case `$am_make -s -f confmf 2> /dev/null` in #(
4262*the\ am__doit\ target*)
4263 am__include=include
4264 am__quote=
4265 _am_result=GNU
4266 ;;
4267esac
4268# Now try BSD make style include.
4269if test "$am__include" = "#"; then
4270 echo '.include "confinc"' > confmf
4271 case `$am_make -s -f confmf 2> /dev/null` in #(
4272 *the\ am__doit\ target*)
4273 am__include=.include
4274 am__quote="\""
4275 _am_result=BSD
4276 ;;
4277 esac
4278fi
4279
4280
4281{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $_am_result" >&5
4282$as_echo "$_am_result" >&6; }
4283rm -f confinc confmf
4284
4285# Check whether --enable-dependency-tracking was given.
4286if test "${enable_dependency_tracking+set}" = set; then :
4287 enableval=$enable_dependency_tracking;
4288fi
4289
4290if test "x$enable_dependency_tracking" != xno; then
4291 am_depcomp="$ac_aux_dir/depcomp"
4292 AMDEPBACKSLASH='\'
4293 am__nodep='_no'
4294fi
4295 if test "x$enable_dependency_tracking" != xno; then
4296 AMDEP_TRUE=
4297 AMDEP_FALSE='#'
4298else
4299 AMDEP_TRUE='#'
4300 AMDEP_FALSE=
4301fi
4302
4303
4304if test "`cd $srcdir && pwd`" != "`pwd`"; then
4305 # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
4306 # is not polluted with repeated "-I."
4307 am__isrc=' -I$(srcdir)'
4308 # test to see if srcdir already configured
4309 if test -f $srcdir/config.status; then
4310 as_fn_error "source directory already configured; run \"make distclean\" there first" "$LINENO" 5
4311 fi
4312fi
4313
4314# test whether we have cygpath
4315if test -z "$CYGPATH_W"; then
4316 if (cygpath --version) >/dev/null 2>/dev/null; then
4317 CYGPATH_W='cygpath -w'
4318 else
4319 CYGPATH_W=echo
4320 fi
4321fi
4322
4323
4324# Define the identity of the package.
4325 PACKAGE='libvtv'
4326 VERSION='1.0'
4327
4328
4329cat >>confdefs.h <<_ACEOF
4330#define PACKAGE "$PACKAGE"
4331_ACEOF
4332
4333
4334cat >>confdefs.h <<_ACEOF
4335#define VERSION "$VERSION"
4336_ACEOF
4337
4338# Some tools Automake needs.
4339
4340ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"}
4341
4342
4343AUTOCONF=${AUTOCONF-"${am_missing_run}autoconf"}
4344
4345
4346AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake-${am__api_version}"}
4347
4348
4349AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"}
4350
4351
4352MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
4353
4354# We need awk for the "check" target. The system "awk" is bad on
4355# some platforms.
4356# Always define AMTAR for backward compatibility. Yes, it's still used
4357# in the wild :-( We should find a proper way to deprecate it ...
4358AMTAR='$${TAR-tar}'
4359
4360am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
4361
4362
4363
4364
4365depcc="$CC" am_compiler_list=
4366
4367{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
4368$as_echo_n "checking dependency style of $depcc... " >&6; }
4369if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
4370 $as_echo_n "(cached) " >&6
4371else
4372 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
4373 # We make a subdir and do the tests there. Otherwise we can end up
4374 # making bogus files that we don't know about and never remove. For
4375 # instance it was reported that on HP-UX the gcc test will end up
4376 # making a dummy file named `D' -- because `-MD' means `put the output
4377 # in D'.
4378 rm -rf conftest.dir
4379 mkdir conftest.dir
4380 # Copy depcomp to subdir because otherwise we won't find it if we're
4381 # using a relative directory.
4382 cp "$am_depcomp" conftest.dir
4383 cd conftest.dir
4384 # We will build objects and dependencies in a subdirectory because
4385 # it helps to detect inapplicable dependency modes. For instance
4386 # both Tru64's cc and ICC support -MD to output dependencies as a
4387 # side effect of compilation, but ICC will put the dependencies in
4388 # the current directory while Tru64 will put them in the object
4389 # directory.
4390 mkdir sub
4391
4392 am_cv_CC_dependencies_compiler_type=none
4393 if test "$am_compiler_list" = ""; then
4394 am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
4395 fi
4396 am__universal=false
4397 case " $depcc " in #(
4398 *\ -arch\ *\ -arch\ *) am__universal=true ;;
4399 esac
4400
4401 for depmode in $am_compiler_list; do
4402 # Setup a source with many dependencies, because some compilers
4403 # like to wrap large dependency lists on column 80 (with \), and
4404 # we should not choose a depcomp mode which is confused by this.
4405 #
4406 # We need to recreate these files for each test, as the compiler may
4407 # overwrite some of them when testing with obscure command lines.
4408 # This happens at least with the AIX C compiler.
4409 : > sub/conftest.c
4410 for i in 1 2 3 4 5 6; do
4411 echo '#include "conftst'$i'.h"' >> sub/conftest.c
4412 # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
4413 # Solaris 8's {/usr,}/bin/sh.
4414 touch sub/conftst$i.h
4415 done
4416 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
4417
4418 # We check with `-c' and `-o' for the sake of the "dashmstdout"
4419 # mode. It turns out that the SunPro C++ compiler does not properly
4420 # handle `-M -o', and we need to detect this. Also, some Intel
4421 # versions had trouble with output in subdirs
4422 am__obj=sub/conftest.${OBJEXT-o}
4423 am__minus_obj="-o $am__obj"
4424 case $depmode in
4425 gcc)
4426 # This depmode causes a compiler race in universal mode.
4427 test "$am__universal" = false || continue
4428 ;;
4429 nosideeffect)
4430 # after this tag, mechanisms are not by side-effect, so they'll
4431 # only be used when explicitly requested
4432 if test "x$enable_dependency_tracking" = xyes; then
4433 continue
4434 else
4435 break
4436 fi
4437 ;;
4438 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
4439 # This compiler won't grok `-c -o', but also, the minuso test has
4440 # not run yet. These depmodes are late enough in the game, and
4441 # so weak that their functioning should not be impacted.
4442 am__obj=conftest.${OBJEXT-o}
4443 am__minus_obj=
4444 ;;
4445 none) break ;;
4446 esac
4447 if depmode=$depmode \
4448 source=sub/conftest.c object=$am__obj \
4449 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
4450 $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
4451 >/dev/null 2>conftest.err &&
4452 grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
4453 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
4454 grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
4455 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
4456 # icc doesn't choke on unknown options, it will just issue warnings
4457 # or remarks (even with -Werror). So we grep stderr for any message
4458 # that says an option was ignored or not supported.
4459 # When given -MP, icc 7.0 and 7.1 complain thusly:
4460 # icc: Command line warning: ignoring option '-M'; no argument required
4461 # The diagnosis changed in icc 8.0:
4462 # icc: Command line remark: option '-MP' not supported
4463 if (grep 'ignoring option' conftest.err ||
4464 grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
4465 am_cv_CC_dependencies_compiler_type=$depmode
4466 break
4467 fi
4468 fi
4469 done
4470
4471 cd ..
4472 rm -rf conftest.dir
4473else
4474 am_cv_CC_dependencies_compiler_type=none
4475fi
4476
4477fi
4478{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
4479$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
4480CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
4481
4482 if
4483 test "x$enable_dependency_tracking" != xno \
4484 && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
4485 am__fastdepCC_TRUE=
4486 am__fastdepCC_FALSE='#'
4487else
4488 am__fastdepCC_TRUE='#'
4489 am__fastdepCC_FALSE=
4490fi
4491
4492
4493
4494# Default to --enable-multilib
4495# Check whether --enable-multilib was given.
4496if test "${enable_multilib+set}" = set; then :
4497 enableval=$enable_multilib; case "$enableval" in
4498 yes) multilib=yes ;;
4499 no) multilib=no ;;
4500 *) as_fn_error "bad value $enableval for multilib option" "$LINENO" 5 ;;
4501 esac
4502else
4503 multilib=yes
4504fi
4505
4506
4507# We may get other options which we leave undocumented:
4508# --with-target-subdir, --with-multisrctop, --with-multisubdir
4509# See config-ml.in if you want the gory details.
4510
4511if test "$srcdir" = "."; then
4512 if test "$with_target_subdir" != "."; then
4513 multi_basedir="$srcdir/$with_multisrctop../.."
4514 else
4515 multi_basedir="$srcdir/$with_multisrctop.."
4516 fi
4517else
4518 multi_basedir="$srcdir/.."
4519fi
4520
4521
4522# Even if the default multilib is not a cross compilation,
4523# it may be that some of the other multilibs are.
4524if test $cross_compiling = no && test $multilib = yes \
4525 && test "x${with_multisubdir}" != x ; then
4526 cross_compiling=maybe
4527fi
4528
4529ac_config_commands="$ac_config_commands default-1"
4530
4531
4532{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5
4533$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
4534 # Check whether --enable-maintainer-mode was given.
4535if test "${enable_maintainer_mode+set}" = set; then :
4536 enableval=$enable_maintainer_mode; USE_MAINTAINER_MODE=$enableval
4537else
4538 USE_MAINTAINER_MODE=no
4539fi
4540
4541 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $USE_MAINTAINER_MODE" >&5
4542$as_echo "$USE_MAINTAINER_MODE" >&6; }
4543 if test $USE_MAINTAINER_MODE = yes; then
4544 MAINTAINER_MODE_TRUE=
4545 MAINTAINER_MODE_FALSE='#'
4546else
4547 MAINTAINER_MODE_TRUE='#'
4548 MAINTAINER_MODE_FALSE=
4549fi
4550
4551 MAINT=$MAINTAINER_MODE_TRUE
4552
4553
4554
4555
4556
4557 # These need to be absolute paths, yet at the same time need to
4558 # canonicalize only relative paths, because then amd will not unmount
4559 # drives. Thus the use of PWDCMD: set it to 'pawd' or 'amq -w' if using amd.
4560 libvtv_builddir=`${PWDCMD-pwd}`
4561 case $srcdir in
4562 \\/$* | ?:\\/*) libvtv_srcdir=${srcdir} ;;
4563 *) libvtv_srcdir=`cd "$srcdir" && ${PWDCMD-pwd} || echo "$srcdir"` ;;
4564 esac
4565 toplevel_builddir=${libvtv_builddir}/..
4566 toplevel_srcdir=${libvtv_srcdir}/..
4567
4568
4569
4570
4571
4572
4573# Calculate toolexeclibdir
4574# Also toolexecdir, though it's only used in toolexeclibdir
4575case ${version_specific_libs} in
4576 yes)
4577 # Need the gcc compiler version to know where to install libraries
4578 # and header files if --enable-version-specific-runtime-libs option
4579 # is selected.
4580 toolexecdir='$(libdir)/gcc/$(target_alias)'
4581 toolexeclibdir='$(toolexecdir)/$(gcc_version)$(MULTISUBDIR)'
4582 ;;
4583 no)
4584 if test -n "$with_cross_host" &&
4585 test x"$with_cross_host" != x"no"; then
4586 # Install a library built with a cross compiler in tooldir, not libdir.
4587 toolexecdir='$(exec_prefix)/$(target_alias)'
4588 toolexeclibdir='$(toolexecdir)/lib'
4589 else
4590 toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
4591 toolexeclibdir='$(libdir)'
4592 fi
4593 multi_os_directory=`$CC -print-multi-os-directory`
4594 case $multi_os_directory in
4595 .) ;; # Avoid trailing /.
4596 *) toolexeclibdir=$toolexeclibdir/$multi_os_directory ;;
4597 esac
4598 ;;
4599esac
4600
4601
4602
4603
4564for ac_func in __secure_getenv 4604for ac_func in __secure_getenv
4565do : 4605do :
4566 ac_fn_c_check_func "$LINENO" "__secure_getenv" "ac_cv_func___secure_getenv" 4606 ac_fn_c_check_func "$LINENO" "__secure_getenv" "ac_cv_func___secure_getenv"
@@ -4586,6 +4626,20 @@ fi
4586done 4626done
4587 4627
4588 4628
4629for ac_func in getexecname __fortify_fail
4630do :
4631 as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh`
4632ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var"
4633eval as_val=\$$as_ac_var
4634 if test "x$as_val" = x""yes; then :
4635 cat >>confdefs.h <<_ACEOF
4636#define `$as_echo "HAVE_$ac_func" | $as_tr_cpp` 1
4637_ACEOF
4638
4639fi
4640done
4641
4642
4589# Check for programs. 4643# Check for programs.
4590 4644
4591 4645
@@ -5129,134 +5183,6 @@ ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
5129ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5' 5183ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
5130ac_compiler_gnu=$ac_cv_c_compiler_gnu 5184ac_compiler_gnu=$ac_cv_c_compiler_gnu
5131 5185
5132depcc="$CC" am_compiler_list=
5133
5134{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
5135$as_echo_n "checking dependency style of $depcc... " >&6; }
5136if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
5137 $as_echo_n "(cached) " >&6
5138else
5139 if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
5140 # We make a subdir and do the tests there. Otherwise we can end up
5141 # making bogus files that we don't know about and never remove. For
5142 # instance it was reported that on HP-UX the gcc test will end up
5143 # making a dummy file named `D' -- because `-MD' means `put the output
5144 # in D'.
5145 rm -rf conftest.dir
5146 mkdir conftest.dir
5147 # Copy depcomp to subdir because otherwise we won't find it if we're
5148 # using a relative directory.
5149 cp "$am_depcomp" conftest.dir
5150 cd conftest.dir
5151 # We will build objects and dependencies in a subdirectory because
5152 # it helps to detect inapplicable dependency modes. For instance
5153 # both Tru64's cc and ICC support -MD to output dependencies as a
5154 # side effect of compilation, but ICC will put the dependencies in
5155 # the current directory while Tru64 will put them in the object
5156 # directory.
5157 mkdir sub
5158
5159 am_cv_CC_dependencies_compiler_type=none
5160 if test "$am_compiler_list" = ""; then
5161 am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
5162 fi
5163 am__universal=false
5164 case " $depcc " in #(
5165 *\ -arch\ *\ -arch\ *) am__universal=true ;;
5166 esac
5167
5168 for depmode in $am_compiler_list; do
5169 # Setup a source with many dependencies, because some compilers
5170 # like to wrap large dependency lists on column 80 (with \), and
5171 # we should not choose a depcomp mode which is confused by this.
5172 #
5173 # We need to recreate these files for each test, as the compiler may
5174 # overwrite some of them when testing with obscure command lines.
5175 # This happens at least with the AIX C compiler.
5176 : > sub/conftest.c
5177 for i in 1 2 3 4 5 6; do
5178 echo '#include "conftst'$i'.h"' >> sub/conftest.c
5179 # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
5180 # Solaris 8's {/usr,}/bin/sh.
5181 touch sub/conftst$i.h
5182 done
5183 echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
5184
5185 # We check with `-c' and `-o' for the sake of the "dashmstdout"
5186 # mode. It turns out that the SunPro C++ compiler does not properly
5187 # handle `-M -o', and we need to detect this. Also, some Intel
5188 # versions had trouble with output in subdirs
5189 am__obj=sub/conftest.${OBJEXT-o}
5190 am__minus_obj="-o $am__obj"
5191 case $depmode in
5192 gcc)
5193 # This depmode causes a compiler race in universal mode.
5194 test "$am__universal" = false || continue
5195 ;;
5196 nosideeffect)
5197 # after this tag, mechanisms are not by side-effect, so they'll
5198 # only be used when explicitly requested
5199 if test "x$enable_dependency_tracking" = xyes; then
5200 continue
5201 else
5202 break
5203 fi
5204 ;;
5205 msvc7 | msvc7msys | msvisualcpp | msvcmsys)
5206 # This compiler won't grok `-c -o', but also, the minuso test has
5207 # not run yet. These depmodes are late enough in the game, and
5208 # so weak that their functioning should not be impacted.
5209 am__obj=conftest.${OBJEXT-o}
5210 am__minus_obj=
5211 ;;
5212 none) break ;;
5213 esac
5214 if depmode=$depmode \
5215 source=sub/conftest.c object=$am__obj \
5216 depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
5217 $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
5218 >/dev/null 2>conftest.err &&
5219 grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
5220 grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
5221 grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
5222 ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
5223 # icc doesn't choke on unknown options, it will just issue warnings
5224 # or remarks (even with -Werror). So we grep stderr for any message
5225 # that says an option was ignored or not supported.
5226 # When given -MP, icc 7.0 and 7.1 complain thusly:
5227 # icc: Command line warning: ignoring option '-M'; no argument required
5228 # The diagnosis changed in icc 8.0:
5229 # icc: Command line remark: option '-MP' not supported
5230 if (grep 'ignoring option' conftest.err ||
5231 grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
5232 am_cv_CC_dependencies_compiler_type=$depmode
5233 break
5234 fi
5235 fi
5236 done
5237
5238 cd ..
5239 rm -rf conftest.dir
5240else
5241 am_cv_CC_dependencies_compiler_type=none
5242fi
5243
5244fi
5245{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CC_dependencies_compiler_type" >&5
5246$as_echo "$am_cv_CC_dependencies_compiler_type" >&6; }
5247CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
5248
5249 if
5250 test "x$enable_dependency_tracking" != xno \
5251 && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
5252 am__fastdepCC_TRUE=
5253 am__fastdepCC_FALSE='#'
5254else
5255 am__fastdepCC_TRUE='#'
5256 am__fastdepCC_FALSE=
5257fi
5258
5259
5260ac_ext=cpp 5186ac_ext=cpp
5261ac_cpp='$CXXCPP $CPPFLAGS' 5187ac_cpp='$CXXCPP $CPPFLAGS'
5262ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5' 5188ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
@@ -12135,7 +12061,7 @@ else
12135 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 12061 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12136 lt_status=$lt_dlunknown 12062 lt_status=$lt_dlunknown
12137 cat > conftest.$ac_ext <<_LT_EOF 12063 cat > conftest.$ac_ext <<_LT_EOF
12138#line 12138 "configure" 12064#line 12064 "configure"
12139#include "confdefs.h" 12065#include "confdefs.h"
12140 12066
12141#if HAVE_DLFCN_H 12067#if HAVE_DLFCN_H
@@ -12241,7 +12167,7 @@ else
12241 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 12167 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12242 lt_status=$lt_dlunknown 12168 lt_status=$lt_dlunknown
12243 cat > conftest.$ac_ext <<_LT_EOF 12169 cat > conftest.$ac_ext <<_LT_EOF
12244#line 12244 "configure" 12170#line 12170 "configure"
12245#include "confdefs.h" 12171#include "confdefs.h"
12246 12172
12247#if HAVE_DLFCN_H 12173#if HAVE_DLFCN_H
@@ -15558,6 +15484,26 @@ else
15558fi 15484fi
15559 15485
15560 15486
15487for ac_func in _obstack_begin
15488do :
15489 ac_fn_c_check_func "$LINENO" "_obstack_begin" "ac_cv_func__obstack_begin"
15490if test "x$ac_cv_func__obstack_begin" = x""yes; then :
15491 cat >>confdefs.h <<_ACEOF
15492#define HAVE__OBSTACK_BEGIN 1
15493_ACEOF
15494
15495fi
15496done
15497
15498 if test $ac_cv_func__obstack_begin = no; then
15499 VTV_NO_OBSTACK_TRUE=
15500 VTV_NO_OBSTACK_FALSE='#'
15501else
15502 VTV_NO_OBSTACK_TRUE='#'
15503 VTV_NO_OBSTACK_FALSE=
15504fi
15505
15506
15561cat >confcache <<\_ACEOF 15507cat >confcache <<\_ACEOF
15562# This file is a shell script that caches the results of configure 15508# This file is a shell script that caches the results of configure
15563# tests run on this system so they can be shared between configure 15509# tests run on this system so they can be shared between configure
@@ -15695,6 +15641,14 @@ if test -z "${ENABLE_VTABLE_VERIFY_TRUE}" && test -z "${ENABLE_VTABLE_VERIFY_FAL
15695 as_fn_error "conditional \"ENABLE_VTABLE_VERIFY\" was never defined. 15641 as_fn_error "conditional \"ENABLE_VTABLE_VERIFY\" was never defined.
15696Usually this means the macro was only invoked conditionally." "$LINENO" 5 15642Usually this means the macro was only invoked conditionally." "$LINENO" 5
15697fi 15643fi
15644if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
15645 as_fn_error "conditional \"AMDEP\" was never defined.
15646Usually this means the macro was only invoked conditionally." "$LINENO" 5
15647fi
15648if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
15649 as_fn_error "conditional \"am__fastdepCC\" was never defined.
15650Usually this means the macro was only invoked conditionally." "$LINENO" 5
15651fi
15698 if test -n "$EXEEXT"; then 15652 if test -n "$EXEEXT"; then
15699 am__EXEEXT_TRUE= 15653 am__EXEEXT_TRUE=
15700 am__EXEEXT_FALSE='#' 15654 am__EXEEXT_FALSE='#'
@@ -15707,18 +15661,6 @@ if test -z "${MAINTAINER_MODE_TRUE}" && test -z "${MAINTAINER_MODE_FALSE}"; then
15707 as_fn_error "conditional \"MAINTAINER_MODE\" was never defined. 15661 as_fn_error "conditional \"MAINTAINER_MODE\" was never defined.
15708Usually this means the macro was only invoked conditionally." "$LINENO" 5 15662Usually this means the macro was only invoked conditionally." "$LINENO" 5
15709fi 15663fi
15710if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
15711 as_fn_error "conditional \"AMDEP\" was never defined.
15712Usually this means the macro was only invoked conditionally." "$LINENO" 5
15713fi
15714if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
15715 as_fn_error "conditional \"am__fastdepCC\" was never defined.
15716Usually this means the macro was only invoked conditionally." "$LINENO" 5
15717fi
15718if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
15719 as_fn_error "conditional \"am__fastdepCC\" was never defined.
15720Usually this means the macro was only invoked conditionally." "$LINENO" 5
15721fi
15722if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then 15664if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
15723 as_fn_error "conditional \"am__fastdepCXX\" was never defined. 15665 as_fn_error "conditional \"am__fastdepCXX\" was never defined.
15724Usually this means the macro was only invoked conditionally." "$LINENO" 5 15666Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -15727,6 +15669,10 @@ if test -z "${VTV_CYGMIN_TRUE}" && test -z "${VTV_CYGMIN_FALSE}"; then
15727 as_fn_error "conditional \"VTV_CYGMIN\" was never defined. 15669 as_fn_error "conditional \"VTV_CYGMIN\" was never defined.
15728Usually this means the macro was only invoked conditionally." "$LINENO" 5 15670Usually this means the macro was only invoked conditionally." "$LINENO" 5
15729fi 15671fi
15672if test -z "${VTV_NO_OBSTACK_TRUE}" && test -z "${VTV_NO_OBSTACK_FALSE}"; then
15673 as_fn_error "conditional \"VTV_NO_OBSTACK\" was never defined.
15674Usually this means the macro was only invoked conditionally." "$LINENO" 5
15675fi
15730 15676
15731: ${CONFIG_STATUS=./config.status} 15677: ${CONFIG_STATUS=./config.status}
15732ac_write_fail=0 15678ac_write_fail=0
@@ -16292,6 +16238,7 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
16292# 16238#
16293# INIT-COMMANDS 16239# INIT-COMMANDS
16294# 16240#
16241AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
16295 16242
16296srcdir="$srcdir" 16243srcdir="$srcdir"
16297host="$host" 16244host="$host"
@@ -16306,7 +16253,6 @@ CC="$CC"
16306CXX="$CXX" 16253CXX="$CXX"
16307GFORTRAN="$GFORTRAN" 16254GFORTRAN="$GFORTRAN"
16308GCJ="$GCJ" 16255GCJ="$GCJ"
16309AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
16310 16256
16311 16257
16312# The HP-UX ksh and POSIX shell print the target directory to stdout 16258# The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -16676,8 +16622,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
16676for ac_config_target in $ac_config_targets 16622for ac_config_target in $ac_config_targets
16677do 16623do
16678 case $ac_config_target in 16624 case $ac_config_target in
16679 "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
16680 "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; 16625 "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
16626 "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
16681 "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; 16627 "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
16682 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; 16628 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
16683 "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; 16629 "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
@@ -17099,14 +17045,6 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
17099 17045
17100 17046
17101 case $ac_file$ac_mode in 17047 case $ac_file$ac_mode in
17102 "default-1":C)
17103# Only add multilib support code if we just rebuilt the top-level
17104# Makefile.
17105case " $CONFIG_FILES " in
17106 *" Makefile "*)
17107 ac_file=Makefile . ${multi_basedir}/config-ml.in
17108 ;;
17109esac ;;
17110 "depfiles":C) test x"$AMDEP_TRUE" != x"" || { 17048 "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
17111 # Autoconf 2.62 quotes --file arguments for eval, but not when files 17049 # Autoconf 2.62 quotes --file arguments for eval, but not when files
17112 # are listed without --file. Let's play safe and only enable the eval 17050 # are listed without --file. Let's play safe and only enable the eval
@@ -17202,6 +17140,14 @@ $as_echo X"$file" |
17202 done 17140 done
17203} 17141}
17204 ;; 17142 ;;
17143 "default-1":C)
17144# Only add multilib support code if we just rebuilt the top-level
17145# Makefile.
17146case " $CONFIG_FILES " in
17147 *" Makefile "*)
17148 ac_file=Makefile . ${multi_basedir}/config-ml.in
17149 ;;
17150esac ;;
17205 "libtool":C) 17151 "libtool":C)
17206 17152
17207 # See if we are running on zsh, and set the options which allow our 17153 # See if we are running on zsh, and set the options which allow our
diff --git a/libvtv/configure.ac b/libvtv/configure.ac
index f0af8ede0c4..32dc21aac64 100644
--- a/libvtv/configure.ac
+++ b/libvtv/configure.ac
@@ -27,6 +27,8 @@ target_alias=${target_alias-$host_alias}
27AC_SUBST(target_alias) 27AC_SUBST(target_alias)
28GCC_LIBSTDCXX_RAW_CXX_FLAGS 28GCC_LIBSTDCXX_RAW_CXX_FLAGS
29 29
30AC_USE_SYSTEM_EXTENSIONS
31
30# Use same top-level configure hooks in libgcc/libstdc++/libvtv. 32# Use same top-level configure hooks in libgcc/libstdc++/libvtv.
31AC_MSG_CHECKING([for --enable-vtable-verify]) 33AC_MSG_CHECKING([for --enable-vtable-verify])
32AC_ARG_ENABLE(vtable-verify, 34AC_ARG_ENABLE(vtable-verify,
@@ -43,6 +45,21 @@ AC_MSG_RESULT($enable_vtable_verify)
43unset VTV_SUPPORTED 45unset VTV_SUPPORTED
44AC_MSG_CHECKING([for host support for vtable verification]) 46AC_MSG_CHECKING([for host support for vtable verification])
45. ${srcdir}/configure.tgt 47. ${srcdir}/configure.tgt
48case ${host} in
49 *-*-solaris2*)
50 # libvtv requires init priority support, which depends on the linker
51 # used on Solaris.
52 AC_CACHE_CHECK(for init priority support, libvtv_cv_init_priority, [
53 AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,
54 [[void ip (void) __attribute__ ((constructor (1)));]])],
55 [libgcc_cv_init_priority=yes],[libgcc_cv_init_priority=no])])
56 if test x$libvtv_cv_init_priority = xno; then
57 VTV_SUPPORTED=no
58 fi
59 # FIXME: Maybe check for dl_iterate_phdr, too? Should be covered by
60 # configure.tgt restricting to libvtv to Solaris 11+.
61 ;;
62esac
46AC_MSG_RESULT($VTV_SUPPORTED) 63AC_MSG_RESULT($VTV_SUPPORTED)
47 64
48# Decide if it's usable. 65# Decide if it's usable.
@@ -97,6 +114,8 @@ AC_CHECK_FUNCS([__secure_getenv])
97AC_GNU_SOURCE 114AC_GNU_SOURCE
98AC_CHECK_FUNCS([secure_getenv]) 115AC_CHECK_FUNCS([secure_getenv])
99 116
117AC_CHECK_FUNCS([getexecname __fortify_fail])
118
100# Check for programs. 119# Check for programs.
101m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) 120m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
102m4_define([_AC_ARG_VAR_PRECIOUS],[]) 121m4_define([_AC_ARG_VAR_PRECIOUS],[])
@@ -167,4 +186,7 @@ esac
167 186
168AM_CONDITIONAL(VTV_CYGMIN, test $vtv_cygmin = yes) 187AM_CONDITIONAL(VTV_CYGMIN, test $vtv_cygmin = yes)
169 188
189AC_CHECK_FUNCS([_obstack_begin])
190AM_CONDITIONAL(VTV_NO_OBSTACK, test $ac_cv_func__obstack_begin = no)
191
170AC_OUTPUT 192AC_OUTPUT
diff --git a/libvtv/configure.tgt b/libvtv/configure.tgt
index adcff5c50ce..d63904d07fa 100644
--- a/libvtv/configure.tgt
+++ b/libvtv/configure.tgt
@@ -23,6 +23,12 @@ VTV_SUPPORTED=no
23case "${target}" in 23case "${target}" in
24 *-*-*android*) 24 *-*-*android*)
25 ;; 25 ;;
26 *-*-solaris2.1[1-9]*)
27 # Vtable verification requires constructor priority support and
28 # dl_iterate_phdr. The former requires a dynamic check in
29 # configure.ac, the latter is fully present in Solaris 11 only.
30 VTV_SUPPORTED=yes
31 ;;
26 x86_64-*-linux* | i?86-*-linux*) 32 x86_64-*-linux* | i?86-*-linux*)
27 VTV_SUPPORTED=yes 33 VTV_SUPPORTED=yes
28 ;; 34 ;;
diff --git a/libvtv/vtv_rts.cc b/libvtv/vtv_rts.cc
index be60ba5f716..ccc777b4161 100644
--- a/libvtv/vtv_rts.cc
+++ b/libvtv/vtv_rts.cc
@@ -150,13 +150,11 @@
150 150
151#include "vtv-change-permission.h" 151#include "vtv-change-permission.h"
152 152
153#if defined (__CYGWIN__) || defined (__MINGW32__) 153#ifdef HAVE_GETEXECNAME
154// porting: fix link error to libc 154const char *program_invocation_name;
155void __fortify_fail (const char * msg){ 155#endif
156 OutputDebugString(msg); 156
157 abort(); 157#ifdef HAVE___FORTIFY_FAIL
158}
159#else
160extern "C" { 158extern "C" {
161 159
162 /* __fortify_fail is a function in glibc that calls __libc_message, 160 /* __fortify_fail is a function in glibc that calls __libc_message,
@@ -173,6 +171,20 @@ extern "C" {
173 extern void __fortify_fail (const char *) __attribute__((noreturn)); 171 extern void __fortify_fail (const char *) __attribute__((noreturn));
174 172
175} /* extern "C" */ 173} /* extern "C" */
174#else
175#if defined (__CYGWIN__) || defined (__MINGW32__)
176// porting: fix link error to libc
177void __fortify_fail (const char * msg){
178 OutputDebugString(msg);
179 abort();
180}
181#else
182// FIXME: Provide backtrace via libbacktrace?
183void __fortify_fail (const char *msg) {
184 write (2, msg, strlen (msg));
185 abort ();
186}
187#endif
176#endif 188#endif
177 189
178/* The following variables are used only for debugging and performance 190/* The following variables are used only for debugging and performance
@@ -573,6 +585,9 @@ read_section_offset_and_length (struct dl_phdr_info *info,
573 /* Get the name of the main executable. This may or may not include 585 /* Get the name of the main executable. This may or may not include
574 arguments passed to the program. Find the first space, assume it 586 arguments passed to the program. Find the first space, assume it
575 is the start of the argument list, and change it to a '\0'. */ 587 is the start of the argument list, and change it to a '\0'. */
588#ifdef HAVE_GETEXECNAME
589 program_invocation_name = getexecname ();
590#endif
576 snprintf (program_name, sizeof (program_name), program_invocation_name); 591 snprintf (program_name, sizeof (program_name), program_invocation_name);
577 592
578 /* Check to see if we already have the data for this file. */ 593 /* Check to see if we already have the data for this file. */
@@ -663,7 +678,10 @@ read_section_offset_and_length (struct dl_phdr_info *info,
663 size. */ 678 size. */
664 *sect_offset = sect_hdr.sh_addr; 679 *sect_offset = sect_hdr.sh_addr;
665 if (!is_libvtv) 680 if (!is_libvtv)
666 *sect_len = sect_hdr.sh_size - VTV_PAGE_SIZE; 681 {
682 VTV_ASSERT (sect_hdr.sh_size - VTV_PAGE_SIZE >= 0);
683 *sect_len = sect_hdr.sh_size - VTV_PAGE_SIZE;
684 }
667 else 685 else
668 *sect_len = sect_hdr.sh_size; 686 *sect_len = sect_hdr.sh_size;
669 found = true; 687 found = true;
@@ -784,7 +802,7 @@ iterate_modules (void *data)
784 if (debug_functions) 802 if (debug_functions)
785 { 803 {
786 snprintf (buffer, sizeof (buffer), 804 snprintf (buffer, sizeof (buffer),
787 "Failed called to mprotect for %s error: ", 805 "Failed call to mprotect for %s error: ",
788 (*mprotect_flags & PROT_WRITE) ? 806 (*mprotect_flags & PROT_WRITE) ?
789 "READ/WRITE" : "READ-ONLY"); 807 "READ/WRITE" : "READ-ONLY");
790 log_memory_protection_data (buffer); 808 log_memory_protection_data (buffer);
@@ -804,9 +822,8 @@ iterate_modules (void *data)
804 } 822 }
805 } 823 }
806 increment_num_calls (&num_calls_to_mprotect); 824 increment_num_calls (&num_calls_to_mprotect);
807 /* num_pages_protected += (map_sect_len + VTV_PAGE_SIZE - 1) 825 num_pages_protected += (map_sect_len + VTV_PAGE_SIZE - 1)
808 / VTV_PAGE_SIZE; */ 826 / VTV_PAGE_SIZE;
809 num_pages_protected += (map_sect_len + 4096 - 1) / 4096;
810 continue; 827 continue;
811 } 828 }
812 } 829 }
@@ -853,6 +870,9 @@ dl_iterate_phdr_callback (struct dl_phdr_info *info, size_t, void *data)
853 /* Get the name of the main executable. This may or may not include 870 /* Get the name of the main executable. This may or may not include
854 arguments passed to the program. Find the first space, assume it 871 arguments passed to the program. Find the first space, assume it
855 is the start of the argument list, and change it to a '\0'. */ 872 is the start of the argument list, and change it to a '\0'. */
873#ifdef HAVE_GETEXECNAME
874 program_invocation_name = getexecname ();
875#endif
856 snprintf (program_name, sizeof (program_name), program_invocation_name); 876 snprintf (program_name, sizeof (program_name), program_invocation_name);
857 877
858 read_section_offset_and_length (info, map_sect_name, *mprotect_flags, 878 read_section_offset_and_length (info, map_sect_name, *mprotect_flags,
@@ -896,7 +916,7 @@ dl_iterate_phdr_callback (struct dl_phdr_info *info, size_t, void *data)
896 if (debug_functions) 916 if (debug_functions)
897 { 917 {
898 snprintf (buffer, sizeof (buffer), 918 snprintf (buffer, sizeof (buffer),
899 "Failed called to mprotect for %s error: ", 919 "Failed call to mprotect for %s error: ",
900 (*mprotect_flags & PROT_WRITE) ? 920 (*mprotect_flags & PROT_WRITE) ?
901 "READ/WRITE" : "READ-ONLY"); 921 "READ/WRITE" : "READ-ONLY");
902 log_memory_protection_data (buffer); 922 log_memory_protection_data (buffer);
@@ -916,8 +936,7 @@ dl_iterate_phdr_callback (struct dl_phdr_info *info, size_t, void *data)
916 } 936 }
917 } 937 }
918 increment_num_calls (&num_calls_to_mprotect); 938 increment_num_calls (&num_calls_to_mprotect);
919 /* num_pages_protected += (map_sect_len + VTV_PAGE_SIZE - 1) / VTV_PAGE_SIZE; */ 939 num_pages_protected += (map_sect_len + VTV_PAGE_SIZE - 1) / VTV_PAGE_SIZE;
920 num_pages_protected += (map_sect_len + 4096 - 1) / 4096;
921 } 940 }
922 941
923 return 0; 942 return 0;
@@ -1054,9 +1073,9 @@ __VLTChangePermission (int perm)
1054 if (debug_functions) 1073 if (debug_functions)
1055 { 1074 {
1056 if (perm == __VLTP_READ_WRITE) 1075 if (perm == __VLTP_READ_WRITE)
1057 fprintf (stdout, "Changing VLT permisisons to Read-Write.\n"); 1076 fprintf (stdout, "Changing VLT permissions to Read-Write.\n");
1058 else if (perm == __VLTP_READ_ONLY) 1077 else if (perm == __VLTP_READ_ONLY)
1059 fprintf (stdout, "Changing VLT permissions to Read-only.\n"); 1078 fprintf (stdout, "Changing VLT permissions to Read-Only.\n");
1060 1079
1061 else 1080 else
1062 fprintf (stdout, "Unrecognized permissions value: %d\n", perm); 1081 fprintf (stdout, "Unrecognized permissions value: %d\n", perm);