Skip to content

Commit db234e5

Browse files
author
qiaopengcheng
committed
[LoongArch64] Fixed the compiling error by
libunwind/libunwind#322.
1 parent 98b471e commit db234e5

File tree

3 files changed

+15
-15
lines changed

3 files changed

+15
-15
lines changed

src/coreclr/pal/src/libunwind/include/tdep-loongarch64/libunwind_i.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,7 @@ dwarf_put (struct dwarf_cursor *c, dwarf_loc_t loc, unw_word_t val)
229229
#define tdep_get_as_arg(c) ((c)->dwarf.as_arg)
230230
#define tdep_get_ip(c) ((c)->dwarf.ip)
231231

232-
extern int tdep_init_done;
232+
extern atomic_bool tdep_init_done;
233233
#define tdep_init_mem_validate UNW_OBJ(init_mem_validate)
234234

235235
extern void tdep_init (void);

src/coreclr/pal/src/libunwind/src/CMakeLists.txt

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -153,31 +153,31 @@ SET(libunwind_elfxx_la_SOURCES
153153
elfxx.c
154154
)
155155

156-
# The list of files that go into libunwind and libunwind-loongarch:
156+
# The list of files that go into libunwind and libunwind-loongarch64:
157157
SET(libunwind_la_SOURCES_loongarch_common
158158
${libunwind_la_SOURCES_common}
159-
loongarch/is_fpreg.c
160-
loongarch/regname.c
159+
loongarch64/is_fpreg.c
160+
loongarch64/regname.c
161161
)
162162

163163
# The list of files that go into libunwind:
164164
SET(libunwind_la_SOURCES_loongarch
165165
${libunwind_la_SOURCES_loongarch_common}
166166
${libunwind_la_SOURCES_local}
167-
loongarch/Lget_proc_info.c loongarch/Linit.c loongarch/Lis_signal_frame.c
168-
loongarch/Lstep.c
169-
loongarch/getcontext.S
170-
loongarch/Lget_save_loc.c
171-
loongarch/Linit_local.c loongarch/Lregs.c
172-
loongarch/Lcreate_addr_space.c loongarch/Lglobal.c loongarch/Linit_remote.c loongarch/Lresume.c
167+
loongarch64/Lget_proc_info.c loongarch64/Linit.c loongarch64/Lis_signal_frame.c
168+
loongarch64/Lstep.c
169+
loongarch64/getcontext.S
170+
loongarch64/Lget_save_loc.c
171+
loongarch64/Linit_local.c loongarch64/Lregs.c
172+
loongarch64/Lcreate_addr_space.c loongarch64/Lglobal.c loongarch64/Linit_remote.c loongarch64/Lresume.c
173173
)
174174

175175
SET(libunwind_loongarch_la_SOURCES_loongarch
176176
${libunwind_la_SOURCES_loongarch_common}
177177
${libunwind_la_SOURCES_generic}
178-
loongarch/Gcreate_addr_space.c loongarch/Gget_proc_info.c loongarch/Gget_save_loc.c
179-
loongarch/Gglobal.c loongarch/Ginit.c loongarch/Ginit_local.c loongarch/Ginit_remote.c
180-
loongarch/Gis_signal_frame.c loongarch/Gregs.c loongarch/Gresume.c loongarch/Gstep.c
178+
loongarch64/Gcreate_addr_space.c loongarch64/Gget_proc_info.c loongarch64/Gget_save_loc.c
179+
loongarch64/Gglobal.c loongarch64/Ginit.c loongarch64/Ginit_local.c loongarch64/Ginit_remote.c
180+
loongarch64/Gis_signal_frame.c loongarch64/Gregs.c loongarch64/Gresume.c loongarch64/Gstep.c
181181
)
182182

183183
# The list of files that go into libunwind and libunwind-aarch64:
@@ -361,7 +361,7 @@ if(CLR_CMAKE_HOST_UNIX)
361361
SET(libunwind_la_SOURCES ${libunwind_la_SOURCES_loongarch})
362362
SET(libunwind_remote_la_SOURCES ${libunwind_loongarch_la_SOURCES_loongarch})
363363
SET(libunwind_elf_la_SOURCES ${libunwind_elf64_la_SOURCES})
364-
list(APPEND libunwind_setjmp_la_SOURCES loongarch/siglongjmp.S)
364+
list(APPEND libunwind_setjmp_la_SOURCES loongarch64/siglongjmp.S)
365365
endif()
366366

367367
if(CLR_CMAKE_HOST_OSX)

src/coreclr/pal/src/libunwind/src/loongarch64/Gglobal.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
2727
#include "dwarf_i.h"
2828

2929
HIDDEN define_lock (loongarch64_lock);
30-
HIDDEN int tdep_init_done;
30+
HIDDEN atomic_bool tdep_init_done;
3131

3232
HIDDEN void
3333
tdep_init (void)

0 commit comments

Comments
 (0)