mirror/upx
1
0
Fork 0
mirror of https://github.com/upx/upx synced 2025-09-28 19:06:07 +08:00
Code Issues Releases Wiki Activity

Small cleanups.

Browse Source 
committer: mfx <mfx> 1058967699 +0000
This commit is contained in:
Markus F.X.J. Oberhumer 2003-07-23 13:41:39 +00:00
parent 4205c699ac
commit ed0e3b9af4
5 changed files with 40 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Makefile.bld
View File

@ -490,6 +490,7 @@ ifeq ($(DEBUG),1)
else else
CFLAGS += -O1 -GF CFLAGS += -O1 -GF
LINK_EXE_LDFLAGS += /release LINK_EXE_LDFLAGS += /release
##LINK_EXE_LDFLAGS += /opt:nowin98
endif endif
RESOURCES := $(subst .rc,.res,$(notdir $(wildcard $(srcdir)/*.rc))) RESOURCES := $(subst .rc,.res,$(notdir $(wildcard $(srcdir)/*.rc)))

2
src/acc/acc.h
View File

@ -25,7 +25,7 @@
#ifndef __ACC_H_INCLUDED #ifndef __ACC_H_INCLUDED
#define __ACC_H_INCLUDED #define __ACC_H_INCLUDED
#define ACC_VERSION 20030720L #define ACC_VERSION 20030722L
#if !defined(ACC_CONFIG_INCLUDE) #if !defined(ACC_CONFIG_INCLUDE)
# define ACC_CONFIG_INCLUDE(file) file # define ACC_CONFIG_INCLUDE(file) file

3
src/acc/acc_chk.ch
View File

@ -112,6 +112,9 @@
# else # else
ACCCHK_ASSERT(sizeof('\0') == sizeof(int)) ACCCHK_ASSERT(sizeof('\0') == sizeof(int))
# endif # endif
#endif
#if defined(acc_alignof)
ACCCHK_ASSERT(acc_alignof(char) == 1)
#endif #endif
ACCCHK_ASSERT_IS_SIGNED(short) ACCCHK_ASSERT_IS_SIGNED(short)

13
src/acc/acc_defs.h
View File

@ -126,6 +126,19 @@
#endif #endif
/***********************************************************************
//
************************************************************************/
#if (ACC_CC_GNUC)
# define acc_alignof(e) __alignof__(e)
#elif (ACC_CC_INTELC && (__INTEL_COMPILER >= 700))
# define acc_alignof(e) __alignof__(e)
#elif (ACC_CC_MSC && (_MSC_VER >= 1300))
# define acc_alignof(e) __alignof(e)
#endif
/* /*
vi:ts=4:et vi:ts=4:et

45
src/main.cpp
View File

@ -1013,26 +1013,26 @@ void upx_sanity_check(void)
{ {
#include "acc/acc_chk.ch" #include "acc/acc_chk.ch"
COMPILE_TIME_ASSERT(sizeof(char) == 1); COMPILE_TIME_ASSERT(sizeof(char) == 1)
COMPILE_TIME_ASSERT(sizeof(short) == 2); COMPILE_TIME_ASSERT(sizeof(short) == 2)
COMPILE_TIME_ASSERT(sizeof(int) == 4); COMPILE_TIME_ASSERT(sizeof(int) == 4)
COMPILE_TIME_ASSERT(sizeof(long) >= 4); COMPILE_TIME_ASSERT(sizeof(long) >= 4)
COMPILE_TIME_ASSERT(sizeof(void *) >= 4); COMPILE_TIME_ASSERT(sizeof(void *) >= 4)
COMPILE_TIME_ASSERT(sizeof(long) >= sizeof(void *)); COMPILE_TIME_ASSERT(sizeof(long) >= sizeof(void *))
COMPILE_TIME_ASSERT(sizeof(off_t) >= sizeof(long)); COMPILE_TIME_ASSERT(sizeof(off_t) >= sizeof(long))
COMPILE_TIME_ASSERT(((off_t) -1) < 0); COMPILE_TIME_ASSERT(((off_t) -1) < 0)
COMPILE_TIME_ASSERT(sizeof(BE16) == 2); COMPILE_TIME_ASSERT(sizeof(BE16) == 2)
COMPILE_TIME_ASSERT(sizeof(BE32) == 4); COMPILE_TIME_ASSERT(sizeof(BE32) == 4)
COMPILE_TIME_ASSERT(sizeof(LE16) == 2); COMPILE_TIME_ASSERT(sizeof(LE16) == 2)
COMPILE_TIME_ASSERT(sizeof(LE32) == 4); COMPILE_TIME_ASSERT(sizeof(LE32) == 4)
#if (ACC_CC_GNUC) || (ACC_CC_INTELC && __INTEL_COMPILER >= 700) #if defined(acc_alignof)
COMPILE_TIME_ASSERT(__alignof__(BE16) == 1); COMPILE_TIME_ASSERT(acc_alignof(BE16) == 1)
COMPILE_TIME_ASSERT(__alignof__(BE32) == 1); COMPILE_TIME_ASSERT(acc_alignof(BE32) == 1)
COMPILE_TIME_ASSERT(__alignof__(LE16) == 1); COMPILE_TIME_ASSERT(acc_alignof(LE16) == 1)
COMPILE_TIME_ASSERT(__alignof__(LE32) == 1); COMPILE_TIME_ASSERT(acc_alignof(LE32) == 1)
#endif #endif
#if !defined(ACC_CC_WATCOMC) #if !defined(ACC_CC_WATCOMC)
@ -1048,13 +1048,13 @@ void upx_sanity_check(void)
//printf("%d\n", (int) sizeof(align_assertion_1b_t)); //printf("%d\n", (int) sizeof(align_assertion_1b_t));
//printf("%d\n", (int) sizeof(align_assertion_2a_t)); //printf("%d\n", (int) sizeof(align_assertion_2a_t));
//printf("%d\n", (int) sizeof(align_assertion_2b_t)); //printf("%d\n", (int) sizeof(align_assertion_2b_t));
COMPILE_TIME_ASSERT(sizeof(align_assertion_1a_t) == sizeof(align_assertion_1b_t)); COMPILE_TIME_ASSERT(sizeof(align_assertion_1a_t) == sizeof(align_assertion_1b_t))
COMPILE_TIME_ASSERT(sizeof(align_assertion_2a_t) == sizeof(align_assertion_2b_t)); COMPILE_TIME_ASSERT(sizeof(align_assertion_2a_t) == sizeof(align_assertion_2b_t))
COMPILE_TIME_ASSERT(sizeof(align_assertion_1a_t) == 3*9); COMPILE_TIME_ASSERT(sizeof(align_assertion_1a_t) == 3*9)
COMPILE_TIME_ASSERT(sizeof(align_assertion_2a_t) == 3*17); COMPILE_TIME_ASSERT(sizeof(align_assertion_2a_t) == 3*17)
#endif #endif
COMPILE_TIME_ASSERT(sizeof(UPX_VERSION_STRING4) == 4 + 1); COMPILE_TIME_ASSERT(sizeof(UPX_VERSION_STRING4) == 4 + 1)
assert(strlen(UPX_VERSION_STRING4) == 4); assert(strlen(UPX_VERSION_STRING4) == 4);
assert(memcmp(UPX_VERSION_STRING4, UPX_VERSION_STRING, 4) == 0); assert(memcmp(UPX_VERSION_STRING4, UPX_VERSION_STRING, 4) == 0);
@ -1248,7 +1248,6 @@ int __acc_cdecl_main main(int argc, char *argv[])
#if 0 && defined(__GLIBC__) #if 0 && defined(__GLIBC__)
//malloc_stats(); //malloc_stats();
#endif #endif
do_exit();
return exit_code; return exit_code;
} }