KolibriOS/umka
11
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Build with clang optionally

Browse Source
This commit is contained in:
Ivan B
2021-12-13 01:07:42 +03:00
parent 3015516f22
commit 74f78a60de
2 changed files with 25 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
makefile
View File

@@ -1,11 +1,25 @@
KOLIBRIOS ?= /root/Sources/kolibrios ifndef KOLIBRIOS
FASM=fasm -dUEFI=1 -dextended_primary_loader=1 -dUMKA=1 $(error "Set KOLIBRIOS environment variable to KolibriOS root")
CC=gcc endif
WARNINGS=-Wall -Wextra -Wduplicated-cond -Wduplicated-branches -Wlogical-op \
-Wrestrict -Wnull-dereference -Wjump-misses-init -Wshadow -Wformat=2 \ FASM ?= fasm -dUEFI=1 -dextended_primary_loader=1 -dUMKA=1
-Wswitch -Wswitch-enum -Wpedantic \ CC ?= gcc
WARNINGS_COMMON=-Wall -Wextra \
-Wnull-dereference -Wshadow -Wformat=2 -Wswitch -Wswitch-enum \
-Wpedantic \
#-Wconversion -Wsign-conversion #-Wconversion -Wsign-conversion
NOWARNINGS=-Wno-address-of-packed-member NOWARNINGS_COMMON=-Wno-address-of-packed-member -Wno-missing-prototype-for-cc
ifeq ($(CC),gcc)
WARNINGS=$(WARNINGS_COMMON) -Wduplicated-cond -Wduplicated-branches -Wrestrict -Wlogical-op -Wjump-misses-init
NOWARNINGS=$(NOWARNINGS_COMMON)
else ifeq ($(CC),clang)
WARNINGS=$(WARNINGS_COMMON)
NOWARNINGS=$(NOWARNINGS_COMMON)
else
$(error compiler $(CC) is not supported)
endif
CFLAGS=$(WARNINGS) $(NOWARNINGS) -std=c11 -g -O0 -D_FILE_OFFSET_BITS=64 \ CFLAGS=$(WARNINGS) $(NOWARNINGS) -std=c11 -g -O0 -D_FILE_OFFSET_BITS=64 \
-DNDEBUG -masm=intel -D_POSIX_C_SOURCE=200809L -Ilinux -fno-pie -DNDEBUG -masm=intel -D_POSIX_C_SOURCE=200809L -Ilinux -fno-pie
CFLAGS_32=$(CFLAGS) -m32 CFLAGS_32=$(CFLAGS) -m32
@@ -25,17 +39,17 @@ covpreproc: covpreproc.c
umka_shell: umka_shell.o umka.o shell.o trace.o trace_lbr.o vdisk.o vnet.o \ umka_shell: umka_shell.o umka.o shell.o trace.o trace_lbr.o vdisk.o vnet.o \
lodepng.o pci.o thread.o util.o getopt.o isatty.o lodepng.o pci.o thread.o util.o getopt.o isatty.o
$(CC) $(LDFLAGS_32) $^ -o $@ -static -T umka.ld $(CC) $(LDFLAGS_32) $^ -o $@ -T umka.ld
umka_fuse: umka_fuse.o umka.o trace.o trace_lbr.o vdisk.o pci.o thread.o umka_fuse: umka_fuse.o umka.o trace.o trace_lbr.o vdisk.o pci.o thread.o
$(CC) $(LDFLAGS_32) $^ -o $@ `pkg-config fuse3 --libs` -T umka.ld $(CC) $(LDFLAGS_32) $^ -o $@ `pkg-config fuse3 --libs` -T umka.ld
umka_os: umka_os.o umka.o shell.o lodepng.o vdisk.o vnet.o trace.o trace_lbr.o \ umka_os: umka_os.o umka.o shell.o lodepng.o vdisk.o vnet.o trace.o trace_lbr.o \
pci.o thread.o umka_ping.o util.o pci.o thread.o umka_ping.o util.o
$(CC) $(LDFLAGS_32) $^ -o $@ -static -T umka.ld $(CC) $(LDFLAGS_32) $^ -o $@ -T umka.ld
umka_gen_devices_dat: umka_gen_devices_dat.o umka.o pci.o thread.o util.o umka_gen_devices_dat: umka_gen_devices_dat.o umka.o pci.o thread.o util.o
$(CC) $(LDFLAGS_32) $^ -o $@ -static -T umka.ld $(CC) $(LDFLAGS_32) $^ -o $@ -T umka.ld
umka.o umka.fas: umka.asm umka.o umka.fas: umka.asm
INCLUDE="$(KOLIBRIOS)/kernel/trunk;$(KOLIBRIOS)/programs/develop/libraries/libcrash/hash" \ INCLUDE="$(KOLIBRIOS)/kernel/trunk;$(KOLIBRIOS)/programs/develop/libraries/libcrash/hash" \

2
umka_gen_devices_dat.c
View File

@@ -80,7 +80,7 @@ acpi_node_t *acpi_get(const char *path) {
size_t len = fread(acpi_value, 1, ACPI_BUF_SIZE, f); size_t len = fread(acpi_value, 1, ACPI_BUF_SIZE, f);
acpi_value[len-1] = '\0'; acpi_value[len-1] = '\0';
fclose(f); fclose(f);
acpi_node_t *n; acpi_node_t *n = NULL;
char *str = acpi_value; char *str = acpi_value;
if (acpi_value[0] == '0') { if (acpi_value[0] == '0') {
kos_node_integer_t *aint = (kos_node_integer_t*)kos_aml_constructor_integer(); kos_node_integer_t *aint = (kos_node_integer_t*)kos_aml_constructor_integer();