Unable to run Sample applications like hello world and Python on SUSE-based Linux distribution docker container. #2009

veluruchaithanya · 2024-09-26T12:50:30Z

veluruchaithanya
Sep 26, 2024

Hi,
I am trying to run applications inside the SGX secure enclave using Gramine LibOS. I have deployed a docker image that includes dependencies for building Gramine, installing the Intel SGX SDK, and running a Hello World application to test basic Gramine functionality.
I successfully ran the Hello world application inside the container without using Gramine. Then I tried to run it using the gramine-direct command, hello world application failed. I tried to debug the issue using GDB and found that I am getting segmentation fault. The error is caused by failure in registering and calling library "/lib/libc.so.6" within the Gramine runtime.

I have tried running python application as well using the gramine-direct command and I got same segmentation fault error. Here error is caused by failure in registering and calling library ""/usr/lib64/libpython3.6m.so.1.0" within the Gramine runtime.

Can someone help with this issue as I have limited experience in using gramine?

~/src/gramine/CI-Examples/helloworld> ./helloworld
+ ./helloworld
Hello, world



~/src/gramine/CI-Examples/helloworld> GDB=1 gramine-direct helloworld
+ GDB=1
+ gramine-direct helloworld
Reading symbols from /usr/local/lib64/gramine/direct/loader...
[gramine_linux_gdb.py] Loading ../../gdb_integration/language_gdb.py...
[gramine_linux_gdb.py] Loading ../../gdb_integration/pagination_gdb.py...
[gramine_linux_gdb.py] Loading ../../gdb_integration/debug_map_gdb.py...
[gramine_linux_gdb.py] Loading ../../gdb_integration/gramine.gdb...
(gdb) break handle_libos_call
Function "handle_libos_call" not defined.
Make breakpoint pending on future shared library load? (y or [n]) y
Breakpoint 1 (handle_libos_call) pending.
(gdb) run
Starting program: /usr/local/lib64/gramine/direct/loader /usr/local/lib64/gramine/direct/libpal.so init helloworld
process 431 is executing new program: /usr/local/lib64/gramine/direct/libpal.so
add symbol table from file "/usr/local/lib64/gramine/direct/libpal.so" at
        .text_addr = 0x7ffff7fbb630
        .note.gnu.build-id_addr = 0x7ffff7fb91c8
        .hash_addr = 0x7ffff7fb91f0
        .dynsym_addr = 0x7ffff7fb9370
        .dynstr_addr = 0x7ffff7fb98b0
        .gnu.version_addr = 0x7ffff7fb9ca4
        .gnu.version_d_addr = 0x7ffff7fb9d18
        .rela.dyn_addr = 0x7ffff7fb9d50
        .rodata_addr = 0x7ffff7fe4dc0
        .eh_frame_hdr_addr = 0x7ffff7ff0c80
        .eh_frame_addr = 0x7ffff7ff22f0
        .dynamic_addr = 0x7ffff7ff8ec0
        .data_addr = 0x7ffff7ff9000
        .bss_addr = 0x7ffff7ffc260
add symbol table from file "/usr/local/lib64/gramine/libsysdb.so" at
        .text_addr = 0x7fffffe7de20
        .note.gnu.build-id_addr = 0x7fffffe711c8
        .hash_addr = 0x7fffffe711f0
        .dynsym_addr = 0x7fffffe71370
        .dynstr_addr = 0x7fffffe718b0
        .gnu.version_addr = 0x7fffffe71d08
        .gnu.version_d_addr = 0x7fffffe71d78
        .gnu.version_r_addr = 0x7fffffe71db0
        .rela.dyn_addr = 0x7fffffe71dd0
        .rela.plt_addr = 0x7fffffe7d5f0
        .plt_addr = 0x7fffffe7dad0
        .plt.got_addr = 0x7ffffff27168
        .rodata_addr = 0x7ffffff27180
        .eh_frame_hdr_addr = 0x7ffffff40f50
        .eh_frame_addr = 0x7ffffff461a0
        .dynamic_addr = 0x7ffffff5ccf8
        .got_addr = 0x7ffffff5ceb8
        .got.plt_addr = 0x7ffffff5cec8
        .data.rel.ro_addr = 0x7ffffff5d080
        .data_addr = 0x7ffffff5e000
        .bss_addr = 0x7ffffff6c000
(libos_init.c:382:libos_init) debug: Gramine was built from commit: 1.7
(libos_init.c:384:libos_init) debug: Host: Linux
(libos_context.c:70:libos_xstate_init) debug: LibOS xsave_enabled 1, xsave_size 0xa88(2696), xsave_features 0x2e7
(libos_vma.c:622:init_vma) debug: Initial VMA region 0xffffffffff600000-0xffffffffff601000 ([vsyscall]) bookkeeped
(libos_vma.c:622:init_vma) debug: Initial VMA region 0x8000000c2000-0x8000000c4000 ([vdso]) bookkeeped
(libos_vma.c:622:init_vma) debug: Initial VMA region 0x8000000be000-0x8000000c2000 ([vvar]) bookkeeped
(libos_vma.c:622:init_vma) debug: Initial VMA region 0x7ffffffde000-0x7ffffffff000 ([stack]) bookkeeped
(libos_vma.c:622:init_vma) debug: Initial VMA region 0x7ffffffdd000-0x7ffffffde000 (stack guard) bookkeeped
(libos_vma.c:622:init_vma) debug: Initial VMA region 0x7ffffff9c000-0x7ffffffdd000 (PAL internal me) bookkeeped
(libos_vma.c:622:init_vma) debug: Initial VMA region 0x7ffffff98000-0x7ffffff9c000 (PAL internal me) bookkeeped
(libos_vma.c:622:init_vma) debug: Initial VMA region 0x7ffffff87000-0x7ffffff98000 (PAL internal me) bookkeeped
(libos_vma.c:622:init_vma) debug: Initial VMA region 0x7ffffff86000-0x7ffffff87000 (PAL internal me) bookkeeped
(libos_vma.c:622:init_vma) debug: Initial VMA region 0x7ffffff85000-0x7ffffff86000 (PAL internal me) bookkeeped
(libos_vma.c:622:init_vma) debug: Initial VMA region 0x7ffffff84000-0x7ffffff85000 (PAL internal me) bookkeeped
(libos_vma.c:622:init_vma) debug: Initial VMA region 0x7ffffff83000-0x7ffffff84000 (PAL internal me) bookkeeped
(libos_vma.c:622:init_vma) debug: Initial VMA region 0x7fffffe71000-0x7ffffff83000 (PAL internal me) bookkeeped
(libos_vma.c:622:init_vma) debug: Initial VMA region 0x7ffff7ffd000-0x7ffff7fff000 ([heap]) bookkeeped
(libos_vma.c:622:init_vma) debug: Initial VMA region 0x7ffff7ff8000-0x7ffff7ffd000 (/usr/local/lib6) bookkeeped
(libos_vma.c:622:init_vma) debug: Initial VMA region 0x7ffff7fb9000-0x7ffff7ff8000 (/usr/local/lib6) bookkeeped
(libos_vma.c:653:init_vma) debug: ASLR top address adjusted to 0x72fc2bb7a000
(libos_init.c:410:libos_init) debug: LibOS loaded at 0x7fffffe71000, ready to initialize
(libos_init.c:563:create_pipe) debug: Creating pipe: pipe.srv:a855839f1518caded5cc04dd5c96b074f7c356ad2fc8422659b23c5daec3f288
(libos_fs.c:518:mount_fs) [P1:T1:] debug: mounting "file:." (chroot) under /
(libos_fs.c:518:mount_fs) [P1:T1:] debug: mounting "proc" (pseudo) under /proc
(libos_fs.c:518:mount_fs) [P1:T1:] debug: mounting "dev" (pseudo) under /dev
(libos_fs.c:518:mount_fs) [P1:T1:] debug: mounting "sys" (pseudo) under /sys
(libos_fs.c:518:mount_fs) [P1:T1:] debug: mounting "file:/usr/local/lib64/gramine/runtime/glibc" (chroot) under /lib
(libos_fs.c:518:mount_fs) [P1:T1:] debug: mounting "file:helloworld" (chroot) under /helloworld
(libos_init.c:563:create_pipe) [P1:T1:helloworld] debug: Creating pipe: pipe.srv:d2bbc48185731f3153b19d9e3452a994c878ed79bb54cb82209fc19ef83d8bc3
(libos_init.c:303:init_stack) [P1:T1:helloworld] debug: Allocated stack at 0x72fc2bb3a000 (size = 0x40000)
(libos_rtld.c:845:load_elf_object) [P1:T1:helloworld] debug: loading "file:helloworld"
(libos_debug.c:121:append_r_debug) [P1:T1:helloworld] debug: adding file:helloworld at 0
add symbol table from file "/home/user1/src/gramine/CI-Examples/helloworld/helloworld" at
        .text_addr = 0x400430
        .interp_addr = 0x400238
        .note.gnu.build-id_addr = 0x400254
        .note.ABI-tag_addr = 0x400278
        .hash_addr = 0x400298
        .gnu.hash_addr = 0x4002c0
        .dynsym_addr = 0x4002e0
        .dynstr_addr = 0x400340
        .gnu.version_addr = 0x40037e
        .gnu.version_r_addr = 0x400388
        .rela.dyn_addr = 0x4003a8
        .rela.plt_addr = 0x4003d8
        .init_addr = 0x4003f0
        .plt_addr = 0x400410
        .fini_addr = 0x4005c4
        .rodata_addr = 0x4005d0
        .eh_frame_hdr_addr = 0x4005e4
        .eh_frame_addr = 0x400618
        .init_array_addr = 0x401de8
        .fini_array_addr = 0x401df0
        .dynamic_addr = 0x401df8
        .got_addr = 0x401fd8
        .got.plt_addr = 0x401fe8
        .data_addr = 0x402008
        __patchable_function_entries_addr = 0x402018
        .bss_addr = 0x402028
