diff options
| author | dotnet-bot <dotnet-bot@microsoft.com> | 2021-05-05 21:25:36 +0300 |
|---|---|---|
| committer | dotnet-bot <dotnet-bot@microsoft.com> | 2021-05-05 21:25:36 +0300 |
| commit | 556582d964cc21b82a88d7154e915076f6f9008e (patch) | |
| tree | 83793ec9d5ef52066fa2f5b796af5456ae3e2967 | |
| parent | c711960f7b37c3517cc76e3a8dc89500f12e71ef (diff) | |
| parent | 49f4fb85df7339eddd07ce4b6065d370cd93d085 (diff) | |
Merge in 'release/5.0' changesv5.0.7
| -rw-r--r-- | eng/pipelines/common/platform-matrix.yml | 2 | ||||
| -rw-r--r-- | eng/pipelines/coreclr/templates/helix-queues-setup.yml | 4 | ||||
| -rw-r--r-- | src/coreclr/src/pal/src/include/pal/palinternal.h | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/eng/pipelines/common/platform-matrix.yml b/eng/pipelines/common/platform-matrix.yml index 2dcc928610b..d2b9aaeee9f 100644 --- a/eng/pipelines/common/platform-matrix.yml +++ b/eng/pipelines/common/platform-matrix.yml @@ -110,7 +110,7 @@ jobs: archType: arm platform: Linux_musl_arm container: - image: ubuntu-18.04-cross-arm-alpine-20200818211451-14441ae + image: ubuntu-16.04-cross-arm-alpine-20210409142327-044d5b9 registry: mcr jobParameters: runtimeFlavor: ${{ parameters.runtimeFlavor }} diff --git a/eng/pipelines/coreclr/templates/helix-queues-setup.yml b/eng/pipelines/coreclr/templates/helix-queues-setup.yml index 6748ff794fe..b696337b24a 100644 --- a/eng/pipelines/coreclr/templates/helix-queues-setup.yml +++ b/eng/pipelines/coreclr/templates/helix-queues-setup.yml @@ -51,9 +51,9 @@ jobs: # Temporarily disabled until packages for musl-arm32 is available #- ${{ if eq(parameters.platform, 'Linux_musl_arm') }}: # - ${{ if eq(variables['System.TeamProject'], 'public') }}: - # - (Alpine.312.Arm32.Open)Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.12-helix-arm32v7-20200908125213-5bece88 + # - (Alpine.313.Arm32.Open)Ubuntu.1804.ArmArch.Open@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-helix-arm32v7-20210414141857-1ea6b0a # - ${{ if eq(variables['System.TeamProject'], 'internal') }}: - # - (Alpine.312.Arm32)Ubuntu.1804.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.12-helix-arm32v7-20200908125213-5bece88 + # - (Alpine.313.Arm32)Ubuntu.1804.ArmArch@mcr.microsoft.com/dotnet-buildtools/prereqs:alpine-3.13-helix-arm32v7-20210414141857-1ea6b0a # Linux musl arm64 - ${{ if eq(parameters.platform, 'Linux_musl_arm64') }}: diff --git a/src/coreclr/src/pal/src/include/pal/palinternal.h b/src/coreclr/src/pal/src/include/pal/palinternal.h index a672d7ce625..c39c65f2455 100644 --- a/src/coreclr/src/pal/src/include/pal/palinternal.h +++ b/src/coreclr/src/pal/src/include/pal/palinternal.h @@ -170,6 +170,7 @@ function_name() to call the system's implementation #define memset DUMMY_memset #define memmove DUMMY_memmove #define memchr DUMMY_memchr +#define atoll DUMMY_atoll #define strlen DUMMY_strlen #define stricmp DUMMY_stricmp #define strstr DUMMY_strstr @@ -357,6 +358,7 @@ function_name() to call the system's implementation #undef memset #undef memmove #undef memchr +#undef atoll #undef strlen #undef strnlen #undef wcsnlen |