sharpetronics/zstd
1
0
Fork 0
mirror of https://github.com/facebook/zstd.git synced 2025-10-09 00:05:28 -04:00
Code Issues Projects Releases Wiki Activity

Update comments, and LD flag usage in Make

Browse Source
This commit is contained in:
Casey McGinty 2018-09-11 14:49:47 -07:00
parent 2224ecd718
commit b9118ecdab
No known key found for this signature in database
GPG Key ID: BA0229620046D260
2 changed files with 32 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
programs/Makefile
View File

@ -47,8 +47,8 @@ DEBUGFLAGS+=-Wall -Wextra -Wcast-qual -Wcast-align -Wshadow \
-Wstrict-prototypes -Wundef -Wpointer-arith -Wformat-security \ -Wstrict-prototypes -Wundef -Wpointer-arith -Wformat-security \
-Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \ -Wvla -Wformat=2 -Winit-self -Wfloat-equal -Wwrite-strings \
-Wredundant-decls -Wredundant-decls
DEBUGFLAGS_LD+=-rdynamic
CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS) CFLAGS += $(DEBUGFLAGS) $(MOREFLAGS)
LDFLAGS += -rdynamic
FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) FLAGS = $(CPPFLAGS) $(CFLAGS) $(LDFLAGS)
@ -145,7 +145,7 @@ allVariants: zstd zstd-compress zstd-decompress zstd-small zstd-nolegacy
$(ZSTDDECOMP_O): CFLAGS += $(ALIGN_LOOP) $(ZSTDDECOMP_O): CFLAGS += $(ALIGN_LOOP)
zstd : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP) zstd : CPPFLAGS += $(THREAD_CPP) $(ZLIBCPP) $(LZMACPP) $(LZ4CPP)
zstd : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD) zstd : LDFLAGS += $(THREAD_LD) $(ZLIBLD) $(LZMALD) $(LZ4LD) $(DEBUGFLAGS_LD)
zstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT) zstd : CPPFLAGS += -DZSTD_LEGACY_SUPPORT=$(ZSTD_LEGACY_SUPPORT)
zstd : $(ZSTDLIB_FILES) zstdcli.o fileio.o bench.o datagen.o dibio.o zstd : $(ZSTDLIB_FILES) zstdcli.o fileio.o bench.o datagen.o dibio.o
@echo "$(THREAD_MSG)" @echo "$(THREAD_MSG)"
@ -159,6 +159,7 @@ endif
.PHONY: zstd-release .PHONY: zstd-release
zstd-release: DEBUGFLAGS := zstd-release: DEBUGFLAGS :=
zstd-release: DEBUGFLAGS_LD :=
zstd-release: zstd zstd-release: zstd
zstd32 : CPPFLAGS += $(THREAD_CPP) zstd32 : CPPFLAGS += $(THREAD_CPP)

58
programs/fileio.c
View File

@ -166,37 +166,37 @@ static void clearHandler(void)
#ifndef _WIN32 #ifndef _WIN32
static void ABRThandler(int sig) { static void ABRThandler(int sig) {
const char* name; const char* name;
void* addrlist[MAX_STACK_FRAMES + 1]; void* addrlist[MAX_STACK_FRAMES];
char** symbollist; char** symbollist;
U32 addrlen, i; U32 addrlen, i;
switch (sig) { switch (sig) {
case SIGABRT: name = "SIGABRT"; break; case SIGABRT: name = "SIGABRT"; break;
case SIGFPE: name = "SIGFPE"; break; case SIGFPE: name = "SIGFPE"; break;
case SIGILL: name = "SIGILL"; break; case SIGILL: name = "SIGILL"; break;
case SIGINT: name = "SIGINT"; break; case SIGINT: name = "SIGINT"; break;
case SIGSEGV: name = "SIGSEGV"; break; case SIGSEGV: name = "SIGSEGV"; break;
default: name = "UNKNOWN"; default: name = "UNKNOWN";
} }
DISPLAY("Caught %s signal, printing stack:\n", name); DISPLAY("Caught %s signal, printing stack:\n", name);
// Retrieve current stack addresses. /* Retrieve current stack addresses. */
addrlen = backtrace(addrlist, sizeof(addrlist) / sizeof(void*)); addrlen = backtrace(addrlist, MAX_STACK_FRAMES);
if (addrlen == 0) { if (addrlen == 0) {
DISPLAY("\n"); DISPLAY("\n");
return; return;
} }
// Create readable strings to each frame. /* Create readable strings to each frame. */
symbollist = backtrace_symbols(addrlist, addrlen); symbollist = backtrace_symbols(addrlist, addrlen);
// Print the stack trace, excluding calls handling the signal. /* Print the stack trace, excluding calls handling the signal. */
for (i = ZSTD_START_SYMBOLLIST_FRAME; i < addrlen; i++) { for (i = ZSTD_START_SYMBOLLIST_FRAME; i < addrlen; i++) {
DISPLAY("%s\n", symbollist[i]); DISPLAY("%s\n", symbollist[i]);
} }
free(symbollist); free(symbollist);
// Reset and raise the signal so default handler runs. /* Reset and raise the signal so default handler runs. */
signal(sig, SIG_DFL); signal(sig, SIG_DFL);
raise(sig); raise(sig);
} }
#endif #endif