Use sysv style hashtable for VDSO

DroMeta · Oct 16, 2017 · 71bef09 · 71bef09
1 parent 41d500d
commit 71bef09
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/meson_options.txt b/meson_options.txt
@@ -1,7 +1,6 @@
 option('log', type: 'string', value: '')
 option('nolog', type: 'string', value: '')
 
-option('vdso_cc', type: 'string', value: 'cc')
 option('vdso_c_args', type: 'string', value: '')
 
 option('no_crlf', type: 'boolean', value: false)
diff --git a/vdso/meson.build b/vdso/meson.build
@@ -2,7 +2,8 @@
 # I can't use shared_library for this because then I have to use the same
 # compiler and options as the rest of the project which prevents me from using
 # sanitizers and afl
+vdso_compiler = find_program('../gcc-docker/docker-multilib-gcc')
 vdso = custom_target('vdso', input: ['vdso.S', 'vdso.c'], output: 'libvdso.so',
-    command: [get_option('vdso_cc'), '-o', '@OUTPUT@', '@INPUT@',
-        '-m32', '-nostdlib', '-Wl,-T,../vdso/vdso.lds', '-shared', '-fPIC']
+    command: [vdso_compiler, '-o', '@OUTPUT@', '@INPUT@',
+        '-m32', '-nostdlib', '-Wl,-T,../vdso/vdso.lds', '-Wl,--hash-style,sysv', '-shared', '-fPIC']
         + get_option('vdso_c_args').split())