WIP

Author: philipc

Cargo.toml

@@ -35,7 +35,18 @@ cpp_demangle = { default-features = false, version = "0.2.3", optional = true }
 
 # Optional dependencies enabled through the `gimli-symbolize` feature
 addr2line = { version = "0.11.0", optional = true, default-features = false, features = ['std'] }
+<<<<<<< HEAD
 goblin = { version = "0.2", optional = true, default-features = false, features = ['elf32', 'elf64', 'mach32', 'mach64', 'pe32', 'pe64', 'std'] }
+=======
+findshlibs = { version = "0.5.0", optional = true }
+
+[dependencies.object]
+git = 'https://github.com/philipc/object'
+branch = 'symbol-table'
+optional = true
+default-features = false
+features = ['read_core', 'elf', 'macho', 'pe']
+>>>>>>> WIP
 
 [target.'cfg(windows)'.dependencies]
 winapi = { version = "0.3.3", optional = true }