From: John Hodge (sonata) <tpg@mutabah.net>
Date: Mon, 3 Nov 2014 04:40:05 +0000 (+0800)
Subject: Usermode/libc - Fix not loading crt0.s in libc
X-Git-Url: https://git.ucc.asn.au/?p=tpg%2Facess2.git;a=commitdiff_plain;h=d7f2b37cad318f38d83d2249b8ff97f13ce973d8

Usermode/libc - Fix not loading crt0.s in libc
---

diff --git a/Usermode/Libraries/libc.so_src/Makefile b/Usermode/Libraries/libc.so_src/Makefile
index 4dc43e1c..40977e9c 100644
--- a/Usermode/Libraries/libc.so_src/Makefile
+++ b/Usermode/Libraries/libc.so_src/Makefile
@@ -7,7 +7,7 @@ CPPFLAGS +=
 CFLAGS   += -nostdlib -Wall -Werror -Wextra
 ASFLAGS  +=
 LDFLAGS  += -nostdlib
-PRELINK  := $(CRTI) $(CRTBEGINS) $(CRTS)
+PRELINK  := $(CRTI) $(CRTBEGINS) $(CRT0S)
 LIBS     += $(LIBGCC_PATH) $(CRTENDS) $(CRTN)
 
 INCFILES := stdio.h stdlib.h
diff --git a/Usermode/Libraries/libc.so_src/stdio.c b/Usermode/Libraries/libc.so_src/stdio.c
index a0008d3d..cf2e7336 100644
--- a/Usermode/Libraries/libc.so_src/stdio.c
+++ b/Usermode/Libraries/libc.so_src/stdio.c
@@ -692,6 +692,10 @@ EXPORT size_t fread(void *ptr, size_t size, size_t num, FILE *fp)
 	if( _GetFileMode(fp) != FILE_FLAG_MODE_READ ) {
 		errno = 0;
 		LOG_WARN("not open for read");
+		if( fp == stdin ) {
+			LOG_WARN("BUGCHECK FAIL: stdin was not open for read");
+			exit(129);
+		}
 		return -1;
 	}