mirror of
https://github.com/apache/nuttx.git
synced 2026-06-05 07:12:54 +08:00
Fix issue with multilib build
git-svn-id: svn://svn.code.sf.net/p/nuttx/code/trunk@3926 42af7a65-404d-4744-a932-0658087f49c3
This commit is contained in:
@@ -1766,8 +1766,8 @@
|
|||||||
(contributed by Uros Platise)
|
(contributed by Uros Platise)
|
||||||
* arch/mips and configs/pcblogic-pic32mx: The MicroChip PIC32MX port is now
|
* arch/mips and configs/pcblogic-pic32mx: The MicroChip PIC32MX port is now
|
||||||
code complete and ready to begin testing. Unfortunately, it looks like
|
code complete and ready to begin testing. Unfortunately, it looks like
|
||||||
testing will be delayed due to tool issues (My PICkit 2 will not work the
|
testing will be delayed due to tool issues (My PICkit 2 will not work the
|
||||||
the MPLAB debugger on PIC32; I will need to get a PICkit 3).
|
the MPLAB debugger on PIC32; I will need to get a PICkit 3).
|
||||||
* drivers/net/e1000.c/h: A PCI-based E1000 Ethernet driver submitted
|
* drivers/net/e1000.c/h: A PCI-based E1000 Ethernet driver submitted
|
||||||
by Yu Qiang.
|
by Yu Qiang.
|
||||||
* lib/net/lib_inetaddr.c: An implementation of the inet_addr() function
|
* lib/net/lib_inetaddr.c: An implementation of the inet_addr() function
|
||||||
@@ -2042,4 +2042,10 @@
|
|||||||
layer).
|
layer).
|
||||||
* drivers/bch: Fixed some important bugs in the BCH driver (noted by
|
* drivers/bch: Fixed some important bugs in the BCH driver (noted by
|
||||||
Li Zhuoyi (Lzyy)). This would have effected any large reads or writes
|
Li Zhuoyi (Lzyy)). This would have effected any large reads or writes
|
||||||
(larger than the hardware sector size).
|
(larger than the hardware sector size).
|
||||||
|
* arch/*/src/Makefile: Use of -print-libgcc-file-name to get path to
|
||||||
|
libgcc.a may select the wrong libgcc.a if a multilib toolchain (like
|
||||||
|
CodeSourcery) is used. This can be a serious problem and can cause
|
||||||
|
crashes on Cortex-M3 if the ARM libgcc is used, for example. The fix
|
||||||
|
is to include ARCHCPUFLAGS on the gcc command line when asking it to
|
||||||
|
-print-libgcc-file-name.
|
||||||
|
|||||||
@@ -85,7 +85,7 @@ LDLIBS = $(patsubst lib%,-l%,$(basename $(notdir $(LINKLIBS))))
|
|||||||
|
|
||||||
BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
|
BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
|
||||||
|
|
||||||
LIBGCC = "${shell $(CC) -print-libgcc-file-name}"
|
LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}"
|
||||||
|
|
||||||
VPATH = chip:common:$(ARCH_SUBDIR)
|
VPATH = chip:common:$(ARCH_SUBDIR)
|
||||||
|
|
||||||
|
|||||||
@@ -90,7 +90,7 @@ LDLIBS = $(patsubst lib%,-l%,$(basename $(notdir $(LINKLIBS))))
|
|||||||
|
|
||||||
BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
|
BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
|
||||||
|
|
||||||
LIBGCC = "${shell $(CC) -print-libgcc-file-name}"
|
LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}"
|
||||||
|
|
||||||
VPATH = chip:common:$(ARCH_SUBDIR)
|
VPATH = chip:common:$(ARCH_SUBDIR)
|
||||||
|
|
||||||
|
|||||||
@@ -82,7 +82,7 @@ LDLIBS = $(patsubst lib%,-l%,$(basename $(notdir $(LINKLIBS))))
|
|||||||
|
|
||||||
BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
|
BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
|
||||||
|
|
||||||
LIBGCC = "${shell $(CC) -print-libgcc-file-name}"
|
LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}"
|
||||||
|
|
||||||
VPATH = chip:common:$(ARCH_SUBDIR)
|
VPATH = chip:common:$(ARCH_SUBDIR)
|
||||||
|
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ LDLIBS = $(patsubst lib%,-l%,$(basename $(notdir $(LINKLIBS))))
|
|||||||
|
|
||||||
BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
|
BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
|
||||||
|
|
||||||
LIBGCC = "${shell $(CC) -print-libgcc-file-name}"
|
LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}"
|
||||||
|
|
||||||
VPATH = chip:common:$(ARCH_SUBDIR)
|
VPATH = chip:common:$(ARCH_SUBDIR)
|
||||||
|
|
||||||
|
|||||||
@@ -59,7 +59,7 @@ LDLIBS = $(patsubst lib%,-l%,$(basename $(notdir $(LINKLIBS))))
|
|||||||
|
|
||||||
BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
|
BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
|
||||||
|
|
||||||
LIBGCC = ${shell $(CC) -print-libgcc-file-name}
|
LIBGCC = ${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}
|
||||||
|
|
||||||
VPATH = chip:common
|
VPATH = chip:common
|
||||||
|
|
||||||
|
|||||||
@@ -79,7 +79,7 @@ LDLIBS = $(patsubst lib%,-l%,$(basename $(notdir $(LINKLIBS))))
|
|||||||
|
|
||||||
BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
|
BOARDDIR = $(TOPDIR)/arch/$(CONFIG_ARCH)/src/board
|
||||||
|
|
||||||
LIBGCC = "${shell $(CC) -print-libgcc-file-name}"
|
LIBGCC = "${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}"
|
||||||
|
|
||||||
ifeq ($(HOSTOS),FreeBSD)
|
ifeq ($(HOSTOS),FreeBSD)
|
||||||
HOST_ARCH = ${shell uname -m 2>/dev/null || echo "Other"}
|
HOST_ARCH = ${shell uname -m 2>/dev/null || echo "Other"}
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ VPATH = chip:common:board
|
|||||||
|
|
||||||
# Libraries
|
# Libraries
|
||||||
|
|
||||||
LIBGCC = ${shell $(CC) -print-libgcc-file-name}
|
LIBGCC = ${shell $(CC) $(ARCHCPUFLAGS) -print-libgcc-file-name}
|
||||||
|
|
||||||
# Supports dynamic sizing of HEAP.
|
# Supports dynamic sizing of HEAP.
|
||||||
#
|
#
|
||||||
|
|||||||
Reference in New Issue
Block a user