sergiotarxz/nuttx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merged in HeathPetersen/nuttx (pull request #101)

Browse Source 
Correct some Make.defs problems for qemu-486 config
This commit is contained in:
Gregory Nutt 2016-07-15 07:03:21 -06:00
commit a615944e0a
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
configs/qemu-i486/nsh/Make.defs
View File

@ -63,8 +63,7 @@ else
ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/nsh/ld.script
endif endif
ARCHCPUFLAGS = -march=i486 -mtune=i486 -fno-builtin ARCHCPUFLAGS = -march=i486 -mtune=i486 -fno-builtin -fno-stack-protector
#ARCHCPUFLAGS = -march=i486 -mtune=i486 -fno-builtin -fno-stack-protector
ARCHPICFLAGS = -fpic ARCHPICFLAGS = -fpic
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
ARCHDEFINES = ARCHDEFINES =
@ -73,6 +72,7 @@ ARCHDEFINES =
ifeq ($(CONFIG_ARCH_X86_M32),y) ifeq ($(CONFIG_ARCH_X86_M32),y)
ARCHCPUFLAGS += -m32 ARCHCPUFLAGS += -m32
LDFLAGS += -m elf_i386
endif endif
# We have to use a cross-development toolchain under Cygwin because the native # We have to use a cross-development toolchain under Cygwin because the native
@ -109,5 +109,5 @@ MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
HOSTCC = gcc HOSTCC = gcc
HOSTINCLUDESv = -I. HOSTINCLUDESv = -I.
HOSTCFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(HOSTINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
HOSTLDFLAGS = HOSTLDFLAGS =

6
configs/qemu-i486/ostest/Make.defs
View File

@ -63,8 +63,7 @@ else
ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ostest/ld.script ARCHSCRIPT = -T$(TOPDIR)/configs/$(CONFIG_ARCH_BOARD)/ostest/ld.script
endif endif
ARCHCPUFLAGS = -march=i486 -mtune=i486 -fno-builtin ARCHCPUFLAGS = -march=i486 -mtune=i486 -fno-builtin -fno-stack-protector
#ARCHCPUFLAGS = -march=i486 -mtune=i486 -fno-builtin -fno-stack-protector
ARCHPICFLAGS = -fpic ARCHPICFLAGS = -fpic
ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef ARCHWARNINGS = -Wall -Wstrict-prototypes -Wshadow -Wundef
ARCHDEFINES = ARCHDEFINES =
@ -73,6 +72,7 @@ ARCHDEFINES =
ifeq ($(CONFIG_ARCH_X86_M32),y) ifeq ($(CONFIG_ARCH_X86_M32),y)
ARCHCPUFLAGS += -m32 ARCHCPUFLAGS += -m32
LDFLAGS += -m elf_i386
endif endif
# We have to use a cross-development toolchain under Cygwin because the native # We have to use a cross-development toolchain under Cygwin because the native
@ -109,5 +109,5 @@ MKDEP = $(TOPDIR)/tools/mkdeps$(HOSTEXEEXT)
HOSTCC = gcc HOSTCC = gcc
HOSTINCLUDESv = -I. HOSTINCLUDESv = -I.
HOSTCFLAGS = $(ARCHWARNINGS) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS) $(HOSTINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES) -pipe HOSTCFLAGS = -Wall -Wstrict-prototypes -Wshadow -Wundef -g -pipe
HOSTLDFLAGS = HOSTLDFLAGS =