diff options
| -rw-r--r-- | ld/Makefile.am | 6 | ||||
| -rw-r--r-- | ld/Makefile.in | 6 | ||||
| -rw-r--r-- | ld/po/BLD-POTFILES.in | 6 | ||||
| -rwxr-xr-x | libctf/configure | 2 | ||||
| -rwxr-xr-x | zlib/configure | 2 |
5 files changed, 14 insertions, 8 deletions
diff --git a/ld/Makefile.am b/ld/Makefile.am index 0abbde4..97f336d 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -258,8 +258,8 @@ ALL_EMULATION_SOURCES = \ eelf32or1k_linux.c \ eelf32ppc.c \ eelf32ppc_fbsd.c \ - eelf32ppclinux.c \ eelf32ppchaiku.c \ + eelf32ppclinux.c \ eelf32ppcnto.c \ eelf32ppcsim.c \ eelf32ppcvxworks.c \ @@ -285,8 +285,8 @@ ALL_EMULATION_SOURCES = \ eelf_i386_ldso.c \ eelf_i386_sol2.c \ eelf_i386_vxworks.c \ - eelf_mipsel_haiku.c \ eelf_iamcu.c \ + eelf_mipsel_haiku.c \ eelf_s390.c \ eh8300elf.c \ eh8300elf_linux.c \ @@ -459,8 +459,8 @@ ALL_64_EMULATION_SOURCES = \ eelf_k1om_fbsd.c \ eelf_x86_64.c \ eelf_x86_64_cloudabi.c \ - eelf_x86_64_haiku.c \ eelf_x86_64_fbsd.c \ + eelf_x86_64_haiku.c \ eelf_x86_64_sol2.c \ ehppa64linux.c \ ei386pep.c \ diff --git a/ld/Makefile.in b/ld/Makefile.in index 2b83b5e..b8ceca3 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -948,8 +948,8 @@ ALL_64_EMULATION_SOURCES = \ eelf_k1om_fbsd.c \ eelf_x86_64.c \ eelf_x86_64_cloudabi.c \ - eelf_x86_64_haiku.c \ eelf_x86_64_fbsd.c \ + eelf_x86_64_haiku.c \ eelf_x86_64_sol2.c \ ehppa64linux.c \ ei386pep.c \ @@ -1451,10 +1451,12 @@ distclean-compile: @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_k1om_fbsd.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_l1om.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_l1om_fbsd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_mipsel_haiku.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_s390.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_cloudabi.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_fbsd.Po@am__quote@ +@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_haiku.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_sol2.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300elf.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300elf_linux.Po@am__quote@ @@ -2447,7 +2449,6 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS) @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_sol2.Pc@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_i386_vxworks.Pc@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_iamcu.Pc@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_mipsel_haiku.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_s390.Pc@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300elf.Pc@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eh8300elf_linux.Pc@am__quote@ @@ -2609,7 +2610,6 @@ $(ALL_EMULATION_SOURCES) $(ALL_64_EMULATION_SOURCES): $(GEN_DEPENDS) @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_k1om_fbsd.Pc@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64.Pc@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_cloudabi.Pc@am__quote@ -@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_haiku.Po@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_fbsd.Pc@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/eelf_x86_64_sol2.Pc@am__quote@ @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/ehppa64linux.Pc@am__quote@ diff --git a/ld/po/BLD-POTFILES.in b/ld/po/BLD-POTFILES.in index ba9f427..54975cd 100644 --- a/ld/po/BLD-POTFILES.in +++ b/ld/po/BLD-POTFILES.in @@ -6,6 +6,7 @@ eaarch64elf32b.c eaarch64elfb.c eaarch64fbsd.c eaarch64fbsdb.c +eaarch64haiku.c eaarch64linux.c eaarch64linux32.c eaarch64linux32b.c @@ -25,6 +26,7 @@ earm_wince_pe.c earmelf.c earmelf_fbsd.c earmelf_fuchsia.c +earmelf_haiku.c earmelf_linux.c earmelf_linux_eabi.c earmelf_linux_fdpiceabi.c @@ -143,6 +145,7 @@ eelf32or1k.c eelf32or1k_linux.c eelf32ppc.c eelf32ppc_fbsd.c +eelf32ppchaiku.c eelf32ppclinux.c eelf32ppcnto.c eelf32ppcsim.c @@ -197,6 +200,7 @@ eelf64tilegx_be.c eelf_i386.c eelf_i386_be.c eelf_i386_fbsd.c +eelf_i386_haiku.c eelf_i386_ldso.c eelf_i386_sol2.c eelf_i386_vxworks.c @@ -205,10 +209,12 @@ eelf_k1om.c eelf_k1om_fbsd.c eelf_l1om.c eelf_l1om_fbsd.c +eelf_mipsel_haiku.c eelf_s390.c eelf_x86_64.c eelf_x86_64_cloudabi.c eelf_x86_64_fbsd.c +eelf_x86_64_haiku.c eelf_x86_64_sol2.c eh8300elf.c eh8300elf_linux.c diff --git a/libctf/configure b/libctf/configure index 82bcf13..38855e1 100755 --- a/libctf/configure +++ b/libctf/configure @@ -10790,7 +10790,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; diff --git a/zlib/configure b/zlib/configure index 695819c..fb392d5 100755 --- a/zlib/configure +++ b/zlib/configure @@ -9851,7 +9851,7 @@ haiku*) soname_spec='${libname}${release}${shared_ext}$major' shlibpath_var=LIBRARY_PATH shlibpath_overrides_runpath=yes - sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/beos/system/lib' + sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib' hardcode_into_libs=yes ;; |