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

Side by Side Diff: native_client_sdk/src/tools/nacl_gcc.mk

Issue 15974011: [NaCl SDK] Remove NACL_ARCH from commom makefiles. (Closed) Base URL: http://git.chromium.org/chromium/src.git@cleanup_genhttpfs
Patch Set: Created 7 years, 6 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 unified diff | Download patch
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 # 5 #
6 # GNU Make based build file. For details on GNU Make see: 6 # GNU Make based build file. For details on GNU Make see:
7 # http://www.gnu.org/software/make/manual/make.html 7 # http://www.gnu.org/software/make/manual/make.html
8 # 8 #
9 # 9 #
10 10
(...skipping 28 matching lines...) Expand all
39 X86_64_NM ?= $(TC_PATH)/$(OSNAME)_x86_$(TOOLCHAIN)/bin/x86_64-nacl-nm 39 X86_64_NM ?= $(TC_PATH)/$(OSNAME)_x86_$(TOOLCHAIN)/bin/x86_64-nacl-nm
40 40
41 ARM_CC ?= $(TC_PATH)/$(OSNAME)_arm_$(TOOLCHAIN)/bin/arm-nacl-gcc 41 ARM_CC ?= $(TC_PATH)/$(OSNAME)_arm_$(TOOLCHAIN)/bin/arm-nacl-gcc
42 ARM_CXX ?= $(TC_PATH)/$(OSNAME)_arm_$(TOOLCHAIN)/bin/arm-nacl-g++ 42 ARM_CXX ?= $(TC_PATH)/$(OSNAME)_arm_$(TOOLCHAIN)/bin/arm-nacl-g++
43 ARM_LINK ?= $(TC_PATH)/$(OSNAME)_arm_$(TOOLCHAIN)/bin/arm-nacl-g++ 43 ARM_LINK ?= $(TC_PATH)/$(OSNAME)_arm_$(TOOLCHAIN)/bin/arm-nacl-g++
44 ARM_LIB ?= $(TC_PATH)/$(OSNAME)_arm_$(TOOLCHAIN)/bin/arm-nacl-ar 44 ARM_LIB ?= $(TC_PATH)/$(OSNAME)_arm_$(TOOLCHAIN)/bin/arm-nacl-ar
45 ARM_STRIP ?= $(TC_PATH)/$(OSNAME)_arm_$(TOOLCHAIN)/bin/arm-nacl-strip 45 ARM_STRIP ?= $(TC_PATH)/$(OSNAME)_arm_$(TOOLCHAIN)/bin/arm-nacl-strip
46 ARM_NM ?= $(TC_PATH)/$(OSNAME)_arm_$(TOOLCHAIN)/bin/arm-nacl-nm 46 ARM_NM ?= $(TC_PATH)/$(OSNAME)_arm_$(TOOLCHAIN)/bin/arm-nacl-nm
47 47
48 48
49 # Architecture-specific flags
binji 2013/05/30 17:53:30 OK, but you should either remove their use below,
Sam Clegg 2013/05/30 17:57:06 I think it might be useful to have ARCH specific f
binji 2013/05/30 19:54:30 Yes, but now it's hard to tell that they even exis
50 X86_32_CFLAGS ?= -DNACL_ARCH=x86_32
51 X86_64_CFLAGS ?= -DNACL_ARCH=x86_64
52 ARM_CFLAGS ?= -DNACL_ARCH=arm
53
54 X86_32_CXXFLAGS ?= -DNACL_ARCH=x86_32
55 X86_64_CXXFLAGS ?= -DNACL_ARCH=x86_64
56 ARM_CXXFLAGS ?= -DNACL_ARCH=arm
57
58 # 49 #
59 # Compile Macro 50 # Compile Macro
60 # 51 #
61 # $1 = Source Name 52 # $1 = Source Name
62 # $2 = Compile Flags 53 # $2 = Compile Flags
63 # 54 #
64 define C_COMPILER_RULE 55 define C_COMPILER_RULE
65 -include $(call SRC_TO_DEP,$(1),_x86_32) 56 -include $(call SRC_TO_DEP,$(1),_x86_32)
66 $(call SRC_TO_OBJ,$(1),_x86_32): $(1) $(TOP_MAKE) | $(dir $(call SRC_TO_OBJ,$(1) ))dir.stamp 57 $(call SRC_TO_OBJ,$(1),_x86_32): $(1) $(TOP_MAKE) | $(dir $(call SRC_TO_OBJ,$(1) ))dir.stamp
67 $(call LOG,CC ,$$@,$(X86_32_CC) -o $$@ -c $$< $(POSIX_FLAGS) $(2) $(NAC L_CFLAGS) $(X86_32_CFLAGS)) 58 $(call LOG,CC ,$$@,$(X86_32_CC) -o $$@ -c $$< $(POSIX_FLAGS) $(2) $(NAC L_CFLAGS) $(X86_32_CFLAGS))
(...skipping 287 matching lines...) Expand 10 before | Expand all | Expand 10 after
355 ifeq ($(CONFIG),Debug) 346 ifeq ($(CONFIG),Debug)
356 NMF_FLAGS += --debug-libs 347 NMF_FLAGS += --debug-libs
357 endif 348 endif
358 349
359 350
360 define NMF_RULE 351 define NMF_RULE
361 all:$(OUTDIR)/$(1).nmf 352 all:$(OUTDIR)/$(1).nmf
362 $(OUTDIR)/$(1).nmf : $(foreach arch,$(NMF_ARCHES),$(OUTDIR)/$(1)$(arch)) $(GLIBC _SO_LIST) 353 $(OUTDIR)/$(1).nmf : $(foreach arch,$(NMF_ARCHES),$(OUTDIR)/$(1)$(arch)) $(GLIBC _SO_LIST)
363 $(call LOG,CREATE_NMF,$$@,$(NMF) $(NMF_FLAGS) -o $$@ $$^ $(GLIBC_PATHS) -s $(OUTDIR) $(2) $(GLIBC_REMAP)) 354 $(call LOG,CREATE_NMF,$$@,$(NMF) $(NMF_FLAGS) -o $$@ $$^ $(GLIBC_PATHS) -s $(OUTDIR) $(2) $(GLIBC_REMAP))
364 endef 355 endef
OLDNEW
« native_client_sdk/src/tools/host_vc.mk ('K') | « native_client_sdk/src/tools/host_vc.mk ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698