Skip to content

Commit 15ab9f9

Browse files
authored
mono: remove ENABLE_NETCORE and associated framework code (#47925)
* 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
1 parent 1fca955 commit 15ab9f9

File tree

126 files changed

+2148
-26342
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

126 files changed

+2148
-26342
lines changed

src/mono/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ endif()
6969
#
7070
set(MONO_CORLIB_VERSION 1A5E0066-58DC-428A-B21C-0AD6CDAE2789)
7171

72-
set(ENABLE_NETCORE 1)
73-
7472
set(DISABLE_REMOTING 1)
7573
set(DISABLE_REFLECTION_EMIT_SAVE 1)
7674
set(DISABLE_APPDOMAINS 1)

src/mono/cmake/config.h.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,6 @@
338338
/* The size of `long long', as computed by sizeof. */
339339
#define SIZEOF_LONG_LONG @SIZEOF_LONG_LONG@
340340

341-
/* Enables the support for .NET Core Features in the MonoVM */
342-
#cmakedefine ENABLE_NETCORE 1
343-
344341
/* Xen-specific behaviour */
345342
#cmakedefine MONO_XEN_OPT 1
346343

src/mono/cmake/options.cmake

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,6 @@
22
# Configure options
33
#
44

5-
option (ENABLE_NETCORE "Enables the support for .NET Core Features in the MonoVM")
6-
75
option (DISABLE_PORTABILITY "Disables the IO portability layer")
86
option (DISABLE_AOT "Disable AOT Compiler")
97
option (DISABLE_PROFILER "Disable default profiler support")

src/mono/mono/eglib/glib.h

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -959,14 +959,6 @@ GUnicodeBreakType g_unichar_break_type (gunichar c);
959959

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

962-
#if ENABLE_NETCORE
963-
#define g_assert_netcore() /* nothing */
964-
#define g_assert_not_netcore() g_assert (!"This function should only be called on mono-notnetcore.")
965-
#else
966-
#define g_assert_netcore() g_assert (!"This function should only be called on mono-netcore.")
967-
#define g_assert_not_netcore() /* nothing */
968-
#endif
969-
970962
/* f is format -- like printf and scanf
971963
* Where you might have said:
972964
* if (!(expr))

src/mono/mono/metadata/CMakeLists.txt

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,6 @@ set(metadata_win32_sources
4343
w32error-win32.c)
4444

4545
set(metadata_unix_sources
46-
console-unix.c
4746
w32mutex-unix.c
4847
w32semaphore-unix.c
4948
w32event-unix.c
@@ -86,7 +85,6 @@ set(metadata_common_sources
8685
class-setup-vtable.c
8786
cominterop.c
8887
cominterop.h
89-
console-io.h
9088
coree.c
9189
coree.h
9290
coree-internals.h
@@ -101,11 +99,8 @@ set(metadata_common_sources
10199
exception.c
102100
exception.h
103101
exception-internals.h
104-
w32file.c
105102
w32file.h
106103
w32file-internals.h
107-
filewatcher.c
108-
filewatcher.h
109104
gc-internals.h
110105
icall.c
111106
icall-internals.h
@@ -160,20 +155,16 @@ set(metadata_common_sources
160155
opcodes.c
161156
property-bag.h
162157
property-bag.c
163-
w32socket.c
164158
w32socket.h
165159
w32socket-internals.h
166160
w32process.c
167161
w32process.h
168162
w32process-internals.h
169163
profiler.c
170164
profiler-private.h
171-
rand.h
172-
rand.c
173165
remoting.h
174166
remoting.c
175167
runtime.c
176-
mono-security.c
177168
security.h
178169
security-core-clr.c
179170
security-core-clr.h
@@ -185,11 +176,6 @@ set(metadata_common_sources
185176
tabledefs.h
186177
threads.c
187178
threads-types.h
188-
threadpool.c
189-
threadpool.h
190-
threadpool-worker.h
191-
threadpool-io.c
192-
threadpool-io.h
193179
verify.c
194180
verify-internals.h
195181
wrapper-types.h
@@ -237,7 +223,6 @@ set(metadata_common_sources
237223
qcall-def.h
238224
loaded-images-internals.h
239225
loaded-images.c
240-
loaded-images-netcore.c
241226
abi-details.h
242227
abi.c
243228
memory-manager.c

0 commit comments

Comments
 (0)