Skip to content
This repository was archived by the owner on Nov 6, 2022. It is now read-only.

Commit 5125c16

Browse files
authored
Merge pull request #9 from fortanix/jb/unsafecell-niche-fix
Actually fix RWLock representation for UnsafeCell niche fix
2 parents 63b1b1c + 19e6690 commit 5125c16

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

libunwind/src/UnwindRustSgx.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@
2222

2323
// We have to use RWLock from rust repo, it is defined in:
2424
// src/libstd/sys/sgx/rwlock.rs.
25-
// rwlock.rs has compile time check to ensure sizeof(RWLock) = 128.
25+
// rwlock.rs has compile time check to ensure sizeof(RWLock) = 144.
2626
typedef struct {
27-
unsigned char opaque[128];
27+
unsigned char opaque[144];
2828
} RWLock;
2929

3030
// The below is obtained by printing initialized bytes

libunwind/src/UnwindRustSgxSnprintf.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
#pragma GCC diagnostic ignored "-Wfloat-conversion"
1111
#pragma GCC diagnostic ignored "-Wsign-conversion"
1212
#pragma GCC diagnostic ignored "-Wstrict-overflow"
13+
#if __GNUC__ >= 7
1314
#pragma GCC diagnostic ignored "-Wimplicit-fallthrough"
15+
#endif
1416

1517
/**************************************************************
1618
* Original:

0 commit comments

Comments
 (0)