(libos_rtld.c:899:find_interp) [P1:T1:helloworld] debug: searching for interpreter: /lib/ld-linux-x86-64.so.2
(libos_rtld.c:845:load_elf_object) [P1:T1:helloworld] debug: loading "file:/usr/local/lib64/gramine/runtime/glibc/ld-linux-x86-64.so.2"
(libos_debug.c:121:append_r_debug) [P1:T1:helloworld] debug: adding file:/usr/local/lib64/gramine/runtime/glibc/ld-linux-x86-64.so.2 at 0x72fc2bb05000
add symbol table from file "/usr/local/lib64/gramine/runtime/glibc/ld-linux-x86-64.so.2" at
        .text_addr = 0x72fc2bb05dc0
        .note.gnu.build-id_addr = 0x72fc2bb051c8
        .hash_addr = 0x72fc2bb051f0
        .gnu.hash_addr = 0x72fc2bb05330
        .dynsym_addr = 0x72fc2bb05490
        .dynstr_addr = 0x72fc2bb05850
        .gnu.version_addr = 0x72fc2bb05b1a
        .gnu.version_d_addr = 0x72fc2bb05b70
        .rela.dyn_addr = 0x72fc2bb05c60
        .rodata_addr = 0x72fc2bb2a980
        .eh_frame_hdr_addr = 0x72fc2bb30b34
        .eh_frame_addr = 0x72fc2bb314b0
        .data.rel.ro_addr = 0x72fc2bb35400
        .dynamic_addr = 0x72fc2bb36ea8
        .got_addr = 0x72fc2bb36fd8
        .got.plt_addr = 0x72fc2bb36fe8
        .data_addr = 0x72fc2bb37000
        .bss_addr = 0x72fc2bb38110
(libos_init.c:563:create_pipe) [P1:T1:helloworld] debug: Creating pipe: pipe.srv:9358525001167615387/1
(libos_init.c:563:create_pipe) [P1:T1:helloworld] debug: Creating pipe: pipe.srv:40ac24a24c8353ebe7734e847c7556420b8a199441c766a8148f91fb9d14ed5b
[New LWP 434]
(libos_init.c:507:libos_init) [P1:T1:helloworld] debug: LibOS initialized
(libos_ipc_worker.c:372:ipc_worker_wrapper) [P1:libos] debug: IPC worker started
(libos_debug.c:121:append_r_debug) [P1:T1:helloworld] debug: adding file:[vdso_libos] at 0x72fc2bb04000
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- brk(0) = 0x18e7000
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- mmap(0, 0x2000, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS, -1, 0x0) ...
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- return from mmap(...) = 0x72fc2bb02000
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- access("/etc/ld.so.preload", F_OK|R_OK) = -2
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- openat(AT_FDCWD, "/lib/glibc-hwcaps/x86-64-v4/libc.so.6", O_RDONLY|0x80000, 0000) = -2
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- newfstatat(AT_FDCWD, "/lib/glibc-hwcaps/x86-64-v4/", 0x72fc2bb78f70, 0) = -2
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- openat(AT_FDCWD, "/lib/glibc-hwcaps/x86-64-v3/libc.so.6", O_RDONLY|0x80000, 0000) = -2
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- newfstatat(AT_FDCWD, "/lib/glibc-hwcaps/x86-64-v3/", 0x72fc2bb78f70, 0) = -2
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- openat(AT_FDCWD, "/lib/glibc-hwcaps/x86-64-v2/libc.so.6", O_RDONLY|0x80000, 0000) = -2
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- newfstatat(AT_FDCWD, "/lib/glibc-hwcaps/x86-64-v2/", 0x72fc2bb78f70, 0) = -2
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- openat(AT_FDCWD, "/lib/libc.so.6", O_RDONLY|0x80000, 0000) = 0x3
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- read(3, 0x72fc2bb790e8, 0x340) ...
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- return from read(...) = 0x340
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- fstat(3, 0x72fc2bb78f70) = 0x0
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- mmap(0, 0x1d8d50, PROT_READ|PROT_EXEC, MAP_PRIVATE|MAP_DENYWRITE, 3, 0x0) ...
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- return from mmap(...) = 0x72fc2b929000
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- mmap(0x72fc2baf4000, 0x6000, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_FIXED|MAP_DENYWRITE, 3, 0x1ca000) ...
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- return from mmap(...) = 0x72fc2baf4000
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- mmap(0x72fc2bafa000, 0x7d50, PROT_READ|PROT_WRITE, MAP_PRIVATE|MAP_ANONYMOUS|MAP_FIXED, -1, 0x0) ...
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- return from mmap(...) = 0x72fc2bafa000
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- close(3) = 0x0

