diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2011-10-11 12:51:44 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2011-10-11 12:51:44 +0000 |
| commit | e2aa5d53db175dff634069cacb31487e3ddb9754 (patch) | |
| tree | af972dbca474a0a5833d48bfa80b3aadb28d762a | |
| parent | 11b8a00a267be70a6f30a630f8cb3323d3b7c4c8 (diff) | |
| download | llvm-e2aa5d53db175dff634069cacb31487e3ddb9754.tar.gz llvm-e2aa5d53db175dff634069cacb31487e3ddb9754.tar.bz2 llvm-e2aa5d53db175dff634069cacb31487e3ddb9754.tar.xz | |
Add -D__STDC_FORMAT_MACROS to use PRIx64.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@141663 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | Makefile.rules | 2 | ||||
| -rw-r--r-- | cmake/modules/HandleLLVMOptions.cmake | 1 | ||||
| -rw-r--r-- | include/llvm/Support/DataTypes.h.cmake | 5 |
3 files changed, 7 insertions, 1 deletions
diff --git a/Makefile.rules b/Makefile.rules index 4d30d45b67..d057f043ff 100644 --- a/Makefile.rules +++ b/Makefile.rules @@ -623,7 +623,7 @@ CPP.BaseFlags += -include llvm/Support/Solaris.h endif # !HOST_OS - AuroraUX. LD.Flags += -L$(LibDir) -L$(LLVMLibDir) -CPP.BaseFlags += -D_GNU_SOURCE -D__STDC_LIMIT_MACROS -D__STDC_CONSTANT_MACROS +CPP.BaseFlags += -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS # All -I flags should go here, so that they don't confuse llvm-config. CPP.Flags += $(sort -I$(PROJ_OBJ_DIR) -I$(PROJ_SRC_DIR) \ $(patsubst %,-I%/include,\ diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake index 908bf6cce9..9dc1624f44 100644 --- a/cmake/modules/HandleLLVMOptions.cmake +++ b/cmake/modules/HandleLLVMOptions.cmake @@ -187,6 +187,7 @@ elseif( LLVM_COMPILER_IS_GCC_COMPATIBLE ) endif( MSVC ) add_llvm_definitions( -D__STDC_CONSTANT_MACROS ) +add_llvm_definitions( -D__STDC_FORMAT_MACROS ) add_llvm_definitions( -D__STDC_LIMIT_MACROS ) option(LLVM_INCLUDE_TESTS "Generate build targets for the LLVM unit tests." ON) diff --git a/include/llvm/Support/DataTypes.h.cmake b/include/llvm/Support/DataTypes.h.cmake index 260ed9bb5c..23d87fbb89 100644 --- a/include/llvm/Support/DataTypes.h.cmake +++ b/include/llvm/Support/DataTypes.h.cmake @@ -164,6 +164,11 @@ typedef signed int ssize_t; #ifndef UINT64_C # define UINT64_C(C) C##ui64 #endif + +#ifndef PRIx64 +# define PRIx64 "I64x" +#endif + #endif /* _MSC_VER */ /* Set defaults for constants which we cannot find. */ |