minor update

.travis.yml

@@ -6,9 +6,10 @@ compiler: gcc
 addons:  
   apt:
     packages:
-      - build-essential
+      - build-essential      
       - valgrind
       - libstdc++6
+      - binutils
 
 env:
   global:

kernel/scripts/vxbin.py

@@ -26,7 +26,7 @@ def get_vma_size(elf_file):
         process = subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
         output, errors = process.communicate()
         if process.returncode != 0:
-            print "Error running objdump:", errors.strip()
+            print "Error running readelf:", errors.strip()
             sys.exit(-1)
 
         min_vma = 2**64 - 1
@@ -76,7 +76,7 @@ def create_vxbin_binary(input_elf, output_bin, objcopy_path):
 
 if __name__ == '__main__':
     if len(sys.argv) != 3:
-        print("Usage: elf2vxbin.py <input>.elf <output>.vxbin")
+        print("Usage: vxbin.py <input>.elf <output>.vxbin")
         sys.exit(-1)
 
     objcopy_path = os.getenv('OBJCOPY', 'objcopy')  # Default to 'objcopy' if not set

tests/opencl/common.mk

@@ -65,7 +65,7 @@ kernel.cl: $(SRC_DIR)/kernel.cl
 	cp $< $@
 
 kernel.pocl: $(SRC_DIR)/kernel.cl
-	LD_LIBRARY_PATH=$(LLVM_POCL)/lib:$(POCL_CC_PATH)/lib:$(LLVM_VORTEX)/lib:$(LD_LIBRARY_PATH) LLVM_PREFIX=$(LLVM_VORTEX) POCL_DEBUG=all POCL_KERNEL_CACHE=0 POCL_VORTEX_BINTOOL="OBJCOPY=$(LLVM_VORTEX)/bin/llvm-objcopy $(VORTEX_HOME)/kernel/scripts/elf2vxbin.py" POCL_VORTEX_CFLAGS="$(VX_CFLAGS)" POCL_VORTEX_LDFLAGS="$(VX_LDFLAGS)" $(POCL_CC_PATH)/bin/poclcc -o $@ $<
+	LD_LIBRARY_PATH=$(LLVM_POCL)/lib:$(POCL_CC_PATH)/lib:$(LLVM_VORTEX)/lib:$(LD_LIBRARY_PATH) LLVM_PREFIX=$(LLVM_VORTEX) POCL_DEBUG=all POCL_KERNEL_CACHE=0 POCL_VORTEX_BINTOOL="OBJCOPY=$(LLVM_VORTEX)/bin/llvm-objcopy $(VORTEX_HOME)/kernel/scripts/vxbin.py" POCL_VORTEX_CFLAGS="$(VX_CFLAGS)" POCL_VORTEX_LDFLAGS="$(VX_LDFLAGS)" $(POCL_CC_PATH)/bin/poclcc -o $@ $<
  
 %.cc.o: $(SRC_DIR)/%.cc
 	$(CXX) $(CXXFLAGS) -c $< -o $@

tests/regression/common.mk

@@ -73,7 +73,7 @@ kernel.dump: kernel.elf
 	$(VX_DP) -D $< > $@
 
 kernel.vxbin: kernel.elf
-	OBJCOPY=$(VX_CP) $(VORTEX_HOME)/kernel/scripts/elf2vxbin.py $< $@
+	OBJCOPY=$(VX_CP) $(VORTEX_HOME)/kernel/scripts/vxbin.py $< $@
 
 kernel.elf: $(VX_SRCS)
 	$(VX_CXX) $(VX_CFLAGS) $^ $(VX_LDFLAGS) -o kernel.elf