diff options
-rw-r--r-- | apps/Makefile | 2 | ||||
-rw-r--r-- | tools/creative.c | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/apps/Makefile b/apps/Makefile index 7fb704634d..88d3155b2d 100644 --- a/apps/Makefile +++ b/apps/Makefile | |||
@@ -147,7 +147,7 @@ $(OBJDIR)/rockbox.elf : $(OBJS) $(LINKFILE) $(DEPFILE) $(LIBROCKBOX) $(VOICE) $( | |||
147 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR)/firmware -L$(BUILDDIR) -lrockbox $(LINKVOICE) $(LINKBITMAPS) -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockbox.map | 147 | $(call PRINTS,LD $(@F))$(CC) $(GCCOPTS) -Os -nostdlib -o $@ $(OBJS) -L$(BUILDDIR)/firmware -L$(BUILDDIR) -lrockbox $(LINKVOICE) $(LINKBITMAPS) -lgcc -T$(LINKFILE) -Wl,-Map,$(OBJDIR)/rockbox.map |
148 | 148 | ||
149 | $(OBJDIR)/rockbox.bin : $(OBJDIR)/rockbox.elf | 149 | $(OBJDIR)/rockbox.bin : $(OBJDIR)/rockbox.elf |
150 | $(call PRINTS,OBJCOPY $(@F))$(if $(filter yes, $(USE_ELF)), cp $< $@, $(OC) -O binary $< $@) | 150 | $(call PRINTS,OBJCOPY $(@F))$(OC) $(if $(filter yes, $(USE_ELF)), -S -x, -O binary) $< $@ |
151 | 151 | ||
152 | $(OBJDIR)/rombox.bin : $(OBJDIR)/rombox.elf | 152 | $(OBJDIR)/rombox.bin : $(OBJDIR)/rombox.elf |
153 | $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ | 153 | $(call PRINTS,OBJCOPY $(@F))$(OC) -O binary $< $@ |
diff --git a/tools/creative.c b/tools/creative.c index 566904f78c..faa95650a4 100644 --- a/tools/creative.c +++ b/tools/creative.c | |||
@@ -84,7 +84,7 @@ static int elf_convert(const unsigned char *inbuf, unsigned char *outbuf) | |||
84 | Elf32_Ehdr *main_header; | 84 | Elf32_Ehdr *main_header; |
85 | Elf32_Shdr *section_header; | 85 | Elf32_Shdr *section_header; |
86 | unsigned int i, j, sum; | 86 | unsigned int i, j, sum; |
87 | int startaddr; | 87 | intptr_t startaddr; |
88 | 88 | ||
89 | main_header = (Elf32_Ehdr*)inbuf; | 89 | main_header = (Elf32_Ehdr*)inbuf; |
90 | if( !( main_header->e_ident[0] == ELFMAG0 && main_header->e_ident[1] == ELFMAG1 | 90 | if( !( main_header->e_ident[0] == ELFMAG0 && main_header->e_ident[1] == ELFMAG1 |
@@ -123,7 +123,7 @@ static int elf_convert(const unsigned char *inbuf, unsigned char *outbuf) | |||
123 | outbuf += section_header->sh_size; | 123 | outbuf += section_header->sh_size; |
124 | } | 124 | } |
125 | } | 125 | } |
126 | return (intptr_t)(outbuf - startaddr); | 126 | return (int)((intptr_t)outbuf - startaddr); |
127 | } | 127 | } |
128 | 128 | ||
129 | static int make_jrm_file(const unsigned char *inbuf, unsigned char *outbuf) | 129 | static int make_jrm_file(const unsigned char *inbuf, unsigned char *outbuf) |