svn commit: r263992 - head/sys/conf

Warner Losh imp at FreeBSD.org
Tue Apr 1 14:24:04 UTC 2014


Author: imp
Date: Tue Apr  1 14:24:03 2014
New Revision: 263992
URL: http://svnweb.freebsd.org/changeset/base/263992

Log:
  Test MK_ARM_ABI rather than if WITHOUT_ARM_ABI is defined.

Modified:
  head/sys/conf/Makefile.arm

Modified: head/sys/conf/Makefile.arm
==============================================================================
--- head/sys/conf/Makefile.arm	Tue Apr  1 14:23:58 2014	(r263991)
+++ head/sys/conf/Makefile.arm	Tue Apr  1 14:24:03 2014	(r263992)
@@ -44,10 +44,10 @@ CFLAGS += -mno-thumb-interwork
 .endif
 
 .if empty(DDB_ENABLED)
-.if defined(WITHOUT_ARM_EABI) && ${COMPILER_TYPE} != "clang"
+.if MK_ARM_EABI == "no" && ${COMPILER_TYPE} == "gcc"
 CFLAGS += -mno-apcs-frame
 .endif
-.elif !defined(WITHOUT_ARM_EABI)
+.elif MK_ARM_EABI != "no"
 CFLAGS += -funwind-tables
 .if ${COMPILER_TYPE} == "clang"
 # clang requires us to tell it to emit assembly with unwind information


More information about the svn-src-all mailing list