Skip to content

Commit e681656

Browse files
authored
Add downstream changes from Emscripten (#19)
This does not include llvm-libc changes, which is now synced with the upstream main branch. This includes changes from emscripten-core/emscripten#26014, which has not yet landed.
1 parent 34bf114 commit e681656

3 files changed

Lines changed: 5 additions & 5 deletions

File tree

compiler-rt/lib/profile/InstrProfilingPort.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@
5454
#endif
5555

5656
#define COMPILER_RT_MAX_HOSTLEN 128
57-
#if defined(__ORBIS__) || defined(__wasi__)
57+
#if defined(__ORBIS__) || defined(__wasi__) || defined(__EMSCRIPTEN__)
5858
#define COMPILER_RT_GETHOSTNAME(Name, Len) ((void)(Name), (void)(Len), (-1))
5959
#else
6060
#define COMPILER_RT_GETHOSTNAME(Name, Len) lprofGetHostName(Name, Len)

libcxxabi/src/cxa_exception.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ struct _LIBCXXABI_HIDDEN __cxa_exception {
3535
void *padding;
3636
};
3737

38-
static_assert(sizeof(__cxa_exception) % alignof(max_align_t) == 0, "__cxa_exception must have a size that is multipl of max alignment");
38+
static_assert(sizeof(__cxa_exception) % alignof(max_align_t) == 0, "__cxa_exception must have a size that is multiple of max alignment");
3939

4040
#else
4141

libunwind/src/Unwind-wasm.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ struct _Unwind_LandingPadContext {
3737
// function
3838
thread_local struct _Unwind_LandingPadContext __wasm_lpad_context;
3939

40-
/// Calls to this function is in landing pads in compiler-generated user code.
40+
/// Calls to this function are in landing pads in compiler-generated user code.
4141
/// In other EH schemes, stack unwinding is done by libunwind library, which
42-
/// calls the personality function for each each frame it lands. On the other
42+
/// calls the personality function for each frame it lands. On the other
4343
/// hand, WebAssembly stack unwinding process is performed by a VM, and the
4444
/// personality function cannot be called from there. So the compiler inserts
4545
/// a call to this function in landing pads in the user code, which in turn
@@ -92,7 +92,7 @@ _LIBUNWIND_EXPORT void _Unwind_SetGR(struct _Unwind_Context *context, int index,
9292

9393
/// Called by personality handler to get instruction pointer.
9494
_LIBUNWIND_EXPORT uintptr_t _Unwind_GetIP(struct _Unwind_Context *context) {
95-
// The result will be used as an 1-based index after decrementing 1, so we
95+
// The result will be used as a 1-based index after decrementing 1, so we
9696
// increment 2 here
9797
uintptr_t result =
9898
((struct _Unwind_LandingPadContext *)context)->lpad_index + 2;

0 commit comments

Comments
 (0)