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

The 'make export' target needs to bundle up the user C startup file (crt0), not the kernel head object

Browse Source
This commit is contained in:
Gregory Nutt 2014-09-04 13:31:34 -06:00
parent 87f946d4a9
commit 56dc80cf59
17 changed files with 69 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
arch/arm/src/Makefile
View File

@ -1,7 +1,7 @@
############################################################################
# arch/arm/src/Makefile
#
# Copyright (C) 2007-2009, 2011-2012 Gregory Nutt. All rights reserved.
# Copyright (C) 2007-2009, 2011-2012, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -85,6 +85,7 @@ endif
# The "head" object
HEAD_OBJ = $(HEAD_ASRC:.S=$(OBJEXT))
STARTUP_OBJS ?= $(HEAD_OBJ)
# Flat build or kernel-mode objects
@ -188,10 +189,10 @@ endif
# Note that there may not be a head object if layout is handled
# by the linker configuration.
export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
ifneq ($(HEAD_OBJ),)
export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
ifneq ($(STARTUP_OBJS),)
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup/."; \
else \
echo "$(EXPORT_DIR)/startup does not exist"; \
exit 1; \

4
arch/arm/src/a1x/Make.defs
View File

@ -38,6 +38,10 @@
HEAD_ASRC = arm_vectortab.S
ifeq ($(CONFIG_BUILD_KERNEL),y)
STARTUP_OBJS = crt0$(OBJEXT)
endif
# Force the start-up logic to be at the beginning of the .text to simplify
# debug.

10
arch/arm/src/armv7-a/crt0.c
View File

@ -40,6 +40,7 @@
#include <nuttx/config.h>
#include <sys/types.h>
#include <stdlib.h>
#include <nuttx/addrenv.h>
@ -57,7 +58,7 @@
* Public Function Prototypes
****************************************************************************/
extern main_t main;
int main(int argc, char *argv[]);
/****************************************************************************
* Private Functions
@ -100,8 +101,9 @@ static void sig_trampoline(void)
" blx ip\n" /* Call the signal handler */
" pop {r2}\n" /* Recover LR in R2 */
" mov lr, r2\n" /* Restore LR */
" mov r0, #4\n" /* SYS_signal_handler_return
" mov r0, #4\n" /* SYS_signal_handler_return */
" svc #0x900001\n" /* Return from the signal handler */
);
}
#endif
@ -138,7 +140,7 @@ void _start(int argc, FAR char *argv[])
* that is visible to the RTOS.
*/
ADDRENV_DATA_RESERVE->ar_sigtramp = (addrenv_sigtramp_t)sig_trampoline;
ARCH_DATA_RESERVE->ar_sigtramp = (addrenv_sigtramp_t)sig_trampoline;
#endif
/* Call C++ constructors */
@ -147,7 +149,7 @@ void _start(int argc, FAR char *argv[])
/* Call the main() entry point passing argc and argv. */
ret = main(argc, argc);
ret = main(argc, argv);
/* Call exit() if/when the main() returns */

4
arch/arm/src/sama5/Make.defs
View File

@ -38,6 +38,10 @@
HEAD_ASRC = arm_vectortab.S
ifeq ($(CONFIG_BUILD_KERNEL),y)
STARTUP_OBJS = crt0$(OBJEXT)
endif
# Force the start-up logic to be at the beginning of the .text to simplify
# debug.

7
arch/avr/src/Makefile
View File

@ -1,7 +1,7 @@
############################################################################
# arch/avr/src/Makefile
#
# Copyright (C) 2010-2012 Gregory Nutt. All rights reserved.
# Copyright (C) 2010-2012, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -72,6 +72,7 @@ CXXFLAGS += $(INCLUDES)
AFLAGS += $(INCLUDES)
HEAD_OBJ = $(HEAD_ASRC:.S=$(OBJEXT))
STARTUP_OBJS ?= $(HEAD_OBJ)
ASRCS = $(CHIP_ASRCS) $(CMN_ASRCS)
AOBJS = $(ASRCS:.S=$(OBJEXT))
@ -147,9 +148,9 @@ endif
# This is part of the top-level export target
export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
else \
echo "$(EXPORT_DIR)/startup does not exist"; \
exit 1; \

