From 29394935e32b03d58f927938a196d40c035e9b1c Mon Sep 17 00:00:00 2001 From: "Markus F.X.J. Oberhumer" Date: Wed, 16 May 2007 04:34:30 +0200 Subject: [PATCH] Use -Wstrict-prototypes CFLAGS in stub/Makefile. --- src/stub/Makefile | 18 +++++++++--------- src/stub/src/c/lzma_d_c.c | 2 ++ src/stub/src/i386-linux.elf-main.c | 27 +++++++++++++++++---------- 3 files changed, 28 insertions(+), 19 deletions(-) diff --git a/src/stub/Makefile b/src/stub/Makefile index 0f48be0c..a9d97db0 100644 --- a/src/stub/Makefile +++ b/src/stub/Makefile @@ -242,7 +242,7 @@ amd64-linux.elf%.h : tc_bfdname = elf64-x86-64 tc.amd64-linux.elf.gcc = amd64-linux-gcc-3.4.4 -m64 -nostdinc -MMD -MT $@ tc.amd64-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables -tc.amd64-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Werror +tc.amd64-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror amd64-linux.elf-entry.h: $(srcdir)/src/$$T.S $(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin @@ -296,7 +296,7 @@ arm-linux.elf%.h : tc_bfdname = elf32-littlearm tc.arm-linux.elf.gcc = arm-linux-gcc-4.1.0 -march=armv4 -nostdinc -MMD -MT $@ tc.arm-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables -tc.arm-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Werror +tc.arm-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror arm-linux.elf-entry.h : $(srcdir)/src/$$T.S $(call tc,gcc) -march=armv4 -c $< -o tmp/$T.bin @@ -330,7 +330,7 @@ arm-linux.kernel.vmlinu%.h : tc_bfdname = elf32-littlearm tc.arm-linux.kernel.gcc = arm-linux-gcc-4.1.0 -march=armv5 -nostdinc -MMD -MT $@ tc.arm-linux.kernel.gcc += -fno-exceptions -fno-asynchronous-unwind-tables -tc.arm-linux.kernel.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Werror +tc.arm-linux.kernel.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror arm-linux.kernel.vmlinu%.h : $(srcdir)/src/$$T.S $(call tc,gcc) -c -x assembler-with-cpp $< -o tmp/$T.bin @@ -632,7 +632,7 @@ i386-linux.elf%.h : tc_bfdname = elf32-i386 tc.i386-linux.elf.gcc = i386-linux-gcc-3.4.6 -m32 -march=i386 -nostdinc -MMD -MT $@ tc.i386-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables -tc.i386-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Werror +tc.i386-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror tc.i386-linux.elf.gcc += -mtune=k6 tc.i386-linux.elf.gcc += -Os -fno-omit-frame-pointer tc.i386-linux.elf.gcc += -momit-leaf-frame-pointer @@ -793,7 +793,7 @@ m68k-atari.tos.h : tc_objdump_disasm_options = -m m68k:68040 tc.m68k-atari.tos.gcc = m68k-linux-gcc-4.1.1 -m68000 -malign-int -nostdinc -MMD -MT $@ tc.m68k-atari.tos.gcc += -fno-exceptions -fno-asynchronous-unwind-tables -tc.m68k-atari.tos.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Werror +tc.m68k-atari.tos.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror m68k-atari.tos.h : $(srcdir)/src/$$T.S $(call tc,gcc) -c -x assembler-with-cpp -Wa,-m68000,-l,--pcrel,--register-prefix-optional $< -o tmp/$T.bin @@ -812,7 +812,7 @@ tc.mipsel.r3000-ps1.as = mipsel-elf-as-20060406 -O -mno-pdr ##tc.mipsel.r3000-ps1.as = mipsel-linux-as-2.16.1 -O -mno-pdr tc.mipsel.r3000-ps1.gcc = mipsel-linux-gcc-4.1.1 -mel -march=r3000 -mno-abicalls -mabi=eabi -G0 -nostdinc -MMD -MT $@ tc.mipsel.r3000-ps1.gcc += -fno-exceptions -fno-asynchronous-unwind-tables -tc.mipsel.r3000-ps1.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Werror +tc.mipsel.r3000-ps1.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror mipsel.r3000-ps1.h : $(srcdir)/src/$$T.S ifeq (1,1) @@ -859,9 +859,9 @@ tmp/mipsel.r3000-linux.elf-fold.o : $(srcdir)/src/$$T.S $(call tc,f-objstrip,$@) tmp/mipsel.r3000-linux.elf-main.o : $(srcdir)/src/$$T.c - $(call tc,gcc) -S -Os $< -o tmp/$T.i + $(call tc,gcc) -S -Os -MF tmp/$T.d $< -o - | $(RTRIM) > tmp/$T.i sed -e 's/ j[ ][ ]*$$L/ b $$L/' \ - -e 's/ jal[ ][ ]*\([^\$$]\)/ bal \1/' tmp/$T.s + -e 's/ jal[ ][ ]*\([^\$$]\)/ bal \1/' < tmp/$T.i > tmp/$T.s $(call tc,gcc) -c -Wa,-O,-mno-pdr tmp/$T.s -o $@ $(call tc,f-objstrip,$@) $(call tc,objdump) -dr $(tc_objdump_disasm_options) $@ | $(RTRIM) > $@.disasm @@ -904,7 +904,7 @@ powerpc-linux.elf%.h : tc_bfdname = elf32-powerpc tc.powerpc-linux.elf.gcc = powerpc.405-linux-gcc-3.4.5 -m32 -mbig-endian -mcpu=405 -nostdinc -MMD -MT $@ tc.powerpc-linux.elf.gcc += -fno-exceptions -fno-asynchronous-unwind-tables -tc.powerpc-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wwrite-strings -Werror +tc.powerpc-linux.elf.gcc += -Wall -W -Wcast-align -Wcast-qual -Wstrict-prototypes -Wwrite-strings -Werror powerpc-linux.elf-entry.h : $(srcdir)/src/$$T.S $(call tc,gcc) -c $< -o tmp/$T.bin diff --git a/src/stub/src/c/lzma_d_c.c b/src/stub/src/c/lzma_d_c.c index 2188f8db..a6d47924 100644 --- a/src/stub/src/c/lzma_d_c.c +++ b/src/stub/src/c/lzma_d_c.c @@ -88,6 +88,8 @@ ACC_COMPILE_TIME_ASSERT_HEADER(sizeof(SizeT) >= 4) #else #define CLzmaDecoderState const CLzmaDecoderState #endif +int LzmaDecodeProperties(CLzmaProperties *, const unsigned char *, int); +int LzmaDecode(CLzmaDecoderState *, const unsigned char *, SizeT, SizeT *, unsigned char *, SizeT, SizeT *); #if (ACC_CC_BORLANDC) #include "LzmaDecode.c" #else diff --git a/src/stub/src/i386-linux.elf-main.c b/src/stub/src/i386-linux.elf-main.c index 231eb669..83ead919 100644 --- a/src/stub/src/i386-linux.elf-main.c +++ b/src/stub/src/i386-linux.elf-main.c @@ -32,6 +32,7 @@ #include "include/linux.h" void *mmap(void *, size_t, int, int, int, off_t); +ssize_t write(int, void const *, size_t); /************************************************************************* @@ -45,7 +46,14 @@ void *mmap(void *, size_t, int, int, int, off_t); #if 1 /*{*/ #define DPRINTF(a) /* empty: no debug drivel */ #else /*}{*/ +#if 0 #include "stdarg.h" +#else +#define va_arg __builtin_va_arg +#define va_end __builtin_va_end +#define va_list __builtin_va_list +#define va_start __builtin_va_start +#endif static int unsimal(unsigned x, char *ptr, int n) @@ -68,7 +76,7 @@ decimal(int x, char *ptr, int n) return unsimal(x, ptr, n); } -extern char const *STR_hex(); +extern char const *STR_hex(void); static int heximal(unsigned x, char *ptr, int n) @@ -83,16 +91,15 @@ heximal(unsigned x, char *ptr, int n) #define DPRINTF(a) dprintf a -extern char const *STR_0x(); -extern char const *STR_xread(); -extern char const *STR_unpackExtent(); -extern char const *STR_make_hatch_arm(); -extern char const *STR_auxv_up(); -extern char const *STR_xfind_pages(); -extern char const *STR_do_xmap(); -extern char const *STR_upx_main(); +extern char const *STR_0x(void); +extern char const *STR_xread(void); +extern char const *STR_unpackExtent(void); +extern char const *STR_make_hatch_arm(void); +extern char const *STR_auxv_up(void); +extern char const *STR_xfind_pages(void); +extern char const *STR_do_xmap(void); +extern char const *STR_upx_main(void); -extern int write(int fd, char const *buf, size_t n); static int dprintf(char const *fmt, ...)