[arch-commits] Commit in clang/trunk (2 files)

[Evangelos Foutras]

    Date: Friday, October 4, 2019 @ 21:46:08
  Author: foutrelis
Revision: 363821

Refresh patch for test/Driver/modules.cpp

Modified:
  clang/trunk/0001-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch
  clang/trunk/PKGBUILD

-----------------------------------------------------------------+
 0001-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch |   33 +++++-----
 PKGBUILD                                                        |    4 -
 2 files changed, 21 insertions(+), 16 deletions(-)

Modified: 0001-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch
===================================================================
--- 0001-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch	2019-10-04 21:33:41 UTC (rev 363820)
+++ 0001-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch	2019-10-04 21:46:08 UTC (rev 363821)
@@ -1,27 +1,32 @@
-From 20ffd5bc4e45980dc804c5fa422e5182cbc975b7 Mon Sep 17 00:00:00 2001
+From 8ea70c9ede7ac82d9363c122a9a84aded054984c Mon Sep 17 00:00:00 2001
 From: Tom Stellard <tstellar at redhat.com>
-Date: Tue, 13 Aug 2019 13:38:40 -0700
+Date: Mon, 30 Sep 2019 23:42:17 +0000
 Subject: [PATCH] Fix Driver/modules.cpp test to work when build directory name
  contains '.s'
 
+Reviewers: dyung, rsmith, hansw
+
+Subscribers: mati865, mgorny, cfe-commits
+
+Tags: #clang
+
+Differential Revision: https://reviews.llvm.org/D66176
+
+git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@373275 91177308-0d34-0410-b5e6-96231b3b80d8
 ---
- clang/test/Driver/modules.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
+ test/Driver/modules.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
 
-diff --git a/clang/test/Driver/modules.cpp b/clang/test/Driver/modules.cpp
-index 7c549c1..9e06151 100644
---- a/clang/test/Driver/modules.cpp
-+++ b/clang/test/Driver/modules.cpp
-@@ -15,7 +15,8 @@
+diff --git a/test/Driver/modules.cpp b/test/Driver/modules.cpp
+index 7c549c1300..4f4e3a4140 100644
+--- a/test/Driver/modules.cpp
++++ b/test/Driver/modules.cpp
+@@ -15,7 +15,7 @@
  // RUN: %clang -std=c++2a %t/module.pcm -S -o %t/module.pcm.o -v 2>&1 | FileCheck %s --check-prefix=CHECK-COMPILE
  //
  // CHECK-COMPILE: -cc1 {{.*}} {{-emit-obj|-S}}
 -// CHECK-COMPILE-SAME: -o {{.*}}.{{pcm.o|s}}
-+// Check for extra space to avoid failures when the build directory contains '.s' in its path.
-+// CHECK-COMPILE-SAME: -o {{.*}}.{{pcm.o|s}}{{ }}
++// CHECK-COMPILE-SAME: -o {{.*}}module{{2*}}.pcm.o
  // CHECK-COMPILE-SAME: -x pcm
  // CHECK-COMPILE-SAME: {{.*}}.pcm
  
--- 
-1.8.3.1
-

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2019-10-04 21:33:41 UTC (rev 363820)
+++ PKGBUILD	2019-10-04 21:46:08 UTC (rev 363821)
@@ -29,7 +29,7 @@
             'd6a0565cf21f22e9b4353b2eb92622e8365000a9e90a16b09b56f8157eabfe84'
             'SKIP'
             '9245955509841e031f4c8169c2207b3029e8af9e30a39e662ac1bfd9d6186a51'
-            '2e47e305a5d79713160c560c7617411815b1a93d73a7f9d182c96e848fdd011b'
+            '72a15c9825a1f5c73cc4f04c831bf3a12620db90922af299599f029aab0d27f0'
             'fde58a4902bec3715bc3d0c9250fa4c5f241af90bfd1e46f7128fa1435c03026')
 validpgpkeys+=('B6C8F98282B944E3B0D5C2530FC3042E345AD05D') # Hans Wennborg <hans at chromium.org>
 validpgpkeys+=('474E22316ABF4785A88C6E8EA2C794A986419D8A') # Tom Stellard <tstellar at redhat.com>
@@ -44,7 +44,7 @@
   patch -Np1 -i ../0001-Initialize-all-fields-in-ABIArgInfo.patch
 
   # https://reviews.llvm.org/D66176
-  patch -Np2 -i ../0001-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch
+  patch -Np1 -i ../0001-Fix-Driver-modules.cpp-test-to-work-when-build-direc.patch
 }
 
 build() {