Subversion Repositories Kolibri OS

Compare Revisions

Regard whitespace Rev 5144 → Rev 5145

/programs/develop/libraries/menuetlibc/linuxtools/mchmem.c
File deleted
/programs/develop/libraries/menuetlibc/linuxtools/mgcc.c
File deleted
/programs/develop/libraries/menuetlibc/linuxtools/mld.c
File deleted
/programs/develop/libraries/menuetlibc/linuxtools/Makefile
File deleted
/programs/develop/libraries/menuetlibc/linuxtools/mmkdep.c
File deleted
/programs/develop/libraries/menuetlibc/linuxtools/mgpp.c
File deleted
/programs/develop/libraries/menuetlibc/Tupfile.lua
File deleted
/programs/develop/libraries/menuetlibc/Makefile
1,26 → 1,12
include osrules.mak
all: genconfig
@echo Building library for $(VERSION_OS)
all:
gcc mkversion.c -o mkversion$(EXESUFFIX)
ifdef ON_MINGW
mkversion$(EXESUFFIX) < version > include/libc/version.h
else
./mkversion$(EXESUFFIX) < version > include/libc/version.h
endif
make -C linuxtools
make -C src depend
make -C src
make -C stub
 
genconfig:
ifdef ON_MINGW
@echo #$(NEED_UNDERSCORES) NEEDS_UNDERSCORES> config.h
else
@echo "#$(NEED_UNDERSCORES) NEEDS_UNDERSCORES" > config.h
endif
 
clean:
make -C src clean
make -C linuxtools clean
make -C stub clean
$(RM) mkversion$(EXESUFFIX)
/programs/develop/libraries/menuetlibc/config.h
0,0 → 1,0
#define NEEDS_UNDERSCORES
/programs/develop/libraries/menuetlibc/makefiles/Makefile_for_cpp_program
3,23 → 3,23
.SUFFIXES: .asm;
 
$(OUTFILE): $(OBJS)
$(MLD) $(OUTFILE) $(OBJS) -lcpp $(LIBS) $(LDFLAGS) $(LD32OPT)
$(MLD) -o $(OUTFILE) $(OBJS) -lcpp $(LIBS) $(LDFLAGS) -lc
 
.c.o:
$(MGCC) $*.c $*.o $(CFLAGS) $(GCC32OPT)
$(MGCC) $*.c -o $*.o $(CFLAGS)
 
.cpp.o:
$(MGPP) $*.cpp $*.o $(CPPFLAGS) $(GCC32OPT)
$(MGPP) $*.cpp -o $*.o $(CPPFLAGS)
 
.cc.o:
$(MGPP) $*.cc $*.o $(CPPFLAGS) $(GCC32OPT)
$(MGPP) $*.cc -o $*.o $(CPPFLAGS)
 
.asm.o:
nasm $*.asm -f $(ASMFMT) -o $*.o
 
.s.o:
cpp $*.s -o $*.asm -nostdinc -I$(MENUETDEV)/include $(SFLAGS)
as $*.asm $(AS32OPT) -o $*.o
kos32-cpp $*.s -o $*.asm -nostdinc -I$(MENUETDEV)/include $(SFLAGS)
kos32-as $*.asm -o $*.o
$(RM) $*.asm
 
clean:
/programs/develop/libraries/menuetlibc/makefiles/Makefile_for_lib
3,23 → 3,23
.SUFFIXES: .asm;
 
$(OUTFILE): $(OBJS)
ar rcs $(OUTFILE) $(OBJS)
kos32-ar rcs $(OUTFILE) $(OBJS)
 
.c.o:
$(MGCC) $*.c $*.o $(CFLAGS) $(GCC32OPT)
$(MGCC) $*.c -o $*.o $(CFLAGS)
 
.cpp.o:
$(MGPP) $*.cpp $*.o $(CPPFLAGS) $(GCC32OPT)
$(MGPP) $*.cpp -o $*.o $(CPPFLAGS)
 
.cc.o:
$(MGPP) $*.cc $*.o $(CPPFLAGS) $(GCC32OPT)
$(MGPP) $*.cc -o $*.o $(CPPFLAGS)
 
.asm.o:
nasm $*.asm -f $(ASMFMT) -o $*.o
 
.s.o:
cpp $*.s -o $*.asm -nostdinc -I$(MENUETDEV)/include
as $*.asm $(AS32OPT) -o $*.o
kos32-cpp $*.s -o $*.asm -nostdinc -I$(MENUETDEV)/include
kos32-as $*.asm -o $*.o
$(RM) $*.asm
 
