From 4d0188930e7d0e571db78d1d2e3c4d9b3f0fe8fb Mon Sep 17 00:00:00 2001
From: John Hodge <tpg@mutabah.net>
Date: Mon, 25 Aug 2014 11:45:34 +0800
Subject: [PATCH] Usermode/Core Libs - Fix CRT* file types

---
 Usermode/Libraries/libc++.so_src/Makefile   | 4 ++--
 Usermode/Libraries/libc.so_src/Makefile     | 4 ++--
 Usermode/Libraries/libposix.so_src/Makefile | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/Usermode/Libraries/libc++.so_src/Makefile b/Usermode/Libraries/libc++.so_src/Makefile
index 6d070de1..ef0372db 100644
--- a/Usermode/Libraries/libc++.so_src/Makefile
+++ b/Usermode/Libraries/libc++.so_src/Makefile
@@ -8,8 +8,8 @@ CFLAGS   += -Wall -Werror -Wextra
 CXXFLAGS += -Wall -Werror -Wextra
 ASFLAGS  +=
 LDFLAGS  += -nostdlib
-PRELINK  := $(CRTI) $(CRTBEGIN) $(OUTPUTDIR)/Libs/crt0S.o
-LIBS     += -lc $(LIBGCC_PATH) $(CRTEND) $(CRTN)
+PRELINK  := $(CRTI) $(CRTBEGINS) $(CRT0S)
+LIBS     += -lc $(LIBGCC_PATH) $(CRTENDS) $(CRTN)
 USE_CXX_LINK := yes
 
 OBJ  = misc.o new.o guard.o cxxabi.o typeinfo.o
diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile
index d5aa2162..22849e0e 100644
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -7,8 +7,8 @@ CPPFLAGS +=
 CFLAGS   += -nostdlib -Wall -Werror -Wextra
 ASFLAGS  +=
 LDFLAGS  += -nostdlib
-PRELINK  := $(CRTI) $(CRTBEGIN) $(OUTPUTDIR)/Libs/crt0S.o
-LIBS     += $(LIBGCC_PATH) $(CRTEND) $(CRTN)
+PRELINK  := $(CRTI) $(CRTBEGINS) $(CRTS)
+LIBS     += $(LIBGCC_PATH) $(CRTENDS) $(CRTN)
 
 INCFILES := stdio.h stdlib.h
 
diff --git a/Usermode/Libraries/libposix.so_src/Makefile b/Usermode/Libraries/libposix.so_src/Makefile
index 69dc90a7..eb2fd2f2 100644
--- a/Usermode/Libraries/libposix.so_src/Makefile
+++ b/Usermode/Libraries/libposix.so_src/Makefile
@@ -7,8 +7,8 @@ CPPFLAGS +=
 CFLAGS   += -Wextra
 ASFLAGS  +=
 LDFLAGS  += -nostdlib
-PRELINK  += $(CRTI) $(CRTBEGIN) $(CRT0S)
-LIBS     += -lc $(CRTEND) $(CRTN)
+PRELINK  += $(CRTI) $(CRTBEGINS) $(CRT0S)
+LIBS     += -lc $(CRTENDS) $(CRTN)
 
 OBJ  = main.o unistd.o dirent.o stat.o utmpx.o termios.o
 OBJ += pwd.o syslog.o sys_time.o sys_ioctl.o sys_resource.o
-- 
2.20.1