Re: www/seamonkey has self-conflicting patch names

[Robert Elz <kre%munnari.OZ.AU@localhost>]

    Date:        Thu, 7 Apr 2016 02:45:13 +0000
    From:        coypu%SDF.ORG@localhost
    Message-ID:  <20160407024513.GA13743%SDF.ORG@localhost>

  | It is missing the ifdef change.
  | For clarity, I compared to original yuv_row_arm.s

Yes ... so replace both patches with this one instead (with the
appropriate $NetBSD$ line added, or whatever is needed...), that is,
unless the file needs to end up being named .S in order to get cpp
applied, I can never remember what the procedure is there.

kre

--- yuv_row_arm.s.orig	2016-01-19 09:46:48.000000000 +0700
+++ yuv_row_arm.s	2016-04-07 11:27:44.000000000 +0700
@@ -2,6 +2,12 @@
  * License, v. 2.0. If a copy of the MPL was not distributed with this
  * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
+#if defined(__ARM_EABI__) && !defined(__ARM_DWARF_EH__)
+#define UNWIND
+#else
+#define UNWIND @
+#endif
+
     .arch   armv7-a
     .fpu    neon
 /* Allow to build on targets not supporting neon, and force the object file
@@ -74,7 +80,8 @@
     .global ScaleYCbCr42xToRGB565_BilinearY_Row_NEON
     .type   ScaleYCbCr42xToRGB565_BilinearY_Row_NEON, %function
     .balign 64
-    .fnstart
+    .cfi_startproc
+    UNWIND .fnstart
 ScaleYCbCr42xToRGB565_BilinearY_Row_NEON:
     STMFD       r13!,{r4-r9,r14}       @ 8 words.
     ADR         r14,YCbCr42xToRGB565_DITHER03_CONSTS_NEON
@@ -296,9 +303,10 @@
 s42xbily_neon_done:
     VPOP        {Q4-Q7}                @ 16 words.
     LDMFD       r13!,{r4-r9,PC}        @ 8 words.
-    .fnend
+    UNWIND .fnend
+    .cfi_endproc
     .size ScaleYCbCr42xToRGB565_BilinearY_Row_NEON, .-ScaleYCbCr42xToRGB565_BilinearY_Row_NEON
 
-#if defined(__ELF__)&&defined(__linux__)
+#if defined(__ELF__)&&(defined(__linux__) || defined(__NetBSD__))
     .section .note.GNU-stack,"",%progbits
 #endif