From f6ef4f195c70a6d704eb2e9d03322919b6eb7a77 Mon Sep 17 00:00:00 2001 From: Sylvestre Ledru Date: Sun, 27 Sep 2020 14:25:46 +0200 Subject: [PATCH] fix changelog --- debian/changelog | 3 --- 1 file changed, 3 deletions(-) diff --git a/debian/changelog b/debian/changelog index 5c4320dd..694275e5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,5 @@ llvm-toolchain-11 (1:11.0.0~+rc3-2) unstable; urgency=medium -<<<<<<< * Update of the symbol list of libomp5: - GOMP_loop_maybe_nonmonotonic_runtime_next - GOMP_loop_maybe_nonmonotonic_runtime_start @@ -17,14 +16,12 @@ llvm-toolchain-11 (1:11.0.0~+rc3-2) unstable; urgency=medium clang (LLVM option parsing): Unknown command line argument '-polly'. Try: 'clang (LLVM option parsing) --help' Also found in autopkgtest -======= * Bring back LLVM_POLLY_LINK_INTO_TOOLS=ON to workaround the error clang (LLVM option parsing): Unknown command line argument '-polly'. Try: 'clang (LLVM option parsing) --help' Fix autopkgtest * In the autopkgtest tests, update the opt arguments (-q removed and -basicaa renamed to -basic-aa) ->>>>>>> -- Sylvestre Ledru Sat, 26 Sep 2020 21:29:05 +0200