diff options
author | Gregory Nutt <gnutt@nuttx.org> | 2014-08-29 07:20:07 -0600 |
---|---|---|
committer | Gregory Nutt <gnutt@nuttx.org> | 2014-08-29 07:20:07 -0600 |
commit | 1280639f2eb423c3e6210441a36c96761cd07560 (patch) | |
tree | 904f52c432c65a10d5d8c56a1ca7a4dba6664d0d /apps/examples/elf/tests/pthread | |
parent | aa61bf9998f4b6e8d6002a94037c54773387ea81 (diff) | |
download | nuttx-1280639f2eb423c3e6210441a36c96761cd07560.tar.gz nuttx-1280639f2eb423c3e6210441a36c96761cd07560.tar.bz2 nuttx-1280639f2eb423c3e6210441a36c96761cd07560.zip |
The ELF test/example has been extended so the individual ELF test programs can link against the SYSCALL library (if it is available) or against the C library to eliminate or minimize the need for symbol tables (2014-8-29).
Diffstat (limited to 'apps/examples/elf/tests/pthread')
-rw-r--r-- | apps/examples/elf/tests/pthread/Makefile | 34 |
1 files changed, 32 insertions, 2 deletions
diff --git a/apps/examples/elf/tests/pthread/Makefile b/apps/examples/elf/tests/pthread/Makefile index f201b12f5..1b02b017c 100644 --- a/apps/examples/elf/tests/pthread/Makefile +++ b/apps/examples/elf/tests/pthread/Makefile @@ -1,7 +1,7 @@ ############################################################################ # examples/elf/tests/pthread/Makefile # -# Copyright (C) 2012 Gregory Nutt. All rights reserved. +# Copyright (C) 2012, 2014 Gregory Nutt. All rights reserved. # Author: Gregory Nutt <gnutt@nuttx.org> # # Redistribution and use in source and binary forms, with or without @@ -35,6 +35,36 @@ -include $(TOPDIR)/Make.defs +ifeq ($(WINTOOL),y) +NUTTXLIB = "${shell cygpath -w $(TOPDIR)$(DELIM)lib}" +else +NUTTXLIB = "$(TOPDIR)$(DELIM)lib" +endif + +LIBPATH = +ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y) +LDELFFLAGS += -Bstatic +LIBPATH += -L $(NUTTXLIB) +else +ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y) +LDELFFLAGS += -Bstatic +LIBPATH += -L $(NUTTXLIB) +endif +endif + +LIBS = +ifeq ($(CONFIG_EXAMPLES_ELF_LIBC),y) +ifeq ($(CONFIG_NUTTX_KERNEL),y) +LIBS += -luc +else +LIBS += -lc +endif +endif + +ifeq ($(CONFIG_EXAMPLES_ELF_SYSCALL),y) +LIBS += -lproxies +endif + BIN = pthread SRCS = $(BIN).c @@ -48,7 +78,7 @@ $(OBJS): %.o: %.c $(BIN): $(OBJS) @echo "LD: $<" - $(Q) $(LD) $(LDELFFLAGS) -o $@ $^ + $(Q) $(LD) $(LDELFFLAGS) $(LIBPATH) -o $@ $^ $(LIBS) clean: $(call DELFILE, $(BIN)) |