Skip to content

Commit b687667

Browse files
steveisokakoeplinger
authored andcommitted
Bump corefx to pick up mono/corefx#370 (#18068)
* Bump corefx to pick up mono/corefx#370 Added HAVE_LCHFLAGS & HAVE_STAT_FLAGS to configure Backport of #17758 * [csproj] Update project files
1 parent da605d8 commit b687667

File tree

5 files changed

+32
-1
lines changed

5 files changed

+32
-1
lines changed

configure.ac

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3411,6 +3411,15 @@ if test x$host_win32 = xno; then
34113411
AC_CHECK_DECL(ICANON, [AC_DEFINE(HAVE_ICANON, 1, [ICANON])], [], [[#include <termios.h>]])
34123412
AC_CHECK_DECL(TCSANOW, [AC_DEFINE(HAVE_TCSANOW, 1, [TCSANOW])], [], [[#include <termios.h>]])
34133413

3414+
AC_CHECK_DECL(lchflags, [AC_DEFINE(HAVE_LCHFLAGS, 1, [lchflags])], [],
3415+
[[#include <sys/types.h>
3416+
#include <sys/stat.h>]])
3417+
AC_CHECK_MEMBER(struct stat.st_flags,
3418+
[AC_DEFINE(HAVE_STAT_FLAGS, 1, [struct stat.st_flags])],
3419+
[],
3420+
[#include <sys/types.h>
3421+
#include <sys/stat.h>])
3422+
34143423
AC_CHECK_MEMBER(struct stat.st_birthtimespec,
34153424
[AC_DEFINE(HAVE_STAT_BIRTHTIME, 1, [struct stat.st_birthtimespec])],
34163425
[],

mcs/class/corlib/corlib.csproj

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1947,6 +1947,7 @@
19471947
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" />
19481948
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" />
19491949
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" />
1950+
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" />
19501951
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" />
19511952
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" />
19521953
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" />
@@ -2474,6 +2475,7 @@
24742475
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" />
24752476
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" />
24762477
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" />
2478+
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" />
24772479
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" />
24782480
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" />
24792481
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" />
@@ -2558,6 +2560,7 @@
25582560
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" />
25592561
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" />
25602562
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" />
2563+
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" />
25612564
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" />
25622565
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" />
25632566
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" />
@@ -2813,6 +2816,7 @@
28132816
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" />
28142817
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" />
28152818
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" />
2819+
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" />
28162820
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" />
28172821
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" />
28182822
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" />
@@ -3384,6 +3388,7 @@
33843388
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" />
33853389
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" />
33863390
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" />
3391+
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" />
33873392
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" />
33883393
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" />
33893394
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" />
@@ -3640,6 +3645,7 @@
36403645
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" />
36413646
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" />
36423647
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" />
3648+
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" />
36433649
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" />
36443650
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" />
36453651
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" />
@@ -3896,6 +3902,7 @@
38963902
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" />
38973903
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" />
38983904
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" />
3905+
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" />
38993906
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" />
39003907
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" />
39013908
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" />
@@ -4146,6 +4153,7 @@
41464153
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" />
41474154
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" />
41484155
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" />
4156+
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" />
41494157
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" />
41504158
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" />
41514159
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" />
@@ -4397,6 +4405,7 @@
43974405
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" />
43984406
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" />
43994407
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" />
4408+
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" />
44004409
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" />
44014410
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" />
44024411
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" />
@@ -4648,6 +4657,7 @@
46484657
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" />
46494658
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" />
46504659
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" />
4660+
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" />
46514661
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" />
46524662
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" />
46534663
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" />
@@ -5181,6 +5191,7 @@
51815191
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" />
51825192
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" />
51835193
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" />
5194+
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" />
51845195
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" />
51855196
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" />
51865197
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" />
@@ -5436,6 +5447,7 @@
54365447
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" />
54375448
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" />
54385449
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" />
5450+
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" />
54395451
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" />
54405452
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" />
54415453
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" />
@@ -5691,6 +5703,7 @@
56915703
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" />
56925704
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" />
56935705
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" />
5706+
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" />
56945707
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" />
56955708
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" />
56965709
<Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" />

mcs/class/corlib/unix_build_corlib.dll.sources

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.GetEUid.cs
1616
../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.GetEGid.cs
1717
../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.CopyFile.cs
18+
../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.LChflags.cs
1819
../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.Unlink.cs
1920
../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.Link.cs
2021
../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.Rename.cs

sdks/wasm/src/pinvoke-tables-default.h

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,17 @@ int SystemNative_OpenDir (int);
1212
int SystemNative_GetReadDirRBufferSize ();
1313
int SystemNative_ReadDirR (int,int,int,int);
1414
int SystemNative_CloseDir (int);
15+
int SystemNative_ReadLink (int,int,int);
1516
int SystemNative_FStat2 (int,int);
1617
int SystemNative_Stat2 (int,int);
1718
int SystemNative_LStat2 (int,int);
19+
int SystemNative_Symlink (int,int);
1820
int SystemNative_ChMod (int,int);
1921
int SystemNative_CopyFile (int,int);
2022
int SystemNative_GetEGid ();
2123
int SystemNative_GetEUid ();
24+
int SystemNative_LChflags (int,int);
25+
int SystemNative_LChflagsCanSetHiddenFlag ();
2226
int SystemNative_Link (int,int);
2327
int SystemNative_MkDir (int,int);
2428
int SystemNative_Rename (int,int);
@@ -37,13 +41,17 @@ static PinvokeImport System_Native_imports [] = {
3741
{"SystemNative_GetReadDirRBufferSize", SystemNative_GetReadDirRBufferSize},
3842
{"SystemNative_ReadDirR", SystemNative_ReadDirR},
3943
{"SystemNative_CloseDir", SystemNative_CloseDir},
44+
{"SystemNative_ReadLink", SystemNative_ReadLink},
4045
{"SystemNative_FStat2", SystemNative_FStat2},
4146
{"SystemNative_Stat2", SystemNative_Stat2},
4247
{"SystemNative_LStat2", SystemNative_LStat2},
48+
{"SystemNative_Symlink", SystemNative_Symlink},
4349
{"SystemNative_ChMod", SystemNative_ChMod},
4450
{"SystemNative_CopyFile", SystemNative_CopyFile},
4551
{"SystemNative_GetEGid", SystemNative_GetEGid},
4652
{"SystemNative_GetEUid", SystemNative_GetEUid},
53+
{"SystemNative_LChflags", SystemNative_LChflags},
54+
{"SystemNative_LChflagsCanSetHiddenFlag", SystemNative_LChflagsCanSetHiddenFlag},
4755
{"SystemNative_Link", SystemNative_Link},
4856
{"SystemNative_MkDir", SystemNative_MkDir},
4957
{"SystemNative_Rename", SystemNative_Rename},

0 commit comments

Comments
 (0)