libs/rt-thread-official
libs
/
rt-thread-official
mirror of https://github.com/RT-Thread/rt-thread.git
4
0
Fork 0
Code Issues Releases Wiki Activity

[fix] building error.

This commit is contained in:
guozhanxin 2022-04-21 10:31:32 +08:00 committed by guo
parent 1404186602
commit 7a717b094e
3 changed files with 5 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
components/libc/cplusplus/cpp11/emutls.c
View File

@ -23,8 +23,6 @@
#include <stdlib.h> #include <stdlib.h>
#include <string.h> #include <string.h>
#define COMPILE_TIME_ASSERT(x)
extern int pthread_key_create(pthread_key_t *key, void (*destructor)(void *)); extern int pthread_key_create(pthread_key_t *key, void (*destructor)(void *));
extern int pthread_key_delete(pthread_key_t key); extern int pthread_key_delete(pthread_key_t key);
extern void *pthread_getspecific(pthread_key_t key); extern void *pthread_getspecific(pthread_key_t key);
@ -85,13 +83,6 @@ static __inline void emutls_memalign_free(void *base)
/* Emulated TLS objects are always allocated at run-time. */ /* Emulated TLS objects are always allocated at run-time. */
static __inline void *emutls_allocate_object(__emutls_control *control) static __inline void *emutls_allocate_object(__emutls_control *control)
{ {
/* Use standard C types, check with gcc's emutls.o. */
typedef unsigned int gcc_word __attribute__((mode(word)));
typedef unsigned int gcc_pointer __attribute__((mode(pointer)));
COMPILE_TIME_ASSERT(sizeof(size_t) == sizeof(gcc_word));
COMPILE_TIME_ASSERT(sizeof(uintptr_t) == sizeof(gcc_pointer));
COMPILE_TIME_ASSERT(sizeof(uintptr_t) == sizeof(void *));
size_t size = control->size; size_t size = control->size;
size_t align = control->align; size_t align = control->align;
if (align < sizeof(void *)) if (align < sizeof(void *))

6
components/libc/posix/pthreads/pthread.h
View File

@ -22,9 +22,9 @@ extern "C" {
#define PTHREAD_KEY_MAX 8 #define PTHREAD_KEY_MAX 8
#define PTHREAD_COND_INITIALIZER {-1, 0} #define PTHREAD_COND_INITIALIZER {-1}
#define PTHREAD_RWLOCK_INITIALIZER {-1, 0} #define PTHREAD_RWLOCK_INITIALIZER {-1}
#define PTHREAD_MUTEX_INITIALIZER {-1, 0} #define PTHREAD_MUTEX_INITIALIZER {-1}
#define PTHREAD_CREATE_JOINABLE 0x00 #define PTHREAD_CREATE_JOINABLE 0x00
#define PTHREAD_CREATE_DETACHED 0x01 #define PTHREAD_CREATE_DETACHED 0x01

2
examples/utest/testcases/cpp11/Kconfig
View File

@ -2,6 +2,8 @@ menu "CPP11 Testcase"
config UTEST_CPP11_THREAD_TC config UTEST_CPP11_THREAD_TC
bool "Cpp11 thread test" bool "Cpp11 thread test"
select RT_USING_CPLUSPLUS
select RT_USING_CPLUSPLUS11
default n default n
endmenu endmenu