Merge branch 'bugfix/fix_pthread_for_cpp' into 'master'

donghengqaz · donghengqaz · commit 9f9ee5a97b48 · 2019-06-17T13:04:49.000+08:00
newlib: fix pthread macro lack for cpp

See merge request sdk/ESP8266_RTOS_SDK!988
diff --git a/components/newlib/CMakeLists.txt b/components/newlib/CMakeLists.txt
@@ -18,11 +18,5 @@ target_compile_definitions(newlib PUBLIC
     -D_CLOCKS_PER_SEC_=CONFIG_FREERTOS_HZ -D_POSIX_THREADS=1 -D_UNIX98_THREAD_MUTEX_ATTRIBUTES=1
     )
 
-if(CONFIG_ENABLE_PTHREAD)
-    target_compile_definitions(newlib PUBLIC
-        -D_POSIX_THREADS=1 -D_UNIX98_THREAD_MUTEX_AT
-        )
-endif()
-
 target_link_libraries(newlib "-L ${CMAKE_CURRENT_SOURCE_DIR}/newlib/lib")
 target_link_libraries(newlib "${LIBC}" "${LIBM}")
diff --git a/components/newlib/Makefile.projbuild b/components/newlib/Makefile.projbuild
@@ -1,4 +1,2 @@
 CFLAGS += -D_CLOCKS_PER_SEC_=CONFIG_FREERTOS_HZ -D_POSIX_THREADS=1 -D_UNIX98_THREAD_MUTEX_ATTRIBUTES=1
-ifdef CONFIG_ENABLE_PTHREAD
-CFLAGS += -D_POSIX_THREADS=1 -D_UNIX98_THREAD_MUTEX_AT
-endif
+CPPFLAGS += -D_CLOCKS_PER_SEC_=CONFIG_FREERTOS_HZ -D_POSIX_THREADS=1 -D_UNIX98_THREAD_MUTEX_ATTRIBUTES=1
