summaryrefslogtreecommitdiff
path: root/nuttx/configs/sim/nx11
diff options
context:
space:
mode:
authorpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-02 15:36:19 +0000
committerpatacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3>2012-05-02 15:36:19 +0000
commit5ebf11ee63f1baaf070fd8484d99362810cd5bcc (patch)
tree2068f6956ceee5aba740da5acb8f97858e2b3f8a /nuttx/configs/sim/nx11
parentaddae64d8c028ffd2c3bb05ec7ebdd1a73720998 (diff)
downloadpx4-nuttx-5ebf11ee63f1baaf070fd8484d99362810cd5bcc.tar.gz
px4-nuttx-5ebf11ee63f1baaf070fd8484d99362810cd5bcc.tar.bz2
px4-nuttx-5ebf11ee63f1baaf070fd8484d99362810cd5bcc.zip
Fix some warnings and fix some simulator builds
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@4688 42af7a65-404d-4744-a932-0658087f49c3
Diffstat (limited to 'nuttx/configs/sim/nx11')
-rw-r--r--nuttx/configs/sim/nx11/Make.defs21
1 files changed, 19 insertions, 2 deletions
diff --git a/nuttx/configs/sim/nx11/Make.defs b/nuttx/configs/sim/nx11/Make.defs
index 2dfda3e65..d385d823b 100644
--- a/nuttx/configs/sim/nx11/Make.defs
+++ b/nuttx/configs/sim/nx11/Make.defs
@@ -53,6 +53,11 @@ ARCHINCLUDES = -I. -isystem $(TOPDIR)/include
ARCHINCLUDESXX = -I. -isystem $(TOPDIR)/include -isystem $(TOPDIR)/include/cxx
ARCHSCRIPT =
+ifeq ($(CONFIG_SIM_M32),y)
+ ARCHCPUFLAGS += -m32
+ ARCHCPUFLAGSXX += -m32
+endif
+
CROSSDEV =
CC = $(CROSSDEV)gcc
CXX = $(CROSSDEV)g++
@@ -79,8 +84,20 @@ else
EXEEXT =
endif
-ifeq ("${CONFIG_DEBUG_SYMBOLS}","y")
- LDFLAGS += -g
+LDLINKFLAGS = $(ARCHSCRIPT) # Link flags used with $(LD)
+CCLINKFLAGS = $(ARCHSCRIPT) # Link flags used with $(CC)
+LDFLAGS = $(ARCHSCRIPT) # For backward compatibility, same as CCLINKFLAGS
+
+ifeq ($(CONFIG_DEBUG_SYMBOLS),y)
+ LDLINKFLAGS += -g
+ CCLINKFLAGS += -g
+ LDFLAGS += -g
+endif
+
+ifeq ($(CONFIG_SIM_M32),y)
+ LDLINKFLAGS += -melf_i386
+ CCLINKFLAGS += -m32
+ LDFLAGS += -m32
endif
define PREPROCESS