Skip to content

Commit

Permalink
mono: remove ENABLE_NETCORE and associated framework code (dotnet#47925)
Browse files Browse the repository at this point in the history
* mono: remove ENABLE_NETCORE and associated framework code

* Remove g_assert_not_netcore

* No more locales.h

* No more filewatcher.h

* Fix Windows build

* Remove g_assert_netcore

I don't see anything calling this

* Add now-needed include
  • Loading branch information
CoffeeFlux authored Feb 5, 2021
1 parent 1fca955 commit 15ab9f9
Show file tree
Hide file tree
Showing 126 changed files with 2,148 additions and 26,342 deletions.
2 changes: 0 additions & 2 deletions src/mono/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -69,8 +69,6 @@ endif()
#
set(MONO_CORLIB_VERSION 1A5E0066-58DC-428A-B21C-0AD6CDAE2789)

set(ENABLE_NETCORE 1)

set(DISABLE_REMOTING 1)
set(DISABLE_REFLECTION_EMIT_SAVE 1)
set(DISABLE_APPDOMAINS 1)
Expand Down
3 changes: 0 additions & 3 deletions src/mono/cmake/config.h.in
Original file line number Diff line number Diff line change
Expand Up @@ -338,9 +338,6 @@
/* The size of `long long', as computed by sizeof. */
#define SIZEOF_LONG_LONG @SIZEOF_LONG_LONG@

/* Enables the support for .NET Core Features in the MonoVM */
#cmakedefine ENABLE_NETCORE 1

/* Xen-specific behaviour */
#cmakedefine MONO_XEN_OPT 1

Expand Down
2 changes: 0 additions & 2 deletions src/mono/cmake/options.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@
# Configure options
#

option (ENABLE_NETCORE "Enables the support for .NET Core Features in the MonoVM")

option (DISABLE_PORTABILITY "Disables the IO portability layer")
option (DISABLE_AOT "Disable AOT Compiler")
option (DISABLE_PROFILER "Disable default profiler support")
Expand Down
8 changes: 0 additions & 8 deletions src/mono/mono/eglib/glib.h
Original file line number Diff line number Diff line change
Expand Up @@ -959,14 +959,6 @@ GUnicodeBreakType g_unichar_break_type (gunichar c);

#define g_assert_not_reached() G_STMT_START { mono_assertion_message_unreachable (__FILE__, __LINE__); eg_unreachable(); } G_STMT_END

#if ENABLE_NETCORE
#define g_assert_netcore() /* nothing */
#define g_assert_not_netcore() g_assert (!"This function should only be called on mono-notnetcore.")
#else
#define g_assert_netcore() g_assert (!"This function should only be called on mono-netcore.")
#define g_assert_not_netcore() /* nothing */
#endif

/* f is format -- like printf and scanf
* Where you might have said:
* if (!(expr))
Expand Down
15 changes: 0 additions & 15 deletions src/mono/mono/metadata/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ set(metadata_win32_sources
w32error-win32.c)

set(metadata_unix_sources
console-unix.c
w32mutex-unix.c
w32semaphore-unix.c
w32event-unix.c
Expand Down Expand Up @@ -86,7 +85,6 @@ set(metadata_common_sources
class-setup-vtable.c
cominterop.c
cominterop.h
console-io.h
coree.c
coree.h
coree-internals.h
Expand All @@ -101,11 +99,8 @@ set(metadata_common_sources
exception.c
exception.h
exception-internals.h
w32file.c
w32file.h
w32file-internals.h
filewatcher.c
filewatcher.h
gc-internals.h
icall.c
icall-internals.h
Expand Down Expand Up @@ -160,20 +155,16 @@ set(metadata_common_sources
opcodes.c
property-bag.h
property-bag.c
w32socket.c
w32socket.h
w32socket-internals.h
w32process.c
w32process.h
w32process-internals.h
profiler.c
profiler-private.h
rand.h
rand.c
remoting.h
remoting.c
runtime.c
mono-security.c
security.h
security-core-clr.c
security-core-clr.h
Expand All @@ -185,11 +176,6 @@ set(metadata_common_sources
tabledefs.h
threads.c
threads-types.h
threadpool.c
threadpool.h
threadpool-worker.h
threadpool-io.c
threadpool-io.h
verify.c
verify-internals.h
wrapper-types.h
Expand Down Expand Up @@ -237,7 +223,6 @@ set(metadata_common_sources
qcall-def.h
loaded-images-internals.h
loaded-images.c
loaded-images-netcore.c
abi-details.h
abi.c
memory-manager.c
Expand Down
Loading

0 comments on commit 15ab9f9

Please sign in to comment.