diff options
author | Brooks Davis <brooks@FreeBSD.org> | 2009-03-03 18:12:02 +0000 |
---|---|---|
committer | Brooks Davis <brooks@FreeBSD.org> | 2009-03-03 18:12:02 +0000 |
commit | 45e5bc018a8bc706f938f968bcc42ea949c67aef (patch) | |
tree | 23bf543d562175a1991b05eb9c38d662472071eb /devel/llvm-devel/files | |
parent | 720437ee4857395bc6b49bea745822aa84c0b27e (diff) | |
download | ports-45e5bc018a8bc706f938f968bcc42ea949c67aef.tar.gz ports-45e5bc018a8bc706f938f968bcc42ea949c67aef.zip |
Notes
Diffstat (limited to 'devel/llvm-devel/files')
4 files changed, 42 insertions, 16 deletions
diff --git a/devel/llvm-devel/files/patch-tools_clang_lib_Headers_Makefile b/devel/llvm-devel/files/patch-tools_clang_lib_Headers_Makefile new file mode 100644 index 000000000000..da8c78141363 --- /dev/null +++ b/devel/llvm-devel/files/patch-tools_clang_lib_Headers_Makefile @@ -0,0 +1,14 @@ + +$FreeBSD$ + +--- tools/clang/lib/Headers/Makefile.orig ++++ tools/clang/lib/Headers/Makefile +@@ -13,7 +13,7 @@ + # FIXME: Get version from a common place. + HeaderDir := $(PROJ_OBJ_ROOT)/$(BuildMode)/lib/clang/1.0/include + +-HEADERS := $(notdir $(wildcard $(PROJ_SRC_DIR)/*.h)) ++HEADERS := $(filter-out std%.h,$(notdir $(wildcard $(PROJ_SRC_DIR)/*.h))) + + OBJHEADERS := $(addprefix $(HeaderDir)/, $(HEADERS)) + diff --git a/devel/llvm-devel/files/patch-tools_clang_lib_Makefile b/devel/llvm-devel/files/patch-tools_clang_lib_Makefile deleted file mode 100644 index ca13a25a9887..000000000000 --- a/devel/llvm-devel/files/patch-tools_clang_lib_Makefile +++ /dev/null @@ -1,14 +0,0 @@ - -$FreeBSD$ - ---- tools/clang/lib/Makefile.orig -+++ tools/clang/lib/Makefile -@@ -8,7 +8,7 @@ - ##===----------------------------------------------------------------------===## - LEVEL = ../../.. - --PARALLEL_DIRS = Headers Basic Lex Parse AST Sema CodeGen Analysis Rewrite Driver -+PARALLEL_DIRS = Basic Lex Parse AST Sema CodeGen Analysis Rewrite Driver - - include $(LEVEL)/Makefile.common - diff --git a/devel/llvm-devel/files/patch-tools_clang_lib_Sema_SemaChecking.cpp b/devel/llvm-devel/files/patch-tools_clang_lib_Sema_SemaChecking.cpp index 4fc9a0d8e991..9fdff9849f44 100644 --- a/devel/llvm-devel/files/patch-tools_clang_lib_Sema_SemaChecking.cpp +++ b/devel/llvm-devel/files/patch-tools_clang_lib_Sema_SemaChecking.cpp @@ -3,7 +3,16 @@ $FreeBSD$ --- tools/clang/lib/Sema/SemaChecking.cpp.orig +++ tools/clang/lib/Sema/SemaChecking.cpp -@@ -699,7 +699,6 @@ +@@ -142,7 +142,7 @@ + + // Printf checking. + if (const FormatAttr *Format = FDecl->getAttr<FormatAttr>()) { +- if (Format->getType() == "printf") { ++ if (Format->getType() == "printf" || Format->getType() == "printf0") { + bool HasVAListArg = Format->getFirstArg() == 0; + if (!HasVAListArg) { + if (const FunctionProtoType *Proto +@@ -701,7 +701,6 @@ case 'u': case 'x': case 'X': @@ -11,7 +20,7 @@ $FreeBSD$ case 'O': case 'U': case 'e': -@@ -715,9 +714,16 @@ +@@ -717,9 +716,16 @@ case 'S': case 's': case 'p': diff --git a/devel/llvm-devel/files/patch-tools_clang_lib_Sema_SemaDeclAttr.cpp b/devel/llvm-devel/files/patch-tools_clang_lib_Sema_SemaDeclAttr.cpp new file mode 100644 index 000000000000..35879d4021aa --- /dev/null +++ b/devel/llvm-devel/files/patch-tools_clang_lib_Sema_SemaDeclAttr.cpp @@ -0,0 +1,17 @@ + +$FreeBSD$ + +--- tools/clang/lib/Sema/SemaDeclAttr.cpp.orig ++++ tools/clang/lib/Sema/SemaDeclAttr.cpp +@@ -1011,7 +1011,10 @@ + default: break; + case 5: Supported = !memcmp(Format, "scanf", 5); break; + case 6: Supported = !memcmp(Format, "printf", 6); break; +- case 7: Supported = !memcmp(Format, "strfmon", 7); break; ++ case 7: ++ Supported = (!memcmp(Format, "strfmon", 7) || ++ !memcmp(Format, "printf0", 7)); ++ break; + case 8: + Supported = (is_strftime = !memcmp(Format, "strftime", 8)) || + (is_NSString = !memcmp(Format, "NSString", 8)) || |