OrgApache/incubator-nuttx
OrgApache
/
incubator-nuttx
mirror of https://github.com/apache/incubator-nuttx.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Adjust microMIPS compile options to enable interlinking with 32-bit code

This commit is contained in:
Gregory Nutt 2015-02-25 09:54:48 -06:00
parent 82fcd4ea0e
commit 04d122c31f
3 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
arch/mips/src/mips32/Toolchain.defs
View File

@ -104,12 +104,14 @@ ifeq ($(CONFIG_DEBUG_CUSTOMOPT),y)
endif
ifeq ($(CONFIG_ARCH_MIPS_M14K),y)
MIPS_MARCH = 24kc
MIPS_MPROCESSOR = elf32pic32mx
MIPS_MICROMIPS = -mmicromips
else
MIPS_MARCH = m14k
MIPS_MPROCESSOR = elf32pic32mz
# MIPS_MICROMIPS = -mmicromips
# MIPS_MICROMIPS = -mmicromips -minterlink-mips16 -mno-jals
MIPS_MICROMIPS = -mmicromips -minterlink-compressed
else
MIPS_MARCH = 24kc
MIPS_MPROCESSOR = elf32pic32mx
MIPS_MICROMIPS =
endif

1
configs/pic32mz-starterkit/nsh/Make.defs
View File

@ -98,6 +98,7 @@ CXXFLAGS = $(ARCHCXXFLAGS) $(ARCHWARNINGSXX) $(ARCHOPTIMIZATION) $(ARCHCPUFLAGS)
CXXPICFLAGS = $(ARCHPICFLAGS) $(CXXFLAGS)
CPPFLAGS = $(ARCHINCLUDES) $(ARCHDEFINES) $(EXTRADEFINES)
AFLAGS = $(CFLAGS) -D__ASSEMBLY__
LDFLAGS = # -no-isn32 --relax
NXFLATLDFLAGS1 = -r -d -warn-common
NXFLATLDFLAGS2 = $(NXFLATLDFLAGS1) -T$(TOPDIR)/binfmt/libnxflat/gnu-nxflat-gotoff.ld -no-check-sections

9
include/nuttx/net/netconfig.h
View File

@ -251,6 +251,8 @@
# define UDP_IPv6_MSS(d) UDP_MSS(d,IPv6_HDRLEN)
# define ETH_IPv6_UDP_MSS ETH_UDP_MSS(IPv6_HDRLEN)
# define SLIP_IPv6_UDP_MSS SLIP_UDP_MSS(IPv6_HDRLEN)
# define MAX_IPv6_UDP_MSS __MAX_UDP_MSS(IPv6_HDRLEN)
# define MAX_UDP_MSS __MAX_UDP_MSS(IPv6_HDRLEN)
#endif
@ -258,16 +260,19 @@
# define UDP_IPv4_MSS(d) UDP_MSS(d,IPv4_HDRLEN)
# define ETH_IPv4_UDP_MSS ETH_UDP_MSS(IPv4_HDRLEN)
# define SLIP_IPv4_UDP_MSS SLIP_UDP_MSS(IPv4_HDRLEN)
# define MIN_IPv4_UDP_MSS __MIN_UDP_MSS(IPv4_HDRLEN)
# define MIN_UDP_MSS __MIN_UDP_MSS(IPv4_HDRLEN)
# undef MAX_UDP_MSS
# undef MAX_UDP_MSS
# define MAX_IPv4_UDP_MSS __MAX_UDP_MSS(IPv4_HDRLEN)
# define MAX_UDP_MSS __MAX_UDP_MSS(IPv4_HDRLEN)
#endif
/* If IPv6 is support, it will have the smaller MSS */
#ifdef CONFIG_NET_IPv6
# undef MIN_UDP_MSS
# undef MIN_UDP_MSS
# define MIN_IPv6_UDP_MSS __MIN_UDP_MSS(IPv6_HDRLEN)
# define MIN_UDP_MSS __MIN_UDP_MSS(IPv6_HDRLEN)
#endif