Browse Source

Fix a few library versions for the latest 16.04. We probably want a better way to handle this across systems.

Don Porter 6 years ago
parent
commit
fd9a3aca5d

+ 2 - 2
LibOS/shim/test/apps/gcc/as.manifest.template

@@ -29,8 +29,8 @@ sgx.trusted_files.libdl = file:$(LIBCDIR)/libdl.so.2
 sgx.trusted_files.libm = file:$(LIBCDIR)/libm.so.6
 sgx.trusted_files.libpthread = file:$(LIBCDIR)/libpthread.so.0
 sgx.trusted_files.libz = file:/lib/x86_64-linux-gnu/libz.so.1
-sgx.trusted_files.libopcodes = file:/usr/lib/libopcodes-2.24-system.so
-sgx.trusted_files.libbfd = file:/usr/lib/libbfd-2.24-system.so
+sgx.trusted_files.libopcodes = file:/usr/lib/x86_64-linux-gnu/libopcodes-2.26-system.so
+sgx.trusted_files.libbfd = file:/usr/lib/x86_64-linux-gnu/libbfd-2.26.1-system.so
 
 sgx.allowed_files.tmp = file:/tmp
 sgx.allowed_files.test_files = file:test_files

+ 1 - 1
LibOS/shim/test/apps/gcc/cc1.manifest.template

@@ -32,7 +32,7 @@ sgx.trusted_files.libm = file:$(LIBCDIR)/libm.so.6
 sgx.trusted_files.libz = file:/lib/x86_64-linux-gnu/libz.so.1
 sgx.trusted_files.libpthread = file:$(LIBCDIR)/libpthread.so.0
 sgx.trusted_files.cloog = file:/usr/lib/x86_64-linux-gnu/libcloog-isl.so.4
-sgx.trusted_files.isl = file:/usr/lib/x86_64-linux-gnu/libisl.so.10
+sgx.trusted_files.isl = file:/usr/lib/x86_64-linux-gnu/libisl.so
 sgx.trusted_files.mpc = file:/usr/lib/x86_64-linux-gnu/libmpc.so.3
 sgx.trusted_files.mpfr = file:/usr/lib/x86_64-linux-gnu/libmpfr.so.4
 sgx.trusted_files.gmp = file:/usr/lib/x86_64-linux-gnu/libgmp.so.10

+ 1 - 1
LibOS/shim/test/apps/gcc/ld.manifest.template

@@ -31,7 +31,7 @@ sgx.trusted_files.libdl = file:$(LIBCDIR)/libdl.so.2
 sgx.trusted_files.libm = file:$(LIBCDIR)/libm.so.6
 sgx.trusted_files.libpthread = file:$(LIBCDIR)/libpthread.so.0
 sgx.trusted_files.libz = file:/lib/x86_64-linux-gnu/libz.so.1
-sgx.trusted_files.libbfd = file:/usr/lib/libbfd-2.24-system.so
+sgx.trusted_files.libbfd = file:/usr/lib/x86_64-linux-gnu/libbfd-2.26.1-system.so
 sgx.trusted_files.libgcc = file:$(GCCDIR)/libgcc_s.so
 sgx.trusted_files.libgcca = file:$(GCCDIR)/libgcc.a
 sgx.trusted_files.crtend = file:$(GCCDIR)/crtend.o