From: <at...@us...> - 2007-07-18 23:45:54
|
Revision: 424 http://svn.sourceforge.net/cadcdev/?rev=424&view=rev Author: atani Date: 2007-07-18 16:45:51 -0700 (Wed, 18 Jul 2007) Log Message: ----------- cleanups for dc-chain binutils-2.17 updates Modified Paths: -------------- dcload/dcload-ip/Makefile.cfg dcload/dcload-ip/host-src/tool/Makefile dcload/dcload-ip/host-src/tool/dc-tool.c dcload/dcload-serial/Makefile.cfg dcload/dcload-serial/host-src/tool/Makefile dcload/dcload-serial/host-src/tool/dc-tool.c Modified: dcload/dcload-ip/Makefile.cfg =================================================================== --- dcload/dcload-ip/Makefile.cfg 2007-07-18 23:03:43 UTC (rev 423) +++ dcload/dcload-ip/Makefile.cfg 2007-07-18 23:45:51 UTC (rev 424) @@ -18,7 +18,7 @@ # sh-elf-stuff TARGETCC = sh-elf-gcc -TARGETCFLAGS = -O2 -ml -m4 +TARGETCFLAGS = -O2 -ml -m4-single-only TARGETOBJCOPY = sh-elf-objcopy TARGETLD = sh-elf-ld @@ -34,7 +34,7 @@ #DREAMCAST_IP = 10.0.0.32 # dir to install dc-tool in -TOOLINSTALLDIR = /usr/local/dcdev/bin +TOOLINSTALLDIR = /usr/local/dc/bin #TOOLINSTALLDIR = /usr/local/dc/bin # uncomment this for cygwin Modified: dcload/dcload-ip/host-src/tool/Makefile =================================================================== --- dcload/dcload-ip/host-src/tool/Makefile 2007-07-18 23:03:43 UTC (rev 423) +++ dcload/dcload-ip/host-src/tool/Makefile 2007-07-18 23:45:51 UTC (rev 424) @@ -18,6 +18,7 @@ .PHONY : install install: $(DCTOOL) + -mkdir $(TOOLINSTALLDIR) cp $(DCTOOL) $(TOOLINSTALLDIR) .PHONY : clean Modified: dcload/dcload-ip/host-src/tool/dc-tool.c =================================================================== --- dcload/dcload-ip/host-src/tool/dc-tool.c 2007-07-18 23:03:43 UTC (rev 423) +++ dcload/dcload-ip/host-src/tool/dc-tool.c 2007-07-18 23:45:51 UTC (rev 424) @@ -24,8 +24,8 @@ #include <fcntl.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> #ifdef _WIN32 -#include <string.h> #include <windows.h> #include <sys/time.h> #include <unistd.h> @@ -446,13 +446,13 @@ if ((section->flags & SEC_HAS_CONTENTS) && (section->flags & SEC_LOAD)) { printf("Section %s, ",section->name); printf("lma 0x%x, ",section->lma); - printf("size %d\n",section->_raw_size); - if (section->_raw_size) { - size += section->_raw_size; - inbuf = malloc(section->_raw_size); - bfd_get_section_contents(somebfd, section, inbuf, 0, section->_raw_size); + printf("size %d\n",bfd_section_size(somebfd, section)); + if (bfd_section_size(somebfd, section)) { + size += bfd_section_size(somebfd, section); + inbuf = malloc(bfd_section_size(somebfd, section)); + bfd_get_section_contents(somebfd, section, inbuf, 0, bfd_section_size(somebfd, section)); - send_data(inbuf, section->lma, section->_raw_size); + send_data(inbuf, section->lma, bfd_section_size(somebfd, section)); free(inbuf); } Modified: dcload/dcload-serial/Makefile.cfg =================================================================== --- dcload/dcload-serial/Makefile.cfg 2007-07-18 23:03:43 UTC (rev 423) +++ dcload/dcload-serial/Makefile.cfg 2007-07-18 23:45:51 UTC (rev 424) @@ -6,7 +6,7 @@ # dc compiler prefix -- this is usually what you used for --prefix when # building your compiler. -TARGETPREFIX = /usr/local/dcdev/sh-elf +TARGETPREFIX = /usr/local/dc/sh-elf # you may have to change the paths for BFDLIB and BFDINCLUDE to # the correct ones for your system @@ -50,7 +50,7 @@ #SERIALDEVICE = COM1 # dir to install dc-tool in -TOOLINSTALLDIR = /usr/local/dcdev/bin +TOOLINSTALLDIR = /usr/local/dc/bin # uncomment this for cygwin #EXECUTABLEEXTENSION = .exe Modified: dcload/dcload-serial/host-src/tool/Makefile =================================================================== --- dcload/dcload-serial/host-src/tool/Makefile 2007-07-18 23:03:43 UTC (rev 423) +++ dcload/dcload-serial/host-src/tool/Makefile 2007-07-18 23:45:51 UTC (rev 424) @@ -24,6 +24,7 @@ .PHONY : install install: $(DCTOOL) + -mkdir $(TOOLINSTALLDIR) cp $(DCTOOL) $(TOOLINSTALLDIR) .PHONY : clean Modified: dcload/dcload-serial/host-src/tool/dc-tool.c =================================================================== --- dcload/dcload-serial/host-src/tool/dc-tool.c 2007-07-18 23:03:43 UTC (rev 423) +++ dcload/dcload-serial/host-src/tool/dc-tool.c 2007-07-18 23:45:51 UTC (rev 424) @@ -25,8 +25,8 @@ #include <fcntl.h> #include <stdio.h> #include <stdlib.h> +#include <string.h> #ifdef _WIN32 -#include <string.h> #include <windows.h> #else #include <termios.h> @@ -337,7 +337,7 @@ ok = 'G'; serial_write(&ok, 1); total -= size; - (unsigned char *) data += size; + data += size; break; case 'C': // compressed if (verbose) { @@ -351,7 +351,7 @@ ok = 'G'; serial_write(&ok, 1); total -= newsize; - (unsigned char *) data += newsize; + data += newsize; } else { ok = 'B'; serial_write(&ok, 1); @@ -705,20 +705,20 @@ if ((section->flags & SEC_HAS_CONTENTS) && (section->flags & SEC_LOAD)) { printf("Section %s, ",section->name); printf("lma 0x%x, ",section->lma); - printf("size %d\n",section->_raw_size); - if (section->_raw_size) { - size += section->_raw_size; - inbuf = malloc(section->_raw_size); - bfd_get_section_contents(somebfd, section, inbuf, 0, section->_raw_size); + printf("size %d\n",bfd_section_size(somebfd, section)); + if (bfd_section_size(somebfd, section)) { + size += bfd_section_size(somebfd, section); + inbuf = malloc(bfd_section_size(somebfd, section)); + bfd_get_section_contents(somebfd, section, inbuf, 0, bfd_section_size(somebfd, section)); c = 'B'; serial_write(&c, 1); blread(&c, 1); send_uint(section->lma); - send_uint(section->_raw_size); + send_uint(bfd_section_size(somebfd, section)); - send_data(inbuf, section->_raw_size, 1); + send_data(inbuf, bfd_section_size(somebfd, section), 1); free(inbuf); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |