From 16ca11dc51a56693f9a70907a3025906d1d6c9e5 Mon Sep 17 00:00:00 2001 From: John Hodge Date: Thu, 24 May 2012 22:01:53 +0800 Subject: [PATCH] Fixing up misc x86-64 bugs --- BuildConf/x86_64/default.mk | 11 ++++------- KernelLand/Kernel/bin/elf.c | 6 ------ Makefile | 5 +++++ .../Libraries/ld-acess.so_src/include_exp/acess/sys.h | 2 +- 4 files changed, 10 insertions(+), 14 deletions(-) diff --git a/BuildConf/x86_64/default.mk b/BuildConf/x86_64/default.mk index 2afabe84..51960b0e 100644 --- a/BuildConf/x86_64/default.mk +++ b/BuildConf/x86_64/default.mk @@ -1,8 +1,5 @@ -MODULES += Storage/ATA -MODULES += Storage/FDDv2 -MODULES += Network/NE2000 Network/RTL8139 -MODULES += Display/BochsGA -MODULES += Interfaces/UDI -MODULES += Input/PS2KbMouse -MODULES += x86/ISADMA x86/VGAText +include $(ACESSDIR)/BuildConf/x86/default.mk + +MODULES := $(filter-out Display/VESA,$(MODULES)) + diff --git a/KernelLand/Kernel/bin/elf.c b/KernelLand/Kernel/bin/elf.c index 31178e34..16da915e 100644 --- a/KernelLand/Kernel/bin/elf.c +++ b/KernelLand/Kernel/bin/elf.c @@ -13,12 +13,6 @@ void *GetSymbol(const char *Name, size_t *Size); void *GetSymbol(const char *Name, size_t *Size) { Uint val; Binary_GetSymbol(Name, &val); if(Size)*Size=0; return (void*)val; }; #define AddLoaded(a,b) do{}while(0) #define LoadLibrary(a,b,c) 0 -#if __STDC_HOSTED__ -#warning "Hosted? why!" -#else -#warning "freestanding - outstanding!" -#endif - #include "../../../Usermode/Libraries/ld-acess.so_src/elf.c" #define DEBUG_WARN 1 diff --git a/Makefile b/Makefile index 54d0e167..887db207 100644 --- a/Makefile +++ b/Makefile @@ -98,6 +98,10 @@ $(CLEAN_USRAPPS): clean-%: +@$(SUBMAKE) clean -C Usermode/Applications/$*_src # Install +ifeq ($(ARCH),host) +install-%: + +else $(INSTALL_DYNMODS): install-%: @$(_build_dynmod)$* install $(INSTALL_MODULES): install-%: @@ -110,3 +114,4 @@ $(INSTALL_USRLIBS): install-%: @$(SUBMAKE) install -C Usermode/Libraries/$*_src $(INSTALL_USRAPPS): install-%: @$(SUBMAKE) install -C Usermode/Applications/$*_src +endif diff --git a/Usermode/Libraries/ld-acess.so_src/include_exp/acess/sys.h b/Usermode/Libraries/ld-acess.so_src/include_exp/acess/sys.h index e91ffb68..368f2cc1 100644 --- a/Usermode/Libraries/ld-acess.so_src/include_exp/acess/sys.h +++ b/Usermode/Libraries/ld-acess.so_src/include_exp/acess/sys.h @@ -76,7 +76,7 @@ extern int readdir(int fd, char *dest); extern int _SysOpenChild(int fd, char *name, int flags); extern int _SysGetACL(int fd, t_sysACL *dest); extern int _SysMount(const char *Device, const char *Directory, const char *Type, const char *Options); -extern int _SysSelect(int nfds, fd_set *read, fd_set *write, fd_set *err, time_t *timeout, int extraevents); +extern int _SysSelect(int nfds, fd_set *read, fd_set *write, fd_set *err, int64_t *timeout, unsigned int extraevents); #define select(nfs, rdfds, wrfds, erfds, timeout) _SysSelect(nfs, rdfds, wrfds, erfds, timeout, 0) // --- IPC --- -- 2.20.1