Fix iOS builds with assembly.

The patch in 76e831d917 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.
This commit is contained in:
Timothy B. Terriberry 2014-03-26 12:58:04 -07:00
parent 76e831d917
commit 4ae4bc61d0
2 changed files with 4 additions and 4 deletions

View file

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

View file

@ -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;