Merge branch 'patch-1' into 'master'

Clean up everything and add lots of new functions

I hope everything here is okay. I fixed some bugs in existing functions (mostly wrong prototypes or off-by-one errors) and formatted everything to a consistent style. If you'd like me to adjust the style, that's no problem. It wasn't very consistent to start with (within the code, and compared to the documentation).

*I added specific notes you may want to comment on to some of the commit messages.*

Major features:
* Pass correct `argv[0]` in loader
* Intercept `readlink("/proc/self/exe")` to allow re-exec
* Add almost all reasonable-to-implement functions in LSB 5.0.0 core generic libc. Remaining functions are:
  - Impossible-to-implement: sigreturn
  - Not useful: reentrant random (`*rand48_r`, etc.), argz, envz, pmap, rpc (clnt_*, svc*, xdr*), bindresvport
  - Got tired of it: checked wchar
* Add additional functions used by android and its NDK tools (clang, cmake, lldb, ninja, etc.).

At this point, I am able to run Android Studio with the bundled prebuilt JDK, and compile, install, and run an android application (including one with native libraries) on a real device, with only a few minor issues:
* must export `LD_LIBRARY_PATH=/opt/android-studio/jre/jre/lib/amd64/server` because musl and glibc interpret the variable differently with regards to `dlopen`. This is something that has to be patched in musl builds of openjdk, so it's not a gcompat issue.
* ld.bfd fails to parse the argument `--sysroot=/path`, but can parse `--sysroot /path`. So there's some difference with `getopt_long_only` (or getopt in general). May be a bug, may be just an API difference. May be it can be patched up.
* LLDB fails to connect to the android phone for native debugging -- I haven't tried it on glibc yet, so it may not be a gcompat issue at all (may be a phone or the app issue).

I'd be happy to send some documentation later.

See merge request !1

1 files changed, 38 insertions, 36 deletions

diff --git a/libgcompat/malloc.c b/libgcompat/malloc.c
index 7478834..14fbf66 100644
--- a/libgcompat/malloc.c
+++ b/libgcompat/malloc.c
@@ -1,16 +1,17 @@
-/* struct mallinfo pulled from mallinfo.3:
+/*
+ * struct mallinfo pulled from mallinfo.3:
  *
  * Copyright (c) 2012 by Michael Kerrisk <mtk.manpages@gmail.com>
- * 
+ *
  * Permission is granted to make and distribute verbatim copies of this
  * manual provided the copyright notice and this permission notice are
  * preserved on all copies.
- * 
+ *
  * Permission is granted to copy and distribute modified versions of this
  * manual under the conditions for verbatim copying, provided that the
  * entire resulting derived work is distributed under the terms of a
  * permission notice identical to this one.
- * 
+ *
  * Since the Linux kernel and libraries are constantly changing, this
  * manual page may be incorrect or out-of-date.  The author(s) assume no
  * responsibility for errors or omissions, or for damages resulting from
@@ -18,62 +19,63 @@
  * have taken the same level of care in the production of this manual,
  * which is licensed free of charge, as they might when working
  * professionally.
- * 
+ *
  * Formatted or processed versions of this manual, if unaccompanied by
  * the source, must acknowledge the copyright and authors of this work.
  */
 
-#include <string.h>	/* memset */
-#include <stdlib.h>	/* {m,c,re}alloc, free */
-#include <malloc.h>	/* memalign */
+#include <malloc.h> /* memalign */
+#include <stdlib.h> /* {m,c,re}alloc, free */
+#include <string.h> /* memset */
+
+#include "alias.h" /* alias */
 
 struct mallinfo {
-	int arena;     /* Non-mmapped space allocated (bytes) */
-	int ordblks;   /* Number of free chunks */
-	int smblks;    /* Number of free fastbin blocks */
-	int hblks;     /* Number of mmapped regions */
-	int hblkhd;    /* Space allocated in mmapped regions (bytes) */
-	int usmblks;   /* Maximum total allocated space (bytes) */
-	int fsmblks;   /* Space in freed fastbin blocks (bytes) */
-	int uordblks;  /* Total allocated space (bytes) */
-	int fordblks;  /* Total free space (bytes) */
-	int keepcost;  /* Top-most, releasable space (bytes) */
+	int arena;    /* Non-mmapped space allocated (bytes) */
+	int ordblks;  /* Number of free chunks */
+	int smblks;   /* Number of free fastbin blocks */
+	int hblks;    /* Number of mmapped regions */
+	int hblkhd;   /* Space allocated in mmapped regions (bytes) */
+	int usmblks;  /* Maximum total allocated space (bytes) */
+	int fsmblks;  /* Space in freed fastbin blocks (bytes) */
+	int uordblks; /* Total allocated space (bytes) */
+	int fordblks; /* Total free space (bytes) */
+	int keepcost; /* Top-most, releasable space (bytes) */
 };
 
-struct mallinfo mallinfo(void)
+void *__libc_calloc(size_t nmemb, size_t size)
 {
-	struct mallinfo my_info;
-	memset(&my_info, 0, sizeof(struct mallinfo));
-	return my_info;
+	return calloc(nmemb, size);
 }
+alias(__libc_calloc, __calloc);
 
-void *__libc_malloc(size_t size)
+void __libc_free(void *ptr)
 {
-	return malloc(size);
+	free(ptr);
 }
+alias(__libc_free, __free);
 
-void __libc_free(void *ptr)
+void *__libc_malloc(size_t size)
 {
-	return free(ptr);
+	return malloc(size);
 }
+alias(__libc_malloc, __malloc);
 
-void *__libc_calloc(size_t nmemb, size_t size)
+void *__libc_memalign(size_t align, size_t len)
 {
-	return calloc(nmemb, size);
+	return memalign(align, len);
 }
+alias(__libc_memalign, __memalign);
 
 void *__libc_realloc(void *ptr, size_t size)
 {
 	return realloc(ptr, size);
 }
+alias(__libc_realloc, __realloc);
 
-void *__libc_memalign(size_t align, size_t len)
+struct mallinfo mallinfo(void)
 {
-	return memalign(align, len);
+	struct mallinfo info;
+	memset(&info, 0, sizeof(info));
+	return info;
 }
-
-extern __typeof(__libc_malloc) __malloc __attribute__((weak, alias("__libc_malloc")));
-extern __typeof(__libc_calloc) __calloc __attribute__((weak, alias("__libc_calloc")));
-extern __typeof(__libc_realloc) __realloc __attribute__((weak, alias("__libc_realloc")));
-extern __typeof(__libc_free) __free __attribute__((weak, alias("__libc_free")));
-