7
arch/hc/src/Makefile
View File

@ -1,7 +1,7 @@
############################################################################
# arch/hc/src/Makefile
#
# Copyright (C) 2009, 2011-2012 Gregory Nutt. All rights reserved.
# Copyright (C) 2009, 2011-2012, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -68,6 +68,7 @@ endif
endif
HEAD_OBJ = $(HEAD_ASRC:.S=$(OBJEXT))
STARTUP_OBJS ?= $(HEAD_OBJ)
ASRCS = $(CHIP_ASRCS) $(CMN_ASRCS)
AOBJS = $(ASRCS:.S=$(OBJEXT))
@ -142,9 +143,9 @@ endif
# This is part of the top-level export target
export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
else \
echo "$(EXPORT_DIR)/startup does not exist"; \
exit 1; \

7
arch/mips/src/Makefile
View File

@ -1,7 +1,7 @@
############################################################################
# arch/mips/src/Makefile
#
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -65,6 +65,7 @@ endif
endif
HEAD_OBJ = $(HEAD_ASRC:.S=$(OBJEXT))
STARTUP_OBJS ?= $(HEAD_OBJ)
ASRCS = $(CHIP_ASRCS) $(CMN_ASRCS)
AOBJS = $(ASRCS:.S=$(OBJEXT))
@ -140,9 +141,9 @@ endif
# This is part of the top-level export target
export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
else \
echo "$(EXPORT_DIR)/startup does not exist"; \
exit 1; \

4
arch/rgmp/src/Makefile
View File

@ -1,7 +1,7 @@
############################################################################
# arch/rgmp/src/Makefile
#
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -85,7 +85,7 @@ nuttx$(EXEEXT): $(LINKOBJS)
# This is part of the top-level export target
export_head:
expport_startup:
# Dependencies

7
arch/sh/src/Makefile
View File

@ -1,7 +1,7 @@
############################################################################
# arch/sh/src/Makefile
#
# Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
# Copyright (C) 2008, 2011-2012, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -63,6 +63,7 @@ endif
CFLAGS += -I$(ARCH_SRCDIR)/chip -I$(ARCH_SRCDIR)/common -I$(TOPDIR)/sched
HEAD_OBJ = $(HEAD_ASRC:.S=$(OBJEXT))
STARTUP_OBJS ?= $(HEAD_OBJ)
ASRCS = $(CHIP_ASRCS) $(CMN_ASRCS)
AOBJS = $(ASRCS:.S=$(OBJEXT))
@ -138,9 +139,9 @@ endif
# This is part of the top-level export target
export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
else \
echo "$(EXPORT_DIR)/startup does not exist"; \
exit 1; \

4
arch/sim/src/Makefile
View File

@ -145,7 +145,7 @@ RELLIBS += -lboard
all: up_head$(OBJEXT) libarch$(LIBEXT)
.PHONY: board/libboard$(LIBEXT) export_head clean distclean cleanrel depend
.PHONY: board/libboard$(LIBEXT) export_startup clean distclean cleanrel depend
$(AOBJS): %$(OBJEXT): %.S
$(call ASSEMBLE, $<, $@)
@ -199,7 +199,7 @@ nuttx$(EXEEXT): cleanrel nuttx.rel $(HOSTOBJS)
# This is part of the top-level export target
export_head: board/libboard$(LIBEXT) up_head.o $(HOSTOBJS)
export_startup: board/libboard$(LIBEXT) up_head.o $(HOSTOBJS)
cp up_head.o $(HOSTOBJS) ${EXPORT_DIR}/startup
cp nuttx-names.dat ${EXPORT_DIR}/libs
echo main NXmain >> ${EXPORT_DIR}/libs/nuttx-names.dat

7
arch/x86/src/Makefile
View File

