diff options
| author | William Bryan <wilbryan@us.ibm.com> | 2016-10-20 13:53:03 -0500 |
|---|---|---|
| committer | William A. Bryan <wilbryan@us.ibm.com> | 2016-10-24 11:25:55 -0400 |
| commit | a4e04571d60b58c0c778c870bc215bf467085fb6 (patch) | |
| tree | cff81d38b342965bcfb90b509cd1591a194bfdf2 /src/occ_405/Makefile | |
| parent | f5f808eb2918e96bcdf324bd2dd90853bf9b5f3c (diff) | |
| download | talos-occ-a4e04571d60b58c0c778c870bc215bf467085fb6.tar.gz talos-occ-a4e04571d60b58c0c778c870bc215bf467085fb6.zip | |
Changes for GCC 4.9 and OP
Change-Id: I95ddff4b290fcf3eab617a674afc489698c78a1e
Reviewed-on: http://ralgit01.raleigh.ibm.com/gerrit1/31563
Reviewed-by: Martha Broyles <mbroyles@us.ibm.com>
Tested-by: FSP CI Jenkins <fsp-CI-jenkins+hostboot@us.ibm.com>
Reviewed-by: William A. Bryan <wilbryan@us.ibm.com>
Diffstat (limited to 'src/occ_405/Makefile')
| -rwxr-xr-x | src/occ_405/Makefile | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/occ_405/Makefile b/src/occ_405/Makefile index 716af1f..ccd0c8b 100755 --- a/src/occ_405/Makefile +++ b/src/occ_405/Makefile @@ -79,14 +79,10 @@ $(OBJDIR)/$(IMAGE_NAME).bin $(OBJDIR)/$(IMAGE_NAME).dis: $(OBJDIR)/$(IMAGE_NAME) $(OBJCOPY) -O binary $< $(OBJDIR)/$(IMAGE_NAME).bin $(OBJDUMP) -S $< > $(OBJDIR)/$(IMAGE_NAME).dis -#create a linked ELF executable -$(OBJDIR)/$(IMAGE_NAME).out: $(TRACEPP_DIR)/tracepp $(LINK_OBJS) $(LINK_SCRIPT) check-sensors +# Create a linked ELF executable and verify we aren't missing sensors +$(OBJDIR)/$(IMAGE_NAME).out: $(PPETOOLS_OBJDIR)/tracepp $(LINK_OBJS) $(LINK_SCRIPT) $(LD) -e __ssx_boot -T$(LINK_SCRIPT) $(LDFLAGS) -Map $(OBJDIR)/$(IMAGE_NAME).map -Bstatic -o $(OBJDIR)/$(IMAGE_NAME).out $(LIB_DIRS) -lssx -locc -lppc405 -lcommon - -#Verifies that we aren't missing sensors in the sensor lists -.PHONY : check-sensors -check-sensors: - $(OCCTOOLS)/check-sensors.sh $(OBJDUMP) $(OBJDIR)/sensor/ + $(OCCTOOLS)/check-sensors.sh $(OBJDUMP) $(OBJDIR) $(PPETOOLS_OBJDIR)/ppetracepp: $(PPETOOLS_OBJDIR) g++ -O3 -w -g -I$(PPETRACEPP_DIR)/ $(PPETRACEPP_DIR)/ppetracepp.C -o $(PPETOOLS_OBJDIR)/ppetracepp @@ -95,11 +91,9 @@ $(PPETOOLS_OBJDIR): mkdir -p $(PPETOOLS_OBJDIR) #pass the link command file through the C preprocessor to evaluate macros and remove comments -#$(LINK_SCRIPT): linkocc.cmd $(LINK_SCRIPT): $(LINK_CMD_SCRIPT) $(CPP) -E -x c -P $(DEFS) $(LINK_CMD_SCRIPT) -o $(LINK_SCRIPT) - #Create an obj directory if needed $(LINK_OBJS) $(OBJS) $(OBJS:.o=.d): | $(OBJDIRS) @@ -122,7 +116,7 @@ $(OCCLIB): $(PPC405LIB): $(MAKE) -I $(IMAGE_SRCDIR) -C $(PPC405LIB_SRCDIR) -$(TRACEPP_DIR)/tracepp: +$(PPETOOLS_OBJDIR)/tracepp: (cd $(TRACEPP_DIR) && make) # collect all of the trace hash files for this image into a single trexStringFile |
