From: Peter Michael Green <plugwash@raspbian.org>
Date: Sun, 10 Jun 2018 08:13:47 +0000 (+0000)
Subject: Remove changes to non-existing file from raspbian.diff
X-Git-Tag: archive/raspbian/3.1.0-6+rpi1^0
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=ab42065df2b697668681936cb438d4520f1aa0ba;p=openmpi.git

Remove changes to non-existing file from raspbian.diff
(changes were already removed from main source tree as part of the merge)
---

diff --git a/debian/patches/raspbian.diff b/debian/patches/raspbian.diff
index b2da60c9..bc90803e 100644
--- a/debian/patches/raspbian.diff
+++ b/debian/patches/raspbian.diff
@@ -26,66 +26,3 @@ Index: openmpi-2.1.1.try3/config/opal_config_asm.m4
              AC_DEFINE_UNQUOTED([OPAL_ASM_ARM_VERSION], [$OPAL_ASM_ARM_VERSION],
                                 [What ARM assembly version to use])
              OPAL_GCC_INLINE_ASSIGN='"mov %0, #0" : "=&r"(ret)'
-Index: openmpi-2.1.1.try3/opal/asm/base/ARM.asm
-===================================================================
---- openmpi-2.1.1.try3.orig/opal/asm/base/ARM.asm
-+++ openmpi-2.1.1.try3/opal/asm/base/ARM.asm
-@@ -3,19 +3,19 @@ START_FILE
- 
-        ALIGN(4)
- START_FUNC(opal_atomic_mb)
--       dmb
-+       MCR p15, 0, r0, c7, c10, 5
-        bx      lr
- END_FUNC(opal_atomic_mb)
- 
- 
- START_FUNC(opal_atomic_rmb)
--       dmb
-+       MCR p15, 0, r0, c7, c10, 5
-        bx      lr
- END_FUNC(opal_atomic_rmb)
- 
- 
- START_FUNC(opal_atomic_wmb)
--       dmb
-+       MCR p15, 0, r0, c7, c10, 5
-        bx      lr
- END_FUNC(opal_atomic_wmb)
- 
-@@ -43,7 +43,7 @@ START_FUNC(opal_atomic_cmpset_acq_32)
-        strex   r12, r2, [r0]
-        cmp     r12, #0
-        bne     REFLSYM(3)
--       dmb
-+       MCR p15, 0, r0, c7, c10, 5
-        mov     r0, #1
-        LSYM(4)
-        movne   r0, #0
-@@ -56,7 +56,7 @@ START_FUNC(opal_atomic_cmpset_rel_32)
-        ldrex   r3, [r0]
-        cmp     r1, r3
-        bne     REFLSYM(6)
--       dmb
-+       MCR p15, 0, r0, c7, c10, 5
-        strex   r12, r2, [r0]
-        cmp     r12, #0
-        bne     REFLSYM(4)
-@@ -98,7 +98,7 @@ START_FUNC(opal_atomic_cmpset_acq_64)
-        strexd  r1, r6, r7, [r0]
-        cmp     r1, #0
-        bne     REFLSYM(9)
--       dmb
-+       MCR p15, 0, r0, c7, c10, 5
-        mov     r0, #1
-        LSYM(10)
-        movne   r0, #0
-@@ -116,7 +116,7 @@ START_FUNC(opal_atomic_cmpset_rel_64)
-        it      eq
-        cmpeq   r5, r3
-        bne     REFLSYM(12)
--       dmb
-+       MCR p15, 0, r0, c7, c10, 5
-        strexd  r1, r6, r7, [r0]
-        cmp     r1, #0
-        bne     REFLSYM(11)