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

Fix for inline asm.

Browse Source
This commit is contained in:
Ivan B
2020-02-06 06:26:14 +03:00
parent b23e29d6d1
commit bcc4a37ccc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
makefile
View File

@@ -1,7 +1,7 @@
FASM=fasm FASM=fasm
CC=gcc CC=gcc
WARNINGS=-Wall -Wextra -Wduplicated-cond -Wduplicated-branches -Wlogical-op -Wrestrict -Wnull-dereference -Wjump-misses-init -Wshadow -Wformat=2 -Wswitch -Wswitch-enum #-Wconversion -Wsign-conversion WARNINGS=-Wall -Wextra -Wduplicated-cond -Wduplicated-branches -Wlogical-op -Wrestrict -Wnull-dereference -Wjump-misses-init -Wshadow -Wformat=2 -Wswitch -Wswitch-enum #-Wconversion -Wsign-conversion
CFLAGS=$(WARNINGS) -g -O0 -D_FILE_OFFSET_BITS=64 -Wno-address-of-packed-member -DNDEBUG CFLAGS=$(WARNINGS) -g -O0 -D_FILE_OFFSET_BITS=64 -Wno-address-of-packed-member -DNDEBUG -masm=intel
CFLAGS_32=-m32 CFLAGS_32=-m32
LDFLAGS= LDFLAGS=
LDFLAGS_32=-m32 LDFLAGS_32=-m32
@@ -48,7 +48,7 @@ cio.o: cio.c
$(CC) $(CFLAGS) $(CFLAGS_32) -c $< $(CC) $(CFLAGS) $(CFLAGS_32) -c $<
kofu.o: kofu.c kolibri.h trace.h syscalls.h kofu.o: kofu.c kolibri.h trace.h syscalls.h
$(CC) $(CFLAGS) $(CFLAGS_32) -c $< -std=c99 -D_POSIX_C_SOURCE -masm=intel $(CC) $(CFLAGS) $(CFLAGS_32) -c $< -std=c99 -D_POSIX_C_SOURCE
kofuse.o: kofuse.c kolibri.h kofuse.o: kofuse.c kolibri.h
$(CC) $(CFLAGS) $(CFLAGS_32) `pkg-config fuse3 --cflags` -c $< -std=gnu99 $(CC) $(CFLAGS) $(CFLAGS_32) `pkg-config fuse3 --cflags` -c $< -std=gnu99

2
syscalls.h
View File

@@ -153,7 +153,7 @@ static inline void umka_sys_put_image_palette(void *image,
"d"((x << 16) + y), "d"((x << 16) + y),
"S"(bpp), "S"(bpp),
"D"(palette), "D"(palette),
[row_offset] "rm"(row_offset) [row_offset] "Rm"(row_offset)
: "memory"); : "memory");
} }