From 7291250b9dd0c95389b9c7cf694422960a7314e4 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Thu, 14 Feb 2019 10:56:01 +0100 Subject: [PATCH] update of the patches --- .../23-strlcpy_strlcat_warning_removed.diff | 58 ++++++++++++------- .../powerpcspe/D49754-powerpcspe-clang.diff | 46 +++++++-------- 2 files changed, 59 insertions(+), 45 deletions(-) diff --git a/debian/patches/23-strlcpy_strlcat_warning_removed.diff b/debian/patches/23-strlcpy_strlcat_warning_removed.diff index c439acc5..f7530d6d 100644 --- a/debian/patches/23-strlcpy_strlcat_warning_removed.diff +++ b/debian/patches/23-strlcpy_strlcat_warning_removed.diff @@ -7,11 +7,11 @@ clang/test/Sema/warn-strlcpycat-size.c | 55 -------------- 6 files changed, 25 insertions(+), 78 deletions(-) -Index: llvm-toolchain-snapshot_9~svn352610/clang/include/clang/Basic/Builtins.def +Index: llvm-toolchain-snapshot_9~svn353820/clang/include/clang/Basic/Builtins.def =================================================================== ---- llvm-toolchain-snapshot_9~svn352610.orig/clang/include/clang/Basic/Builtins.def -+++ llvm-toolchain-snapshot_9~svn352610/clang/include/clang/Basic/Builtins.def -@@ -519,8 +519,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz +--- llvm-toolchain-snapshot_9~svn353820.orig/clang/include/clang/Basic/Builtins.def ++++ llvm-toolchain-snapshot_9~svn353820/clang/include/clang/Basic/Builtins.def +@@ -520,8 +520,8 @@ BUILTIN(__builtin___memset_chk, "v*v*izz BUILTIN(__builtin___stpcpy_chk, "c*c*cC*z", "nF") BUILTIN(__builtin___strcat_chk, "c*c*cC*z", "nF") BUILTIN(__builtin___strcpy_chk, "c*c*cC*z", "nF") @@ -22,7 +22,7 @@ Index: llvm-toolchain-snapshot_9~svn352610/clang/include/clang/Basic/Builtins.de BUILTIN(__builtin___strncat_chk, "c*c*cC*zz", "nF") BUILTIN(__builtin___strncpy_chk, "c*c*cC*zz", "nF") BUILTIN(__builtin___stpncpy_chk, "c*c*cC*zz", "nF") -@@ -977,8 +977,8 @@ LIBBUILTIN(getcontext, "iK*", "fj", +@@ -978,8 +978,8 @@ LIBBUILTIN(getcontext, "iK*", "fj", LIBBUILTIN(_longjmp, "vJi", "fr", "setjmp.h", ALL_GNU_LANGUAGES) LIBBUILTIN(siglongjmp, "vSJi", "fr", "setjmp.h", ALL_GNU_LANGUAGES) // non-standard but very common @@ -33,10 +33,10 @@ Index: llvm-toolchain-snapshot_9~svn352610/clang/include/clang/Basic/Builtins.de // id objc_msgSend(id, SEL, ...) LIBBUILTIN(objc_msgSend, "GGH.", "f", "objc/message.h", OBJC_LANG) // long double objc_msgSend_fpret(id self, SEL op, ...) -Index: llvm-toolchain-snapshot_9~svn352610/clang/lib/AST/Decl.cpp +Index: llvm-toolchain-snapshot_9~svn353820/clang/lib/AST/Decl.cpp =================================================================== ---- llvm-toolchain-snapshot_9~svn352610.orig/clang/lib/AST/Decl.cpp -+++ llvm-toolchain-snapshot_9~svn352610/clang/lib/AST/Decl.cpp +--- llvm-toolchain-snapshot_9~svn353820.orig/clang/lib/AST/Decl.cpp ++++ llvm-toolchain-snapshot_9~svn353820/clang/lib/AST/Decl.cpp @@ -3660,13 +3660,13 @@ unsigned FunctionDecl::getMemoryFunction case Builtin::BImemmove: return Builtin::BImemmove; @@ -57,11 +57,11 @@ Index: llvm-toolchain-snapshot_9~svn352610/clang/lib/AST/Decl.cpp case Builtin::BI__builtin_memcmp: case Builtin::BImemcmp: -Index: llvm-toolchain-snapshot_9~svn352610/clang/lib/Sema/SemaChecking.cpp +Index: llvm-toolchain-snapshot_9~svn353820/clang/lib/Sema/SemaChecking.cpp =================================================================== ---- llvm-toolchain-snapshot_9~svn352610.orig/clang/lib/Sema/SemaChecking.cpp -+++ llvm-toolchain-snapshot_9~svn352610/clang/lib/Sema/SemaChecking.cpp -@@ -1313,12 +1313,12 @@ Sema::CheckBuiltinFunctionCall(FunctionD +--- llvm-toolchain-snapshot_9~svn353820.orig/clang/lib/Sema/SemaChecking.cpp ++++ llvm-toolchain-snapshot_9~svn353820/clang/lib/Sema/SemaChecking.cpp +@@ -1314,12 +1314,12 @@ Sema::CheckBuiltinFunctionCall(FunctionD case Builtin::BI__builtin___memset_chk: SemaBuiltinMemChkCall(*this, FDecl, TheCall, 2, 3, "memset"); break; @@ -76,7 +76,7 @@ Index: llvm-toolchain-snapshot_9~svn352610/clang/lib/Sema/SemaChecking.cpp case Builtin::BI__builtin___strncat_chk: SemaBuiltinMemChkCall(*this, FDecl, TheCall, 2, 3, "strncat"); break; -@@ -4247,9 +4247,10 @@ bool Sema::CheckFunctionCall(FunctionDec +@@ -4248,9 +4248,10 @@ bool Sema::CheckFunctionCall(FunctionDec return false; // Handle memory setting and copying functions. @@ -90,10 +90,10 @@ Index: llvm-toolchain-snapshot_9~svn352610/clang/lib/Sema/SemaChecking.cpp CheckStrncatArguments(TheCall, FnInfo); else CheckMemaccessArguments(TheCall, CMId, FnInfo); -Index: llvm-toolchain-snapshot_9~svn352610/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +Index: llvm-toolchain-snapshot_9~svn353820/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp =================================================================== ---- llvm-toolchain-snapshot_9~svn352610.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp -+++ llvm-toolchain-snapshot_9~svn352610/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp +--- llvm-toolchain-snapshot_9~svn353820.orig/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp ++++ llvm-toolchain-snapshot_9~svn353820/clang/lib/StaticAnalyzer/Checkers/GenericTaintChecker.cpp @@ -240,9 +240,9 @@ GenericTaintChecker::TaintPropagationRul case Builtin::BIstrncpy: case Builtin::BIstrncat: @@ -107,10 +107,10 @@ Index: llvm-toolchain-snapshot_9~svn352610/clang/lib/StaticAnalyzer/Checkers/Gen case Builtin::BIstrndup: return TaintPropagationRule({0, 1}, {ReturnValueIndex}); -Index: llvm-toolchain-snapshot_9~svn352610/clang/test/Sema/builtins.c +Index: llvm-toolchain-snapshot_9~svn353820/clang/test/Sema/builtins.c =================================================================== ---- llvm-toolchain-snapshot_9~svn352610.orig/clang/test/Sema/builtins.c -+++ llvm-toolchain-snapshot_9~svn352610/clang/test/Sema/builtins.c +--- llvm-toolchain-snapshot_9~svn353820.orig/clang/test/Sema/builtins.c ++++ llvm-toolchain-snapshot_9~svn353820/clang/test/Sema/builtins.c @@ -199,11 +199,11 @@ void test18() { ptr = __builtin___memccpy_chk(dst, src, '\037', sizeof(src), sizeof(dst)); @@ -156,9 +156,9 @@ Index: llvm-toolchain-snapshot_9~svn352610/clang/test/Sema/builtins.c } // rdar://11076881 -Index: llvm-toolchain-snapshot_9~svn352610/clang/test/Sema/warn-strlcpycat-size.c +Index: llvm-toolchain-snapshot_9~svn353820/clang/test/Sema/warn-strlcpycat-size.c =================================================================== ---- llvm-toolchain-snapshot_9~svn352610.orig/clang/test/Sema/warn-strlcpycat-size.c +--- llvm-toolchain-snapshot_9~svn353820.orig/clang/test/Sema/warn-strlcpycat-size.c +++ /dev/null @@ -1,55 +0,0 @@ -// RUN: %clang_cc1 -Wstrlcpy-strlcat-size -verify -fsyntax-only %s @@ -231,4 +231,18 @@ Index: llvm-toolchain-snapshot_9~svn353820/clang/lib/Basic/Builtins.cpp case Builtin::BIstrncat: return Builtin::BI__builtin___strncat_chk; case Builtin::BIstrncpy: return Builtin::BI__builtin___strncpy_chk; case Builtin::BIstpncpy: return Builtin::BI__builtin___stpncpy_chk; - +Index: llvm-toolchain-snapshot_9~svn353820/clang/lib/CodeGen/CGBuiltin.cpp +=================================================================== +--- llvm-toolchain-snapshot_9~svn353820.orig/clang/lib/CodeGen/CGBuiltin.cpp ++++ llvm-toolchain-snapshot_9~svn353820/clang/lib/CodeGen/CGBuiltin.cpp +@@ -1508,8 +1508,8 @@ RValue CodeGenFunction::emitFortifiedStd + case Builtin::BIstpcpy: + case Builtin::BIstrcat: + case Builtin::BIstrcpy: +- case Builtin::BIstrlcat: +- case Builtin::BIstrlcpy: ++// case Builtin::BIstrlcat: ++// case Builtin::BIstrlcpy: + case Builtin::BIstrncat: + case Builtin::BIstrncpy: + case Builtin::BIstpncpy: diff --git a/debian/patches/powerpcspe/D49754-powerpcspe-clang.diff b/debian/patches/powerpcspe/D49754-powerpcspe-clang.diff index 5d7b813d..fb07c387 100644 --- a/debian/patches/powerpcspe/D49754-powerpcspe-clang.diff +++ b/debian/patches/powerpcspe/D49754-powerpcspe-clang.diff @@ -3,11 +3,11 @@ Author: Justin Hibbits Origin: https://reviews.llvm.org/D49754 Last-Update: 2018-12-04 -Index: llvm-toolchain-snapshot_9~svn351647/clang/include/clang/Driver/Options.td +Index: llvm-toolchain-snapshot_9~svn354011/clang/include/clang/Driver/Options.td =================================================================== ---- llvm-toolchain-snapshot_9~svn351647.orig/clang/include/clang/Driver/Options.td -+++ llvm-toolchain-snapshot_9~svn351647/clang/include/clang/Driver/Options.td -@@ -2179,6 +2179,8 @@ def faltivec : Flag<["-"], "faltivec">, +--- llvm-toolchain-snapshot_9~svn354011.orig/clang/include/clang/Driver/Options.td ++++ llvm-toolchain-snapshot_9~svn354011/clang/include/clang/Driver/Options.td +@@ -2184,6 +2184,8 @@ def faltivec : Flag<["-"], "faltivec">, def fno_altivec : Flag<["-"], "fno-altivec">, Group, Flags<[DriverOption]>; def maltivec : Flag<["-"], "maltivec">, Group; def mno_altivec : Flag<["-"], "mno-altivec">, Group; @@ -16,10 +16,10 @@ Index: llvm-toolchain-snapshot_9~svn351647/clang/include/clang/Driver/Options.td def mvsx : Flag<["-"], "mvsx">, Group; def mno_vsx : Flag<["-"], "mno-vsx">, Group; def msecure_plt : Flag<["-"], "msecure-plt">, Group; -Index: llvm-toolchain-snapshot_9~svn351647/clang/lib/Basic/Targets/PPC.cpp +Index: llvm-toolchain-snapshot_9~svn354011/clang/lib/Basic/Targets/PPC.cpp =================================================================== ---- llvm-toolchain-snapshot_9~svn351647.orig/clang/lib/Basic/Targets/PPC.cpp -+++ llvm-toolchain-snapshot_9~svn351647/clang/lib/Basic/Targets/PPC.cpp +--- llvm-toolchain-snapshot_9~svn354011.orig/clang/lib/Basic/Targets/PPC.cpp ++++ llvm-toolchain-snapshot_9~svn354011/clang/lib/Basic/Targets/PPC.cpp @@ -53,6 +53,8 @@ bool PPCTargetInfo::handleTargetFeatures HasFloat128 = true; } else if (Feature == "+power9-vector") { @@ -73,10 +73,10 @@ Index: llvm-toolchain-snapshot_9~svn351647/clang/lib/Basic/Targets/PPC.cpp }; bool PPCTargetInfo::isValidCPUName(StringRef Name) const { -Index: llvm-toolchain-snapshot_9~svn351647/clang/lib/Basic/Targets/PPC.h +Index: llvm-toolchain-snapshot_9~svn354011/clang/lib/Basic/Targets/PPC.h =================================================================== ---- llvm-toolchain-snapshot_9~svn351647.orig/clang/lib/Basic/Targets/PPC.h -+++ llvm-toolchain-snapshot_9~svn351647/clang/lib/Basic/Targets/PPC.h +--- llvm-toolchain-snapshot_9~svn354011.orig/clang/lib/Basic/Targets/PPC.h ++++ llvm-toolchain-snapshot_9~svn354011/clang/lib/Basic/Targets/PPC.h @@ -44,7 +44,8 @@ class LLVM_LIBRARY_VISIBILITY PPCTargetI ArchDefinePwr8 = 1 << 12, ArchDefinePwr9 = 1 << 13, @@ -95,19 +95,19 @@ Index: llvm-toolchain-snapshot_9~svn351647/clang/lib/Basic/Targets/PPC.h protected: std::string ABI; -@@ -144,6 +146,8 @@ public: - ArchDefinePwr6x | ArchDefinePwr6 | ArchDefinePwr5x | - ArchDefinePwr5 | ArchDefinePwr4 | ArchDefinePpcgr | - ArchDefinePpcsq) +@@ -143,6 +145,8 @@ public: + ArchDefinePwr9 | ArchDefinePwr8 | ArchDefinePwr7 | + ArchDefinePwr6 | ArchDefinePwr5x | ArchDefinePwr5 | + ArchDefinePwr4 | ArchDefinePpcgr | ArchDefinePpcsq) + .Cases("e500", "e500v2", + ArchDefineName | ArchDefine500v2) .Default(ArchDefineNone); } return CPUKnown; -Index: llvm-toolchain-snapshot_9~svn351647/clang/test/Driver/ppc-features.cpp +Index: llvm-toolchain-snapshot_9~svn354011/clang/test/Driver/ppc-features.cpp =================================================================== ---- llvm-toolchain-snapshot_9~svn351647.orig/clang/test/Driver/ppc-features.cpp -+++ llvm-toolchain-snapshot_9~svn351647/clang/test/Driver/ppc-features.cpp +--- llvm-toolchain-snapshot_9~svn354011.orig/clang/test/Driver/ppc-features.cpp ++++ llvm-toolchain-snapshot_9~svn354011/clang/test/Driver/ppc-features.cpp @@ -168,6 +168,9 @@ // RUN: %clang -target powerpc64-unknown-linux-gnu %s -mno-invariant-function-descriptors -minvariant-function-descriptors -### -o %t.o 2>&1 | FileCheck -check-prefix=CHECK-INVFUNCDESC %s // CHECK-INVFUNCDESC: "-target-feature" "+invariant-function-descriptors" @@ -118,10 +118,10 @@ Index: llvm-toolchain-snapshot_9~svn351647/clang/test/Driver/ppc-features.cpp // Assembler features // RUN: %clang -target powerpc64-unknown-linux-gnu %s -### -o %t.o -no-integrated-as 2>&1 | FileCheck -check-prefix=CHECK_BE_AS_ARGS %s // CHECK_BE_AS_ARGS: "-mppc64" -Index: llvm-toolchain-snapshot_9~svn351647/clang/test/Misc/target-invalid-cpu-note.c +Index: llvm-toolchain-snapshot_9~svn354011/clang/test/Misc/target-invalid-cpu-note.c =================================================================== ---- llvm-toolchain-snapshot_9~svn351647.orig/clang/test/Misc/target-invalid-cpu-note.c -+++ llvm-toolchain-snapshot_9~svn351647/clang/test/Misc/target-invalid-cpu-note.c +--- llvm-toolchain-snapshot_9~svn354011.orig/clang/test/Misc/target-invalid-cpu-note.c ++++ llvm-toolchain-snapshot_9~svn354011/clang/test/Misc/target-invalid-cpu-note.c @@ -79,7 +79,7 @@ // PPC: error: unknown target CPU 'not-a-cpu' // PPC: note: valid target CPU values are: generic, 440, 450, 601, 602, 603, @@ -131,10 +131,10 @@ Index: llvm-toolchain-snapshot_9~svn351647/clang/test/Misc/target-invalid-cpu-no // PPC-SAME: power5, pwr5, power5x, pwr5x, power6, pwr6, power6x, pwr6x, power7, // PPC-SAME: pwr7, power8, pwr8, power9, pwr9, powerpc, ppc, powerpc64, ppc64, // PPC-SAME: powerpc64le, ppc64le -Index: llvm-toolchain-snapshot_9~svn351647/clang/test/Preprocessor/init.c +Index: llvm-toolchain-snapshot_9~svn354011/clang/test/Preprocessor/init.c =================================================================== ---- llvm-toolchain-snapshot_9~svn351647.orig/clang/test/Preprocessor/init.c -+++ llvm-toolchain-snapshot_9~svn351647/clang/test/Preprocessor/init.c +--- llvm-toolchain-snapshot_9~svn354011.orig/clang/test/Preprocessor/init.c ++++ llvm-toolchain-snapshot_9~svn354011/clang/test/Preprocessor/init.c @@ -7016,6 +7016,10 @@ // // PPC32-LINUX-NOT: _CALL_LINUX