diff --git a/LibOS/glibc-patches/glibc-2.23.patch b/LibOS/glibc-patches/glibc-2.23.patch index ca5dbdf2..989878b9 100644 --- a/LibOS/glibc-patches/glibc-2.23.patch +++ b/LibOS/glibc-patches/glibc-2.23.patch @@ -86,7 +86,7 @@ diff -ruNp a/elf/Versions b/elf/Versions __pointer_chk_guard; } + SHIM { -+ syscalldb; glibc_version; glibc_option; register_library; ++ syscalldb; glibc_version; register_library; + } } diff -ruNp a/Makeconfig b/Makeconfig diff --git a/LibOS/glibc-patches/glibc-2.27.patch b/LibOS/glibc-patches/glibc-2.27.patch index b8e185c2..df3eae1c 100644 --- a/LibOS/glibc-patches/glibc-2.27.patch +++ b/LibOS/glibc-patches/glibc-2.27.patch @@ -86,7 +86,7 @@ diff -ruNp a/elf/Versions b/elf/Versions __tunable_get_val; } + SHIM { -+ syscalldb; glibc_version; glibc_option; register_library; ++ syscalldb; glibc_version; register_library; + } } diff -ruNp a/Makeconfig b/Makeconfig diff --git a/LibOS/glibc-patches/syscalldb-api.patch b/LibOS/glibc-patches/syscalldb-api.patch index 532480bb..95f1ce12 100644 --- a/LibOS/glibc-patches/syscalldb-api.patch +++ b/LibOS/glibc-patches/syscalldb-api.patch @@ -36,7 +36,7 @@ new file mode 100644 index 0000000..7a56162 --- /dev/null +++ b/syscalldb.c -@@ -0,0 +1,16 @@ +@@ -0,0 +1,11 @@ +#include "syscalldb.h" +#include +#include @@ -48,17 +48,12 @@ index 0000000..7a56162 +{ + return 0; +} -+ -+long int glibc_option (const char * opt) -+{ -+ return -EINVAL; -+} diff --git a/syscalldb.h b/syscalldb.h new file mode 100644 index 0000000..2833def --- /dev/null +++ b/syscalldb.h -@@ -0,0 +1,39 @@ +@@ -0,0 +1,33 @@ +#ifndef _SYSCALLDB_H_ +#define _SYSCALLDB_H_ + @@ -89,12 +84,6 @@ index 0000000..2833def +#define SYSCALLDB_ASM \ + "callq *syscalldb@GOTPCREL(%rip)\n\t" + -+long int glibc_option (const char * opt); -+ -+asm ( -+".weak glibc_option\r\n" -+".type glibc_option, @function\r\n"); -+ +#endif /* Assembler */ + +#endif /* _SYSCALLDB_H */ diff --git a/LibOS/shim/src/shim.map b/LibOS/shim/src/shim.map index 9d8e9213..e049a520 100644 --- a/LibOS/shim/src/shim.map +++ b/LibOS/shim/src/shim.map @@ -1,6 +1,6 @@ SHIM { global: syscalldb; register_library; - glibc_version; glibc_option; + glibc_version; local: *; }; diff --git a/LibOS/shim/src/shim_init.c b/LibOS/shim/src/shim_init.c index 37b29f5f..b23b5da2 100644 --- a/LibOS/shim/src/shim_init.c +++ b/LibOS/shim/src/shim_init.c @@ -166,25 +166,6 @@ unsigned long parse_int (const char * str) return num; } -long int glibc_option (const char * opt) -{ - char cfg[CONFIG_MAX]; - - if (!strcmp_static(opt, "heap_size")) { - ssize_t ret = get_config(root_config, "glibc.heap_size", cfg, sizeof(cfg)); - if (ret <= 0) { - debug("no glibc option: %s (err=%ld)\n", opt, ret); - return -ENOENT; - } - - long int heap_size = parse_int(cfg); - debug("glibc option: heap_size = %ld\n", heap_size); - return (long int) heap_size; - } - - return -EINVAL; -} - void * migrated_memory_start; void * migrated_memory_end;