@ -1,7 +1,7 @@
############################################################################
# arch/x86/src/Makefile
#
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -65,6 +65,7 @@ endif
endif
HEAD_OBJ = $(HEAD_ASRC:.S=$(OBJEXT))
STARTUP_OBJS ?= $(HEAD_OBJ)
ASRCS = $(CHIP_ASRCS) $(CMN_ASRCS)
AOBJS = $(ASRCS:.S=$(OBJEXT))
@ -148,9 +149,9 @@ endif
# This is part of the top-level export target
export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
else \
echo "$(EXPORT_DIR)/startup does not exist"; \
exit 1; \

9
arch/z16/src/Makefile
View File

@ -1,7 +1,7 @@
############################################################################
# arch/z16/src/Makefile
#
# Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
# Copyright (C) 2008, 2011-2012, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -65,6 +65,7 @@ endif
HEAD_ASRC = $(HEAD_SSRC:.S=$(ASMEXT))
HEAD_OBJ = $(HEAD_SSRC:.S=$(OBJEXT))
STARTUP_OBJS ?= $(HEAD_OBJ)
SSRCS = $(CHIP_SSRCS) $(CMN_SSRCS)
ASRCS = $(SSRCS:.S=$(ASMEXT))
@ -145,12 +146,12 @@ endif
# This is part of the top-level export target
export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
ifeq ($(CONFIG_WINDOWS_NATIVE),y)
$(Q) if exist "$(EXPORT_DIR)$(DELIM)startup" ( copy $(HEAD_OBJ) "$(EXPORT_DIR)$(DELIM)startup$(DELIM)." /b /y)
$(Q) if exist "$(EXPORT_DIR)$(DELIM)startup" ( copy $(STARTUP_OBJS) "$(EXPORT_DIR)$(DELIM)startup$(DELIM)." /b /y)
else
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
else \
echo "$(EXPORT_DIR)/startup does not exist"; \
exit 1; \

7
arch/z80/src/Makefile.sdccl
View File

@ -1,7 +1,7 @@
############################################################################
# arch/z80/src/Makefile.sdccl
#
# Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
# Copyright (C) 2008, 2011-2012, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -43,6 +43,7 @@ CPPFLAGS += -D__ASSEMBLY__
# There should be one head source (.asm file)
HEAD_OBJ = $(HEAD_ASRC:$(ASMEXT)=$(OBJEXT))
STARTUP_OBJS ?= $(HEAD_OBJ)
# Assembly sources and objects
@ -181,9 +182,9 @@ endif
# This is part of the top-level export target
export_head: board/libboard$(LIBEXT) $(HEAD_OBJ)
export_startup: board/libboard$(LIBEXT) $(STARTUP_OBJS)
$(Q) if [ -d "$(EXPORT_DIR)/startup" ]; then \
cp -f $(HEAD_OBJ) "$(EXPORT_DIR)/startup"; \
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)/startup"; \
else \
echo "$(EXPORT_DIR)/startup does not exist"; \
exit 1; \

7
arch/z80/src/Makefile.sdccw
View File

@ -1,7 +1,7 @@
############################################################################
# arch/z80/src/Makefile.sdccw
#
# Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
# Copyright (C) 2008, 2011-2012, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -43,6 +43,7 @@ CPPFLAGS += -D__ASSEMBLY__
# There should be one head source (.asm file)
HEAD_OBJ = $(HEAD_ASRC:$(ASMEXT)=$(OBJEXT))
STARTUP_OBJS ?= $(HEAD_OBJ)
# Assembly sources and objects
@ -179,9 +180,9 @@ endif
# This is part of the top-level export target
export_head: board\libboard$(LIBEXT) $(HEAD_OBJ)
export_startup: board\libboard$(LIBEXT) $(STARTUP_OBJS)
$(Q) if not exist board\Makefile ( echo $(EXPORT_DIR)\startup does not exist )
$(Q) if exist board\Makefile ( cp -f $(HEAD_OBJ) "$(EXPORT_DIR)\startup" )
$(Q) if exist board\Makefile ( cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)\startup" )
# Build dependencies

9
arch/z80/src/Makefile.zdsiil
View File

