diff options
| author | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-04 21:04:30 +0000 |
|---|---|---|
| committer | patacongo <patacongo@42af7a65-404d-4744-a932-0658087f49c3> | 2012-11-04 21:04:30 +0000 |
| commit | da1ae022722331326cbe3880b355ea9166e50de4 (patch) | |
| tree | 33bc0fd2649b8ea583d975029a6cfcbcbd606047 | |
| parent | 38ef1b734afd1994804529ddbf5d28a8106f089b (diff) | |
| download | nuttx-da1ae022722331326cbe3880b355ea9166e50de4.tar.gz nuttx-da1ae022722331326cbe3880b355ea9166e50de4.tar.bz2 nuttx-da1ae022722331326cbe3880b355ea9166e50de4.zip | |
Change = to += in setting of LDFLAGS in all architecture Makefiles
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@5311 42af7a65-404d-4744-a932-0658087f49c3
| -rw-r--r-- | nuttx/arch/8051/src/Makefile | 2 | ||||
| -rw-r--r-- | nuttx/arch/arm/src/Makefile | 2 | ||||
| -rw-r--r-- | nuttx/arch/avr/src/Makefile | 2 | ||||
| -rw-r--r-- | nuttx/arch/hc/src/Makefile | 2 | ||||
| -rw-r--r-- | nuttx/arch/mips/src/Makefile | 2 | ||||
| -rw-r--r-- | nuttx/arch/sh/src/Makefile | 2 | ||||
| -rw-r--r-- | nuttx/arch/x86/src/Makefile | 2 | ||||
| -rw-r--r-- | nuttx/arch/z16/src/Makefile | 2 | ||||
| -rw-r--r-- | nuttx/arch/z80/src/Makefile.zdsii | 2 |
9 files changed, 9 insertions, 9 deletions
diff --git a/nuttx/arch/8051/src/Makefile b/nuttx/arch/8051/src/Makefile index fe1995fd0..83c796119 100644 --- a/nuttx/arch/8051/src/Makefile +++ b/nuttx/arch/8051/src/Makefile @@ -72,7 +72,7 @@ BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board IRAM_SIZE = 0x100 DEF_STACK_BASE = 0x24 -LDFLAGS = --model-large --nostdlib \ +LDFLAGS += --model-large --nostdlib \ --data-loc $(DEF_STACK_BASE) --iram-size $(IRAM_SIZE) \ --code-loc 0x2100 --code-size 0x5f40 \ --xram-loc $(IRAM_SIZE) --xram-size 0x1f00 diff --git a/nuttx/arch/arm/src/Makefile b/nuttx/arch/arm/src/Makefile index 7bba7315f..f356f4d02 100644 --- a/nuttx/arch/arm/src/Makefile +++ b/nuttx/arch/arm/src/Makefile @@ -70,7 +70,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -LDFLAGS = $(ARCHSCRIPT) +LDFLAGS += $(ARCHSCRIPT) EXTRA_LIBS ?= EXTRA_LIBPATHS ?= diff --git a/nuttx/arch/avr/src/Makefile b/nuttx/arch/avr/src/Makefile index b72a6c8a8..bbfc4dd4f 100644 --- a/nuttx/arch/avr/src/Makefile +++ b/nuttx/arch/avr/src/Makefile @@ -74,7 +74,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -LDFLAGS = $(ARCHSCRIPT) +LDFLAGS += $(ARCHSCRIPT) EXTRA_LIBS ?= LINKLIBS = diff --git a/nuttx/arch/hc/src/Makefile b/nuttx/arch/hc/src/Makefile index 36fc9bf72..ff19ce6fe 100644 --- a/nuttx/arch/hc/src/Makefile +++ b/nuttx/arch/hc/src/Makefile @@ -67,7 +67,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -LDFLAGS = $(ARCHSCRIPT) +LDFLAGS += $(ARCHSCRIPT) EXTRA_LIBS ?= LINKLIBS = diff --git a/nuttx/arch/mips/src/Makefile b/nuttx/arch/mips/src/Makefile index 8d7b940c6..8769f35ec 100644 --- a/nuttx/arch/mips/src/Makefile +++ b/nuttx/arch/mips/src/Makefile @@ -64,7 +64,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -LDFLAGS = $(ARCHSCRIPT) +LDFLAGS += $(ARCHSCRIPT) EXTRA_LIBS ?= LINKLIBS = diff --git a/nuttx/arch/sh/src/Makefile b/nuttx/arch/sh/src/Makefile index 7ec8c9f80..300898396 100644 --- a/nuttx/arch/sh/src/Makefile +++ b/nuttx/arch/sh/src/Makefile @@ -50,7 +50,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -LDFLAGS = $(ARCHSCRIPT) +LDFLAGS += $(ARCHSCRIPT) EXTRA_LIBS ?= LINKLIBS = diff --git a/nuttx/arch/x86/src/Makefile b/nuttx/arch/x86/src/Makefile index 9c35e9809..7225f31cf 100644 --- a/nuttx/arch/x86/src/Makefile +++ b/nuttx/arch/x86/src/Makefile @@ -64,7 +64,7 @@ COBJS = $(CSRCS:.c=$(OBJEXT)) SRCS = $(ASRCS) $(CSRCS) OBJS = $(AOBJS) $(COBJS) -LDFLAGS = $(ARCHSCRIPT) +LDFLAGS += $(ARCHSCRIPT) EXTRA_LIBS ?= LINKLIBS = diff --git a/nuttx/arch/z16/src/Makefile b/nuttx/arch/z16/src/Makefile index 40dc73c5e..088aeebd2 100644 --- a/nuttx/arch/z16/src/Makefile +++ b/nuttx/arch/z16/src/Makefile @@ -49,7 +49,7 @@ INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) CPPFLAGS += -I$(ARCHSRCDIR) ifeq ($(COMPILER),zneocc.exe) -LDFLAGS = @"${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}" +LDFLAGS += @"${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}" endif HEAD_ASRC = $(HEAD_SSRC:.S=$(ASMEXT)) diff --git a/nuttx/arch/z80/src/Makefile.zdsii b/nuttx/arch/z80/src/Makefile.zdsii index a105597a9..e749bddd3 100644 --- a/nuttx/arch/z80/src/Makefile.zdsii +++ b/nuttx/arch/z80/src/Makefile.zdsii @@ -41,7 +41,7 @@ USRINCLUDES = -usrinc:'.;$(WTOPDIR)\sched;$(WARCHSRCDIR);$(WARCHSRCDIR)\common' INCLUDES = $(ARCHSTDINCLUDES) $(USRINCLUDES) CFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(INCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) CPPFLAGS += -I$(ARCHSRCDIR) -I$(ZDSSTDINCDIR) -I$(ZDSZILOGINCDIR) -LDFLAGS = @"${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}" +LDFLAGS += @"${shell cygpath -w $(ARCHSRCDIR)/nuttx.linkcmd}" ############################################################################ # Files and directories |