linux-sgx.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
To: linux-sgx@vger.kernel.org
Cc: serge.ayoun@intel.com, shay.katz-zamir@intel.com,
	sean.j.christopherson@intel.com,
	Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>,
	Cedric Xing <cedric.xing@intel.com>
Subject: [PATCH v3 1/7] selftests/x86/sgx: Fix objcopy call in the Makefile
Date: Mon, 19 Aug 2019 16:28:24 +0300	[thread overview]
Message-ID: <20190819132830.9056-2-jarkko.sakkinen@linux.intel.com> (raw)
In-Reply-To: <20190819132830.9056-1-jarkko.sakkinen@linux.intel.com>

Use $(OBJCOPY) to point to the correct objcopy binary. Do not discard
.got.plt because we need to detect libcalls and fail the compilation if
they exist.

Cc: Sean Christopherson <sean.j.christopherson@intel.com>
Reported-by: Cedric Xing <cedric.xing@intel.com>
Signed-off-by: Jarkko Sakkinen <jarkko.sakkinen@linux.intel.com>
---
 tools/testing/selftests/x86/sgx/Makefile | 6 +++++-
 tools/testing/selftests/x86/sgx/encl.lds | 1 +
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/tools/testing/selftests/x86/sgx/Makefile b/tools/testing/selftests/x86/sgx/Makefile
index 10136b73096b..fdd67478c52b 100644
--- a/tools/testing/selftests/x86/sgx/Makefile
+++ b/tools/testing/selftests/x86/sgx/Makefile
@@ -2,6 +2,10 @@ top_srcdir = ../../../../..
 
 include ../../lib.mk
 
+ifndef OBJCOPY
+OBJCOPY := $(CROSS_COMPILE)objcopy
+endif
+
 HOST_CFLAGS := -Wall -Werror -g $(INCLUDES) -fPIC -z noexecstack
 ENCL_CFLAGS := -Wall -Werror -static -nostdlib -nostartfiles -fPIC \
 	       -fno-stack-protector -mrdrnd $(INCLUDES)
@@ -23,7 +27,7 @@ $(OUTPUT)/encl_piggy.o: $(OUTPUT)/encl.bin $(OUTPUT)/encl.ss
 	$(CC) $(HOST_CFLAGS) -c encl_piggy.S -o $@
 
 $(OUTPUT)/encl.bin: $(OUTPUT)/encl.elf $(OUTPUT)/sgxsign
-	objcopy --remove-section=.got.plt -O binary $< $@
+	$(OBJCOPY) -O binary $< $@
 
 $(OUTPUT)/encl.elf: $(OUTPUT)/encl.o $(OUTPUT)/encl_bootstrap.o
 	$(CC) $(ENCL_CFLAGS) -T encl.lds -o $@ $^
diff --git a/tools/testing/selftests/x86/sgx/encl.lds b/tools/testing/selftests/x86/sgx/encl.lds
index 2ee01ac3ec79..9a56d3064104 100644
--- a/tools/testing/selftests/x86/sgx/encl.lds
+++ b/tools/testing/selftests/x86/sgx/encl.lds
@@ -31,3 +31,4 @@ ASSERT(!DEFINED(.altinstructions), "ALTERNATIVES are not supported in enclaves")
 ASSERT(!DEFINED(.altinstr_replacement), "ALTERNATIVES are not supported in enclaves")
 ASSERT(!DEFINED(.discard.retpoline_safe), "RETPOLINE ALTERNATIVES are not supported in enclaves")
 ASSERT(!DEFINED(.discard.nospec), "RETPOLINE ALTERNATIVES are not supported in enclaves")
+ASSERT(!DEFINED(.got.plt), "Libcalls are not supported in enclaves")
-- 
2.20.1


  reply	other threads:[~2019-08-19 13:28 UTC|newest]

Thread overview: 15+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2019-08-19 13:28 [PATCH v3 0/7] Fix the reported SGX selftest makefile issues Jarkko Sakkinen
2019-08-19 13:28 ` Jarkko Sakkinen [this message]
2019-08-19 13:28 ` [PATCH v3 2/7] selftests/x86/sgx: Do not generate object files Jarkko Sakkinen
2019-08-19 13:28 ` [PATCH v3 3/7] selftests/x86/sgx: Add -I$(OUTPUT) when compiling encl_piggy.S Jarkko Sakkinen
2019-08-19 13:28 ` [PATCH v3 4/7] selftests/x86/sgx: Fix EXTRA_CLEAN Jarkko Sakkinen
2019-08-19 13:28 ` [PATCH v3 5/7] selftests/x86/sgx: Fix target in the Makefile Jarkko Sakkinen
2019-08-19 13:28 ` [PATCH v3 6/7] selftests/x86: Revert SGX changes Jarkko Sakkinen
2019-08-19 13:28 ` [PATCH v3 7/7] selftests/x86: Recurse into subdirectories Jarkko Sakkinen
2019-08-22  3:42   ` Sean Christopherson
2019-08-22 14:59     ` Jarkko Sakkinen
2019-08-22 15:02       ` Jarkko Sakkinen
2019-08-22 16:13         ` Jarkko Sakkinen
2019-08-22 16:14           ` Jarkko Sakkinen
2019-08-22  3:31 ` [PATCH v3 0/7] Fix the reported SGX selftest makefile issues Sean Christopherson
2019-08-22 14:58   ` Jarkko Sakkinen

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20190819132830.9056-2-jarkko.sakkinen@linux.intel.com \
    --to=jarkko.sakkinen@linux.intel.com \
    --cc=cedric.xing@intel.com \
    --cc=linux-sgx@vger.kernel.org \
    --cc=sean.j.christopherson@intel.com \
    --cc=serge.ayoun@intel.com \
    --cc=shay.katz-zamir@intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).