Browse Source

Bug 618, Thomas Chou: update build flags for nios target

Mike Frysinger 19 years ago
parent
commit
40770ac31c
2 changed files with 8 additions and 1 deletions
  1. 7 0
      Rules.mak
  2. 1 1
      extra/Configs/Config.nios

+ 7 - 0
Rules.mak

@@ -176,6 +176,11 @@ ifeq ($(TARGET_ARCH),mips)
 	CPU_CFLAGS-$(CONFIG_MIPS_ISA_MIPS64)+=-mips64 -mtune=mips32
 endif
 
+ifeq ($(TARGET_ARCH),nios)
+	CPU_LDFLAGS-y+=-m32
+	CPU_CFLAGS-y+=-m32
+endif
+
 ifeq ($(TARGET_ARCH),sh)
 	OPTIMIZATION+=-fstrict-aliasing
 	OPTIMIZATION+= $(call check_gcc,-mprefergot,)
@@ -281,9 +286,11 @@ ifeq ($(UCLIBC_HAS_SOFT_FLOAT),y)
 # If -msoft-float isn't supported, we want an error anyway.
 # Hmm... might need to revisit this for arm since it has 2 different
 # soft float encodings.
+ifneq ($(TARGET_ARCH),nios)
 ifneq ($(TARGET_ARCH),nios2)
     CPU_CFLAGS += -msoft-float
 endif
+endif
 ifeq ($(TARGET_ARCH),arm)
 # No longer needed with current toolchains, but leave it here for now.
 # If anyone is actually still using gcc 2.95 (say), they can uncomment it.

+ 1 - 1
extra/Configs/Config.nios

@@ -15,7 +15,7 @@ config HAVE_ELF
 
 config ARCH_CFLAGS
 	string
-	default "-m32 -funaligned-struct-hack"
+	default "-funaligned-struct-hack"
 
 config LIBGCC_CFLAGS
 	string