Mercurial > ecos

diff packages/services/objloader/current/cdl/objloader.cdl @ 2925:7cbaadc92c67

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
* services/objloader/current/src/objloader.c, services/objloader/current/src/objelf.c services/objloader/current/include/objelf.h: Fixed a memory leak where a library section was loaded but memory allocated was not released. This bug was reported by Davy Wouters on the eCos list. Added minor cosmetics and a number of CYG_ASSERT and if() to test the values returned by cyg_ldr_load_elf_section() * services/objloader/current/cdl/objloader.cdl: Eliminate workarounds for file path handling issue in obsolete Cygwin tclsh. Use ACTUAL_CFLAGS for robustness. * fs/rom/current/cdl/romfs.cdl: Eliminate workarounds for file path handling issue in obsolete Cygwin tclsh. Build the mk_romfs tool with higher priority than the custom rules which use it.
author jld
date Fri, 09 Oct 2009 13:53:09 +0000
parents f8dd12428f1d
children
line wrap: on
line diff
--- a/packages/services/objloader/current/cdl/objloader.cdl
+++ b/packages/services/objloader/current/cdl/objloader.cdl
@@ -191,25 +191,23 @@ cdl_package CYGPKG_OBJLOADER {
             application for testing the loader." 
         
         make -priority 320 {
-            tests/testromfs/hello.o : <PACKAGE>/tests/library/hello.c
-            @sh -c "mkdir -p tests tests/testromfs"
-            $(CC) -c $(INCLUDE_PATH) -I$(dir $<) $(CFLAGS) -o $@ $<
+            testobj/hello.o : <PACKAGE>/tests/library/hello.c
+            @mkdir -p "$(dir $@)"
+            $(CC) -c $(INCLUDE_PATH) -I$(dir $<) $(ACTUAL_CFLAGS) -o $@ $<
         }
 
         make -priority 322 {
-            <PREFIX>/include/cyg/objloader/testromfs_be.h : tests/testromfs/hello.o 
-            $(PREFIX)/bin/mk_romfs -b tests/testromfs testromfs_be.bin 
-	    @mkdir -p "$(dir $@)"
-            @tclsh $(PREFIX)/bin/file2c.tcl testromfs_be.bin testromfs_be.h
-            @cp testromfs_be.h $@
+            <PREFIX>/include/cyg/objloader/testromfs_be.h : testobj/hello.o
+            $(PREFIX)/bin/mk_romfs -b $(dir $<) testromfs_be.bin
+            @mkdir -p "$(dir $@)"
+            @tclsh $(PREFIX)/bin/file2c.tcl testromfs_be.bin $@
         }
         
         make -priority 322 {
-            <PREFIX>/include/cyg/objloader/testromfs_le.h : tests/testromfs/hello.o 
-            $(PREFIX)/bin/mk_romfs tests/testromfs testromfs_le.bin
-	    @mkdir -p "$(dir $@)"
-            @tclsh $(PREFIX)/bin/file2c.tcl testromfs_le.bin testromfs_le.h
-            @cp testromfs_le.h $@
+            <PREFIX>/include/cyg/objloader/testromfs_le.h : testobj/hello.o
+            $(PREFIX)/bin/mk_romfs $(dir $<) testromfs_le.bin
+            @mkdir -p "$(dir $@)"
+            @tclsh $(PREFIX)/bin/file2c.tcl testromfs_le.bin $@
         }
     
         cdl_option CYGPKG_OBJLOADER_TESTS {