X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=Usermode%2FLibraries%2Fld-acess.so_src%2FMakefile;h=d6691e401c731185a9ba6803caa54582e7021689;hb=038439147795891da9d99ddbc10ebbbb0d9fca09;hp=49afb1e1bc2f9bbfc74a98b11a890d59c23e62f6;hpb=bfacdd3b71576cf6ceaa83352d3a7d162adb75e1;p=tpg%2Facess2.git diff --git a/Usermode/Libraries/ld-acess.so_src/Makefile b/Usermode/Libraries/ld-acess.so_src/Makefile index 49afb1e1..d6691e40 100644 --- a/Usermode/Libraries/ld-acess.so_src/Makefile +++ b/Usermode/Libraries/ld-acess.so_src/Makefile @@ -8,26 +8,40 @@ OBJ := main.o lib.o loadlib.o export.o elf.o pe.o OBJ += arch/$(ARCHDIR).ao_ BIN = ld-acess.so EXTRABIN := libld-acess.so -EXTRACLEAN := $(_OBJPREFIX)_stublib.o +EXTRACLEAN = $(_OBJPREFIX)_stublib.o +INCFILES := sys/sys.h -CFLAGS = -g -Wall -fno-builtin -fno-leading-underscore -fno-stack-protector -fPIC +#CPPFLAGS += -D DISABLE_ELF64 +CFLAGS = -g -Wall -fno-builtin -fno-stack-protector -fPIC -std=c99 -ffreestanding +# -fno-leading-underscore CFLAGS += $(CPPFLAGS) -LDFLAGS = -g -T arch/$(ARCHDIR).ld -Map map.txt --export-dynamic +LDFLAGS = -ffreestanding -nostdlib -g -Wl,-T,arch/$(ARCHDIR).ld -Map map.txt --export-dynamic -x +LIBS := $(LIBGCC_PATH) + +ifeq ($(ARCH),native) +XBIN := $(addprefix $(OUTPUTDIR)Libs/,$(EXTRABIN)) +$(XBIN): obj-$(ARCH)/_stublib.o +all: $(XBIN) +CFLAGS += -ffreestanding +LDFLAGS := +BIN := +OBJ := +endif include ../Makefile.tpl # create libld-acess.so $(_XBIN): $(_OBJPREFIX)_stublib.o @echo [LD] -o -shared libld-acess.so - $(LD) -shared -o $@ $< + $V$(LD) -shared -o $@ $< # @$(LD) $(LDFLAGS) -o $@ $(OBJ) # Override .ao to look in the object prefix for the source -$(_OBJPREFIX)arch/$(ARCHDIR).ao_: $(_OBJPREFIX)arch/$(ARCHDIR).$(ASSUFFIX) +$(_OBJPREFIX)arch/$(ARCHDIR).ao_: $(_OBJPREFIX)arch/$(ARCHDIR).$(ASSUFFIX) Makefile @echo [AS] -o $@ @mkdir -p $(dir $@) - @$(AS) $(ASFLAGS) -o $@ $< + $V$(AS) $(ASFLAGS) -o $@ $< #.PRECIOUS: $(OBJ:%.ao=%.asm) @@ -35,7 +49,9 @@ $(_OBJPREFIX)arch/$(ARCHDIR).ao_: $(_OBJPREFIX)arch/$(ARCHDIR).$(ASSUFFIX) $(_OBJPREFIX)arch/$(ARCHDIR).$(ASSUFFIX): arch/$(ARCHDIR).$(ASSUFFIX).h arch/syscalls.s.h @echo [CPP] -o $@ @mkdir -p $(dir $@) - @$(CPP) $(CPPFLAGS) -P -D__ASSEMBLER__ $< -o $@ + $V$(CPP) $(CPPFLAGS) -P -D__ASSEMBLER__ $< -o $@ + +$(_OBJPREFIX)arch/$(ARCHDIR).$(ASSUFFIX): $(ACESSDIR)/KernelLand/Kernel/include/syscalls.h $(_OBJPREFIX)_stublib.o: arch/syscalls.s.h