Thread 1 "exe" hit Breakpoint 1, handle_libos_call (number=732963088, arg1=0, arg2=126427390504960) at ../libos/src/libos_call.c:102
102         switch (number) {
(gdb) backtrace
#0  handle_libos_call (number=732963088, arg1=0, arg2=126427390504960) at ../libos/src/libos_call.c:102
#1  0x00007fffffedcca8 in libos_emulate_syscall (context=0x7fffffe15f38) at ../libos/src/libos_syscalls.c:32
#2  0x00007ffffff0929e in libos_syscall_entry () at ../libos/src/arch/x86_64/syscallas.S:174
#3  0x00007ffffff092a1 in __morestack () at ../libos/src/arch/x86_64/syscallas.S:205
#4  0x000072fc2bb0ca02 in gramine_call (number=1, arg1=126427390288128, arg2=126427388350464) at /home/user1/src/gramine/subprojects/glibc-2.39-1/../../libos/include/arch/x86_64/gramine_entry_api.h:53
#5  gramine_register_library (name=0x72fc2bb02100 "/lib/libc.so.6", load_address=126427388350464) at /home/user1/src/gramine/subprojects/glibc-2.39-1/../../libos/include/arch/x86_64/gramine_entry_api.h:79
#6  _dl_map_object_from_fd (name=name@entry=0x400358 "libc.so.6", origname=origname@entry=0x0, fd=-1, fbp=<optimized out>, realname=<optimized out>, loader=loader@entry=0x72fc2bb382e0, l_type=<optimized out>, mode=<optimized out>, stack_endp=<optimized out>, nsid=<optimized out>)
    at dl-load.c:1485
#7  0x000072fc2bb0d5cd in _dl_map_object (loader=0x72fc2bb382e0, name=0x400358 "libc.so.6", type=1, trace_mode=0, mode=0, nsid=<optimized out>) at dl-load.c:2253
#8  0x000072fc2bb07522 in openaux (a=a@entry=0x72fc2bb79680) at dl-deps.c:64
#9  0x000072fc2bb0628f in __GI__dl_catch_exception (exception=exception@entry=0x72fc2bb79660, operate=operate@entry=0x72fc2bb074f0 <openaux>, args=args@entry=0x72fc2bb79680) at dl-catch.c:237
#10 0x000072fc2bb07803 in _dl_map_object_deps (map=map@entry=0x72fc2bb382e0, preloads=preloads@entry=0x0, npreloads=npreloads@entry=0, trace_mode=<optimized out>, open_mode=open_mode@entry=0) at dl-deps.c:232
#11 0x000072fc2bb22593 in dl_main (phdr=<optimized out>, phnum=<optimized out>, user_entry=<optimized out>, auxv=<optimized out>) at rtld.c:1965
#12 0x000072fc2bb1f372 in _dl_sysdep_start (start_argptr=start_argptr@entry=0x72fc2bb79ec0, dl_main=dl_main@entry=0x72fc2bb20a30 <dl_main>) at ../sysdeps/unix/sysv/linux/dl-sysdep.c:140
#13 0x000072fc2bb206d4 in _dl_start_final (arg=0x72fc2bb79ec0) at rtld.c:494
#14 _dl_start (arg=0x72fc2bb79ec0) at rtld.c:581
#15 0x000072fc2bb1f8e8 in _start ()
#16 0x0000000000000001 in ?? ()
#17 0x000072fc2bb79ff4 in ?? ()
#18 0x0000000000000000 in ?? ()
(gdb) continue
Continuing.
(libos_call.c:140:handle_libos_call) [P1:T1:helloworld] warning: handle_libos_call: invalid number: 732963088

Thread 1 "exe" received signal SIGSEGV, Segmentation fault.
0x0000000000000000 in ?? ()
(gdb) 
Continuing.
(libos_signal.c:351:memfault_upcall) [P1:T1:helloworld] debug: memory fault at 0x00000000 (IP = 0x00000000)
(libos_signal.c:58:sighandler_kill) [P1:T1:helloworld] debug: killed by signal 11
(libos_fs_lock.c:785:file_lock_clear_pid) [P1:T1:helloworld] debug: clearing file (POSIX) locks for pid 1
(libos_sync_client.c:331:shutdown_sync_client) [P1:T1:helloworld] debug: sync client shutdown: closing handles
(libos_sync_client.c:346:shutdown_sync_client) [P1:T1:helloworld] debug: sync client shutdown: waiting for confirmation
(libos_sync_client.c:359:shutdown_sync_client) [P1:T1:helloworld] debug: sync client shutdown: finished
(libos_ipc_worker.c:285:ipc_worker_main) [P1:libos] debug: IPC worker: exiting worker thread
[LWP 434 exited]
(libos_exit.c:58:libos_clean_and_exit) [P1:T1:helloworld] debug: process 1 exited with status 139
[Inferior 1 (process 431) exited with code 0213]
(gdb) 
The program is not being run.
(gdb)

dimakuv · 2024-09-27T10:06:16Z

dimakuv
Sep 27, 2024

How did you install Gramine? There seems to be a mismatch between the versions of Gramine itself and the Gramine-patched Glibc library. Could it be that you installed Gramine from packages, but then also installed it from source?

10 replies

kailun-qin Oct 9, 2024
Maintainer

I think that's the problem:
(libos_rtld.c:845:load_elf_object) [P1:T1:helloworld] debug: loading "file:/usr/local/lib64/gramine/runtime/glibc/ld-linux-x86-64.so.2"
[...]
(libos_parser.c:1658:buf_write_all) [P1:T1:helloworld] trace: ---- openat(AT_FDCWD, "/lib/libc.so.6", O_RDONLY|0x80000, 0000) = 0x3
For some reason Gramine is loading ld.so shipped with Gramine, but then the app is loading system's glibc (which most likely have mismatched versions).

I agree w/ the speculation about version mismatch. But /lib/libc.so.6 is the path mounted inside the LibOS (i.e., doesn't necessarily indicate that the app is loading system's glibc)?

mkow Oct 9, 2024
Maintainer

@veluruchaithanya: Can you share your manifest?

veluruchaithanya Oct 10, 2024
Author

Hi @mkow,
This is the manifest file I used.
helloworld.manifest.template

 # Smoke test manifest file example

loader.entrypoint = "file:{{ gramine.libos }}"
libos.entrypoint = "/helloworld"
loader.log_level = "all"

loader.env.LD_LIBRARY_PATH = "/lib"

fs.mounts = [
  { path = "/lib", uri = "file:{{ gramine.runtimedir() }}" },
  { path = "/helloworld", uri = "file:helloworld" },
]

sgx.debug = true
sgx.max_threads =  32
#sgx.debug = {{ 'true' if env.get('DEBUG', '0') == '1' else 'false' }}
sgx.edmm_enable = {{ 'true' if env.get('EDMM', '0') == '1' else 'false' }}
sgx.use_exinfo = {{ 'true' if env.get('EXINFO', '0') == '1' else 'false' }}
sgx.insecure__allow_memfaults_without_exinfo = {{ 'true' if env.get('ALLOW_MEMFAULTS_WITHOUT_EXINFO', '0') == '1' else 'false' }}

sgx.trusted_files = [
  "file:{{ gramine.libos }}",
  "file:helloworld",
  "file:{{ gramine.runtimedir() }}/",
]

veluruchaithanya Oct 10, 2024
Author

I managed to run helloworld application successfully using below manifest. Here, I completely removed gramine runtime libraries and only using system libraries.

# Smoke test manifest file example
 
loader.entrypoint = "file:{{ gramine.libos }}"
libos.entrypoint = "/helloworld"
loader.log_level = "all"
 
loader.env.LD_LIBRARY_PATH = "/lib"
 
fs.mounts = [
  { path = "/lib", uri = "file:/lib64" },
  { path = "/helloworld", uri = "file:helloworld" },
]
 
sgx.debug = true
sgx.max_threads =  32
#sgx.debug = {{ 'true' if env.get('DEBUG', '0') == '1' else 'false' }}
sgx.edmm_enable = {{ 'true' if env.get('EDMM', '0') == '1' else 'false' }}
sgx.use_exinfo = {{ 'true' if env.get('EXINFO', '0') == '1' else 'false' }}
sgx.insecure__allow_memfaults_without_exinfo = {{ 'true' if env.get('ALLOW_MEMFAULTS_WITHOUT_EXINFO', '0') == '1' else 'false' }}
 
sgx.trusted_files = [
  "file:{{ gramine.libos }}",
  "file:helloworld",
  "file:/lib64/",

But this will degrade the performance since I am not using Gramine syscall APIs

veluruchaithanya Oct 10, 2024
Author

FYI
I am running hello-world apllication with Gramine v1.7 on SUSE linux distribution 15.4. The glibc version that comes as default in this linux distribution is glibc version v2.31. In gramine source repo code, for version v1.7 glibc version being used is v2.39 and glibc source code is also modified to support gramine API calls with gramine-syscall.patch

So, I tried to backport the Gramine patches to the glibc version that comes with SLES 15.4 (i.e., glibc v2.31) before building gramine. I am attaching the diff file I applied below. I am not sure if I applied the gramine changes on glibc v2.31 source code correctly and due to this I am seeing the errors? I did like this because glibc v2.39 is not available on SUSE linux distribution 15.4.

Subject: [PATCH] [gramine] change glibc version from 2.39 to 2.31

---
 meson.build                                   |   2 +-
 subprojects/glibc-2.31-1.wrap                 |  15 ++
 subprojects/glibc-2.39-1.wrap                 |  15 --
 .../{glibc-2.39 => glibc-2.31}/compile.sh     |   1 +
 .../gramine-syscall.patch                     | 191 +++++++++---------
 .../hp-timing.patch                           |   4 +-
 .../{glibc-2.39 => glibc-2.31}/meson.build    |   6 +-
 7 files changed, 115 insertions(+), 119 deletions(-)
 create mode 100644 subprojects/glibc-2.31-1.wrap
 delete mode 100644 subprojects/glibc-2.39-1.wrap
 rename subprojects/packagefiles/{glibc-2.39 => glibc-2.31}/compile.sh (98%)
 rename subprojects/packagefiles/{glibc-2.39 => glibc-2.31}/gramine-syscall.patch (68%)
 rename subprojects/packagefiles/{glibc-2.39 => glibc-2.31}/hp-timing.patch (90%)
 rename subprojects/packagefiles/{glibc-2.39 => glibc-2.31}/meson.build (93%)

diff --git a/meson.build b/meson.build
index 963af477..4b7ef52c 100644
--- a/meson.build
+++ b/meson.build
@@ -283,7 +283,7 @@ subdir('python')
 subdir('tools')
 
 if get_option('libc') == 'glibc'
-    subproject('glibc-2.39-1')
+    subproject('glibc-2.31-1')
 elif get_option('libc') == 'musl'
     subproject('musl-1.2.4')
 endif
diff --git a/subprojects/glibc-2.31-1.wrap b/subprojects/glibc-2.31-1.wrap
new file mode 100644
index 00000000..a4753a06
--- /dev/null
+++ b/subprojects/glibc-2.31-1.wrap
@@ -0,0 +1,15 @@
+# NOTE: We use a custom version number (the `-1` suffix) to force Meson to rebuild when there is a
+# breaking change to the interface between Glibc and Gramine. The important part is that the
+# directory in `subprojects` has to change (`subprojects/glibc-2.31-1`, `subprojects/glibc-2.31-2`
+# etc.)
+
+[wrap-file]
+directory = glibc-2.31-1
+source_url = https://ftp.gnu.org/gnu/glibc/glibc-2.31.tar.gz
+source_fallback_url = https://ftp.gnu.org/gnu/glibc/glibc-2.31.tar.gz
+source_filename = glibc-2.31.tar.gz
+source_hash = cb2d64fb808affff30d8a99a85de9d2aa67dc2cbac4ae99af4500d6cfea2bda7
+patch_directory = glibc-2.31
+
+# this unpacks the sources to `glibc-2.31-1/glibc-2.31`
+lead_directory_missing = true
diff --git a/subprojects/glibc-2.39-1.wrap b/subprojects/glibc-2.39-1.wrap
deleted file mode 100644
index 2fd7f1c5..00000000
--- a/subprojects/glibc-2.39-1.wrap
+++ /dev/null
@@ -1,15 +0,0 @@
-# NOTE: We use a custom version number (the `-1` suffix) to force Meson to rebuild when there is a
-# breaking change to the interface between Glibc and Gramine. The important part is that the
-# directory in `subprojects` has to change (`subprojects/glibc-2.39-1`, `subprojects/glibc-2.39-2`
-# etc.)
-
-[wrap-file]
-directory = glibc-2.39-1
-source_url = https://ftp.gnu.org/gnu/glibc/glibc-2.39.tar.gz
-source_fallback_url = https://packages.gramineproject.io/distfiles/glibc-2.39.tar.gz
-source_filename = glibc-2.39.tar.gz
-source_hash = 97f84f3b7588cd54093a6f6389b0c1a81e70d99708d74963a2e3eab7c7dc942d
-patch_directory = glibc-2.39
-
-# this unpacks the sources to `glibc-2.39-1/glibc-2.39`
-lead_directory_missing = true
diff --git a/subprojects/packagefiles/glibc-2.39/compile.sh b/subprojects/packagefiles/glibc-2.31/compile.sh
similarity index 98%
rename from subprojects/packagefiles/glibc-2.39/compile.sh
rename to subprojects/packagefiles/glibc-2.31/compile.sh
index 38e1957f..f8e36f89 100644
--- a/subprojects/packagefiles/glibc-2.39/compile.sh
+++ b/subprojects/packagefiles/glibc-2.31/compile.sh
@@ -58,6 +58,7 @@ mkdir -p "$BUILDDIR"
         --disable-sanity-checks \
         --disable-test \
         --disable-nscd \
+        --disable-werror \
         >>"$BUILD_LOG" 2>&1
 
     log "running make..."
diff --git a/subprojects/packagefiles/glibc-2.39/gramine-syscall.patch b/subprojects/packagefiles/glibc-2.31/gramine-syscall.patch
similarity index 68%
rename from subprojects/packagefiles/glibc-2.39/gramine-syscall.patch
rename to subprojects/packagefiles/glibc-2.31/gramine-syscall.patch
index 8538cc17..13d0e174 100644
--- a/subprojects/packagefiles/glibc-2.39/gramine-syscall.patch
+++ b/subprojects/packagefiles/glibc-2.31/gramine-syscall.patch
@@ -1,8 +1,8 @@
 diff --git a/Makerules b/Makerules
-index 00365bc58be119bb0fec9cf2cfa51780c27fae8c..1995396ae885a75575eebb96254528d80d6686ab 100644
+index 1e9c18f0..3fa0d4a5 100644
 --- a/Makerules
 +++ b/Makerules
-@@ -777,7 +777,7 @@ verbose	:=
+@@ -829,7 +829,7 @@ verbose	:=
  endif						# not -s
  
  ARFLAGS := r$(verbose)
@@ -12,20 +12,20 @@ index 00365bc58be119bb0fec9cf2cfa51780c27fae8c..1995396ae885a75575eebb96254528d8
  # This makes all the object files in the parent library archive.
  
 diff --git a/elf/Makefile b/elf/Makefile
-index 5d78b659ce813ff973e499043154e5b1fc8a639b..ac86ce8f81ac89ae4a9a958503fdc160516856b9 100644
+index 632a4d8b..66f178ae 100644
 --- a/elf/Makefile
 +++ b/elf/Makefile
-@@ -1296,7 +1296,7 @@ $(objpfx)librtld.map: $(objpfx)dl-allobjs.os $(common-objpfx)libc_pic.a
- # For lld, skip preceding addresses and values before matching the archive and the member.
+@@ -503,7 +503,7 @@ $(objpfx)librtld.map: $(objpfx)dl-allobjs.os $(common-objpfx)libc_pic.a
+ 
  $(objpfx)librtld.mk: $(objpfx)librtld.map Makefile
  	LC_ALL=C \
--	sed -n 's@^[0-9a-f ]*$(common-objpfx)\([^(]*\)(\([^)]*\.os\)) *.*$$@\1 \2@p' \
-+	sed -n 's@^[0-9a-f ]*$(subst @,\@,$(common-objpfx))\([^(]*\)(\([^)]*\.os\)) *.*$$@\1 \2@p' \
+-	sed -n 's@^$(common-objpfx)\([^(]*\)(\([^)]*\.os\)) *.*$$@\1 \2@p' \
++	sed -n 's@^$(subst @,\@,$(common-objpfx))\([^(]*\)(\([^)]*\.os\)) *.*$$@\1 \2@p' \
  	    $< | \
  	while read lib file; do \
  	  case $$lib in \
-@@ -1304,7 +1304,7 @@ $(objpfx)librtld.mk: $(objpfx)librtld.map Makefile
- 	    LC_ALL=C grep -F -l /$$file \
+@@ -511,7 +511,7 @@ $(objpfx)librtld.mk: $(objpfx)librtld.map Makefile
+ 	    LC_ALL=C fgrep -l /$$file \
  		  $(common-objpfx)stamp.os $(common-objpfx)*/stamp.os | \
  	    LC_ALL=C \
 -	    sed 's@^$(common-objpfx)\([^/]*\)/stamp\.os$$@rtld-\1'" +=$$file@"\
@@ -34,19 +34,18 @@ index 5d78b659ce813ff973e499043154e5b1fc8a639b..ac86ce8f81ac89ae4a9a958503fdc160
  	  */*.a) \
  	    echo rtld-$${lib%%/*} += $$file ;; \
 diff --git a/elf/dl-load.c b/elf/dl-load.c
-index ce8fdea3024359b0d4f4aea90a49796003aeaa1d..58392a372fdb3ebb66b85b8963ccdb01024dc616 100644
+index a6b80f93..2eb685b3 100644
 --- a/elf/dl-load.c
 +++ b/elf/dl-load.c
-@@ -76,6 +76,8 @@ struct filebuf
+@@ -72,6 +72,7 @@ struct filebuf
+ #include <dl-sysdep-open.h>
  #include <dl-prop.h>
  #include <not-cancel.h>
- 
 +#include "gramine_entry_api.h"
-+
+ 
  #include <endian.h>
  #if BYTE_ORDER == BIG_ENDIAN
- # define byteorder ELFDATA2MSB
-@@ -1480,6 +1482,8 @@ cannot enable executable stack as shared object requires");
+@@ -1390,6 +1391,8 @@ cannot enable executable stack as shared object requires");
    DL_AFTER_LOAD (l);
  #endif
  
@@ -56,23 +55,23 @@ index ce8fdea3024359b0d4f4aea90a49796003aeaa1d..58392a372fdb3ebb66b85b8963ccdb01
    _dl_add_to_namespace_list (l, nsid);
  
 diff --git a/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
-index 9d9732afdcef471c7e6852f1cebe025296da4d62..af732ed758698fd13d0400024d2427f496a33541 100644
+index cbce0083..798df6db 100644
 --- a/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
 +++ b/sysdeps/unix/sysv/linux/x86_64/____longjmp_chk.S
-@@ -40,7 +40,7 @@ longjmp_msg:
- 	xorl	%edi, %edi;						\
- 	lea	-sizeSS(%rsp), %RSI_LP;					\
- 	movl	$__NR_sigaltstack, %eax;				\
--	syscall;							\
-+	GRAMINE_SYSCALL;							\
- 	/* Without working sigaltstack we cannot perform the test.  */	\
- 	testl	%eax, %eax;						\
- 	jne	.Lok2;							\
+@@ -89,7 +89,7 @@ ENTRY(____longjmp_chk)
+ 	xorl	%edi, %edi
+ 	lea	-sizeSS(%rsp), %RSI_LP
+ 	movl	$__NR_sigaltstack, %eax
+-	syscall
++	GRAMINE_SYSCALL
+ 	/* Without working sigaltstack we cannot perform the test.  */
+ 	testl	%eax, %eax
+ 	jne	.Lok2
 diff --git a/sysdeps/unix/sysv/linux/x86_64/clone.S b/sysdeps/unix/sysv/linux/x86_64/clone.S
-index d0adc21c850632aea23aab6a0ce9426ea303334d..9bbf4e08e549d98c32d4dbdbcab0f39222d2a81a 100644
+index 5ae90f06..872137c1 100644
 --- a/sysdeps/unix/sysv/linux/x86_64/clone.S
 +++ b/sysdeps/unix/sysv/linux/x86_64/clone.S
-@@ -78,7 +78,7 @@ ENTRY (__clone)
+@@ -73,7 +73,7 @@ ENTRY (__clone)
  	/* End FDE now, because in the child the unwind info will be
  	   wrong.  */
  	cfi_endproc;
@@ -81,7 +80,7 @@ index d0adc21c850632aea23aab6a0ce9426ea303334d..9bbf4e08e549d98c32d4dbdbcab0f392
  
  	testq	%rax,%rax
  	jl	SYSCALL_ERROR_LABEL
-@@ -101,7 +101,7 @@ L(thread_start):
+@@ -96,7 +96,7 @@ L(thread_start):
  	/* Call exit with return value from function call. */
  	movq	%rax, %rdi
  	movl	$SYS_ify(exit), %eax
@@ -90,33 +89,20 @@ index d0adc21c850632aea23aab6a0ce9426ea303334d..9bbf4e08e549d98c32d4dbdbcab0f392
  	cfi_endproc;
  
  	cfi_startproc;
-diff --git a/sysdeps/unix/sysv/linux/x86_64/clone3.S b/sysdeps/unix/sysv/linux/x86_64/clone3.S
-index 5a2d42234e0cb16c56fe4a16e81a95ebd7b0c176..b9b65be33f37a77a951967fa50c3284b73a94580 100644
---- a/sysdeps/unix/sysv/linux/x86_64/clone3.S
-+++ b/sysdeps/unix/sysv/linux/x86_64/clone3.S
-@@ -57,7 +57,7 @@ ENTRY (__clone3)
- 	/* End FDE now, because in the child the unwind info will be
- 	   wrong.  */
- 	cfi_endproc
--	syscall
-+	GRAMINE_SYSCALL
- 
- 	test	%RAX_LP, %RAX_LP
- 	jl	SYSCALL_ERROR_LABEL
-@@ -79,7 +79,7 @@ L(thread_start):
- 	/* Call exit with return value from function call. */
- 	movq	%rax, %rdi
- 	movl	$SYS_ify(exit), %eax
--	syscall
-+	GRAMINE_SYSCALL
- 	cfi_endproc
- 
- 	cfi_startproc
 diff --git a/sysdeps/unix/sysv/linux/x86_64/getcontext.S b/sysdeps/unix/sysv/linux/x86_64/getcontext.S
-index e588a8cc0764064377e3cbac1058254abf190a2d..477d21ecccc894dc8faad1051737ebdab0e71094 100644
+index debdd891..8763fa50 100644
 --- a/sysdeps/unix/sysv/linux/x86_64/getcontext.S
 +++ b/sysdeps/unix/sysv/linux/x86_64/getcontext.S
-@@ -104,7 +104,7 @@ L(no_shstk):
+@@ -73,7 +73,7 @@ ENTRY(__getcontext)
+ 	mov	%RSP_LP, %RSI_LP
+ 	movl	$ARCH_CET_STATUS, %edi
+ 	movl	$__NR_arch_prctl, %eax
+-	syscall
++	GRAMINE_SYSCALL
+ 	testq	%rax, %rax
+ 	jz	L(continue_no_err)
+ 
+@@ -125,7 +125,7 @@ L(no_shstk):
  #endif
  	movl	$_NSIG8,%r10d
  	movl	$__NR_rt_sigprocmask, %eax
@@ -125,24 +111,11 @@ index e588a8cc0764064377e3cbac1058254abf190a2d..477d21ecccc894dc8faad1051737ebda
  	cmpq	$-4095, %rax		/* Check %rax for error.  */
  	jae	SYSCALL_ERROR_LABEL	/* Jump to error handler if error.  */
  
-diff --git a/sysdeps/unix/sysv/linux/x86_64/libc_sigaction.c b/sysdeps/unix/sysv/linux/x86_64/libc_sigaction.c
-index b39812f81d179878249d73920765d1ac2c6b8315..31c4af1e681ad4e416da9e843a619f84fd53b7b2 100644
---- a/sysdeps/unix/sysv/linux/x86_64/libc_sigaction.c
-+++ b/sysdeps/unix/sysv/linux/x86_64/libc_sigaction.c
-@@ -78,7 +78,7 @@ asm									\
-    "	.type __" #name ",@function\n"					\
-    "__" #name ":\n"							\
-    "	movq $" #syscall ", %rax\n"					\
--   "	syscall\n"							\
-+   "	GRAMINE_SYSCALL\n"						\
-    ".LEND_" #name ":\n"							\
-    ".section .eh_frame,\"a\",@progbits\n"				\
-    ".LSTARTFRAME_" #name ":\n"						\
 diff --git a/sysdeps/unix/sysv/linux/x86_64/setcontext.S b/sysdeps/unix/sysv/linux/x86_64/setcontext.S
-index d0bcd794e89eebb5d81f676d7090925e96cac524..3befe350309c89188dc6a3030337bc6aaf7f1e04 100644
+index 31bbc9db..ea9d7fb9 100644
 --- a/sysdeps/unix/sysv/linux/x86_64/setcontext.S
 +++ b/sysdeps/unix/sysv/linux/x86_64/setcontext.S
-@@ -43,7 +43,7 @@ ENTRY(__setcontext)
+@@ -44,7 +44,7 @@ ENTRY(__setcontext)
  	movl	$SIG_SETMASK, %edi
  	movl	$_NSIG8,%r10d
  	movl	$__NR_rt_sigprocmask, %eax
@@ -151,11 +124,24 @@ index d0bcd794e89eebb5d81f676d7090925e96cac524..3befe350309c89188dc6a3030337bc6a
  	/* Pop the pointer into RDX. The choice is arbitrary, but
  	   leaving RDI and RSI available for use later can avoid
  	   shuffling values.  */
+diff --git a/sysdeps/unix/sysv/linux/x86_64/sigaction.c b/sysdeps/unix/sysv/linux/x86_64/sigaction.c
+index c58a77c5..749a4a7e 100644
+--- a/sysdeps/unix/sysv/linux/x86_64/sigaction.c
++++ b/sysdeps/unix/sysv/linux/x86_64/sigaction.c
+@@ -78,7 +78,7 @@ asm									\
+    "	.type __" #name ",@function\n"					\
+    "__" #name ":\n"							\
+    "	movq $" #syscall ", %rax\n"					\
+-   "	syscall\n"							\
++   "	GRAMINE_SYSCALL\n"							\
+    ".LEND_" #name ":\n"							\
+    ".section .eh_frame,\"a\",@progbits\n"				\
+    ".LSTARTFRAME_" #name ":\n"						\
 diff --git a/sysdeps/unix/sysv/linux/x86_64/swapcontext.S b/sysdeps/unix/sysv/linux/x86_64/swapcontext.S
-index b2e0f19a9d57e5007b094037b4cf59868029fc36..94f1eb7ce4ae2746db49282761d2e08c25770ab1 100644
+index e071ef63..e7709253 100644
 --- a/sysdeps/unix/sysv/linux/x86_64/swapcontext.S
 +++ b/sysdeps/unix/sysv/linux/x86_64/swapcontext.S
-@@ -76,7 +76,7 @@ ENTRY(__swapcontext)
+@@ -77,7 +77,7 @@ ENTRY(__swapcontext)
  	movl	$SIG_SETMASK, %edi
  	movl	$_NSIG8,%r10d
  	movl	$__NR_rt_sigprocmask, %eax
@@ -164,8 +150,17 @@ index b2e0f19a9d57e5007b094037b4cf59868029fc36..94f1eb7ce4ae2746db49282761d2e08c
  	cmpq	$-4095, %rax		/* Check %rax for error.  */
  	jae	SYSCALL_ERROR_LABEL	/* Jump to error handler if error.  */
  
+@@ -117,7 +117,7 @@ ENTRY(__swapcontext)
+ 	mov	%RSP_LP, %RSI_LP
+ 	movl	$ARCH_CET_STATUS, %edi
+ 	movl	$__NR_arch_prctl, %eax
+-	syscall
++	GRAMINE_SYSCALL
+ 	testq	%rax, %rax
+ 	jz	L(continue_no_err)
+ 
 diff --git a/sysdeps/unix/sysv/linux/x86_64/syscall.S b/sysdeps/unix/sysv/linux/x86_64/syscall.S
-index 43af8087b657fd9954cb1d4368624affa6c53af0..5c0cc9294aa082ab5ffe39b6c524ebbace6ee9c8 100644
+index 6c93fc63..408d8b8e 100644
 --- a/sysdeps/unix/sysv/linux/x86_64/syscall.S
 +++ b/sysdeps/unix/sysv/linux/x86_64/syscall.S
 @@ -34,7 +34,7 @@ ENTRY (syscall)
@@ -173,12 +168,12 @@ index 43af8087b657fd9954cb1d4368624affa6c53af0..5c0cc9294aa082ab5ffe39b6c524ebba
  	movq %r9, %r8
  	movq 8(%rsp),%r9	/* arg6 is on the stack.  */
 -	syscall			/* Do the system call.  */
-+	GRAMINE_SYSCALL		/* Do the system call.  */
++	GRAMINE_SYSCALL			/* Do the system call.  */
  	cmpq $-4095, %rax	/* Check %rax for error.  */
  	jae SYSCALL_ERROR_LABEL	/* Jump to error handler if error.  */
  	ret			/* Return to caller.  */
 diff --git a/sysdeps/unix/sysv/linux/x86_64/sysdep.h b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
-index a2b021bd86f5d47284958eed11d6024a4027b698..690362d270c90a46968a9bcfc3afb294e39090a3 100644
+index c2eb37e5..10b398f3 100644
 --- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h
 +++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
 @@ -26,6 +26,8 @@
@@ -190,93 +185,93 @@ index a2b021bd86f5d47284958eed11d6024a4027b698..690362d270c90a46968a9bcfc3afb294
  /* For Linux we can use the system call table in the header file
  	/usr/include/asm/unistd.h
     of the kernel.  But these symbols do not follow the SYS_* syntax
-@@ -197,7 +199,7 @@
-     ZERO_EXTEND_##ulong_arg_1			\
-     ZERO_EXTEND_##ulong_arg_2			\
+@@ -166,7 +168,7 @@
+ # define DO_CALL(syscall_name, args)		\
+     DOARGS_##args				\
      movl $SYS_ify (syscall_name), %eax;		\
 -    syscall;
 +    GRAMINE_SYSCALL;
  
  # define DOARGS_0 /* nothing */
  # define DOARGS_1 /* nothing */
-@@ -243,7 +245,7 @@
+@@ -230,7 +232,7 @@
  ({									\
      unsigned long int resultvar;					\
      asm volatile (							\
 -    "syscall\n\t"							\
-+    "GRAMINE_SYSCALL\n\t"						\
++    "GRAMINE_SYSCALL\n\t"							\
      : "=a" (resultvar)							\
      : "0" (number)							\
      : "memory", REGISTERS_CLOBBERED_BY_SYSCALL);			\
-@@ -257,7 +259,7 @@
+@@ -244,7 +246,7 @@
      TYPEFY (arg1, __arg1) = ARGIFY (arg1);			 	\
      register TYPEFY (arg1, _a1) asm ("rdi") = __arg1;			\
      asm volatile (							\
 -    "syscall\n\t"							\
-+    "GRAMINE_SYSCALL\n\t"						\
++    "GRAMINE_SYSCALL\n\t"							\
      : "=a" (resultvar)							\
      : "0" (number), "r" (_a1)						\
      : "memory", REGISTERS_CLOBBERED_BY_SYSCALL);			\
-@@ -273,7 +275,7 @@
+@@ -260,7 +262,7 @@
      register TYPEFY (arg2, _a2) asm ("rsi") = __arg2;			\
      register TYPEFY (arg1, _a1) asm ("rdi") = __arg1;			\
      asm volatile (							\
 -    "syscall\n\t"							\
-+    "GRAMINE_SYSCALL\n\t"						\
++    "GRAMINE_SYSCALL\n\t"							\
      : "=a" (resultvar)							\
      : "0" (number), "r" (_a1), "r" (_a2)				\
      : "memory", REGISTERS_CLOBBERED_BY_SYSCALL);			\
-@@ -291,7 +293,7 @@
+@@ -278,7 +280,7 @@
      register TYPEFY (arg2, _a2) asm ("rsi") = __arg2;			\
      register TYPEFY (arg1, _a1) asm ("rdi") = __arg1;			\
      asm volatile (							\
 -    "syscall\n\t"							\
-+    "GRAMINE_SYSCALL\n\t"						\
++    "GRAMINE_SYSCALL\n\t"							\
      : "=a" (resultvar)							\
      : "0" (number), "r" (_a1), "r" (_a2), "r" (_a3)			\
      : "memory", REGISTERS_CLOBBERED_BY_SYSCALL);			\
-@@ -311,7 +313,7 @@
+@@ -298,7 +300,7 @@
      register TYPEFY (arg2, _a2) asm ("rsi") = __arg2;			\
      register TYPEFY (arg1, _a1) asm ("rdi") = __arg1;			\
      asm volatile (							\
 -    "syscall\n\t"							\
-+    "GRAMINE_SYSCALL\n\t"						\
++    "GRAMINE_SYSCALL\n\t"							\
      : "=a" (resultvar)							\
      : "0" (number), "r" (_a1), "r" (_a2), "r" (_a3), "r" (_a4)		\
      : "memory", REGISTERS_CLOBBERED_BY_SYSCALL);			\
-@@ -333,7 +335,7 @@
+@@ -320,7 +322,7 @@
      register TYPEFY (arg2, _a2) asm ("rsi") = __arg2;			\
      register TYPEFY (arg1, _a1) asm ("rdi") = __arg1;			\
      asm volatile (							\
 -    "syscall\n\t"							\
-+    "GRAMINE_SYSCALL\n\t"						\
++    "GRAMINE_SYSCALL\n\t"							\
      : "=a" (resultvar)							\
      : "0" (number), "r" (_a1), "r" (_a2), "r" (_a3), "r" (_a4),		\
        "r" (_a5)								\
-@@ -358,7 +360,7 @@
+@@ -345,7 +347,7 @@
      register TYPEFY (arg2, _a2) asm ("rsi") = __arg2;			\
      register TYPEFY (arg1, _a1) asm ("rdi") = __arg1;			\
      asm volatile (							\
 -    "syscall\n\t"							\
-+    "GRAMINE_SYSCALL\n\t"						\
++    "GRAMINE_SYSCALL\n\t"							\
      : "=a" (resultvar)							\
      : "0" (number), "r" (_a1), "r" (_a2), "r" (_a3), "r" (_a4),		\
        "r" (_a5), "r" (_a6)						\
 diff --git a/sysdeps/unix/sysv/linux/x86_64/vfork.S b/sysdeps/unix/sysv/linux/x86_64/vfork.S
-index 0d8732e37421d2ae003424ca94b7136c0a90469a..0cbfbb0307ca460ecbdbc5fec0dd6c132304f15a 100644
+index 776d2fc6..ced455da 100644
 --- a/sysdeps/unix/sysv/linux/x86_64/vfork.S
 +++ b/sysdeps/unix/sysv/linux/x86_64/vfork.S
-@@ -35,7 +35,7 @@ ENTRY (__vfork)
+@@ -51,7 +51,7 @@ ENTRY (__vfork)
  
  	/* Stuff the syscall number in RAX and enter into the kernel.  */
  	movl	$SYS_ify (vfork), %eax
 -	syscall
 +	GRAMINE_SYSCALL
  
+ #if !SHSTK_ENABLED
  	/* Push back the return PC.  */
- 	pushq	%rdi
 diff --git a/sysdeps/unix/sysv/linux/x86_64/x32/times.c b/sysdeps/unix/sysv/linux/x86_64/x32/times.c
-index 67b6fc1da183e8f8affb0a37f7d269847752e686..f98471a4fadf775dc072b342fb2eff72dea4adcb 100644
+index fb93cb60..6f24c281 100644
 --- a/sysdeps/unix/sysv/linux/x86_64/x32/times.c
 +++ b/sysdeps/unix/sysv/linux/x86_64/x32/times.c
 @@ -26,7 +26,7 @@
@@ -284,12 +279,12 @@ index 67b6fc1da183e8f8affb0a37f7d269847752e686..f98471a4fadf775dc072b342fb2eff72
      register TYPEFY (arg1, _a1) asm ("rdi") = __arg1;			\
      asm volatile (							\
 -    "syscall\n\t"							\
-+    "GRAMINE_SYSCALL\n\t"						\
++    "GRAMINE_SYSCALL\n\t"							\
      : "=a" (resultvar)							\
      : "0" (number), "r" (_a1)						\
      : "memory", REGISTERS_CLOBBERED_BY_SYSCALL);			\
 diff --git a/sysdeps/unix/x86_64/sysdep.h b/sysdeps/unix/x86_64/sysdep.h
-index 6cbb4d867b4f92a7af3d69c41264683911aefe1b..bf861504960263ac6eaa48b003588a4f1f3c3d6f 100644
+index c549dce4..0aaabec7 100644
 --- a/sysdeps/unix/x86_64/sysdep.h
 +++ b/sysdeps/unix/x86_64/sysdep.h
 @@ -25,7 +25,7 @@
@@ -302,7 +297,7 @@ index 6cbb4d867b4f92a7af3d69c41264683911aefe1b..bf861504960263ac6eaa48b003588a4f
  #define	r0		%rax	/* Normal return-value register.  */
  #define	r1		%rbx	/* Secondary return-value register.  */
 diff --git a/sysdeps/x86_64/nptl/tls.h b/sysdeps/x86_64/nptl/tls.h
-index 876889bed4bf2bc97779f1ab0593403d33648aeb..25f5aa07ab24bc22aab66d1065d1027537c9d3a7 100644
+index e7c1416e..68feac22 100644
 --- a/sysdeps/x86_64/nptl/tls.h
 +++ b/sysdeps/x86_64/nptl/tls.h
 @@ -30,6 +30,8 @@
@@ -314,12 +309,12 @@ index 876889bed4bf2bc97779f1ab0593403d33648aeb..25f5aa07ab24bc22aab66d1065d10275
  /* Replacement type for __m128 since this file is included by ld.so,
     which is compiled with -mno-sse.  It must not change the alignment
     of rtld_savespace_sse.  */
-@@ -149,7 +151,7 @@ _Static_assert (offsetof (tcbhead_t, __glibc_unused2) == 0x80,
+@@ -161,7 +163,7 @@ _Static_assert (offsetof (tcbhead_t, __glibc_unused2) == 0x80,
       _head->self = _thrdescr;						      \
  									      \
       /* It is a simple syscall to set the %fs value for the thread.  */	      \
 -     asm volatile ("syscall"						      \
-+     asm volatile ("GRAMINE_SYSCALL"					      \
++     asm volatile ("GRAMINE_SYSCALL"						      \
  		   : "=a" (_result)					      \
  		   : "0" ((unsigned long int) __NR_arch_prctl),		      \
  		     "D" ((unsigned long int) ARCH_SET_FS),		      \
diff --git a/subprojects/packagefiles/glibc-2.39/hp-timing.patch b/subprojects/packagefiles/glibc-2.31/hp-timing.patch
similarity index 90%
rename from subprojects/packagefiles/glibc-2.39/hp-timing.patch
rename to subprojects/packagefiles/glibc-2.31/hp-timing.patch
index e1f9b051..4c286702 100644
--- a/subprojects/packagefiles/glibc-2.39/hp-timing.patch
+++ b/subprojects/packagefiles/glibc-2.31/hp-timing.patch
@@ -1,5 +1,5 @@
 diff --git a/sysdeps/x86/hp-timing.h b/sysdeps/x86/hp-timing.h
-index 699baa34725ae7e1f8a52f9c9f7e57a3c8ade414..bdf6463445ed8c43468be514b91fc0516feb37d7 100644
+index 84940ad4..54f767dc 100644
 --- a/sysdeps/x86/hp-timing.h
 +++ b/sysdeps/x86/hp-timing.h
 @@ -17,45 +17,7 @@
@@ -20,7 +20,7 @@ index 699baa34725ae7e1f8a52f9c9f7e57a3c8ade414..bdf6463445ed8c43468be514b91fc051
 -/* That's quite simple.  Use the `rdtsc' instruction.  Note that the value
 -   might not be 100% accurate since there might be some more instructions
 -   running in this moment.  This could be changed by using a barrier like
--   'cpuid' right before the `rdtsc' instruction.  But we are not interested
+-   'cpuid' right before the `rdtsc' instruciton.  But we are not interested
 -   in accurate clock cycles here so we don't do this.
 -
 -   NB: Use __builtin_ia32_rdtsc directly since including <x86intrin.h>
diff --git a/subprojects/packagefiles/glibc-2.39/meson.build b/subprojects/packagefiles/glibc-2.31/meson.build
similarity index 93%
rename from subprojects/packagefiles/glibc-2.39/meson.build
rename to subprojects/packagefiles/glibc-2.31/meson.build
index f6033777..3f253d26 100644
--- a/subprojects/packagefiles/glibc-2.39/meson.build
+++ b/subprojects/packagefiles/glibc-2.31/meson.build
@@ -1,4 +1,4 @@
-project('glibc', 'c', version: '2.39')
+project('glibc', 'c', version: '2.31')
 
 fs = import('fs')
 
@@ -60,7 +60,7 @@ glibc = custom_target('glibc',
         find_program('compile.sh'),
         host_machine.cpu_family(),
         '@CURRENT_SOURCE_DIR@',
-        '@CURRENT_SOURCE_DIR@/glibc-2.39',
+        '@CURRENT_SOURCE_DIR@/glibc-2.31',
         meson.current_build_dir(),
         '@PRIVATE_DIR@',
         get_option('prefix'),
@@ -70,7 +70,7 @@ glibc = custom_target('glibc',
     ],
 
     input: [
-        'glibc-2.39/configure',
+        'glibc-2.31/configure',
         'gramine-syscall.patch',
         'hp-timing.patch',
     ],
-- 
2.34.1

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Unable to run Sample applications like hello world and Python on SUSE-based Linux distribution docker container. #2009

{{title}}

{{editor}}'s edit

{{editor}}'s edit

Replies: 1 comment 10 replies

{{title}}

{{title}}

{{title}}

{{title}}

{{title}}

{{editor}}'s edit

{{editor}}'s edit

{{title}}

{{editor}}'s edit

{{editor}}'s edit

Select a reply

Unable to run Sample applications like hello world and Python on SUSE-based Linux distribution docker container. #2009

veluruchaithanya Sep 26, 2024

Replies: 1 comment · 10 replies

dimakuv Sep 27, 2024

kailun-qin Oct 9, 2024 Maintainer

mkow Oct 9, 2024 Maintainer

veluruchaithanya Oct 10, 2024 Author

veluruchaithanya Oct 10, 2024 Author

veluruchaithanya Oct 10, 2024 Author

veluruchaithanya
Sep 26, 2024

Replies: 1 comment 10 replies

dimakuv
Sep 27, 2024

kailun-qin Oct 9, 2024
Maintainer

mkow Oct 9, 2024
Maintainer

veluruchaithanya Oct 10, 2024
Author

veluruchaithanya Oct 10, 2024
Author

veluruchaithanya Oct 10, 2024
Author