From 9ad0d6f666fcd2392a5d6d3634df82264a5729eb Mon Sep 17 00:00:00 2001 From: William Bryan Date: Tue, 26 Jul 2016 15:02:15 -0500 Subject: Delete unused files, update PK, and use new compilers Change-Id: I9e4951a2cebd204d1ea752c63e3f2b532ad3a2db Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/27465 Tested-by: FSP CI Jenkins Reviewed-by: Martha Broyles Reviewed-by: Wael El-Essawy --- src/occ_gpe1/Makefile | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) (limited to 'src/occ_gpe1/Makefile') diff --git a/src/occ_gpe1/Makefile b/src/occ_gpe1/Makefile index 3479842..30aad60 100644 --- a/src/occ_gpe1/Makefile +++ b/src/occ_gpe1/Makefile @@ -22,8 +22,6 @@ # permissions and limitations under the License. # # IBM_PROLOG_END_TAG -#remove this once we have a real compiler -export P2P_ENABLE = 1 #Pull in the definitions that affect all makefiles for this image include img_defs.mk @@ -40,7 +38,7 @@ OBJS := $(addprefix $(OBJDIR)/, $(TOP_OBJECTS)) PKLIB := $(OBJDIR)/pk/libpk.a COMMONLIB := $(OBJDIR)/commonlib/libcommon.a OCCLIB := $(OBJDIR)/occlib/libocc.a -LIB_DIRS = -L$(OBJDIR)/pk -L$(OBJDIR)/commonlib -L$(OBJDIR)/occlib +LIB_DIRS += -L$(OBJDIR)/pk -L$(OBJDIR)/commonlib -L$(OBJDIR)/occlib LINK_OBJS = $(OBJS) $(PKLIB) $(COMMONLIB) $(OCCLIB) LINK_SCRIPT = $(addprefix $(OBJDIR)/, linkscript) @@ -51,6 +49,8 @@ LINK_OBJS += $(P2PLIB) endif #default target is to make a binary application image +all: $(PPETOOLS_OBJDIR)/ppetracepp $(OBJDIR)/$(IMAGE_NAME).bin $(OBJDIR)/$(IMAGE_NAME).dis + #This removes all unecessary headers from the ELF executable $(OBJDIR)/$(IMAGE_NAME).bin $(OBJDIR)/$(IMAGE_NAME).dis: $(OBJDIR)/$(IMAGE_NAME).out $(OBJCOPY) -O binary $< $(OBJDIR)/$(IMAGE_NAME).bin @@ -58,7 +58,7 @@ $(OBJDIR)/$(IMAGE_NAME).bin $(OBJDIR)/$(IMAGE_NAME).dis: $(OBJDIR)/$(IMAGE_NAME) #create a linked ELF executable $(OBJDIR)/$(IMAGE_NAME).out: $(LINK_OBJS) $(LINK_SCRIPT) - $(LD) -e __system_reset -N -T$(LINK_SCRIPT) -Map $(OBJDIR)/$(IMAGE_NAME).map -Bstatic -o $(OBJDIR)/$(IMAGE_NAME).out $(LIB_DIRS) $(OBJS) -locc -lcommon -lpk -lp2p + $(LD) -e __system_reset -N -T$(LINK_SCRIPT) -Map $(OBJDIR)/$(IMAGE_NAME).map -Bstatic -o $(OBJDIR)/$(IMAGE_NAME).out $(LIB_DIRS) $(OBJS) -locc -lcommon -lpk -leabi -lmath -lc #pass the link command file through the C preprocessor to evaluate macros and remove comments $(LINK_SCRIPT): link.cmd @@ -70,6 +70,12 @@ $(LINK_OBJS) $(OBJS) $(OBJS:.o=.d): | $(OBJDIR) $(OBJDIR): mkdir -p $(OBJDIR) +$(PPETOOLS_OBJDIR)/ppetracepp: $(PPETOOLS_OBJDIR) + g++ -m32 -O3 -w -g -I$(PPETRACEPP_DIR)/ $(PPETRACEPP_DIR)/ppetracepp.C -o $(PPETOOLS_OBJDIR)/ppetracepp + +$(PPETOOLS_OBJDIR): + mkdir -p $(PPETOOLS_OBJDIR) + .PHONY: clean $(PKLIB) $(P2PLIB) #Build macro-specific kernel code -- cgit v1.2.1