about summary refs log tree commit diff
path: root/src/libstd
diff options
context:
space:
mode:
authorAdrian Cruceru <cruceruadrian@gmail.com>2020-06-23 19:18:34 +0200
committerAdrian Cruceru <cruceruadrian@gmail.com>2020-06-24 11:28:41 +0200
commitf3b1582bb926a7005ba77bfaa44b1ed59a587509 (patch)
treef57d3481c2bf205ee98ecea49319f46d7834d7e3 /src/libstd
parent3b1c08c68ccc2c222f84384c836b5e167e2bc241 (diff)
downloadrust-f3b1582bb926a7005ba77bfaa44b1ed59a587509.tar.gz
rust-f3b1582bb926a7005ba77bfaa44b1ed59a587509.zip
Update libunwind build process for x86_64-fortanix-unknown-sgx target
Diffstat (limited to 'src/libstd')
-rw-r--r--src/libstd/sys/sgx/abi/entry.S14
1 files changed, 9 insertions, 5 deletions
diff --git a/src/libstd/sys/sgx/abi/entry.S b/src/libstd/sys/sgx/abi/entry.S
index fc6ce577033..f61bcf06f08 100644
--- a/src/libstd/sys/sgx/abi/entry.S
+++ b/src/libstd/sys/sgx/abi/entry.S
@@ -11,7 +11,7 @@ IMAGE_BASE:
     .long 1                    /* type = NT_VERSION */
 0:  .asciz "toolchain-version" /* name */
 1:  .align 4
-2:  .long 0                    /* desc - toolchain version number, 32-bit LE */
+2:  .long 1                    /* desc - toolchain version number, 32-bit LE */
 3:  .align 4
 
 .section .rodata
@@ -60,10 +60,14 @@ IMAGE_BASE:
     globvar TEXT_BASE 8
     /*  The size in bytes of enclacve text section */
     globvar TEXT_SIZE 8
-    /*  The base address (relative to enclave start) of the enclave EH_FRM_HDR section */
-    globvar EH_FRM_HDR_BASE 8
-    /*  The size in bytes of enclacve EH_FRM_HDR section */
-    globvar EH_FRM_HDR_SIZE 8
+    /*  The base address (relative to enclave start) of the enclave .eh_frame_hdr section */
+    globvar EH_FRM_HDR_OFFSET 8
+    /*  The size in bytes of enclave .eh_frame_hdr section */
+    globvar EH_FRM_HDR_LEN 8
+    /*  The base address (relative to enclave start) of the enclave .eh_frame section */
+    globvar EH_FRM_OFFSET 8
+    /*  The size in bytes of enclacve .eh_frame section */
+    globvar EH_FRM_LEN 8
 
 .org .Lxsave_clear+512
 .Lxsave_header: