OpenE2K
/
gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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
This commit is contained in:
Rainer Orth 2015-11-25 10:30:25 +00:00 committed by Rainer Orth
parent 70927cae31
commit e5ef217c3e
19 changed files with 1146 additions and 1047 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gcc/ChangeLog
View File

@ -1,3 +1,14 @@
2015-11-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* 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*}.
2015-11-25 Bernd Schmidt <bschmidt@redhat.com> 2015-11-25 Bernd Schmidt <bschmidt@redhat.com>
* ifcvt.c (noce_mem_write_may_trap_or_fault_p, * ifcvt.c (noce_mem_write_may_trap_or_fault_p,

36
gcc/config/sol2.h
View File

@ -150,6 +150,10 @@ along with GCC; see the file COPYING3. If not see
#define MD_EXEC_PREFIX "/usr/ccs/bin/" #define MD_EXEC_PREFIX "/usr/ccs/bin/"
#endif #endif
/* Enable constructor priorities if the configured linker supports it. */
#undef SUPPORTS_INIT_PRIORITY
#define SUPPORTS_INIT_PRIORITY HAVE_INITFINI_ARRAY_SUPPORT
#undef STARTFILE_ARCH_SPEC #undef STARTFILE_ARCH_SPEC
#define STARTFILE_ARCH_SPEC "%{ansi:values-Xc.o%s} \ #define STARTFILE_ARCH_SPEC "%{ansi:values-Xc.o%s} \
%{!ansi:values-Xa.o%s}" %{!ansi:values-Xa.o%s}"
@ -162,6 +166,22 @@ along with GCC; see the file COPYING3. If not see
#define STARTFILE_CRTBEGIN_SPEC "crtbegin.o%s" #define STARTFILE_CRTBEGIN_SPEC "crtbegin.o%s"
#endif #endif
#if SUPPORTS_INIT_PRIORITY
#define STARTFILE_VTV_SPEC \
"%{fvtable-verify=none:%s; \
fvtable-verify=preinit:vtv_start_preinit.o%s; \
fvtable-verify=std:vtv_start.o%s}"
#define ENDFILE_VTV_SPEC \
"%{fvtable-verify=none:%s; \
fvtable-verify=preinit:vtv_end_preinit.o%s; \
fvtable-verify=std:vtv_end.o%s}"
#else
#define STARTFILE_VTV_SPEC \
"%{fvtable-verify:%e-fvtable-verify is not supported in this configuration}"
#define ENDFILE_VTV_SPEC ""
#endif
/* We don't use the standard svr4 STARTFILE_SPEC because it's wrong for us. */ /* We don't use the standard svr4 STARTFILE_SPEC because it's wrong for us. */
#undef STARTFILE_SPEC #undef STARTFILE_SPEC
#ifdef HAVE_SOLARIS_CRTS #ifdef HAVE_SOLARIS_CRTS
@ -172,13 +192,15 @@ along with GCC; see the file COPYING3. If not see
%{p:%e-p is not supported; \ %{p:%e-p is not supported; \
pg:crtpg.o%s gmon.o%s; \ pg:crtpg.o%s gmon.o%s; \
:crtp.o%s}}} \ :crtp.o%s}}} \
crti.o%s %(startfile_arch) %(startfile_crtbegin)" crti.o%s %(startfile_arch) %(startfile_crtbegin) \
%(startfile_vtv)"
#else #else
#define STARTFILE_SPEC "%{!shared:%{!symbolic: \ #define STARTFILE_SPEC "%{!shared:%{!symbolic: \
%{p:mcrt1.o%s; \ %{p:mcrt1.o%s; \
pg:gcrt1.o%s gmon.o%s; \ pg:gcrt1.o%s gmon.o%s; \
:crt1.o%s}}} \ :crt1.o%s}}} \
crti.o%s %(startfile_arch) %(startfile_crtbegin)" crti.o%s %(startfile_arch) %(startfile_crtbegin) \
%(startfile_vtv)"
#endif #endif
#if defined(HAVE_LD_PIE) && defined(HAVE_SOLARIS_CRTS) #if defined(HAVE_LD_PIE) && defined(HAVE_SOLARIS_CRTS)
@ -192,7 +214,7 @@ along with GCC; see the file COPYING3. If not see
#undef ENDFILE_SPEC #undef ENDFILE_SPEC
#define ENDFILE_SPEC \ #define ENDFILE_SPEC \
"%{Ofast|ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \ "%{Ofast|ffast-math|funsafe-math-optimizations:crtfastmath.o%s} \
%(endfile_arch) %(endfile_crtend) crtn.o%s" %(endfile_arch) %(endfile_vtv) %(endfile_crtend) crtn.o%s"
#undef LINK_ARCH32_SPEC_BASE #undef LINK_ARCH32_SPEC_BASE
#define LINK_ARCH32_SPEC_BASE \ #define LINK_ARCH32_SPEC_BASE \
@ -267,12 +289,14 @@ along with GCC; see the file COPYING3. If not see
#define SUBTARGET_EXTRA_SPECS \ #define SUBTARGET_EXTRA_SPECS \
{ "startfile_arch", STARTFILE_ARCH_SPEC }, \ { "startfile_arch", STARTFILE_ARCH_SPEC }, \
{ "startfile_crtbegin", STARTFILE_CRTBEGIN_SPEC }, \ { "startfile_crtbegin", STARTFILE_CRTBEGIN_SPEC }, \
{ "startfile_vtv", STARTFILE_VTV_SPEC }, \
{ "link_arch32", LINK_ARCH32_SPEC }, \ { "link_arch32", LINK_ARCH32_SPEC }, \
{ "link_arch64", LINK_ARCH64_SPEC }, \ { "link_arch64", LINK_ARCH64_SPEC }, \
{ "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \ { "link_arch_default", LINK_ARCH_DEFAULT_SPEC }, \
{ "link_arch", LINK_ARCH_SPEC }, \ { "link_arch", LINK_ARCH_SPEC }, \
{ "endfile_arch", ENDFILE_ARCH_SPEC }, \ { "endfile_arch", ENDFILE_ARCH_SPEC }, \
{ "endfile_crtend", ENDFILE_CRTEND_SPEC }, \ { "endfile_crtend", ENDFILE_CRTEND_SPEC }, \
{ "endfile_vtv", ENDFILE_VTV_SPEC }, \
SUBTARGET_CPU_EXTRA_SPECS SUBTARGET_CPU_EXTRA_SPECS
/* C++11 programs need -lrt for nanosleep. */ /* C++11 programs need -lrt for nanosleep. */
@ -398,10 +422,6 @@ along with GCC; see the file COPYING3. If not see
#define NO_DBX_BNSYM_ENSYM 1 #define NO_DBX_BNSYM_ENSYM 1
#endif #endif
/* Enable constructor priorities if the configured linker supports it. */
#undef SUPPORTS_INIT_PRIORITY
#define SUPPORTS_INIT_PRIORITY HAVE_INITFINI_ARRAY_SUPPORT
/* Solaris has an implementation of __enable_execute_stack. */ /* Solaris has an implementation of __enable_execute_stack. */
#define HAVE_ENABLE_EXECUTE_STACK #define HAVE_ENABLE_EXECUTE_STACK

6
gcc/gcc.c
View File

@ -1016,9 +1016,9 @@ proper position among the other output files. */
%{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \ %{flto} %{fno-lto} %{flto=*} %l " LINK_PIE_SPEC \
"%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \ "%{fuse-ld=*:-fuse-ld=%*} " LINK_COMPRESS_DEBUG_SPEC \
"%X %{o*} %{e*} %{N} %{n} %{r}\ "%X %{o*} %{e*} %{N} %{n} %{r}\
%{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}} " VTABLE_VERIFICATION_SPEC " \ %{s} %{t} %{u*} %{z} %{Z} %{!nostdlib:%{!nostartfiles:%S}} \
%{static:} %{L*} %(mfwrap) %(link_libgcc) " SANITIZER_EARLY_SPEC " %o\ %{static:} %{L*} %(mfwrap) %(link_libgcc) " \
" CHKP_SPEC " \ VTABLE_VERIFICATION_SPEC " " SANITIZER_EARLY_SPEC " %o " CHKP_SPEC " \
%{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*} 1):\ %{fopenacc|fopenmp|%:gt(%{ftree-parallelize-loops=*} 1):\
%:include(libgomp.spec)%(link_gomp)}\ %:include(libgomp.spec)%(link_gomp)}\
%{fcilkplus:%:include(libcilkrts.spec)%(link_cilkrts)}\ %{fcilkplus:%:include(libcilkrts.spec)%(link_cilkrts)}\

5
include/ChangeLog
View File

@ -1,3 +1,8 @@
2015-11-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* vtv-change-permission.h (VTV_PAGE_SIZE) [__sun__ && __svr4__ &&
__sparc__]: Define.
2015-11-12 James Norris <jnorris@codesourcery.com> 2015-11-12 James Norris <jnorris@codesourcery.com>
Joseph Myers <joseph@codesourcery.com> Joseph Myers <joseph@codesourcery.com>

4
include/vtv-change-permission.h
View File

@ -46,8 +46,12 @@ extern void __VLTChangePermission (int);
/* TODO - Replace '4096' below with correct big page size. */ /* TODO - Replace '4096' below with correct big page size. */
#define VTV_PAGE_SIZE 4096 #define VTV_PAGE_SIZE 4096
#else #else
#if defined(__sun__) && defined(__svr4__) && defined(__sparc__)
#define VTV_PAGE_SIZE 8192
#else
#define VTV_PAGE_SIZE 4096 #define VTV_PAGE_SIZE 4096
#endif #endif
#endif

9
libgcc/ChangeLog
View File

@ -1,3 +1,12 @@
2015-11-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* 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.
2015-11-23 Szabolcs Nagy <szabolcs.nagy@arm.com> 2015-11-23 Szabolcs Nagy <szabolcs.nagy@arm.com>
PR target/68059 PR target/68059

13
libgcc/Makefile.in
View File

@ -1006,17 +1006,22 @@ endif
ifeq ($(enable_vtable_verify),yes) ifeq ($(enable_vtable_verify),yes)
# These are used in vtable verification; see comments in source files for # These are used in vtable verification; see comments in source files for
# more details. # more details.
# Override -finhibit-size-directive to avoid mismatch between libgcc and libvtv
# compilations.
VTV_CFLAGS = $(CRTSTUFF_T_CFLAGS_S) -fno-inhibit-size-directive
vtv_start$(objext): $(srcdir)/vtv_start.c vtv_start$(objext): $(srcdir)/vtv_start.c
$(crt_compile) $(CRTSTUFF_T_CFLAGS_S) -c $(srcdir)/vtv_start.c $(crt_compile) $(VTV_CFLAGS) -c $(srcdir)/vtv_start.c
vtv_end$(objext): $(srcdir)/vtv_end.c vtv_end$(objext): $(srcdir)/vtv_end.c
$(crt_compile) $(CRTSTUFF_T_CFLAGS_S) -c $(srcdir)/vtv_end.c $(crt_compile) $(VTV_CFLAGS) -c $(srcdir)/vtv_end.c
vtv_start_preinit$(objext): $(srcdir)/vtv_start_preinit.c vtv_start_preinit$(objext): $(srcdir)/vtv_start_preinit.c
$(crt_compile) $(CRTSTUFF_T_CFLAGS_S) -c $(srcdir)/vtv_start_preinit.c $(crt_compile) $(VTV_CFLAGS) -c $(srcdir)/vtv_start_preinit.c
vtv_end_preinit$(objext): $(srcdir)/vtv_end_preinit.c vtv_end_preinit$(objext): $(srcdir)/vtv_end_preinit.c
$(crt_compile) $(CRTSTUFF_T_CFLAGS_S) -c $(srcdir)/vtv_end_preinit.c $(crt_compile) $(VTV_CFLAGS) -c $(srcdir)/vtv_end_preinit.c
endif endif
ifeq ($(CUSTOM_CRTIN),) ifeq ($(CUSTOM_CRTIN),)

3
libgcc/config.host
View File

@ -294,6 +294,9 @@ case ${host} in
;; ;;
esac esac
fi fi
if test x$enable_vtable_verify = xyes; then
extra_parts="$extra_parts vtv_start.o vtv_end.o vtv_start_preinit.o vtv_end_preinit.o"
fi
;; ;;
*-*-uclinux*) *-*-uclinux*)
extra_parts="crtbegin.o crtend.o" extra_parts="crtbegin.o crtend.o"

9
libstdc++-v3/ChangeLog
View File

@ -1,3 +1,12 @@
2015-11-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* 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+.
2015-11-24 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE> 2015-11-24 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* acinclude.m4 (GLIBCXX_CHECK_MATH11_PROTO): New test. * acinclude.m4 (GLIBCXX_CHECK_MATH11_PROTO): New test.

4
libstdc++-v3/acinclude.m4
View File

@ -2628,6 +2628,10 @@ AC_DEFUN([GLIBCXX_ENABLE_VTABLE_VERIFY], [
VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u,_vtable_map_vars_start -Wl,-u,_vtable_map_vars_end" 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_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,-rpath,${toplevel_builddir}/libvtv/.libs"
;; ;;
solaris2*)
VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end"
VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,-R -Wl,${toplevel_builddir}/libvtv/.libs"
;;
*) *)
VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end" 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" VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,--rpath -Wl,${toplevel_builddir}/libvtv/.libs"

4
libstdc++-v3/configure vendored
View File

@ -18041,6 +18041,10 @@ $as_echo "$enable_vtable_verify" >&6; }
VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u,_vtable_map_vars_start -Wl,-u,_vtable_map_vars_end" 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_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,-rpath,${toplevel_builddir}/libvtv/.libs"
;; ;;
solaris2*)
VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end"
VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,-R -Wl,${toplevel_builddir}/libvtv/.libs"
;;
*) *)
VTV_CXXFLAGS="-fvtable-verify=std -Wl,-u_vtable_map_vars_start,-u_vtable_map_vars_end" 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" VTV_CXXLINKFLAGS="-L${toplevel_builddir}/libvtv/.libs -Wl,--rpath -Wl,${toplevel_builddir}/libvtv/.libs"

2
libstdc++-v3/testsuite/18_support/bad_exception/23591_thread-1.c
View File

@ -1,5 +1,5 @@
// { dg-require-sharedlib "" } // { dg-require-sharedlib "" }
// { dg-options "-g -O2 -pthread -ldl -x c -fvtable-verify=none" { target *-*-linux* *-*-gnu* } } // { dg-options "-g -O2 -pthread -ldl -x c -fvtable-verify=none" { target *-*-linux* *-*-gnu* *-*-solaris2.1[2-9]* } }
// Copyright (C) 2005-2015 Free Software Foundation, Inc. // Copyright (C) 2005-2015 Free Software Foundation, Inc.
// //

27
libvtv/ChangeLog
View File

@ -1,3 +1,30 @@
2015-11-25 Rainer Orth <ro@CeBiTec.Uni-Bielefeld.DE>
* 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.
2015-11-09 Alan Modra <amodra@gmail.com> 2015-11-09 Alan Modra <amodra@gmail.com>
* vtv_malloc.cc (obstack_chunk_free): Correct param type. * vtv_malloc.cc (obstack_chunk_free): Correct param type.

16
libvtv/Makefile.am
View File

@ -76,11 +76,14 @@ vtv_end.c:
rm -f $@ rm -f $@
$(LN_S) $(toplevel_srcdir)/libgcc/vtv_end.c $@ $(LN_S) $(toplevel_srcdir)/libgcc/vtv_end.c $@
if VTV_CYGMIN if VTV_NO_OBSTACK
obstack.c: obstack.c:
rm -f $@ rm -f $@
$(LN_S) $(toplevel_srcdir)/libiberty/obstack.c $@ $(LN_S) $(toplevel_srcdir)/libiberty/obstack.c $@
> config.h
endif
if VTV_CYGMIN
vtv_stubs.cc: vtv_stubs.cc:
rm -f $@ rm -f $@
$(LN_S) $(toplevel_srcdir)/libstdc++-v3/libsupc++/vtv_stubs.cc $@ $(LN_S) $(toplevel_srcdir)/libstdc++-v3/libsupc++/vtv_stubs.cc $@
@ -93,11 +96,12 @@ if VTV_CYGMIN
endif endif
if ENABLE_VTABLE_VERIFY if ENABLE_VTABLE_VERIFY
if VTV_CYGMIN
libvtv_la_SOURCES = $(vtv_sources) obstack.c
libvtv_stubs_la_SOURCES = $(vtv_stubs_sources)
else
libvtv_la_SOURCES = $(vtv_sources) libvtv_la_SOURCES = $(vtv_sources)
if VTV_NO_OBSTACK
libvtv_la_SOURCES += obstack.c
endif
if VTV_CYGMIN
libvtv_stubs_la_SOURCES = $(vtv_stubs_sources)
endif endif
libvtv_include_HEADERS = $(vtv_headers) libvtv_include_HEADERS = $(vtv_headers)
else else

25
libvtv/Makefile.in
View File

@ -53,6 +53,7 @@ POST_UNINSTALL = :
build_triplet = @build@ build_triplet = @build@
host_triplet = @host@ host_triplet = @host@
target_triplet = @target@ target_triplet = @target@
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_NO_OBSTACK_TRUE@am__append_1 = obstack.c
subdir = . subdir = .
DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \ DIST_COMMON = ChangeLog $(srcdir)/Makefile.in $(srcdir)/Makefile.am \
$(top_srcdir)/configure $(am__configure_deps) \ $(top_srcdir)/configure $(am__configure_deps) \
@ -110,11 +111,10 @@ LTLIBRARIES = $(toolexeclib_LTLIBRARIES)
libvtv_la_DEPENDENCIES = libvtv_la_DEPENDENCIES =
am__objects_1 = vtv_start.lo vtv_malloc.lo vtv_rts.lo vtv_utils.lo \ am__objects_1 = vtv_start.lo vtv_malloc.lo vtv_rts.lo vtv_utils.lo \
vtv_end.lo vtv_end.lo
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_FALSE@am_libvtv_la_OBJECTS = \ @ENABLE_VTABLE_VERIFY_TRUE@@VTV_NO_OBSTACK_TRUE@am__objects_2 = \
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_FALSE@ $(am__objects_1) @ENABLE_VTABLE_VERIFY_TRUE@@VTV_NO_OBSTACK_TRUE@ obstack.lo
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@am_libvtv_la_OBJECTS = \ @ENABLE_VTABLE_VERIFY_TRUE@am_libvtv_la_OBJECTS = $(am__objects_1) \
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@ $(am__objects_1) \ @ENABLE_VTABLE_VERIFY_TRUE@ $(am__objects_2)
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@ obstack.lo
libvtv_la_OBJECTS = $(am_libvtv_la_OBJECTS) libvtv_la_OBJECTS = $(am_libvtv_la_OBJECTS)
libvtv_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ libvtv_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@ -122,9 +122,9 @@ libvtv_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
@VTV_CYGMIN_FALSE@am_libvtv_la_rpath = -rpath $(toolexeclibdir) @VTV_CYGMIN_FALSE@am_libvtv_la_rpath = -rpath $(toolexeclibdir)
@VTV_CYGMIN_TRUE@am_libvtv_la_rpath = -rpath $(toolexeclibdir) @VTV_CYGMIN_TRUE@am_libvtv_la_rpath = -rpath $(toolexeclibdir)
libvtv_stubs_la_LIBADD = libvtv_stubs_la_LIBADD =
am__objects_2 = vtv_start.lo vtv_stubs.lo vtv_end.lo am__objects_3 = vtv_start.lo vtv_stubs.lo vtv_end.lo
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@am_libvtv_stubs_la_OBJECTS = \ @ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@am_libvtv_stubs_la_OBJECTS = \
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@ $(am__objects_2) @ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@ $(am__objects_3)
libvtv_stubs_la_OBJECTS = $(am_libvtv_stubs_la_OBJECTS) libvtv_stubs_la_OBJECTS = $(am_libvtv_stubs_la_OBJECTS)
libvtv_stubs_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \ libvtv_stubs_la_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS) \
$(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \ $(LIBTOOLFLAGS) --mode=link $(CXXLD) $(AM_CXXFLAGS) \
@ -353,8 +353,8 @@ BUILT_SOURCES = vtv_start.c vtv_end.c
@VTV_CYGMIN_TRUE@libvtv_la_LDFLAGS = $(lt_host_flags) @VTV_CYGMIN_TRUE@libvtv_la_LDFLAGS = $(lt_host_flags)
@VTV_CYGMIN_TRUE@libvtv_stubs_la_LDFLAGS = $(lt_host_flags) @VTV_CYGMIN_TRUE@libvtv_stubs_la_LDFLAGS = $(lt_host_flags)
@ENABLE_VTABLE_VERIFY_FALSE@libvtv_la_SOURCES = @ENABLE_VTABLE_VERIFY_FALSE@libvtv_la_SOURCES =
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_FALSE@libvtv_la_SOURCES = $(vtv_sources) @ENABLE_VTABLE_VERIFY_TRUE@libvtv_la_SOURCES = $(vtv_sources) \
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@libvtv_la_SOURCES = $(vtv_sources) obstack.c @ENABLE_VTABLE_VERIFY_TRUE@ $(am__append_1)
@ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@libvtv_stubs_la_SOURCES = $(vtv_stubs_sources) @ENABLE_VTABLE_VERIFY_TRUE@@VTV_CYGMIN_TRUE@libvtv_stubs_la_SOURCES = $(vtv_stubs_sources)
@ENABLE_VTABLE_VERIFY_FALSE@libvtv_include_HEADERS = @ENABLE_VTABLE_VERIFY_FALSE@libvtv_include_HEADERS =
@ENABLE_VTABLE_VERIFY_TRUE@libvtv_include_HEADERS = $(vtv_headers) @ENABLE_VTABLE_VERIFY_TRUE@libvtv_include_HEADERS = $(vtv_headers)
@ -832,9 +832,10 @@ vtv_end.c:
rm -f $@ rm -f $@
$(LN_S) $(toplevel_srcdir)/libgcc/vtv_end.c $@ $(LN_S) $(toplevel_srcdir)/libgcc/vtv_end.c $@
@VTV_CYGMIN_TRUE@ obstack.c: @VTV_NO_OBSTACK_TRUE@ obstack.c:
@VTV_CYGMIN_TRUE@ rm -f $@ @VTV_NO_OBSTACK_TRUE@ rm -f $@
@VTV_CYGMIN_TRUE@ $(LN_S) $(toplevel_srcdir)/libiberty/obstack.c $@ @VTV_NO_OBSTACK_TRUE@ $(LN_S) $(toplevel_srcdir)/libiberty/obstack.c $@
@VTV_NO_OBSTACK_TRUE@ > config.h
@VTV_CYGMIN_TRUE@ vtv_stubs.cc: @VTV_CYGMIN_TRUE@ vtv_stubs.cc:
@VTV_CYGMIN_TRUE@ rm -f $@ @VTV_CYGMIN_TRUE@ rm -f $@

1938
libvtv/configure vendored
View File

File diff suppressed because it is too large Load Diff

22
libvtv/configure.ac
View File

@ -27,6 +27,8 @@ target_alias=${target_alias-$host_alias}
AC_SUBST(target_alias) AC_SUBST(target_alias)
GCC_LIBSTDCXX_RAW_CXX_FLAGS GCC_LIBSTDCXX_RAW_CXX_FLAGS
AC_USE_SYSTEM_EXTENSIONS
# Use same top-level configure hooks in libgcc/libstdc++/libvtv. # Use same top-level configure hooks in libgcc/libstdc++/libvtv.
AC_MSG_CHECKING([for --enable-vtable-verify]) AC_MSG_CHECKING([for --enable-vtable-verify])
AC_ARG_ENABLE(vtable-verify, AC_ARG_ENABLE(vtable-verify,
@ -43,6 +45,21 @@ AC_MSG_RESULT($enable_vtable_verify)
unset VTV_SUPPORTED unset VTV_SUPPORTED
AC_MSG_CHECKING([for host support for vtable verification]) AC_MSG_CHECKING([for host support for vtable verification])
. ${srcdir}/configure.tgt . ${srcdir}/configure.tgt
case ${host} in
*-*-solaris2*)
# libvtv requires init priority support, which depends on the linker
# used on Solaris.
AC_CACHE_CHECK(for init priority support, libvtv_cv_init_priority, [
AC_COMPILE_IFELSE([AC_LANG_PROGRAM(,
[[void ip (void) __attribute__ ((constructor (1)));]])],
[libgcc_cv_init_priority=yes],[libgcc_cv_init_priority=no])])
if test x$libvtv_cv_init_priority = xno; then
VTV_SUPPORTED=no
fi
# FIXME: Maybe check for dl_iterate_phdr, too? Should be covered by
# configure.tgt restricting to libvtv to Solaris 11+.
;;
esac
AC_MSG_RESULT($VTV_SUPPORTED) AC_MSG_RESULT($VTV_SUPPORTED)
# Decide if it's usable. # Decide if it's usable.
@ -97,6 +114,8 @@ AC_CHECK_FUNCS([__secure_getenv])
AC_GNU_SOURCE AC_GNU_SOURCE
AC_CHECK_FUNCS([secure_getenv]) AC_CHECK_FUNCS([secure_getenv])
AC_CHECK_FUNCS([getexecname __fortify_fail])
# Check for programs. # Check for programs.
m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS]) m4_rename([_AC_ARG_VAR_PRECIOUS],[real_PRECIOUS])
m4_define([_AC_ARG_VAR_PRECIOUS],[]) m4_define([_AC_ARG_VAR_PRECIOUS],[])
@ -167,4 +186,7 @@ esac
AM_CONDITIONAL(VTV_CYGMIN, test $vtv_cygmin = yes) AM_CONDITIONAL(VTV_CYGMIN, test $vtv_cygmin = yes)
AC_CHECK_FUNCS([_obstack_begin])
AM_CONDITIONAL(VTV_NO_OBSTACK, test $ac_cv_func__obstack_begin = no)
AC_OUTPUT AC_OUTPUT

