Attempt fix and enable for Ubuntu 22

chakra-core · Apr 16, 2024 · 8ec35c5 · 8ec35c5
1 parent 2f15d4e
commit 8ec35c5
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 9 deletions.
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -33,16 +33,26 @@ jobs:
  maxParallel: 6
  matrix:
  Linux.NoJit:
- image_name: 'ubuntu-20.04'
+ image_name: 'ubuntu-22.04'
  deps: 'sudo apt-get install -y ninja-build clang libicu-dev'
  build_type: 'Debug'
  libtype_flag: '-DDISABLE_JIT=ON'
  Linux.ReleaseWithDebug:
- image_name: 'ubuntu-20.04'
+ image_name: 'ubuntu-22.04'
  deps: 'sudo apt-get install -y ninja-build clang libicu-dev'
  build_type: 'RelWithDebInfo'
  libtype_flag: ''
  Linux.Release:
+ image_name: 'ubuntu-22.04'
+ deps: 'sudo apt-get install -y ninja-build clang libicu-dev'
+ build_type: 'Release'
+ libtype_flag: ''
+ Ubuntu20.ReleaseWithDebug:
+ image_name: 'ubuntu-20.04'
+ deps: 'sudo apt-get install -y ninja-build clang libicu-dev'
+ build_type: 'RelWithDebInfo'
+ libtype_flag: ''
+ Ubuntu20.Release:
  image_name: 'ubuntu-20.04'
  deps: 'sudo apt-get install -y ninja-build clang libicu-dev'
  build_type: 'Release'

diff --git a/pal/inc/cclock.hpp b/pal/inc/cclock.hpp
@@ -9,13 +9,7 @@
 #ifndef CC_PAL_INC_CCLOCK_H
 #define CC_PAL_INC_CCLOCK_H
 
-#if defined(_M_ARM64)
-#define CCLOCK_ALIGN __declspec(align(8))
-#else
-#define CCLOCK_ALIGN
-#endif
-
-class CCLOCK_ALIGN CCLock
+class __declspec(align(sizeof(size_t))) CCLock
 {
  char mutexPtr[64]; // keep mutex implementation opaque to consumer (PAL vs non-PAL)