Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(674)

Unified Diff: libc/Makefile

Issue 156883002: Prep dynamic linker. (Closed) Base URL: https://chromium.googlesource.com/native_client/nacl-bionic.git@master
Patch Set: Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | libc/arch-nacl/bionic/crtbegin.c » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: libc/Makefile
diff --git a/libc/Makefile b/libc/Makefile
index a5284235999232c57d59a552bf1b54f22f1f28cc..71b997e24fb6398740ad47567c9e36e5725f884a 100644
--- a/libc/Makefile
+++ b/libc/Makefile
@@ -1,4 +1,4 @@
-# Copyright (c) 2013 The Chromium Authors. All rights reserved.
+# Copyright (c) 2014 The Chromium Authors. All rights reserved.
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
@@ -379,6 +379,7 @@ C_NACL_SOURCES = \
arch-nacl/syscalls/gettid.c \
arch-nacl/syscalls/gettimeofday.c \
arch-nacl/syscalls/getuid.c \
+ arch-nacl/syscalls/kill.c \
arch-nacl/syscalls/listen.c \
arch-nacl/syscalls/lseek.c \
arch-nacl/syscalls/lseek64.c \
@@ -400,6 +401,7 @@ C_NACL_SOURCES = \
arch-nacl/syscalls/recvmsg.c \
arch-nacl/syscalls/rename.c \
arch-nacl/syscalls/rmdir.c \
+ arch-nacl/syscalls/select.c \
arch-nacl/syscalls/sendmsg.c \
arch-nacl/syscalls/sendto.c \
arch-nacl/syscalls/sigaction.c \
@@ -450,8 +452,7 @@ $(foreach src,$(LIBC_CC_SOURCES),$(eval $(call BASIC_COMPILE_TARGET,$(basename $
$(foreach src,$(LIBC_CXX_SOURCES),$(eval $(call BASIC_COMPILE_TARGET,$(basename $(src)).o,$(SRC_ROOT)/$(src),$(CXX),$(CFLAGS) $(LIBC_CFLAGS) $(ARCH_FLAGS))))
$(eval $(call BASIC_LIB_TARGET,$(INS_ROOT)/libc.a,$(STATIC_OBJECTS),$(AR)))
-
-#$(eval $(call BASIC_LINK_TARGET,$(INS_ROOT)/libc.so,$(INS_ROOT)/crtbeginS.o $(DYNAMIC_OBJECTS) $(INS_ROOT)/crtendS.o,$(CC),-nostdlib -shared))
+$(eval $(call BASIC_LINK_TARGET,$(INS_ROOT)/libc.so,$(GCC_ROOT)/crtbeginS.o $(DYNAMIC_OBJECTS) $(GCC_ROOT)/crtendS.o,$(CC),-nostdlib -shared))
all: compile lib
@@ -463,8 +464,8 @@ clean:
rm -f $(INS_ROOT)/crtend.o $(INS_ROOT)/crtendS.o
-hello: $(SRC_ROOT)/hello.c $(INS_ROOT)/libc.a $(INS_ROOT)/crtbegin.o $(INS_ROOT)/crtend.o
- $(CC) $< -g -o $@
+hello: $(SRC_ROOT)/hello.c $(INS_ROOT)/libc.a $(GCC_ROOT)/crtbegin.o $(GCC_ROOT)/crtend.o
+ $(CC) $< -g -o $@ -static
.PHONY : test
test: hello
« no previous file with comments | « no previous file | libc/arch-nacl/bionic/crtbegin.c » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698