summaryrefslogtreecommitdiffstats
path: root/libvtv
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2015-12-02 18:18:51 +0000
committerMatthias Klose <doko@gcc.gnu.org>2015-12-02 18:18:51 +0000
commit701fa326a18df74cabd79cfef314ebbe5847d23b (patch)
tree6f91f3bb5e5eea0912b0b84e88ad01a6aa0548b3 /libvtv
parentnvptx.c (enum nvptx_shuffle_kind): New. (diff)
downloadgcc-701fa326a18df74cabd79cfef314ebbe5847d23b.tar.gz
gcc-701fa326a18df74cabd79cfef314ebbe5847d23b.tar.bz2
gcc-701fa326a18df74cabd79cfef314ebbe5847d23b.tar.xz
configure.ac: Move AM_ENABLE_MULTILIB before GCC_LIBSTDCXX_RAW_CXX_FLAGS.
2015-12-02 Matthias Klose <doko@ubuntu.com> * configure.ac: Move AM_ENABLE_MULTILIB before GCC_LIBSTDCXX_RAW_CXX_FLAGS. * configure: Regenerate. From-SVN: r231193
Diffstat (limited to 'libvtv')
-rw-r--r--libvtv/ChangeLog6
-rwxr-xr-xlibvtv/configure109
-rw-r--r--libvtv/configure.ac3
3 files changed, 63 insertions, 55 deletions
diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog
index 02dba258e16..c6c75d39b03 100644
--- a/libvtv/ChangeLog
+++ b/libvtv/ChangeLog
@@ -1,3 +1,9 @@
12015-12-02 Matthias Klose <doko@ubuntu.com>
2
3 * configure.ac: Move AM_ENABLE_MULTILIB before
4 GCC_LIBSTDCXX_RAW_CXX_FLAGS.
5 * configure: Regenerate.
6
12015-11-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> 72015-11-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
2 8
3 * configure.tgt (*-*-solaris2.[1-9]*): Declare supported. 9 * configure.tgt (*-*-solaris2.[1-9]*): Declare supported.
diff --git a/libvtv/configure b/libvtv/configure
index 64439f0906b..ea1a17f6c7b 100755
--- a/libvtv/configure
+++ b/libvtv/configure
@@ -646,7 +646,6 @@ libvtv_builddir
646MAINT 646MAINT
647MAINTAINER_MODE_FALSE 647MAINTAINER_MODE_FALSE
648MAINTAINER_MODE_TRUE 648MAINTAINER_MODE_TRUE
649multi_basedir
650am__fastdepCC_FALSE 649am__fastdepCC_FALSE
651am__fastdepCC_TRUE 650am__fastdepCC_TRUE
652CCDEPMODE 651CCDEPMODE
@@ -707,6 +706,7 @@ build_os
707build_vendor 706build_vendor
708build_cpu 707build_cpu
709build 708build
709multi_basedir
710target_alias 710target_alias
711host_alias 711host_alias
712build_alias 712build_alias
@@ -748,10 +748,10 @@ SHELL'
748ac_subst_files='' 748ac_subst_files=''
749ac_user_opts=' 749ac_user_opts='
750enable_option_checking 750enable_option_checking
751enable_multilib
751enable_version_specific_runtime_libs 752enable_version_specific_runtime_libs
752enable_vtable_verify 753enable_vtable_verify
753enable_dependency_tracking 754enable_dependency_tracking
754enable_multilib
755enable_maintainer_mode 755enable_maintainer_mode
756enable_shared 756enable_shared
757enable_static 757enable_static
@@ -1390,11 +1390,11 @@ Optional Features:
1390 --disable-option-checking ignore unrecognized --enable/--with options 1390 --disable-option-checking ignore unrecognized --enable/--with options
1391 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no) 1391 --disable-FEATURE do not include FEATURE (same as --enable-FEATURE=no)
1392 --enable-FEATURE[=ARG] include FEATURE [ARG=yes] 1392 --enable-FEATURE[=ARG] include FEATURE [ARG=yes]
1393 --enable-multilib build many library versions (default)
1393 --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory 1394 --enable-version-specific-runtime-libs Specify that runtime libraries should be installed in a compiler-specific directory
1394 --enable-vtable-verify Enable vtable verification feature 1395 --enable-vtable-verify Enable vtable verification feature
1395 --disable-dependency-tracking speeds up one-time build 1396 --disable-dependency-tracking speeds up one-time build
1396 --enable-dependency-tracking do not reject slow dependency extractors 1397 --enable-dependency-tracking do not reject slow dependency extractors
1397 --enable-multilib build many library versions (default)
1398 --enable-maintainer-mode enable make rules and dependencies not useful 1398 --enable-maintainer-mode enable make rules and dependencies not useful
1399 (and sometimes confusing) to the casual installer 1399 (and sometimes confusing) to the casual installer
1400 --enable-shared[=PKGS] build shared libraries [default=yes] 1400 --enable-shared[=PKGS] build shared libraries [default=yes]
@@ -2330,6 +2330,44 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
2330#AC_INIT(package-unused, version-unused, libvtv) 2330#AC_INIT(package-unused, version-unused, libvtv)
2331 2331
2332 2332
2333# Default to --enable-multilib
2334# Check whether --enable-multilib was given.
2335if test "${enable_multilib+set}" = set; then :
2336 enableval=$enable_multilib; case "$enableval" in
2337 yes) multilib=yes ;;
2338 no) multilib=no ;;
2339 *) as_fn_error "bad value $enableval for multilib option" "$LINENO" 5 ;;
2340 esac
2341else
2342 multilib=yes
2343fi
2344
2345
2346# We may get other options which we leave undocumented:
2347# --with-target-subdir, --with-multisrctop, --with-multisubdir
2348# See config-ml.in if you want the gory details.
2349
2350if test "$srcdir" = "."; then
2351 if test "$with_target_subdir" != "."; then
2352 multi_basedir="$srcdir/$with_multisrctop../.."
2353 else
2354 multi_basedir="$srcdir/$with_multisrctop.."
2355 fi
2356else
2357 multi_basedir="$srcdir/.."
2358fi
2359
2360
2361# Even if the default multilib is not a cross compilation,
2362# it may be that some of the other multilibs are.
2363if test $cross_compiling = no && test $multilib = yes \
2364 && test "x${with_multisubdir}" != x ; then
2365 cross_compiling=maybe
2366fi
2367
2368ac_config_commands="$ac_config_commands default-1"
2369
2370
2333# ------- 2371# -------
2334# Options 2372# Options
2335# ------- 2373# -------
@@ -4491,43 +4529,6 @@ fi
4491 4529
4492 4530
4493 4531
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
4532{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to enable maintainer-specific portions of Makefiles" >&5 4533{ $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$as_echo_n "checking whether to enable maintainer-specific portions of Makefiles... " >&6; }
@@ -10033,7 +10034,7 @@ _LT_EOF
10033 if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then 10034 if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
10034 export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' 10035 export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
10035 else 10036 else
10036 export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' 10037 export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
10037 fi 10038 fi
10038 aix_use_runtimelinking=no 10039 aix_use_runtimelinking=no
10039 10040
@@ -12061,7 +12062,7 @@ else
12061 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 12062 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12062 lt_status=$lt_dlunknown 12063 lt_status=$lt_dlunknown
12063 cat > conftest.$ac_ext <<_LT_EOF 12064 cat > conftest.$ac_ext <<_LT_EOF
12064#line 12064 "configure" 12065#line 12065 "configure"
12065#include "confdefs.h" 12066#include "confdefs.h"
12066 12067
12067#if HAVE_DLFCN_H 12068#if HAVE_DLFCN_H
@@ -12167,7 +12168,7 @@ else
12167 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2 12168 lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
12168 lt_status=$lt_dlunknown 12169 lt_status=$lt_dlunknown
12169 cat > conftest.$ac_ext <<_LT_EOF 12170 cat > conftest.$ac_ext <<_LT_EOF
12170#line 12170 "configure" 12171#line 12171 "configure"
12171#include "confdefs.h" 12172#include "confdefs.h"
12172 12173
12173#if HAVE_DLFCN_H 12174#if HAVE_DLFCN_H
@@ -14519,7 +14520,7 @@ $as_echo_n "checking whether the $compiler linker ($LD) supports shared librarie
14519 if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then 14520 if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
14520 export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' 14521 export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
14521 else 14522 else
14522 export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols' 14523 export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "L")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
14523 fi 14524 fi
14524 ;; 14525 ;;
14525 pw32*) 14526 pw32*)
@@ -16238,7 +16239,6 @@ cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
16238# 16239#
16239# INIT-COMMANDS 16240# INIT-COMMANDS
16240# 16241#
16241AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
16242 16242
16243srcdir="$srcdir" 16243srcdir="$srcdir"
16244host="$host" 16244host="$host"
@@ -16253,6 +16253,7 @@ CC="$CC"
16253CXX="$CXX" 16253CXX="$CXX"
16254GFORTRAN="$GFORTRAN" 16254GFORTRAN="$GFORTRAN"
16255GCJ="$GCJ" 16255GCJ="$GCJ"
16256AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
16256 16257
16257 16258
16258# The HP-UX ksh and POSIX shell print the target directory to stdout 16259# The HP-UX ksh and POSIX shell print the target directory to stdout
@@ -16622,8 +16623,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
16622for ac_config_target in $ac_config_targets 16623for ac_config_target in $ac_config_targets
16623do 16624do
16624 case $ac_config_target in 16625 case $ac_config_target in
16625 "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
16626 "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; 16626 "default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
16627 "depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
16627 "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;; 16628 "libtool") CONFIG_COMMANDS="$CONFIG_COMMANDS libtool" ;;
16628 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;; 16629 "Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
16629 "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;; 16630 "testsuite/Makefile") CONFIG_FILES="$CONFIG_FILES testsuite/Makefile" ;;
@@ -17045,6 +17046,14 @@ $as_echo "$as_me: executing $ac_file commands" >&6;}
17045 17046
17046 17047
17047 case $ac_file$ac_mode in 17048 case $ac_file$ac_mode in
17049 "default-1":C)
17050# Only add multilib support code if we just rebuilt the top-level
17051# Makefile.
17052case " $CONFIG_FILES " in
17053 *" Makefile "*)
17054 ac_file=Makefile . ${multi_basedir}/config-ml.in
17055 ;;
17056esac ;;
17048 "depfiles":C) test x"$AMDEP_TRUE" != x"" || { 17057 "depfiles":C) test x"$AMDEP_TRUE" != x"" || {
17049 # Autoconf 2.62 quotes --file arguments for eval, but not when files 17058 # Autoconf 2.62 quotes --file arguments for eval, but not when files
17050 # are listed without --file. Let's play safe and only enable the eval 17059 # are listed without --file. Let's play safe and only enable the eval
@@ -17140,14 +17149,6 @@ $as_echo X"$file" |
17140 done 17149 done
17141} 17150}
17142 ;; 17151 ;;
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 ;;
17151 "libtool":C) 17152 "libtool":C)
17152 17153
17153 # See if we are running on zsh, and set the options which allow our 17154 # 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 32dc21aac64..19c65083ee1 100644
--- a/libvtv/configure.ac
+++ b/libvtv/configure.ac
@@ -6,6 +6,8 @@ AC_INIT([GNU Vtable Verification Runtime Library], 1.0,,[libvtv])
6#AC_INIT(package-unused, version-unused, libvtv) 6#AC_INIT(package-unused, version-unused, libvtv)
7AC_CONFIG_SRCDIR([vtv_rts.h]) 7AC_CONFIG_SRCDIR([vtv_rts.h])
8 8
9AM_ENABLE_MULTILIB(, ..)
10
9# ------- 11# -------
10# Options 12# Options
11# ------- 13# -------
@@ -73,7 +75,6 @@ fi
73AM_CONDITIONAL(ENABLE_VTABLE_VERIFY, test $use_vtable_verify = yes) 75AM_CONDITIONAL(ENABLE_VTABLE_VERIFY, test $use_vtable_verify = yes)
74 76
75AM_INIT_AUTOMAKE(foreign no-dist) 77AM_INIT_AUTOMAKE(foreign no-dist)
76AM_ENABLE_MULTILIB(, ..)
77AM_MAINTAINER_MODE 78AM_MAINTAINER_MODE
78 79
79LIBVTV_CONFIGURE 80LIBVTV_CONFIGURE