Skip to content

Commit

Permalink
Move a few vendor libraries to src/native/external (#62673)
Browse files Browse the repository at this point in the history
* Move brotli to src/native/external

* Move rapidjson to src/native/external

* Move zlib to src/native/external

* Move zlib-intel to src/native/external

* Cleanup trailing whitespace in changeset files
  • Loading branch information
am11 authored Dec 12, 2021
1 parent 71bf3ba commit 0e499ac
Show file tree
Hide file tree
Showing 243 changed files with 98 additions and 11,574 deletions.
12 changes: 6 additions & 6 deletions src/mono/mono/metadata/debug-mono-ppdb.c
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
#include <mono/utils/mono-logger-internals.h>

#if HOST_WIN32 || HOST_WASM
#include "../zlib/zlib.h"
#include <external/zlib/zlib.h>
#elif HAVE_SYS_ZLIB
#include <zlib.h>
#endif
Expand Down Expand Up @@ -85,7 +85,7 @@ get_pe_debug_info (MonoImage *image, guint8 *out_guid, gint32 *out_age, gint32 *
debug_dir.size_of_data = read32(data + 16);
debug_dir.address = read32(data + 20);
debug_dir.pointer = read32(data + 24);

if (debug_dir.type == DEBUG_DIR_ENTRY_CODEVIEW && debug_dir.major_version == 0x100 && debug_dir.minor_version == 0x504d) {
/* This is a 'CODEVIEW' debug directory */
CodeviewDebugDirectory dir;
Expand Down Expand Up @@ -593,7 +593,7 @@ mono_ppdb_get_seq_points_internal (MonoImage *image, MonoPPDBFile *ppdb, MonoMet
return n_seqs;
}

gboolean
gboolean
mono_ppdb_get_seq_points_enc (MonoDebugMethodInfo *minfo, MonoPPDBFile *ppdb_file, int idx, char **source_file, GPtrArray **source_file_list, int **source_files, MonoSymSeqPoint **seq_points, int *n_seq_points)
{
MonoMethod *method = minfo->method;
Expand All @@ -610,7 +610,7 @@ mono_ppdb_get_seq_points (MonoDebugMethodInfo *minfo, char **source_file, GPtrAr
MonoMethod *method = minfo->method;

int method_idx = mono_metadata_token_index (method->token);

mono_ppdb_get_seq_points_internal (image, ppdb, method, method_idx, source_file, source_file_list, source_files, seq_points, n_seq_points);
}

Expand All @@ -622,7 +622,7 @@ mono_ppdb_lookup_locals_internal (MonoImage *image, int method_idx)

guint32 cols [MONO_LOCALSCOPE_SIZE];
guint32 locals_cols [MONO_LOCALVARIABLE_SIZE];

int i, lindex, sindex, locals_idx, locals_end_idx, nscopes, start_scope_idx, scope_idx;

start_scope_idx = mono_metadata_localscope_from_methoddef (image, method_idx);
Expand Down Expand Up @@ -733,7 +733,7 @@ mono_ppdb_lookup_locals (MonoDebugMethodInfo *minfo)

method_idx = mono_metadata_token_index (method->token);


return mono_ppdb_lookup_locals_internal (image, method_idx);
}

Expand Down
4 changes: 2 additions & 2 deletions src/mono/mono/mini/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ include(../utils/CMakeLists.txt)
include(../metadata/CMakeLists.txt)
include(../sgen/CMakeLists.txt)
if(INTERNAL_ZLIB) # TODO: hook up HAVE_SYS_ZLIB instead
include(../zlib/CMakeLists.txt)
include(${CLR_SRC_NATIVE_DIR}/external/zlib.cmake)
endif()
include(../component/CMakeLists.txt)

Expand Down Expand Up @@ -313,7 +313,7 @@ elseif(NOT HOST_BROWSER)
set(mini_sources "${mini_sources};${VERSION_FILE_PATH}") # this is generated by GenerateNativeVersionFile in Arcade
endif()

set(monosgen-sources "${metadata_sources};${utils_sources};${sgen_sources};${icu_shim_sources};${mini_sources};${zlib_sources}")
set(monosgen-sources "${metadata_sources};${utils_sources};${sgen_sources};${icu_shim_sources};${mini_sources};${ZLIB_SOURCES}")

add_library(monosgen-objects OBJECT "${monosgen-sources}")
add_library(monosgen-static STATIC $<TARGET_OBJECTS:monosgen-objects>;$<TARGET_OBJECTS:eglib_objects>)
Expand Down
10 changes: 0 additions & 10 deletions src/mono/mono/zlib/.gitignore

This file was deleted.

Loading

0 comments on commit 0e499ac

Please sign in to comment.