blob: aff1cb1842793f04491715c0bdc128fc72046754 [file] [log] [blame]
Patrick Williamsc124f4f2015-09-15 14:41:29 -05001Upstream-Status: Inappropriate [configuration]
2
3From 1921498bcc06408e8b051a3a9e9ce4182998f748 Mon Sep 17 00:00:00 2001
4From: David Schleef <ds@schleef.org>
5Date: Fri, 8 Apr 2011 10:05:49 -0700
6Subject: [PATCH 10/10] Fix --enable-vfp flag
7
8Patch from Christophe Lyon, fixes #36084.
9---
10 configure.ac | 4 ++--
11 liboil/arm/Makefile.am | 1 +
12 2 files changed, 3 insertions(+), 2 deletions(-)
13
14diff --git a/configure.ac b/configure.ac
15index 98c81fb..407d88c 100644
16--- a/configure.ac
17+++ b/configure.ac
18@@ -188,8 +188,8 @@ fi
19 AC_ARG_ENABLE(vfp,
20 AC_HELP_STRING([--enable-vfp],[compile with Vector Floating-point unit support]),
21 enable_vfp=$enableval,enable_vfp=yes)
22-if test "x$enable-vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then
23- AS_COMPILER_FLAG(["-Wa,-mfpu=vfp"],
24+if test "x$enable_vfp" = xyes -a x$HAVE_GCC_ASM = xyes -a x$HAVE_ARM = xyes; then
25+ AS_COMPILER_FLAG(["-mfpu=vfp"],
26 [VFP_CFLAGS="$VFP_CFLAGS -mfpu=vfp"],
27 true)
28 #AS_COMPILER_FLAG(["-Wa,-mfloat-abi=softfp"],
29diff --git a/liboil/arm/Makefile.am b/liboil/arm/Makefile.am
30index ead08ed..cd8d9fa 100644
31--- a/liboil/arm/Makefile.am
32+++ b/liboil/arm/Makefile.am
33@@ -6,4 +6,5 @@ libarm_la_SOURCES = \
34 math_vfp_asm.S
35
36 libarm_la_CFLAGS = $(LIBOIL_CFLAGS) $(VFP_CFLAGS)
37+libarm_la_CCASFLAGS = $(LIBOIL_CFLAGS) $(VFP_CFLAGS)
38
39--
401.7.6
41