6
libvtv/configure.tgt
View File

@ -23,6 +23,12 @@ VTV_SUPPORTED=no
case "${target}" in case "${target}" in
*-*-*android*) *-*-*android*)
;; ;;
*-*-solaris2.1[1-9]*)
# Vtable verification requires constructor priority support and
# dl_iterate_phdr. The former requires a dynamic check in
# configure.ac, the latter is fully present in Solaris 11 only.
VTV_SUPPORTED=yes
;;
x86_64-*-linux* | i?86-*-linux*) x86_64-*-linux* | i?86-*-linux*)
VTV_SUPPORTED=yes VTV_SUPPORTED=yes
;; ;;

53
libvtv/vtv_rts.cc
View File

@ -150,13 +150,11 @@
#include "vtv-change-permission.h" #include "vtv-change-permission.h"
#if defined (__CYGWIN__) || defined (__MINGW32__) #ifdef HAVE_GETEXECNAME
// porting: fix link error to libc const char *program_invocation_name;
void __fortify_fail (const char * msg){ #endif
OutputDebugString(msg);
abort(); #ifdef HAVE___FORTIFY_FAIL
}
#else
extern "C" { extern "C" {
/* __fortify_fail is a function in glibc that calls __libc_message, /* __fortify_fail is a function in glibc that calls __libc_message,
@ -173,6 +171,20 @@ extern "C" {
extern void __fortify_fail (const char *) __attribute__((noreturn)); extern void __fortify_fail (const char *) __attribute__((noreturn));
} /* extern "C" */ } /* extern "C" */
#else
#if defined (__CYGWIN__) || defined (__MINGW32__)
// porting: fix link error to libc
void __fortify_fail (const char * msg){
OutputDebugString(msg);
abort();
}
#else
// FIXME: Provide backtrace via libbacktrace?
void __fortify_fail (const char *msg) {
write (2, msg, strlen (msg));
abort ();
}
#endif
#endif #endif
/* The following variables are used only for debugging and performance /* The following variables are used only for debugging and performance
@ -573,6 +585,9 @@ read_section_offset_and_length (struct dl_phdr_info *info,
/* Get the name of the main executable. This may or may not include /* Get the name of the main executable. This may or may not include
arguments passed to the program. Find the first space, assume it arguments passed to the program. Find the first space, assume it
is the start of the argument list, and change it to a '\0'. */ is the start of the argument list, and change it to a '\0'. */
#ifdef HAVE_GETEXECNAME
program_invocation_name = getexecname ();
#endif
snprintf (program_name, sizeof (program_name), program_invocation_name); snprintf (program_name, sizeof (program_name), program_invocation_name);
/* Check to see if we already have the data for this file. */ /* 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,
size. */ size. */
*sect_offset = sect_hdr.sh_addr; *sect_offset = sect_hdr.sh_addr;
if (!is_libvtv) if (!is_libvtv)
*sect_len = sect_hdr.sh_size - VTV_PAGE_SIZE; {
VTV_ASSERT (sect_hdr.sh_size - VTV_PAGE_SIZE >= 0);
*sect_len = sect_hdr.sh_size - VTV_PAGE_SIZE;
}
else else
*sect_len = sect_hdr.sh_size; *sect_len = sect_hdr.sh_size;
found = true; found = true;
@ -784,7 +802,7 @@ iterate_modules (void *data)
if (debug_functions) if (debug_functions)
{ {
snprintf (buffer, sizeof (buffer), snprintf (buffer, sizeof (buffer),
"Failed called to mprotect for %s error: ", "Failed call to mprotect for %s error: ",
(*mprotect_flags & PROT_WRITE) ? (*mprotect_flags & PROT_WRITE) ?
"READ/WRITE" : "READ-ONLY"); "READ/WRITE" : "READ-ONLY");
log_memory_protection_data (buffer); log_memory_protection_data (buffer);
@ -804,9 +822,8 @@ iterate_modules (void *data)
} }
} }
increment_num_calls (&num_calls_to_mprotect); increment_num_calls (&num_calls_to_mprotect);
/* num_pages_protected += (map_sect_len + VTV_PAGE_SIZE - 1) num_pages_protected += (map_sect_len + VTV_PAGE_SIZE - 1)
/ VTV_PAGE_SIZE; */ / VTV_PAGE_SIZE;
num_pages_protected += (map_sect_len + 4096 - 1) / 4096;
continue; continue;
} }
} }
@ -853,6 +870,9 @@ dl_iterate_phdr_callback (struct dl_phdr_info *info, size_t, void *data)
/* Get the name of the main executable. This may or may not include /* Get the name of the main executable. This may or may not include
arguments passed to the program. Find the first space, assume it arguments passed to the program. Find the first space, assume it
is the start of the argument list, and change it to a '\0'. */ is the start of the argument list, and change it to a '\0'. */
#ifdef HAVE_GETEXECNAME
program_invocation_name = getexecname ();
#endif
snprintf (program_name, sizeof (program_name), program_invocation_name); snprintf (program_name, sizeof (program_name), program_invocation_name);
read_section_offset_and_length (info, map_sect_name, *mprotect_flags, 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)
if (debug_functions) if (debug_functions)
{ {
snprintf (buffer, sizeof (buffer), snprintf (buffer, sizeof (buffer),
"Failed called to mprotect for %s error: ", "Failed call to mprotect for %s error: ",
(*mprotect_flags & PROT_WRITE) ? (*mprotect_flags & PROT_WRITE) ?
"READ/WRITE" : "READ-ONLY"); "READ/WRITE" : "READ-ONLY");
log_memory_protection_data (buffer); log_memory_protection_data (buffer);
@ -916,8 +936,7 @@ dl_iterate_phdr_callback (struct dl_phdr_info *info, size_t, void *data)
} }
} }
increment_num_calls (&num_calls_to_mprotect); increment_num_calls (&num_calls_to_mprotect);
/* num_pages_protected += (map_sect_len + VTV_PAGE_SIZE - 1) / VTV_PAGE_SIZE; */ num_pages_protected += (map_sect_len + VTV_PAGE_SIZE - 1) / VTV_PAGE_SIZE;
num_pages_protected += (map_sect_len + 4096 - 1) / 4096;
} }
return 0; return 0;
@ -1054,9 +1073,9 @@ __VLTChangePermission (int perm)
if (debug_functions) if (debug_functions)
{ {
if (perm == __VLTP_READ_WRITE) if (perm == __VLTP_READ_WRITE)
fprintf (stdout, "Changing VLT permisisons to Read-Write.\n"); fprintf (stdout, "Changing VLT permissions to Read-Write.\n");
else if (perm == __VLTP_READ_ONLY) else if (perm == __VLTP_READ_ONLY)
fprintf (stdout, "Changing VLT permissions to Read-only.\n"); fprintf (stdout, "Changing VLT permissions to Read-Only.\n");
else else
fprintf (stdout, "Unrecognized permissions value: %d\n", perm); fprintf (stdout, "Unrecognized permissions value: %d\n", perm);