clean:
/programs/develop/libraries/menuetlibc/makefiles/Makefile_for_o_lib
3,23 → 3,23
.SUFFIXES: .asm;
 
$(OUTFILE): $(OBJS)
ld -r -o $(OUTFILE) $(OBJS) $(LDFLAGS) $(LD32OPT)
kos32-ld -r -o $(OUTFILE) $(OBJS) $(LDFLAGS)
 
.c.o:
$(MGCC) $*.c $*.o $(CFLAGS) $(GCC32OPT)
$(MGCC) $*.c -o $*.o $(CFLAGS)
 
.cpp.o:
$(MGPP) $*.cpp $*.o $(CPPFLAGS) $(GCC32OPT)
$(MGPP) $*.cpp -o $*.o $(CPPFLAGS)
.cc.o:
$(MGPP) $*.cc $*.o $(CPPFLAGS) $(GCC32OPT)
$(MGPP) $*.cc -o $*.o $(CPPFLAGS)
 
.asm.o:
nasm $*.asm -f $(ASMFMT) -o $*.o
 
.s.o:
cpp $*.s -o $*.asm -nostdinc -I$(MENUETDEV)/include
as $*.asm $(AS32OPT) -o $*.o
kos32-cpp $*.s -o $*.asm -nostdinc -I$(MENUETDEV)/include
kos32-as $*.asm -o $*.o
$(RM) $*.asm
 
clean:
/programs/develop/libraries/menuetlibc/makefiles/Makefile_for_program
1,31 → 1,27
include $(MENUETDEV)/osrules.mak
ifdef ON_WINDOWS
ALIGN = --section-alignment=16 --file-alignment=16
else
ALIGN =
endif
 
.SUFFIXES: .asm;
 
$(OUTFILE): $(OBJS)
$(MLD) $(OUTFILE) $(OBJS) $(LIBS) $(LDFLAGS) -n -Map $(OUTFILE).map $(LD32OPT)$(ALIGN)
$(MLD) -o $(OUTFILE) $(OBJS) $(LIBS) $(LDFLAGS) -n -Map $(OUTFILE).map $(ALIGN) -lc
objcopy $(OUTFILE) -O binary
 
.c.o:
$(MGCC) $*.c $*.o $(CFLAGS) $(GCC32OPT)
$(MGCC) $*.c -o $*.o $(CFLAGS)
 
.cpp.o:
$(MGPP) $*.cpp $*.o $(CPPFLAGS) $(GCC32OPT)
$(MGPP) $*.cpp -o $*.o $(CPPFLAGS)
 
.cc.o:
$(MGPP) $*.cc $*.o $(CPPFLAGS) $(GCC32OPT)
$(MGPP) $*.cc -o $*.o $(CPPFLAGS)
 
.asm.o:
nasm $*.asm -f $(ASMFMT) -o $*.o
 
.s.o:
cpp $*.s -o $*.asm -nostdinc -I$(MENUETDEV)/include
as $*.asm $(AS32OPT) -o $*.o
kos32-cpp $*.s -o $*.asm -nostdinc -I$(MENUETDEV)/include
kos32-as $*.asm -o $*.o
$(RM) $*.asm
 
clean:
/programs/develop/libraries/menuetlibc/osrules.mak
1,58 → 1,10
ifdef windir
ON_WINDOWS = 1
else
ifdef WINDIR
ON_WINDOWS = 1
endif
endif
 
ifndef ON_WINDOWS
VERSION_OS = linux
NEED_UNDERSCORES = undef
EXESUFFIX =
RM = rm -f
MV = mv
D_ECHO = echo
LIBDIR = $(MENUETDEV)/lib
ASMFMT = elf
else
ifdef HOME
VERSION_OS = cygwin
NEED_UNDERSCORES = define
EXESUFFIX = .exe
RM = rm -f
MV = mv
D_ECHO = echo
LIBDIR = $(MENUETDEV)/lib
ASMFMT = elf
else
VERSION_OS = MinGW
NEED_UNDERSCORES = define
EXESUFFIX = .exe
RM = del
MV = move
D_ECHO = echo.
ON_MINGW = 1
LIBDIR = $(MENUETDEV)\lib
ASMFMT = coff
endif
endif
 
HAS_DEVENV = 0
GPP_TOOLNAME = g++
STUBFMT = elf
 
