From: Matthias Kruk <m@m10k.eu>
Date: Sat, 8 Aug 2020 09:13:16 +0000 (+0900)
Subject: Merge branch 'io' into unstable
X-Git-Url: https://git.corax.cc/?a=commitdiff_plain;h=c0c9f7f6fa73b336e8dbfc0b53aa924eb41b703b;p=corax

Merge branch 'io' into unstable
---

c0c9f7f6fa73b336e8dbfc0b53aa924eb41b703b
diff --cc include/unistd.h
index 211d3d7,09e2937..900600e
--- a/include/unistd.h
+++ b/include/unistd.h
@@@ -10,5 -10,9 +10,7 @@@ extern pid_t vfork(void)
  extern int execfve(void*, const char**, const char**);
  extern int execeve(void*, size_t, char *const [], char *const []);
  extern unsigned int sleep(unsigned int);
 -extern int brk(void*);
 -extern void* sbrk(int);
  
+ extern int pipe(int pipefd[2]);
+ 
  #endif /* _UNISTD_H */
diff --cc kernel/klibc/Makefile
index ec3635b,ff21f07..b86fc4a
--- a/kernel/klibc/Makefile
+++ b/kernel/klibc/Makefile
@@@ -1,6 -1,6 +1,6 @@@
  OUTPUT = klibc.a
- OBJECTS = string.o spinlock.o mutex.o posixcall.o coraxcall.o stdio.o signal.o \
-           kq.o sem.o
 -OBJECTS = string.o spinlock.o mutex.o posixcall.o coraxcall.o heap.o stdio.o signal.o \
 -          kq.o sem.o string_ia32.o
++OBJECTS = string.o spinlock.o mutex.o posixcall.o coraxcall.o stdio.o signal.o kq.o sem.o \
++	  string_ia32.o
  PHONY = clean
  INCLUDES = -I../include -I../../include -I../..
  CFLAGS = -m32 -Wall -nostdlib -nodefaultlibs -nostartfiles -ffreestanding $(INCLUDES)