Changeset 15278 for release/1.8/source/lisp-kernel/linuxarm/Makefile

Timestamp:

Mar 28, 2012, 4:04:57 PM (9 years ago)

Author:

rme

Message:

Update linuxarm Makefile to specify the soft-float ABI
explicitly.

Location:

release/1.8/source

Files:

• . (modified) (1 prop)
• lisp-kernel/linuxarm/Makefile (modified) (4 diffs)

release/1.8/source/lisp-kernel/linuxarm/Makefile

@@ -22 +22 @@
 AS = as
 M4 = m4
-ASFLAGS = -mfpu=vfp -march=armv7-a
+ASFLAGS = -mfpu=vfp -march=armv7-a -mfloat-abi=$(FLOAT_ABI)
 M4FLAGS = -DLINUX -DARM
 CDEFINES = -DLINUX -DARM -D_REENTRANT -D_GNU_SOURCE -DUSE_FUTEX -DSVN_REVISION=$(SVN_REVISION)
@@ -31 +31 @@
 WFORMAT = -Wno-format
 PLATFORM_H = platform-linuxarm.h
+FLOAT_ABI = softfp
 
 # If the linker supports a "--hash-style=" option, use traditional
@@ -52 +53 @@
         $(M4) $(M4FLAGS) -I../ $< | $(AS) $(A32) $(ASFLAGS) -o $@
 .c.o:
-        $(CC) -include ../$(PLATFORM_H) -c $< $(CDEFINES) $(CDEBUG) $(COPT) -marm $(WFORMAT)  -o $@
+        $(CC) -include ../$(PLATFORM_H) -c $< $(CDEFINES) $(CDEBUG) $(COPT) -marm -mfloat-abi=$(FLOAT_ABI) $(WFORMAT)  -o $@
 
 SPOBJ = pad.o  arm-spentry.o
@@ -86 +87 @@
 
 ../../armcl:    $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ)
-        $(CC)  $(CDEBUG)  -Wl,--export-dynamic $(HASH_STYLE) -o $@ -T ./armlinux.x $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) -Wl,--no-as-needed $(OSLIBS)
+        $(CC)  $(CDEBUG)  -Wl,--export-dynamic $(HASH_STYLE) -mfloat-abi=$(FLOAT_ABI) -o $@ -T ./armlinux.x $(KSPOBJ) $(KERNELOBJ) $(DEBUGOBJ) -Wl,--no-as-needed $(OSLIBS)