MMKDEP = $(MENUETDEV)/linuxtools/mmkdep
MGCC = $(MENUETDEV)/linuxtools/mgcc
MGPP = $(MENUETDEV)/linuxtools/mgpp
MLD = $(MENUETDEV)/linuxtools/mld
MCHMEM = $(MENUETDEV)/linuxtools/mchmem
 
GCC32OPT =
AS32OPT =
LD32OPT =
ifneq (,$(findstring 64,$(shell gcc -dumpmachine)))
GCC32OPT = -m32
AS32OPT = --32
LD32OPT = -m$(ASMFMT)_i386
endif
MGCC=kos32-gcc -c -Os -nostdinc -fno-builtin -I$(MENUETDEV)/include -fno-common -D__DEV_CONFIG_H="\"../../config.h\"" -D__MENUETOS__
MGPP=kos32-g++ -c -Os -nostdinc -fno-builtin -I$(MENUETDEV)/include -fno-common -I$(MENUETDEV)/include/STL -D__MENUETOS__ -fno-rtti -fno-exceptions -fomit-frame-pointer
MLD=kos32-ld -T$(MENUETDEV)/include/scripts/menuetos_app_v01.ld -nostdlib -L$(MENUETDEV)/lib $(MENUETDEV)/stub/crt0.o
MMKDEP=kos32-gcc -nostdinc -I$(MENUETDEV)/include -D__DEV_CONFIG_H="\"../../config.h\"" -M
/programs/develop/libraries/menuetlibc/src/Make.rules
2,17 → 2,17
 
.SUFFIXES: .asm;
 
AS = as
AS = kos32-as
NASM = nasm
CPP = cpp
CPP = kos32-cpp
 
DEBUG = 0
 
.c.o:
$(MGCC) $*.c $*.o $(CFLAGS) $(GCC32OPT)
$(MGCC) $*.c -o $*.o $(CFLAGS)
 
.cpp.o:
$(MGPP) $*.cpp $*.o $(CPPFLAGS) $(GCC32OPT)
$(MGPP) $*.cpp -o $*.o $(CPPFLAGS)
 
.asm.o:
$(NASM) $*.asm -o $*.o -f $(ASMFMT)
19,7 → 19,7
.s.o:
$(CPP) -nostdinc -I$(MENUETDEV)/include $*.s -o $*.sx $(CSFLAGS) -DMENUETDEV=$(MENUETDEV) -D__DEV_CONFIG_H=\"$(MENUETDEV)/config.h\"
as $*.sx $(AS32OPT) -o $*.o
$(AS) $*.sx -o $*.o
$(RM) $*.sx
 
ATHIS_LIBC_OBJS += $(subst .c,.o,$(filter %.c,$(THIS_SRCS))) \
44,15 → 44,8
@echo "# nothing" > ./ldepend
endif
 
ifdef DJDIR
depend:
echo $(THIS_SRCS) > __tmp.1
$(MMKDEP) @__tmp.1 > ./ldepend
$(RM) __tmp.1
else
depend:
$(MMKDEP) $(THIS_SRCS) > ./ldepend
endif
 
ifeq ($(wildcard ./ldepend),)
check_ldepend:
/programs/develop/libraries/menuetlibc/src/libc/Makefile-link
6,5 → 6,5
else
../mks $(OUTFILE) < ../tmp_make > tmp_make.ars
endif
ar -M < tmp_make.ars
kos32-ar -M < tmp_make.ars
$(RM) tmp_make.ars
/programs/develop/libraries/menuetlibc/stub/crt0_elf.asm
File deleted
/programs/develop/libraries/menuetlibc/stub/crt0_elf_nounderscores.asm
File deleted
/programs/develop/libraries/menuetlibc/stub/Makefile
2,17 → 2,14
 
.SUFFIXES: .asm;
 
OBJS = crt0.o
OBJS = crt0.o crt0_dynstack.o
 
all: $(OBJS)
 
ifdef ON_WINDOWS
crt0.o: crt0_$(STUBFMT).asm
fasm crt0_$(STUBFMT).asm crt0.o
else
crt0.o: crt0_$(STUBFMT)_nounderscores.asm
fasm crt0_$(STUBFMT)_nounderscores.asm crt0.o
endif
crt0.o: crt0_coff.asm
fasm crt0_coff.asm crt0.o
crt0_dynstack.o: crt0_coff_dynstack.asm
fasm crt0_coff_dynstack.asm crt0_dynstack.o
 
clean:
$(RM) $(OBJS)