mars_nwe/mars-libowfat
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't trip ubsan in uint32.h

Browse Source 
make pic adds to $CC instead of overwriting it
This commit is contained in:
leitner
2025-05-14 10:59:45 +00:00
parent e03ac00fa1
commit b7d4d7f2ad
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
GNUmakefile
View File

@@ -16,10 +16,10 @@ textcode.a cdb.a critbit.a
all: ent $(LIBS) libowfat.a libsocket t
pic pie:
$(MAKE) CC="gcc -fPIC" LDFLAGS="-fpie"
$(MAKE) CC="$(CC) -fPIC" LDFLAGS="-fpie"
picx32 piex32:
$(MAKE) CC="gcc -mx32 -fPIC" LDFLAGS="-fpie"
$(MAKE) CC="$(CC) -mx32 -fPIC" LDFLAGS="-fpie"
CROSS=
#CROSS=i686-mingw-

8
uint32.h
View File

@@ -27,12 +27,12 @@ static inline void uint32_pack(char out[4],uint32 in) {
static inline void uint32_unpack(const char in[4],uint32* out) {
const unsigned char* i = (const unsigned char*)in;
*out=i[0] | (i[1]<<8) | (i[2]<<16) | (i[3]<<24);
*out=i[0] | (i[1]<<8) | (i[2]<<16) | ((uint32)(i[3])<<24);
}
static inline uint32 uint32_read(const char in[4]) {
const unsigned char* i = (const unsigned char*)in;
return i[0] | (i[1]<<8) | (i[2]<<16) | (i[3]<<24);
return i[0] | (i[1]<<8) | (i[2]<<16) | ((uint32)(i[3])<<24);
}
static inline void uint32_pack_big(char out[4],uint32 in) {
@@ -44,12 +44,12 @@ static inline void uint32_pack_big(char out[4],uint32 in) {
static inline void uint32_unpack_big(const char in[4],uint32* out) {
const unsigned char* i = (const unsigned char*)in;
*out=(i[0]<<24) | (i[1]<<16) | (i[2]<<8) | i[3];
*out=((uint32)(i[0])<<24) | (i[1]<<16) | (i[2]<<8) | i[3];
}
static inline uint32 uint32_read_big(const char in[4]) {
const unsigned char* i = (const unsigned char*)in;
return (i[0]<<24) | (i[1]<<16) | (i[2]<<8) | i[3];
return ((uint32)(i[0])<<24) | (i[1]<<16) | (i[2]<<8) | i[3];
}
#else