Refactor libc stubs into libwrap

The --wrap feature of GNU ld supports a cleaner framework for linking in
alternative implementations of libc functions without cpp hacks.
Place wrappers in separate object files to reduce static code size.

1 files changed, 1 insertions, 14 deletions

diff --git a/software/dhrystone/dhry_stubs.c b/software/dhrystone/dhry_stubs.c
index d384bf1..d3bd14c 100644
--- a/software/dhrystone/dhry_stubs.c
+++ b/software/dhrystone/dhry_stubs.c
@@ -12,20 +12,7 @@ long time(void)
 }
 
 // set the number of dhrystone iterations
-void scanf(const char* fmt, int* n)
+void __wrap_scanf(const char* fmt, int* n)
 {
   *n = 1500000;
 }
-
-// simple memory allocator
-void* malloc(unsigned long sz)
-{
-  extern void* sbrk(long);
-  void* res = sbrk(sz);
-  if ((long)res == -1)
-    return 0;
-  return res;
-}
-
-// simple memory deallocator
-void free(void* ptr) {}