Usermode - ARCH=native changes, kinda borked

- Might not be, no caching so things are damn slow

diff --git a/Usermode/Applications/Makefile.cfg b/Usermode/Applications/Makefile.cfg
index 2dbcfc2..d0a07d1 100644 (file)
--- a/Usermode/Applications/Makefile.cfg
+++ b/Usermode/Applications/Makefile.cfg
@@ -8,7 +8,7 @@ ifeq ($(ARCHDIR),native)
 ASFLAGS = -felf
 CPPFLAGS = -Wall
 CFLAGS = $(CPPFLAGS)
-LDFLAGS = -L $(OUTPUTDIR)Libs -lacess-native
+LDFLAGS = -L $(OUTPUTDIR)Libs -lacess-native -lc_acess
 #LIBGCC_PATH = $(ACESSDIR)/AcessNative/symbol_renames.ld
 else
 ASFLAGS = -felf

diff --git a/Usermode/Libraries/Makefile.cfg b/Usermode/Libraries/Makefile.cfg
index a9a0eef..a4346eb 100644 (file)
--- a/Usermode/Libraries/Makefile.cfg
+++ b/Usermode/Libraries/Makefile.cfg
@@ -8,6 +8,7 @@ MAKEDEP  = $(CC) -M
 ifeq ($(ARCHDIR),native)
 ASFLAGS += -D ARCHDIR=$(ARCHDIR) -D __ASSEMBLER__=1
 LDFLAGS := -lacess-native
+#CPPFLAGS := -D SoMain="__attribute__ ((constructor(101))) libacessnative_init"
  ifeq ($(PLATFORM),windows)
  else
   LDFLAGS += -Wl,-init,SoMain

diff --git a/Usermode/Libraries/Makefile.tpl b/Usermode/Libraries/Makefile.tpl
index 652d5a2..0f6253c 100644 (file)
--- a/Usermode/Libraries/Makefile.tpl
+++ b/Usermode/Libraries/Makefile.tpl
@@ -4,6 +4,12 @@
 
 comma=,
 
+LDFLAGS += -soname $(BIN)
+
+ifeq ($(ARCH),native)
+ LDFLAGS := $(LDFLAGS:-lc=-lc_acess)
+endif
+
 ifneq ($(lastword $(subst -, ,$(basename $(LD)))),ld)
   LDFLAGS := $(subst -soname ,-Wl$(comma)-soname$(comma),$(LDFLAGS))
   LDFLAGS := $(subst -Map ,-Wl$(comma)-Map$(comma),$(LDFLAGS))

diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile
index f95e086..be6e08a 100644 (file)
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -6,7 +6,7 @@
 CPPFLAGS += \r
 CFLAGS   += -Werror -Wextra\r
 ASFLAGS  +=\r
-LDFLAGS  += -soname libc.so -Map map.txt\r
+LDFLAGS  += -Map map.txt\r
 \r
 INCFILES := stdio.h stdlib.h\r
 \r

diff --git a/Usermode/Libraries/libc.so_src/include_exp/stdio.h b/Usermode/Libraries/libc.so_src/include_exp/stdio.h
index 646844e..b383652 100644 (file)
--- a/Usermode/Libraries/libc.so_src/include_exp/stdio.h
+++ b/Usermode/Libraries/libc.so_src/include_exp/stdio.h
@@ -22,6 +22,26 @@ typedef struct sFILE FILE;
 #define SEEK_END       (-1)
 #endif
 
+#ifdef ARCHDIR_is_native
+#define printf acess_printf
+#define vsprintf       acess_vsprintf
+#define vsnprintf      acess_vsnprintf
+#define sprintf        acess_sprintf
+#define snprintf       acess_snprintf
+#define vprintf        acess_vprintf
+#define vfprintf       acess_vfprintf
+#define fopen  acess_fopen
+#define fdopen acess_fdopen
+#define freopen        acess_freopen
+#define fclose acess_fclose
+
+#define putchar        acess_putchar
+#define getchar        acess_getchar
+
+#define stdin  acess_stdin
+#define stdout acess_stdout
+#endif
+
 /* --- Standard IO --- */
 extern int     printf(const char *format, ...);
 extern int     vsnprintf(char *buf, size_t __maxlen, const char *format, va_list args);