diff options
| author | ctice <ctice@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-08-12 15:40:11 +0000 |
|---|---|---|
| committer | ctice <ctice@138bc75d-0d04-0410-961f-82ee72b054a4> | 2015-08-12 15:40:11 +0000 |
| commit | a95f42c2fb70cb574049304905f556e9f1fdfc7e (patch) | |
| tree | db96f2ea0d4680e8113e8d826ff5f4887cd7d9ff /libstdc++-v3 | |
| parent | 9d71bbdcf0d9c7cd14acb7c6b668f7459c5e75dd (diff) | |
| download | gcc-a95f42c2fb70cb574049304905f556e9f1fdfc7e.tar.gz | |
Fix warnings when bootstrapping on darwin with vtable verification enabled.
libstdc++-v3/ChangeLog:
2015-08-11 Caroline Tice <cmtice@google.com>
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@226820 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libstdc++-v3')
| -rw-r--r-- | libstdc++-v3/ChangeLog | 7 | ||||
| -rw-r--r-- | libstdc++-v3/acinclude.m4 | 7 | ||||
| -rwxr-xr-x | 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 <cmtice@google.com> + + 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 <jwakely@redhat.com> * 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= |