[glibc] Bump to 2.36

Signed-off-by: Wojtek Porczyk <woju@invisiblethingslab.com>

meson.build

@@ -299,7 +299,7 @@ subdir('python')
 subdir('tools')
 
 if enable_glibc
-    subproject('glibc-2.35-1')
+    subproject('glibc-2.36-1')
 endif
 if enable_musl
     subproject('musl-1.2.2')

subprojects/glibc-2.35-1.wrap → subprojects/glibc-2.36-1.wrap

@@ -1,15 +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.35-1`, `subprojects/glibc-2.35-2`
+# directory in `subprojects` has to change (`subprojects/glibc-2.36-1`, `subprojects/glibc-2.36-2`
 # etc.)
 
 [wrap-file]
-directory = glibc-2.35-1
-source_url = https://ftp.gnu.org/gnu/glibc/glibc-2.35.tar.gz
-source_fallback_url = https://packages.gramineproject.io/distfiles/glibc-2.35.tar.gz
-source_filename = glibc-2.35.tar.gz
-source_hash = 3e8e0c6195da8dfbd31d77c56fb8d99576fb855fafd47a9e0a895e51fd5942d4
-patch_directory = glibc-2.35
+directory = glibc-2.36-1
+source_url = https://ftp.gnu.org/gnu/glibc/glibc-2.36.tar.gz
+source_fallback_url = https://packages.gramineproject.io/distfiles/glibc-2.36.tar.gz
+source_filename = glibc-2.36.tar.gz
+source_hash = 02efa6ffbbaf3e10e88f16818a862608d04b0ef838c66f6025ae120530792c9c
+patch_directory = glibc-2.36
 
-# this unpacks the sources to `glibc-2.35-1/glibc-2.35`
+# this unpacks the sources to `glibc-2.36-1/glibc-2.36`
 lead_directory_missing = true

subprojects/packagefiles/glibc-2.35/glibc-2.35.patch → subprojects/packagefiles/glibc-2.36/gramine-syscall.patch

@@ -1,8 +1,8 @@
 diff --git a/Makerules b/Makerules
-index 5de2cec6be472729135c4d415fa4111cdcbea5d8..65dc72a8c4b06dfc2e489901b6f577a51fb541c2 100644
+index d1e139d03c1c448e14aee35af3e54ee7abe2180c..3f3d8739d3419804b35d00a69cab5538ec60f74e 100644
 --- a/Makerules
 +++ b/Makerules
-@@ -826,7 +826,7 @@ verbose	:=
+@@ -818,7 +818,7 @@ verbose	:=
  endif						# not -s
 
  ARFLAGS := r$(verbose)
@@ -12,10 +12,10 @@ index 5de2cec6be472729135c4d415fa4111cdcbea5d8..65dc72a8c4b06dfc2e489901b6f577a5
  # This makes all the object files in the parent library archive.
 
 diff --git a/elf/Makefile b/elf/Makefile
-index 5bdf0a383d6b957a7f2db67fb9b54b53797889cd..abda6dd1e50722adbe150c7426ad029030e50ad1 100644
+index fd77d0c7c8799c336c65278f6f8e939ed8707633..6fc16b46d041f2c80f3995be183644d276e8a294 100644
 --- a/elf/Makefile
 +++ b/elf/Makefile
-@@ -1198,7 +1198,7 @@ $(objpfx)librtld.map: $(objpfx)dl-allobjs.os $(common-objpfx)libc_pic.a
+@@ -1310,7 +1310,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.
  $(objpfx)librtld.mk: $(objpfx)librtld.map Makefile
  	LC_ALL=C \
@@ -24,8 +24,8 @@ index 5bdf0a383d6b957a7f2db67fb9b54b53797889cd..abda6dd1e50722adbe150c7426ad0290
  	    $< | \
  	while read lib file; do \
  	  case $$lib in \
-@@ -1206,7 +1206,7 @@ $(objpfx)librtld.mk: $(objpfx)librtld.map Makefile
- 	    LC_ALL=C fgrep -l /$$file \
+@@ -1318,7 +1318,7 @@ $(objpfx)librtld.mk: $(objpfx)librtld.map Makefile
+ 	    LC_ALL=C grep -F -l /$$file \
  		  $(common-objpfx)stamp.os $(common-objpfx)*/stamp.os | \
  	    LC_ALL=C \
 -	    sed 's@^$(common-objpfx)\([^/]*\)/stamp\.os$$@rtld-\1'" +=$$file@"\
@@ -34,7 +34,7 @@ index 5bdf0a383d6b957a7f2db67fb9b54b53797889cd..abda6dd1e50722adbe150c7426ad0290
  	  */*.a) \
  	    echo rtld-$${lib%%/*} += $$file ;; \
 diff --git a/elf/dl-load.c b/elf/dl-load.c
-index 5b0ff41ee13c9295db55af8ac55306bc97118788..e113a01d33e17d693c0e54c4b67dd6f56b98a31a 100644
+index 1ad0868dad809d56c7ecced65ce482af4982abc9..8c4eae155754d7d9b140fcb838b8b74df6db0368 100644
 --- a/elf/dl-load.c
 +++ b/elf/dl-load.c
 @@ -76,6 +76,8 @@ struct filebuf
@@ -46,7 +46,7 @@ index 5b0ff41ee13c9295db55af8ac55306bc97118788..e113a01d33e17d693c0e54c4b67dd6f5
  #include <endian.h>
  #if BYTE_ORDER == BIG_ENDIAN
  # define byteorder ELFDATA2MSB
-@@ -1480,6 +1482,8 @@ cannot enable executable stack as shared object requires");
+@@ -1490,6 +1492,8 @@ cannot enable executable stack as shared object requires");
    DL_AFTER_LOAD (l);
  #endif
 
@@ -209,7 +209,7 @@ index 192455a89883fc815ecb58677c0da6a7bb4583fa..4041fb7d9b73fc9743666f19ed33bb74
  	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 e1ce3b62eb21acb9dafdf668fbdbefb1258f4a55..1676db8bffc3c90a2f8e5992fed939becdcaf14d 100644
+index 740abefcfd3612928bdd42c605ebdcf341d76667..4a675bd1ed886fa0b0c585356a4fb6194c07d2ed 100644
 --- a/sysdeps/unix/sysv/linux/x86_64/sysdep.h
 +++ b/sysdeps/unix/sysv/linux/x86_64/sysdep.h
 @@ -26,6 +26,8 @@

subprojects/packagefiles/glibc-2.35/meson.build → subprojects/packagefiles/glibc-2.36/meson.build

@@ -1,4 +1,4 @@
-project('glibc', 'c', version: '2.35')
+project('glibc', 'c', version: '2.36')
 
 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.35',
+        '@CURRENT_SOURCE_DIR@/glibc-2.36',
         meson.current_build_dir(),
         '@PRIVATE_DIR@',
         get_option('prefix'),
@@ -70,9 +70,9 @@ glibc = custom_target('glibc',
     ],
 
     input: [
-        'glibc-2.35/configure',
-        'glibc-2.35.patch',
-        'hp-timing-2.35.patch',
+        'glibc-2.36/configure',
+        'gramine-syscall.patch',
+        'hp-timing.patch',
     ],
 
     output: glibc_output,