@ -1,7 +1,7 @@
############################################################################
# arch/z80/src/Makefile.zdsiil
#
# Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
# Copyright (C) 2008, 2011-2012, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -51,6 +51,7 @@ LDFLAGS += @nuttx.linkcmd
############################################################################
# Files and directories
ifneq ($(HEAD_SSRC),)
HEAD_GENSRC = $(HEAD_SSRC:.S=$(ASMEXT))
HEAD_OBJ = $(HEAD_SSRC:.S=$(OBJEXT))
@ -58,6 +59,8 @@ else
HEAD_OBJ = $(HEAD_ASRC:$(ASMEXT)=$(OBJEXT))
endif
STARTUP_OBJS ?= $(HEAD_OBJ)
SSRCS = $(CHIP_SSRCS) $(CMN_SSRCS)
ASRCS = $(CHIP_ASRCS) $(CMN_ASRCS)
GENSRCS = $(SSRCS:.S=$(ASMEXT))
@ -140,9 +143,9 @@ nuttx$(EXEEXT): $(HEAD_OBJ) board$(DELIM)libboard$(LIBEXT) nuttx.linkcmd
# This is part of the top-level export target
export_head: board$(DELIM)libboard$(LIBEXT) $(HEAD_OBJ)
export_startup: board$(DELIM)libboard$(LIBEXT) $(STARTUP_OBJS)
$(Q) if [ -d "$(EXPORT_DIR)$(DELIM)startup" ]; then \
cp -f $(HEAD_OBJ) "$(EXPORT_DIR)$(DELIM)startup"; \
cp -f $(STARTUP_OBJS) "$(EXPORT_DIR)$(DELIM)startup"; \
else \
echo "$(EXPORT_DIR)$(DELIM)startup does not exist"; \
exit 1; \

8
arch/z80/src/Makefile.zdsiiw
View File

@ -1,7 +1,7 @@
############################################################################
# arch/z80/src/Makefile.zdsiiw
#
# Copyright (C) 2008, 2011-2012 Gregory Nutt. All rights reserved.
# Copyright (C) 2008, 2011-2012, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -55,6 +55,8 @@ else
HEAD_OBJ = $(HEAD_ASRC:$(ASMEXT)=$(OBJEXT))
endif
STARTUP_OBJS ?= $(HEAD_OBJ)
SSRCS = $(CHIP_SSRCS) $(CMN_SSRCS)
ASRCS = $(CHIP_ASRCS) $(CMN_ASRCS)
GENSRCS = $(SSRCS:.S=$(ASMEXT))
@ -132,8 +134,8 @@ nuttx$(EXEEXT): $(HEAD_OBJ) board$(DELIM)libboard$(LIBEXT) nuttx.linkcmd
# This is part of the top-level export target
export_head: board$(DELIM)libboard$(LIBEXT) $(HEAD_OBJ)
$(Q) if exist "$(EXPORT_DIR)$(DELIM)startup" ( copy $(HEAD_OBJ) "$(EXPORT_DIR)$(DELIM)startup$(DELIM)." /b /y)
export_startup: board$(DELIM)libboard$(LIBEXT) $(STARTUP_OBJS)
$(Q) if exist "$(EXPORT_DIR)$(DELIM)startup" ( copy $(STARTUP_OBJS) "$(EXPORT_DIR)$(DELIM)startup$(DELIM)." /b /y)
# Dependencies

4
tools/mkexport.sh
View File

@ -1,7 +1,7 @@
#!/bin/bash
# tools/mkexport.sh
#
# Copyright (C) 2011-2012 Gregory Nutt. All rights reserved.
# Copyright (C) 2011-2012, 2014 Gregory Nutt. All rights reserved.
# Author: Gregory Nutt <gnutt@nuttx.org>
#
# Redistribution and use in source and binary forms, with or without
@ -194,7 +194,7 @@ cp -LR -p "${TOPDIR}/include" "${EXPORTDIR}/." || \
# Copy the startup object file(s)
make -C ${ARCHDIR} export_head TOPDIR=${TOPDIR} EXPORT_DIR="${EXPORTDIR}"
make -C ${ARCHDIR} export_startup TOPDIR=${TOPDIR} EXPORT_DIR="${EXPORTDIR}"
# Copy architecture-specific header files into the arch export sub-directory.
# This is tricky because each architecture does things in a little different