From 441fb2cdb76e26ef0e559d87d3f0f1302a0c4b7c Mon Sep 17 00:00:00 2001 From: Caroline Tice Date: Wed, 12 Aug 2015 08:40:11 -0700 Subject: [PATCH] Fix warnings when bootstrapping on darwin with vtable verification enabled. libstdc++-v3/ChangeLog: 2015-08-11 Caroline Tice PR 66521, Contributed by Eric Gallager * acinclude.m4 (VTV_CXXLINKFLAGS): Make this variable OS-specific, and fix the rpath flag to work properly for darwin. * configure: Regenerated. From-SVN: r226820 --- libstdc++-v3/ChangeLog | 7 +++++++ libstdc++-v3/acinclude.m4 | 7 ++++++- libstdc++-v3/configure | 7 ++++++- 3 files changed, 19 insertions(+), 2 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 4fe808d6606..f92a67d1fd3 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,10 @@ +2015-08-12 Caroline Tice + + PR 66521, Contributed by Eric Gallager + * acinclude.m4 (VTV_CXXLINKFLAGS): Make this variable OS-specific, and + fix the rpath flag to work properly for darwin. + * configure: Regenerated. + 2015-08-12 Jonathan Wakely * doc/xml/manual/appendix_contributing.xml: Update patch email policy. diff --git a/libstdc++-v3/acinclude.m4 b/libstdc++-v3/acinclude.m4 index 11f48f96724..78c1a8255fe 100644 --- a/libstdc++-v3/acinclude.m4 +++ b/libstdc++-v3/acinclude.m4 @@ -2325,14 +2325,19 @@ AC_DEFUN([GLIBCXX_ENABLE_VTABLE_VERIFY], [ case ${target_os} in cygwin*|mingw32*) VTV_CXXFLAGS="-fvtable-verify=std -Wl,-lvtv,-u_vtable_map_vars_start,-u_vtable_map_vars_end" + VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,--rpath -Wl,${toplevel_builddir}/libvtv/.libs" vtv_cygmin=yes ;; + darwin*) + VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u,_vtable_map_vars_start -Wl,-u,_vtable_map_vars_end" + VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,-rpath,${toplevel_builddir}/libvtv/.libs" + ;; *) VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end" + VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,--rpath -Wl,${toplevel_builddir}/libvtv/.libs" ;; esac VTV_PCH_CXXFLAGS="-fvtable-verify=std" - VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,--rpath -Wl,${toplevel_builddir}/libvtv/.libs" else VTV_CXXFLAGS= VTV_PCH_CXXFLAGS= diff --git a/libstdc++-v3/configure b/libstdc++-v3/configure index e9521d6dec5..3bee21204f6 100755 --- a/libstdc++-v3/configure +++ b/libstdc++-v3/configure @@ -17433,14 +17433,19 @@ $as_echo "$enable_vtable_verify" >&6; } case ${target_os} in cygwin*|mingw32*) VTV_CXXFLAGS="-fvtable-verify=std -Wl,-lvtv,-u_vtable_map_vars_start,-u_vtable_map_vars_end" + VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,--rpath -Wl,${toplevel_builddir}/libvtv/.libs" vtv_cygmin=yes ;; + darwin*) + VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u,_vtable_map_vars_start -Wl,-u,_vtable_map_vars_end" + VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,-rpath,${toplevel_builddir}/libvtv/.libs" + ;; *) VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end" + VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,--rpath -Wl,${toplevel_builddir}/libvtv/.libs" ;; esac VTV_PCH_CXXFLAGS="-fvtable-verify=std" - VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,--rpath -Wl,${toplevel_builddir}/libvtv/.libs" else VTV_CXXFLAGS= VTV_PCH_CXXFLAGS= -- 2.30.2