Fixing up misc x86-64 bugs

diff --git a/BuildConf/x86_64/default.mk b/BuildConf/x86_64/default.mk
index 2afabe8..51960b0 100644 (file)
--- 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 31178e3..16da915 100644 (file)
--- 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; };\r
 #define AddLoaded(a,b) do{}while(0)\r
 #define LoadLibrary(a,b,c)     0\r
-#if __STDC_HOSTED__\r
-#warning "Hosted? why!"\r
-#else\r
-#warning "freestanding - outstanding!"\r
-#endif\r
-\r
 #include "../../../Usermode/Libraries/ld-acess.so_src/elf.c"\r
 \r
 #define DEBUG_WARN     1\r

diff --git a/Makefile b/Makefile
index 54d0e16..887db20 100644 (file)
--- 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 e91ffb6..368f2cc 100644 (file)
--- 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 ---