mirror of
https://github.com/mozilla/gecko-dev.git
synced 2024-11-25 05:41:12 +00:00
29 lines
979 B
Diff
29 lines
979 B
Diff
diff --git a/arm/arm_init.c b/arm/arm_init.c
|
|
--- a/arm/arm_init.c
|
|
+++ b/arm/arm_init.c
|
|
@@ -41,7 +41,7 @@
|
|
/* ARM Neon is expected to be available on the target CPU architecture. */
|
|
# error "PNG_ARM_NEON_CHECK_SUPPORTED must not be defined on this CPU arch"
|
|
# elif defined(__linux__)
|
|
-# define PNG_ARM_NEON_FILE "contrib/arm-neon/linux.c"
|
|
+# define PNG_ARM_NEON_FILE "linux.c"
|
|
# else
|
|
# error "No support for run-time ARM Neon checking; use compile-time options"
|
|
# endif
|
|
diff --git a/arm/filter_neon.S b/arm/filter_neon.S
|
|
--- a/arm/filter_neon.S
|
|
+++ b/arm/filter_neon.S
|
|
@@ -10,6 +10,12 @@
|
|
* and license in png.h
|
|
*/
|
|
|
|
+/* These are required because Mozilla's moz.build system doesn't pass
|
|
+ * -DDefined macros to the assembler.
|
|
+ */
|
|
+#define PNG_READ_SUPPORTED
|
|
+#define MOZ_PNG_HAVE_ARM_NEON
|
|
+
|
|
/* This is required to get the symbol renames, which are #defines, and the
|
|
* definitions (or not) of PNG_ARM_NEON_OPT and PNG_ARM_NEON_IMPLEMENTATION.
|
|
*/
|