gcc/binutils: Update dynamic linker path

lutoma · Dec 9, 2023 · 627b404 · 627b404
1 parent 3fcfdd8
commit 627b404
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 4 deletions.
diff --git a/land/binutils/elf_i386_xelix.sh b/land/binutils/elf_i386_xelix.sh
@@ -1,3 +1,3 @@
 source_sh ${srcdir}/emulparams/elf_i386.sh
 TEXT_START_ADDR=0x3200000
-ELF_INTERPRETER_NAME=\"/usr/lib/ld-xelix.so\"
+ELF_INTERPRETER_NAME=\"/usr/libexec/system/xelix-loader\"
diff --git a/land/binutils/elf_x86_64_xelix.sh b/land/binutils/elf_x86_64_xelix.sh
@@ -1,3 +1,3 @@
 source_sh ${srcdir}/emulparams/elf_x86_64.sh
 TEXT_START_ADDR=0x3200000
-ELF_INTERPRETER_NAME=\"/usr/lib/ld-xelix.so\"
+ELF_INTERPRETER_NAME=\"/usr/libexec/system/xelix-loader\"
diff --git a/land/gcc/xelix.h b/land/gcc/xelix.h
@@ -10,7 +10,7 @@
         builtin_assert("system=posix"); \
     } while (0);
 
-#define DYNAMIC_LINKER "/usr/lib/ld-xelix.so"
+#define DYNAMIC_LINKER "/usr/libexec/system/xelix-loader"
 
 #undef LIB_SPEC
 #define LIB_SPEC "-lc"

diff --git a/land/xelix-utils/src/Makefile b/land/xelix-utils/src/Makefile
@@ -48,5 +48,4 @@ install:
 	install -d $(DESTDIR)/usr/libexec/system/
 	install -D $(TARGETS) $(DESTDIR)/usr/bin/
 	install -D init xelix-loader $(DESTDIR)/usr/libexec/system
-	install -D ld-xelix.so $(DESTDIR)/usr/lib/
 	chmod u+s $(DESTDIR)/usr/bin/su