diff options
author | Steve Pfister <steveisok@users.noreply.github.com> | 2019-11-18 14:13:16 +0300 |
---|---|---|
committer | Alexander Köplinger <alex.koeplinger@outlook.com> | 2019-11-18 14:13:16 +0300 |
commit | 0269f7b479f245c13b30c1b44cc91cc224c48b93 (patch) | |
tree | e5a96291fc2aa15bd93ddbfed63ef1e9d71670e6 | |
parent | e2ccdac3f48d2c7726a69bf813df6992badfae01 (diff) |
Bump corefx to pick up https://github.com/mono/corefx/pull/370 (#17758)
Backport of https://github.com/dotnet/corefx/pull/34560
Added HAVE_LCHFLAGS & HAVE_STAT_FLAGS to configure.
-rw-r--r-- | configure.ac | 9 | ||||
m--------- | external/corefx | 0 | ||||
-rw-r--r-- | mcs/class/corlib/corlib.csproj | 13 | ||||
-rw-r--r-- | mcs/class/corlib/unix_build_corlib.dll.sources | 1 | ||||
-rw-r--r-- | sdks/wasm/src/pinvoke-tables-default.h | 8 |
5 files changed, 31 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 17243cfd55d..be29df06082 100644 --- a/configure.ac +++ b/configure.ac @@ -3409,6 +3409,15 @@ if test x$host_win32 = xno; then AC_CHECK_DECL(ICANON, [AC_DEFINE(HAVE_ICANON, 1, [ICANON])], [], [[#include <termios.h>]]) AC_CHECK_DECL(TCSANOW, [AC_DEFINE(HAVE_TCSANOW, 1, [TCSANOW])], [], [[#include <termios.h>]]) + AC_CHECK_DECL(lchflags, [AC_DEFINE(HAVE_LCHFLAGS, 1, [lchflags])], [], + [[#include <sys/types.h> + #include <sys/stat.h>]]) + AC_CHECK_MEMBER(struct stat.st_flags, + [AC_DEFINE(HAVE_STAT_FLAGS, 1, [struct stat.st_flags])], + [], + [#include <sys/types.h> + #include <sys/stat.h>]) + AC_CHECK_MEMBER(struct stat.st_birthtimespec, [AC_DEFINE(HAVE_STAT_BIRTHTIME, 1, [struct stat.st_birthtimespec])], [], diff --git a/external/corefx b/external/corefx -Subproject 81929cf874593abc218819ab7ded21f4b81147d +Subproject 1cdb9c20946c74a88a7fa507215556fadc2c2b2 diff --git a/mcs/class/corlib/corlib.csproj b/mcs/class/corlib/corlib.csproj index e6e8189646a..d15d3507c63 100644 --- a/mcs/class/corlib/corlib.csproj +++ b/mcs/class/corlib/corlib.csproj @@ -1947,6 +1947,7 @@ <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" /> + <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" /> @@ -2474,6 +2475,7 @@ <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" /> + <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" /> @@ -2558,6 +2560,7 @@ <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" /> + <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" /> @@ -2813,6 +2816,7 @@ <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" /> + <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" /> @@ -3384,6 +3388,7 @@ <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" /> + <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" /> @@ -3640,6 +3645,7 @@ <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" /> + <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" /> @@ -3896,6 +3902,7 @@ <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" /> + <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" /> @@ -4146,6 +4153,7 @@ <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" /> + <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" /> @@ -4397,6 +4405,7 @@ <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" /> + <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" /> @@ -4648,6 +4657,7 @@ <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" /> + <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" /> @@ -5181,6 +5191,7 @@ <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" /> + <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" /> @@ -5436,6 +5447,7 @@ <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" /> + <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" /> @@ -5691,6 +5703,7 @@ <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.CopyFile.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEGid.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.GetEUid.cs" /> + <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.LChflags.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Link.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.MkDir.cs" /> <Compile Include="..\..\..\external\corefx\src\Common\src\Interop\Unix\System.Native\Interop.Permissions.cs" /> diff --git a/mcs/class/corlib/unix_build_corlib.dll.sources b/mcs/class/corlib/unix_build_corlib.dll.sources index e33ba79c143..a3ebc60f09c 100644 --- a/mcs/class/corlib/unix_build_corlib.dll.sources +++ b/mcs/class/corlib/unix_build_corlib.dll.sources @@ -15,6 +15,7 @@ ../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.GetEUid.cs ../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.GetEGid.cs ../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.CopyFile.cs +../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.LChflags.cs ../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.Unlink.cs ../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.Link.cs ../../../external/corefx/src/Common/src/Interop/Unix/System.Native/Interop.Rename.cs diff --git a/sdks/wasm/src/pinvoke-tables-default.h b/sdks/wasm/src/pinvoke-tables-default.h index 14865d217b2..cb322d09206 100644 --- a/sdks/wasm/src/pinvoke-tables-default.h +++ b/sdks/wasm/src/pinvoke-tables-default.h @@ -12,13 +12,17 @@ int SystemNative_OpenDir (int); int SystemNative_GetReadDirRBufferSize (); int SystemNative_ReadDirR (int,int,int,int); int SystemNative_CloseDir (int); +int SystemNative_ReadLink (int,int,int); int SystemNative_FStat2 (int,int); int SystemNative_Stat2 (int,int); int SystemNative_LStat2 (int,int); +int SystemNative_Symlink (int,int); int SystemNative_ChMod (int,int); int SystemNative_CopyFile (int,int); int SystemNative_GetEGid (); int SystemNative_GetEUid (); +int SystemNative_LChflags (int,int); +int SystemNative_LChflagsCanSetHiddenFlag (); int SystemNative_Link (int,int); int SystemNative_MkDir (int,int); int SystemNative_Rename (int,int); @@ -37,13 +41,17 @@ static PinvokeImport System_Native_imports [] = { {"SystemNative_GetReadDirRBufferSize", SystemNative_GetReadDirRBufferSize}, {"SystemNative_ReadDirR", SystemNative_ReadDirR}, {"SystemNative_CloseDir", SystemNative_CloseDir}, +{"SystemNative_ReadLink", SystemNative_ReadLink}, {"SystemNative_FStat2", SystemNative_FStat2}, {"SystemNative_Stat2", SystemNative_Stat2}, {"SystemNative_LStat2", SystemNative_LStat2}, +{"SystemNative_Symlink", SystemNative_Symlink}, {"SystemNative_ChMod", SystemNative_ChMod}, {"SystemNative_CopyFile", SystemNative_CopyFile}, {"SystemNative_GetEGid", SystemNative_GetEGid}, {"SystemNative_GetEUid", SystemNative_GetEUid}, +{"SystemNative_LChflags", SystemNative_LChflags}, +{"SystemNative_LChflagsCanSetHiddenFlag", SystemNative_LChflagsCanSetHiddenFlag}, {"SystemNative_Link", SystemNative_Link}, {"SystemNative_MkDir", SystemNative_MkDir}, {"SystemNative_Rename", SystemNative_Rename}, |