shithub: opus

Info  •  Files  •  Log  •  Branches

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.

--- a/Makefile.am

+++ b/Makefile.am

@@ -228,4 +228,4 @@

 	$(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@ < $< > $@

--- a/celt/arm/arm2gnu.pl

+++ b/celt/arm/arm2gnu.pl

@@ -36,12 +36,12 @@

 while ($ARGV[0] =~ /^-/) {

     $_ = shift;

-  last if /^--/;

-    if (/^-n/) {

+  last if /^--$/;

+    if (/^-n$/) {

     $nflag++;

     next;

     }

-    if (/^--apple/) {

+    if (/^--apple$/) {

         $apple = 1;

         $symprefix = "_";

         next;