commit e975c1fa3f6e4a08fa0bfc4c2449844604b981f4
author Dan Albert <danalbert@google.com> Fri Mar 20 23:30:33 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Mar 20 23:30:33 2015 +0000
tree e2493d070055f1448323b2fea0d7e4b364ca76aa
parent 4955bfb4caeb9b0b03b85a1e886674ddbccdb44f
parent e98c9fc8fa25d4d5a270276148696a2686ed000b

am e98c9fc8: am f7da2fd4: Merge "Fix build after side-stepping global -Bsymbolic."

* commit 'e98c9fc8fa25d4d5a270276148696a2686ed000b':
  Fix build after side-stepping global -Bsymbolic.

Tremolo/dpen.s

diff --git a/Tremolo/dpen.s b/Tremolo/dpen.s
index f1bda1d..9bc6f18 100644
--- a/Tremolo/dpen.s
+++ b/Tremolo/dpen.s
@@ -44,6 +44,7 @@
 	.extern	oggpack_look
 	.extern	oggpack_eop
 	.extern	crc_lookup
+	.hidden	crc_lookup
 
 decode_packed_entry_number_REALSTART:
 dpen_nobits:

Tremolo/mdctARM.s

diff --git a/Tremolo/mdctARM.s b/Tremolo/mdctARM.s
index 5ad3aee..0fcc68e 100644
--- a/Tremolo/mdctARM.s
+++ b/Tremolo/mdctARM.s
@@ -45,6 +45,8 @@
 
 	.extern	sincos_lookup0
 	.extern	sincos_lookup1
+	.hidden	sincos_lookup0
+	.hidden	sincos_lookup1
 
 mdct_unroll_prelap:
 	@ r0 = out