Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
[main] Update dependencies from dotnet/arcade (#10455)
* Update dependencies from https://github.com/dotnet/arcade build 20201111.5 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.20552.5 -> To Version 6.0.0-beta.20561.5 * Update dependencies from https://github.com/dotnet/arcade build 20201113.2 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.20552.5 -> To Version 6.0.0-beta.20563.2 * Update dependencies from https://github.com/dotnet/arcade build 20201116.3 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.20552.5 -> To Version 6.0.0-beta.20566.3 * Update dependencies from https://github.com/dotnet/arcade build 20201117.7 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.20552.5 -> To Version 6.0.0-beta.20567.7 * Update dependencies from https://github.com/dotnet/arcade build 20201123.2 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.20552.5 -> To Version 6.0.0-beta.20573.2 * retain older sdk * Update dependencies from https://github.com/dotnet/arcade build 20201123.2 Microsoft.DotNet.Arcade.Sdk From Version 6.0.0-beta.20552.5 -> To Version 6.0.0-beta.20573.2 * retain 3.1 SDK Co-authored-by: dotnet-maestro[bot] <dotnet-maestro[bot]@users.noreply.github.com> Co-authored-by: Brett V. Forsgren <brettfo@microsoft.com>
- Loading branch information
1 parent
8f6e2b7
commit 86c4beb
Showing
13 changed files
with
87 additions
and
90 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,43 @@ | ||
diff -u -r a/usr/include/urcu/uatomic/generic.h b/usr/include/urcu/uatomic/generic.h | ||
--- a/usr/include/urcu/uatomic/generic.h 2014-10-22 15:00:58.000000000 -0700 | ||
+++ b/usr/include/urcu/uatomic/generic.h 2020-10-30 21:38:28.550000000 -0700 | ||
@@ -69,10 +69,10 @@ | ||
#endif | ||
#ifdef UATOMIC_HAS_ATOMIC_SHORT | ||
case 2: | ||
- return __sync_val_compare_and_swap_2(addr, old, _new); | ||
+ return __sync_val_compare_and_swap_2((uint16_t*) addr, old, _new); | ||
#endif | ||
case 4: | ||
- return __sync_val_compare_and_swap_4(addr, old, _new); | ||
+ return __sync_val_compare_and_swap_4((uint32_t*) addr, old, _new); | ||
#if (CAA_BITS_PER_LONG == 64) | ||
case 8: | ||
return __sync_val_compare_and_swap_8(addr, old, _new); | ||
@@ -109,7 +109,7 @@ | ||
return; | ||
#endif | ||
case 4: | ||
- __sync_and_and_fetch_4(addr, val); | ||
+ __sync_and_and_fetch_4((uint32_t*) addr, val); | ||
return; | ||
#if (CAA_BITS_PER_LONG == 64) | ||
case 8: | ||
@@ -148,7 +148,7 @@ | ||
return; | ||
#endif | ||
case 4: | ||
- __sync_or_and_fetch_4(addr, val); | ||
+ __sync_or_and_fetch_4((uint32_t*) addr, val); | ||
return; | ||
#if (CAA_BITS_PER_LONG == 64) | ||
case 8: | ||
@@ -187,7 +187,7 @@ | ||
return __sync_add_and_fetch_2(addr, val); | ||
#endif | ||
case 4: | ||
- return __sync_add_and_fetch_4(addr, val); | ||
+ return __sync_add_and_fetch_4((uint32_t*) addr, val); | ||
#if (CAA_BITS_PER_LONG == 64) | ||
case 8: | ||
return __sync_add_and_fetch_8(addr, val); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters