openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge changes from topic "mingw-clang" 

* changes:
  Do not customize __format__ for Windows/MinGW to gnu_printf
  Adapt to switch to Clang for Windows host builds
  Update cflags for building Windows modules with Clang
This commit is contained in:
Treehugger Robot 2018-06-26 19:47:53 +00:00 committed by Gerrit Code Review
parent b0ea3d38b4 a2df1ef441
commit b8f4fe4fd4
6 changed files with 11 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
adb/Android.bp
View File

@ -19,17 +19,13 @@ cc_defaults {
"-Wall",
"-Wextra",
"-Werror",
"-Wexit-time-destructors",
"-Wno-unused-parameter",
"-Wno-missing-field-initializers",
"-Wvla",
],
rtti: true,
clang_cflags: [
"-Wexit-time-destructors",
"-Wthread-safety",
],
use_version_lib: true,
compile_multilib: "first",
@ -85,6 +81,12 @@ cc_defaults {
"-luserenv",
],
},
not_windows: {
cflags: [
"-Wthread-safety",
],
},
},
}

10
adb/sysdeps.h
View File

@ -41,16 +41,8 @@
// Some printf-like functions are implemented in terms of
// android::base::StringAppendV, so they should use the same attribute for
// compile-time format string checking. On Windows, if the mingw version of
// vsnprintf is used in StringAppendV, use `gnu_printf' which allows z in %zd
// and PRIu64 (and related) to be recognized by the compile-time checking.
// compile-time format string checking.
#define ADB_FORMAT_ARCHETYPE __printf__
#ifdef __USE_MINGW_ANSI_STDIO
#if __USE_MINGW_ANSI_STDIO
#undef ADB_FORMAT_ARCHETYPE
#define ADB_FORMAT_ARCHETYPE gnu_printf
#endif
#endif
#ifdef _WIN32

2
base/include/android-base/chrono_utils.h
View File

@ -20,7 +20,7 @@
#include <chrono>
#include <sstream>
#if __cplusplus > 201103L // C++14
#if __cplusplus > 201103L && !defined(__WIN32) // C++14
using namespace std::chrono_literals;
#endif

11
base/include/android-base/stringprintf.h
View File

@ -24,17 +24,8 @@ namespace android {
namespace base {
// These printf-like functions are implemented in terms of vsnprintf, so they
// use the same attribute for compile-time format string checking. On Windows,
// if the mingw version of vsnprintf is used, use `gnu_printf' which allows z
// in %zd and PRIu64 (and related) to be recognized by the compile-time
// checking.
// use the same attribute for compile-time format string checking.
#define ANDROID_BASE_FORMAT_ARCHETYPE __printf__
#ifdef __USE_MINGW_ANSI_STDIO
#if __USE_MINGW_ANSI_STDIO
#undef ANDROID_BASE_FORMAT_ARCHETYPE
#define ANDROID_BASE_FORMAT_ARCHETYPE gnu_printf
#endif
#endif
// Returns a string corresponding to printf-like formatting of the arguments.
std::string StringPrintf(const char* fmt, ...)

11
fastboot/fastboot.h
View File

@ -78,17 +78,8 @@ char* xstrdup(const char*);
void set_verbose();
// These printf-like functions are implemented in terms of vsnprintf, so they
// use the same attribute for compile-time format string checking. On Windows,
// if the mingw version of vsnprintf is used, use `gnu_printf' which allows z
// in %zd and PRIu64 (and related) to be recognized by the compile-time
// checking.
// use the same attribute for compile-time format string checking.
#define FASTBOOT_FORMAT_ARCHETYPE __printf__
#ifdef __USE_MINGW_ANSI_STDIO
#if __USE_MINGW_ANSI_STDIO
#undef FASTBOOT_FORMAT_ARCHETYPE
#define FASTBOOT_FORMAT_ARCHETYPE gnu_printf
#endif
#endif
void die(const char* fmt, ...) __attribute__((__noreturn__))
__attribute__((__format__(FASTBOOT_FORMAT_ARCHETYPE, 1, 2)));
void verbose(const char* fmt, ...) __attribute__((__format__(FASTBOOT_FORMAT_ARCHETYPE, 1, 2)));

24
liblog/include/android/log.h
View File

@ -115,15 +115,7 @@ int __android_log_write(int prio, const char* tag, const char* text);
*/
int __android_log_print(int prio, const char* tag, const char* fmt, ...)
#if defined(__GNUC__)
#ifdef __USE_MINGW_ANSI_STDIO
#if __USE_MINGW_ANSI_STDIO
__attribute__((__format__(gnu_printf, 3, 4)))
#else
__attribute__((__format__(printf, 3, 4)))
#endif
#else
__attribute__((__format__(printf, 3, 4)))
#endif
#endif
;
@ -133,15 +125,7 @@ int __android_log_print(int prio, const char* tag, const char* fmt, ...)
*/
int __android_log_vprint(int prio, const char* tag, const char* fmt, va_list ap)
#if defined(__GNUC__)
#ifdef __USE_MINGW_ANSI_STDIO
#if __USE_MINGW_ANSI_STDIO
__attribute__((__format__(gnu_printf, 3, 0)))
#else
__attribute__((__format__(printf, 3, 0)))
#endif
#else
__attribute__((__format__(printf, 3, 0)))
#endif
#endif
;
@ -164,15 +148,7 @@ void __android_log_assert(const char* cond, const char* tag, const char* fmt,
...)
#if defined(__GNUC__)
__attribute__((__noreturn__))
#ifdef __USE_MINGW_ANSI_STDIO
#if __USE_MINGW_ANSI_STDIO
__attribute__((__format__(gnu_printf, 3, 4)))
#else
__attribute__((__format__(printf, 3, 4)))
#endif
#else
__attribute__((__format__(printf, 3, 4)))
#endif
#endif
;