You've already forked linux-packaging-mono
Imported Upstream version 6.8.0.73
Former-commit-id: d18deab1b47cfd3ad8cba82b3f37d00eec2170af
This commit is contained in:
parent
bceda29824
commit
73ee7591e8
@@ -1,3 +1,4 @@
|
||||
if !ENABLE_MSVC_ONLY
|
||||
|
||||
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS) $(SHARED_CFLAGS)
|
||||
|
||||
@@ -16,7 +17,12 @@ endif
|
||||
endif
|
||||
endif
|
||||
|
||||
endif # !ENABLE_MSVC_ONLY
|
||||
|
||||
CFLAGS = $(filter-out @CXX_REMOVE_CFLAGS@, @CFLAGS@)
|
||||
|
||||
if !ENABLE_MSVC_ONLY
|
||||
|
||||
libpedump_a_CFLAGS = @CXX_ADD_CFLAGS@
|
||||
|
||||
pedump_SOURCES =
|
||||
@@ -34,6 +40,28 @@ if HOST_DARWIN
|
||||
pedump_LDFLAGS=-framework CoreFoundation -framework Foundation
|
||||
endif
|
||||
|
||||
endif # !ENABLE_MSVC_ONLY
|
||||
|
||||
if ENABLE_MSVC_ONLY
|
||||
|
||||
if SUPPORT_SGEN
|
||||
mono_bin_suffix = sgen
|
||||
else
|
||||
mono_bin_suffix =
|
||||
endif
|
||||
|
||||
all-local:
|
||||
|
||||
make -C $(top_srcdir)/msvc pedump
|
||||
cp -f $(mono_msvc_build_bin_dir)/pedump-$(mono_bin_suffix)$(EXEEXT) ./pedump$(EXEEXT)
|
||||
|
||||
clean-local:
|
||||
|
||||
make -C $(top_srcdir)/msvc clean-pedump
|
||||
rm ./pedump$(EXEEXT)
|
||||
|
||||
endif # ENABLE_MSVC_ONLY
|
||||
|
||||
#Helper target to rebuild metadata as well, it's useful when working on the verifier as its source still on metadata
|
||||
md:
|
||||
make -C ../../mono/metadata all
|
||||
|
||||
@@ -90,7 +90,7 @@ POST_UNINSTALL = :
|
||||
build_triplet = @build@
|
||||
host_triplet = @host@
|
||||
target_triplet = @target@
|
||||
@DISABLE_EXECUTABLES_FALSE@@DISABLE_LIBRARIES_FALSE@@SUPPORT_SGEN_TRUE@bin_PROGRAMS = pedump$(EXEEXT)
|
||||
@DISABLE_EXECUTABLES_FALSE@@DISABLE_LIBRARIES_FALSE@@ENABLE_MSVC_ONLY_FALSE@@SUPPORT_SGEN_TRUE@bin_PROGRAMS = pedump$(EXEEXT)
|
||||
subdir = tools/pedump
|
||||
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
|
||||
am__aclocal_m4_deps = $(top_srcdir)/m4/apple-target.m4 \
|
||||
@@ -119,16 +119,20 @@ am__v_AR_0 = @echo " AR " $@;
|
||||
am__v_AR_1 =
|
||||
libpedump_a_AR = $(AR) $(ARFLAGS)
|
||||
libpedump_a_LIBADD =
|
||||
am_libpedump_a_OBJECTS = libpedump_a-pedump.$(OBJEXT)
|
||||
am__libpedump_a_SOURCES_DIST = pedump.c
|
||||
@ENABLE_MSVC_ONLY_FALSE@am_libpedump_a_OBJECTS = \
|
||||
@ENABLE_MSVC_ONLY_FALSE@ libpedump_a-pedump.$(OBJEXT)
|
||||
libpedump_a_OBJECTS = $(am_libpedump_a_OBJECTS)
|
||||
am__installdirs = "$(DESTDIR)$(bindir)"
|
||||
PROGRAMS = $(bin_PROGRAMS)
|
||||
am_pedump_OBJECTS =
|
||||
pedump_OBJECTS = $(am_pedump_OBJECTS)
|
||||
pedump_DEPENDENCIES = libpedump_a-pedump.$(OBJEXT) \
|
||||
$(top_builddir)/mono/metadata/libmonoruntimesgen.la \
|
||||
$(top_builddir)/mono/sgen/libmonosgen.la \
|
||||
$(top_builddir)/mono/utils/libmonoutils.la $(glib_libs)
|
||||
@ENABLE_MSVC_ONLY_FALSE@pedump_DEPENDENCIES = \
|
||||
@ENABLE_MSVC_ONLY_FALSE@ libpedump_a-pedump.$(OBJEXT) \
|
||||
@ENABLE_MSVC_ONLY_FALSE@ $(top_builddir)/mono/metadata/libmonoruntimesgen.la \
|
||||
@ENABLE_MSVC_ONLY_FALSE@ $(top_builddir)/mono/sgen/libmonosgen.la \
|
||||
@ENABLE_MSVC_ONLY_FALSE@ $(top_builddir)/mono/utils/libmonoutils.la \
|
||||
@ENABLE_MSVC_ONLY_FALSE@ $(glib_libs)
|
||||
AM_V_lt = $(am__v_lt_@AM_V@)
|
||||
am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
|
||||
am__v_lt_0 = --silent
|
||||
@@ -167,7 +171,7 @@ am__v_CCLD_ = $(am__v_CCLD_@AM_DEFAULT_V@)
|
||||
am__v_CCLD_0 = @echo " CCLD " $@;
|
||||
am__v_CCLD_1 =
|
||||
SOURCES = $(libpedump_a_SOURCES) $(pedump_SOURCES)
|
||||
DIST_SOURCES = $(libpedump_a_SOURCES) $(pedump_SOURCES)
|
||||
DIST_SOURCES = $(am__libpedump_a_SOURCES_DIST) $(pedump_SOURCES)
|
||||
am__can_run_installinfo = \
|
||||
case $$AM_UPDATE_INFO_DIR in \
|
||||
n|no|NO) false;; \
|
||||
@@ -279,6 +283,7 @@ INSTALL_DATA = @INSTALL_DATA@
|
||||
INSTALL_PROGRAM = @INSTALL_PROGRAM@
|
||||
INSTALL_SCRIPT = @INSTALL_SCRIPT@
|
||||
INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
|
||||
INTERP_CFLAGS = @INTERP_CFLAGS@
|
||||
INTL = @INTL@
|
||||
INVARIANT_AOT_OPTIONS = @INVARIANT_AOT_OPTIONS@
|
||||
JEMALLOC_AUTOCONF_FLAGS = @JEMALLOC_AUTOCONF_FLAGS@
|
||||
@@ -467,22 +472,24 @@ target_vendor = @target_vendor@
|
||||
top_build_prefix = @top_build_prefix@
|
||||
top_builddir = @top_builddir@
|
||||
top_srcdir = @top_srcdir@
|
||||
AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS) $(SHARED_CFLAGS)
|
||||
glib_libs = $(top_builddir)/mono/eglib/libeglib.la
|
||||
@DISABLE_EXECUTABLES_FALSE@@DISABLE_LIBRARIES_FALSE@@SUPPORT_SGEN_TRUE@noinst_LIBRARIES = libpedump.a
|
||||
libpedump_a_CFLAGS = @CXX_ADD_CFLAGS@
|
||||
pedump_SOURCES =
|
||||
libpedump_a_SOURCES = pedump.c
|
||||
pedump_LDADD = \
|
||||
libpedump_a-pedump.$(OBJEXT) \
|
||||
$(top_builddir)/mono/metadata/libmonoruntimesgen.la \
|
||||
$(top_builddir)/mono/sgen/libmonosgen.la \
|
||||
$(top_builddir)/mono/utils/libmonoutils.la \
|
||||
$(LLVM_LIBS) \
|
||||
$(LLVM_LDFLAGS) \
|
||||
$(glib_libs)
|
||||
@ENABLE_MSVC_ONLY_FALSE@AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/mono $(LIBGC_CPPFLAGS) $(GLIB_CFLAGS) $(SHARED_CFLAGS)
|
||||
@ENABLE_MSVC_ONLY_FALSE@glib_libs = $(top_builddir)/mono/eglib/libeglib.la
|
||||
@DISABLE_EXECUTABLES_FALSE@@DISABLE_LIBRARIES_FALSE@@ENABLE_MSVC_ONLY_FALSE@@SUPPORT_SGEN_TRUE@noinst_LIBRARIES = libpedump.a
|
||||
@ENABLE_MSVC_ONLY_FALSE@libpedump_a_CFLAGS = @CXX_ADD_CFLAGS@
|
||||
@ENABLE_MSVC_ONLY_FALSE@pedump_SOURCES =
|
||||
@ENABLE_MSVC_ONLY_FALSE@libpedump_a_SOURCES = pedump.c
|
||||
@ENABLE_MSVC_ONLY_FALSE@pedump_LDADD = \
|
||||
@ENABLE_MSVC_ONLY_FALSE@ libpedump_a-pedump.$(OBJEXT) \
|
||||
@ENABLE_MSVC_ONLY_FALSE@ $(top_builddir)/mono/metadata/libmonoruntimesgen.la \
|
||||
@ENABLE_MSVC_ONLY_FALSE@ $(top_builddir)/mono/sgen/libmonosgen.la \
|
||||
@ENABLE_MSVC_ONLY_FALSE@ $(top_builddir)/mono/utils/libmonoutils.la \
|
||||
@ENABLE_MSVC_ONLY_FALSE@ $(LLVM_LIBS) \
|
||||
@ENABLE_MSVC_ONLY_FALSE@ $(LLVM_LDFLAGS) \
|
||||
@ENABLE_MSVC_ONLY_FALSE@ $(glib_libs)
|
||||
|
||||
@HOST_DARWIN_TRUE@pedump_LDFLAGS = -framework CoreFoundation -framework Foundation
|
||||
@ENABLE_MSVC_ONLY_FALSE@@HOST_DARWIN_TRUE@pedump_LDFLAGS = -framework CoreFoundation -framework Foundation
|
||||
@ENABLE_MSVC_ONLY_TRUE@@SUPPORT_SGEN_FALSE@mono_bin_suffix =
|
||||
@ENABLE_MSVC_ONLY_TRUE@@SUPPORT_SGEN_TRUE@mono_bin_suffix = sgen
|
||||
all: all-am
|
||||
|
||||
.SUFFIXES:
|
||||
@@ -587,25 +594,22 @@ distclean-compile:
|
||||
@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libpedump_a-pedump.Po@am__quote@
|
||||
|
||||
.c.o:
|
||||
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\
|
||||
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
|
||||
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
||||
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ $<
|
||||
|
||||
.c.obj:
|
||||
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.obj$$||'`;\
|
||||
@am__fastdepCC_TRUE@ $(COMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ `$(CYGPATH_W) '$<'` &&\
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Po
|
||||
@am__fastdepCC_TRUE@ $(AM_V_CC)$(COMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ `$(CYGPATH_W) '$<'`
|
||||
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Po
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=no @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(COMPILE) -c -o $@ `$(CYGPATH_W) '$<'`
|
||||
|
||||
.c.lo:
|
||||
@am__fastdepCC_TRUE@ $(AM_V_CC)depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\
|
||||
@am__fastdepCC_TRUE@ $(LTCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\
|
||||
@am__fastdepCC_TRUE@ $(am__mv) $$depbase.Tpo $$depbase.Plo
|
||||
@am__fastdepCC_TRUE@ $(AM_V_CC)$(LTCOMPILE) -MT $@ -MD -MP -MF $(DEPDIR)/$*.Tpo -c -o $@ $<
|
||||
@am__fastdepCC_TRUE@ $(AM_V_at)$(am__mv) $(DEPDIR)/$*.Tpo $(DEPDIR)/$*.Plo
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ $(AM_V_CC)source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@
|
||||
@AMDEP_TRUE@@am__fastdepCC_FALSE@ DEPDIR=$(DEPDIR) $(CCDEPMODE) $(depcomp) @AMDEPBACKSLASH@
|
||||
@am__fastdepCC_FALSE@ $(AM_V_CC@am__nodep@)$(LTCOMPILE) -c -o $@ $<
|
||||
@@ -716,7 +720,8 @@ distdir: $(DISTFILES)
|
||||
done
|
||||
check-am: all-am
|
||||
check: check-am
|
||||
all-am: Makefile $(LIBRARIES) $(PROGRAMS)
|
||||
@ENABLE_MSVC_ONLY_FALSE@all-local:
|
||||
all-am: Makefile $(LIBRARIES) $(PROGRAMS) all-local
|
||||
installdirs:
|
||||
for dir in "$(DESTDIR)$(bindir)"; do \
|
||||
test -z "$$dir" || $(MKDIR_P) "$$dir"; \
|
||||
@@ -751,9 +756,10 @@ distclean-generic:
|
||||
maintainer-clean-generic:
|
||||
@echo "This command is intended for maintainers to use"
|
||||
@echo "it deletes files that may require special tools to rebuild."
|
||||
@ENABLE_MSVC_ONLY_FALSE@clean-local:
|
||||
clean: clean-am
|
||||
|
||||
clean-am: clean-binPROGRAMS clean-generic clean-libtool \
|
||||
clean-am: clean-binPROGRAMS clean-generic clean-libtool clean-local \
|
||||
clean-noinstLIBRARIES mostlyclean-am
|
||||
|
||||
distclean: distclean-am
|
||||
@@ -832,8 +838,8 @@ uninstall-am: uninstall-binPROGRAMS
|
||||
|
||||
.MAKE: install-am install-strip
|
||||
|
||||
.PHONY: CTAGS GTAGS TAGS all all-am check check-am clean \
|
||||
clean-binPROGRAMS clean-generic clean-libtool \
|
||||
.PHONY: CTAGS GTAGS TAGS all all-am all-local check check-am clean \
|
||||
clean-binPROGRAMS clean-generic clean-libtool clean-local \
|
||||
clean-noinstLIBRARIES cscopelist-am ctags ctags-am distclean \
|
||||
distclean-compile distclean-generic distclean-libtool \
|
||||
distclean-tags distdir dvi dvi-am html html-am info info-am \
|
||||
@@ -851,6 +857,16 @@ uninstall-am: uninstall-binPROGRAMS
|
||||
.PRECIOUS: Makefile
|
||||
|
||||
|
||||
@ENABLE_MSVC_ONLY_TRUE@all-local:
|
||||
|
||||
@ENABLE_MSVC_ONLY_TRUE@ make -C $(top_srcdir)/msvc pedump
|
||||
@ENABLE_MSVC_ONLY_TRUE@ cp -f $(mono_msvc_build_bin_dir)/pedump-$(mono_bin_suffix)$(EXEEXT) ./pedump$(EXEEXT)
|
||||
|
||||
@ENABLE_MSVC_ONLY_TRUE@clean-local:
|
||||
|
||||
@ENABLE_MSVC_ONLY_TRUE@ make -C $(top_srcdir)/msvc clean-pedump
|
||||
@ENABLE_MSVC_ONLY_TRUE@ rm ./pedump$(EXEEXT)
|
||||
|
||||
#Helper target to rebuild metadata as well, it's useful when working on the verifier as its source still on metadata
|
||||
md:
|
||||
make -C ../../mono/metadata all
|
||||
|
||||
@@ -46,8 +46,8 @@ gboolean verify_partial_md = FALSE;
|
||||
|
||||
static char *assembly_directory[2];
|
||||
|
||||
static MonoAssembly *pedump_preload (MonoAssemblyName *aname, gchar **assemblies_path, gpointer user_data);
|
||||
static void pedump_assembly_load_hook (MonoAssembly *assembly, gpointer user_data);
|
||||
static MonoAssembly *pedump_preload (MonoAssemblyLoadContext *alc, MonoAssemblyName *aname, char **assemblies_path, gboolean refonly, gpointer user_data, MonoError *error);
|
||||
static void pedump_assembly_load_hook (MonoAssemblyLoadContext *alc, MonoAssembly *assembly, gpointer user_data, MonoError *error);
|
||||
static MonoAssembly *pedump_assembly_search_hook (MonoAssemblyLoadContext *alc, MonoAssembly *requesting, MonoAssemblyName *aname, gboolean refonly, gboolean postload, gpointer user_data, MonoError *error);
|
||||
|
||||
/* unused
|
||||
@@ -467,23 +467,23 @@ verify_image_file (const char *fname)
|
||||
mono_assembly_fill_assembly_name (image, &assembly->aname);
|
||||
|
||||
/*Finish initializing the runtime*/
|
||||
mono_install_assembly_load_hook (pedump_assembly_load_hook, NULL);
|
||||
mono_install_assembly_load_hook_v2 (pedump_assembly_load_hook, NULL);
|
||||
mono_install_assembly_search_hook_v2 (pedump_assembly_search_hook, NULL, FALSE, FALSE);
|
||||
|
||||
mono_init_version ("pedump", image->version);
|
||||
|
||||
mono_install_assembly_preload_hook (pedump_preload, GUINT_TO_POINTER (FALSE));
|
||||
mono_install_assembly_preload_hook_v2 (pedump_preload, GUINT_TO_POINTER (FALSE), FALSE);
|
||||
|
||||
mono_icall_init ();
|
||||
mono_marshal_init ();
|
||||
} else {
|
||||
/*Finish initializing the runtime*/
|
||||
mono_install_assembly_load_hook (pedump_assembly_load_hook, NULL);
|
||||
mono_install_assembly_load_hook_v2 (pedump_assembly_load_hook, NULL);
|
||||
mono_install_assembly_search_hook_v2 (pedump_assembly_search_hook, NULL, FALSE, FALSE);
|
||||
|
||||
mono_init_version ("pedump", NULL);
|
||||
|
||||
mono_install_assembly_preload_hook (pedump_preload, GUINT_TO_POINTER (FALSE));
|
||||
mono_install_assembly_preload_hook_v2 (pedump_preload, GUINT_TO_POINTER (FALSE), FALSE);
|
||||
|
||||
mono_icall_init ();
|
||||
mono_marshal_init ();
|
||||
@@ -624,15 +624,16 @@ real_load (gchar **search_path, const gchar *culture, const gchar *name, const M
|
||||
* Try to load referenced assemblies from assemblies_path.
|
||||
*/
|
||||
static MonoAssembly *
|
||||
pedump_preload (MonoAssemblyName *aname,
|
||||
gchar **assemblies_path,
|
||||
gpointer user_data)
|
||||
pedump_preload (MonoAssemblyLoadContext *alc,
|
||||
MonoAssemblyName *aname,
|
||||
gchar **assemblies_path,
|
||||
gboolean refonly,
|
||||
gpointer user_data,
|
||||
MonoError *error)
|
||||
{
|
||||
MonoAssembly *result = NULL;
|
||||
gboolean refonly = GPOINTER_TO_UINT (user_data);
|
||||
MonoAssemblyOpenRequest req;
|
||||
mono_assembly_request_prepare (&req.request, sizeof (req), refonly ? MONO_ASMCTX_REFONLY : MONO_ASMCTX_DEFAULT);
|
||||
|
||||
mono_assembly_request_prepare_open (&req, refonly ? MONO_ASMCTX_REFONLY : MONO_ASMCTX_DEFAULT, alc);
|
||||
|
||||
if (assemblies_path && assemblies_path [0] != NULL) {
|
||||
result = real_load (assemblies_path, aname->culture, aname->name, &req);
|
||||
@@ -646,7 +647,7 @@ pedump_preload (MonoAssemblyName *aname,
|
||||
static GList *loaded_assemblies = NULL;
|
||||
|
||||
static void
|
||||
pedump_assembly_load_hook (MonoAssembly *assembly, gpointer user_data)
|
||||
pedump_assembly_load_hook (MonoAssemblyLoadContext *alc, MonoAssembly *assembly, gpointer user_data, MonoError *error)
|
||||
{
|
||||
loaded_assemblies = g_list_prepend (loaded_assemblies, assembly);
|
||||
}
|
||||
@@ -797,7 +798,7 @@ main (int argc, char *argv [])
|
||||
|
||||
mono_verifier_set_mode (verifier_mode);
|
||||
|
||||
mono_assembly_request_prepare (&req.request, sizeof (req), MONO_ASMCTX_DEFAULT);
|
||||
mono_assembly_request_prepare_open (&req, MONO_ASMCTX_DEFAULT, mono_domain_default_alc (mono_get_root_domain ()));
|
||||
assembly = mono_assembly_request_open (file, &req, NULL);
|
||||
/*fake an assembly for netmodules so the verifier works*/
|
||||
if (!assembly && (image = mono_image_open (file, &status)) && image->tables [MONO_TABLE_ASSEMBLY].rows == 0) {
|
||||
|
||||
Reference in New Issue
Block a user