[NaCl SDK] Fix PNACL for debugging.

native_client_sdk/src/tools/nacl_llvm.mk

-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright (c) 2012 The Chromium Authors.   All rights reserved.

[Sam Clegg, 2013/08/10 00:54:01]

Was that deliberate?  3 spaces?

 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 #
 # GNU Make based build file.  For details on GNU Make see:
 #   http://www.gnu.org/software/make/manual/make.html
 #
 
 #
 # Paths to Tools
 #
 PNACL_BIN = $(TC_PATH)/$(OSNAME)_x86_$(TOOLCHAIN)/newlib/bin
 PNACL_CC ?= $(PNACL_BIN)/pnacl-clang -c
 PNACL_CXX ?= $(PNACL_BIN)/pnacl-clang++ -c
 PNACL_LINK ?= $(PNACL_BIN)/pnacl-clang++
 PNACL_LIB ?= $(PNACL_BIN)/pnacl-ar
 PNACL_STRIP ?= $(PNACL_BIN)/pnacl-strip
 PNACL_FINALIZE ?= $(PNACL_BIN)/pnacl-finalize
 
+# if you want to debug, do not use PEXE, use BC

[Sam Clegg, 2013/08/10 00:54:01]

You mean "use NEXE"?  

This comment could be filled out a bit, or perhaps moved down to where translate
is used.

[noelallen1, 2013/08/10 19:08:49]

Done.

+PNACL_TRANSLATE ?= $(PNACL_BIN)/pnacl-translate
+
 #
 # Compile Macro
 #
 # $1 = Source Name
 # $2 = Compile Flags
 # $3 = Include Directories
 #
 define C_COMPILER_RULE
 -include $(call SRC_TO_DEP,$(1),_pnacl)
 $(call SRC_TO_OBJ,$(1),_pnacl): $(1) $(TOP_MAKE) | $(dir $(call SRC_TO_OBJ,$(1)))dir.stamp
@@ skipping 56 matching lines @@
 # Specific Link Macro
 #
 # $1 = Target Name
 # $2 = List of inputs
 # $3 = List of libs
 # $4 = List of deps
 # $5 = List of lib dirs
 # $6 = Other Linker Args
 #
 define LINKER_RULE
-all: $(1).pexe
+all: $(1).pexe 
+$(1)_x86_32.nexe : $(1).bc
+        $(call LOG,TRANSLATE,$$@,$(PNACL_TRANSLATE) -arch x86-32 $$^ -o $$@)
+
+$(1)_x86_64.nexe : $(1).bc
+        $(call LOG,TRANSLATE,$$@,$(PNACL_TRANSLATE) -arch x86-64 $$^ -o $$@)
+
+$(1)_arm.nexe : $(1).bc
+        $(call LOG,TRANSLATE,$$@,$(PNACL_TRANSLATE) -arch arm $$^ -o $$@)
+
 $(1).pexe: $(1).bc
         $(call LOG,FINALIZE,$$@,$(PNACL_FINALIZE) -o $$@ $$^)
 
 $(1).bc: $(2) $(foreach dep,$(4),$(STAMPDIR)/$(dep).stamp)
         $(call LOG,LINK,$$@,$(PNACL_LINK) -o $$@ $(2) $(foreach path,$(5),-L$(path)/pnacl/$(CONFIG)) $(foreach lib,$(3),-l$(lib)) $(6))
 endef
 
 
 #
 # Generalized Link Macro
 #
 # $1 = Target Name
 # $2 = List of Sources
 # $3 = List of LIBS
 # $4 = List of DEPS
 # $5 = POSIX Linker Switches
 # $6 = VC Linker Switches
 #
 define LINK_RULE
+ifeq ($(CONFIG),Debug)
+EXECUTABLES=$(OUTDIR)/$(1)_x86_32.nexe $(OUTDIR)/$(1)_x86_64.nexe $(OUTDIR)/$(1)_arm.nexe
+else
+EXECUTABLES=$(OUTDIR)/$(1).pexe
+endif
 $(call LINKER_RULE,$(OUTDIR)/$(1),$(foreach src,$(2),$(call SRC_TO_OBJ,$(src),_pnacl)),$(filter-out pthread,$(3)),$(4),$(LIB_PATHS),$(5))
 endef
 
 
 #
 # Strip Macro
 #
 # NOTE: pnacl-strip does not currently support stripping finalized pexes (in a
 # sense, they are already stripped). So we just copy the file instead.
 #
 # See https://code.google.com/p/nativeclient/issues/detail?id=3534
 #
 # $1 = Target Name
 # $2 = Input Name
 #
 define STRIP_RULE
 all: $(OUTDIR)/$(1).pexe
 $(OUTDIR)/$(1).pexe: $(OUTDIR)/$(2).pexe
         $(CP) $$^ $$@
 endef
 
 
+
+EXECUTABLES=$(foreach arch,$(ARCH_SUFFIXES),$(OUTDIR)/$(1)$(arch))
+

[Sam Clegg, 2013/08/10 00:54:01]

This variable seems to be specified twice.

Does this take into account?

[noelallen1, 2013/08/10 19:08:49]

Done.

+
 #
 # NMF Manifiest generation
 #
 # Use the python script create_nmf to scan the binaries for dependencies using
 # objdump.  Pass in the (-L) paths to the default library toolchains so that we
 # can find those libraries and have it automatically copy the files (-s) to
 # the target directory for us.
 #
 # $1 = Target Name (the basename of the nmf
 # $2 = Additional create_nmf.py arguments
 #
 NMF:=python $(NACL_SDK_ROOT)/tools/create_nmf.py
 
 define NMF_RULE
 all: $(OUTDIR)/$(1).nmf
-$(OUTDIR)/$(1).nmf: $(OUTDIR)/$(1).pexe
+$(OUTDIR)/$(1).nmf: $(EXECUTABLES)
         $(call LOG,CREATE_NMF,$$@,$(NMF) -o $$@ $$^ -s $(OUTDIR) $(2))
 endef
 
 #
 # HTML file generation
 #
 CREATE_HTML := python $(NACL_SDK_ROOT)/tools/create_html.py
 
 define HTML_RULE
 all: $(OUTDIR)/$(1).html
-$(OUTDIR)/$(1).html: $(OUTDIR)/$(1).pexe
+$(OUTDIR)/$(1).html: $(EXECUTABLES)
         $(call LOG,CREATE_HTML,$$@,$(CREATE_HTML) -o $$@ $$^)
 endef