From 4ae4bc61d033bd615bb6ddfe18f28994d02c51bc Mon Sep 17 00:00:00 2001
From: "Timothy B. Terriberry" <tterribe@xiph.org>
Date: Wed, 26 Mar 2014 12:58:04 -0700
Subject: [PATCH] Fix iOS builds with assembly.

The patch in 76e831d917ff got us most of the way there, but
 out-of-tree builds required a second Makefile.am rule, which was
 missing @ARM2GNU_PARAMS@.
Also, the arm2gnu.pl was terminating argument processing on any
 argument beginning with --, rather than an argument that was just
 -- by itself (as is the normal convention in GNU programs).
That meant it never saw the --apple flag even when it was passed.

Thanks to Jonathan Lennox for the report and for testing.
---
 Makefile.am         | 2 +-
 celt/arm/arm2gnu.pl | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e76b2049..fac7651f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -228,4 +228,4 @@ $(CELT_SOURCES_ARM_ASM:%.s=%-gnu.S): $(top_srcdir)/celt/arm/arm2gnu.pl
 	$(top_srcdir)/celt/arm/arm2gnu.pl @ARM2GNU_PARAMS@ < $< > $@
 # For autoconf-modified sources (e.g., armopts.s)
 %-gnu.S: %.s
-	$(top_srcdir)/celt/arm/arm2gnu.pl < $< > $@
+	$(top_srcdir)/celt/arm/arm2gnu.pl @ARM2GNU_PARAMS@ < $< > $@
diff --git a/celt/arm/arm2gnu.pl b/celt/arm/arm2gnu.pl
index 54f7129b..6c922ac8 100755
--- a/celt/arm/arm2gnu.pl
+++ b/celt/arm/arm2gnu.pl
@@ -36,12 +36,12 @@ eval 'exec /usr/local/bin/perl -S $0 ${1+"$@"}'
 
 while ($ARGV[0] =~ /^-/) {
     $_ = shift;
-  last if /^--/;
-    if (/^-n/) {
+  last if /^--$/;
+    if (/^-n$/) {
     $nflag++;
     next;
     }
-    if (/^--apple/) {
+    if (/^--apple$/) {
         $apple = 1;
         $symprefix = "_";
         next;