From 77d5e5756397db6a643fcebe78f14eadc59e0450 Mon Sep 17 00:00:00 2001 From: Don Porter Date: Sat, 23 Sep 2017 06:50:52 -0400 Subject: [PATCH] Fix a few library versions for the latest 16.04. We probably want a better way to handle this across systems. --- LibOS/shim/test/apps/gcc/as.manifest.template | 4 ++-- LibOS/shim/test/apps/gcc/cc1.manifest.template | 2 +- LibOS/shim/test/apps/gcc/ld.manifest.template | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/LibOS/shim/test/apps/gcc/as.manifest.template b/LibOS/shim/test/apps/gcc/as.manifest.template index 69d34f54..e29a52a2 100644 --- a/LibOS/shim/test/apps/gcc/as.manifest.template +++ b/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 diff --git a/LibOS/shim/test/apps/gcc/cc1.manifest.template b/LibOS/shim/test/apps/gcc/cc1.manifest.template index 21d46b1a..04a55082 100644 --- a/LibOS/shim/test/apps/gcc/cc1.manifest.template +++ b/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 diff --git a/LibOS/shim/test/apps/gcc/ld.manifest.template b/LibOS/shim/test/apps/gcc/ld.manifest.template index fff60f41..ed3ec564 100644 --- a/LibOS/shim/test/apps/gcc/ld.manifest.template +++ b/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