Author: bdragon
Date: Tue Dec 24 16:52:10 2019
New Revision: 356058
URL: https://svnweb.freebsd.org/changeset/base/356058
Log:
Unbreak build. It seems that mips and amd64 still pull in link_elf.c, so
we need to have elf_cpu_parse_dynamic() everywhere after all to avoid
an undefined symbol.
Modified:
head/sys/amd64/amd64/elf_machdep.c
head/sys/mips/mips/elf_machdep.c
head/sys/sys/linker.h
Modified: head/sys/amd64/amd64/elf_machdep.c
==============================================================================
--- head/sys/amd64/amd64/elf_machdep.c Tue Dec 24 16:19:33 2019
(r356057)
+++ head/sys/amd64/amd64/elf_machdep.c Tue Dec 24 16:52:10 2019
(r356058)
@@ -329,3 +329,10 @@ elf_cpu_unload_file(linker_file_t lf __unused)
return (0);
}
+
+int
+elf_cpu_parse_dynamic(linker_file_t lf __unused, Elf_Dyn *dynamic __unused)
+{
+
+ return (0);
+}
Modified: head/sys/mips/mips/elf_machdep.c
==============================================================================
--- head/sys/mips/mips/elf_machdep.c Tue Dec 24 16:19:33 2019
(r356057)
+++ head/sys/mips/mips/elf_machdep.c Tue Dec 24 16:52:10 2019
(r356058)
@@ -501,3 +501,10 @@ elf_cpu_unload_file(linker_file_t lf __unused)
return (0);
}
+
+int
+elf_cpu_parse_dynamic(linker_file_t lf __unused, Elf_Dyn *dynamic __unused)
+{
+
+ return (0);
+}
Modified: head/sys/sys/linker.h
==============================================================================
--- head/sys/sys/linker.h Tue Dec 24 16:19:33 2019 (r356057)
+++ head/sys/sys/linker.h Tue Dec 24 16:52:10 2019 (r356058)
@@ -305,10 +305,7 @@ int linker_ctf_get(linker_file_t, linker_ctf_t *);
int elf_cpu_load_file(linker_file_t);
int elf_cpu_unload_file(linker_file_t);
-/* amd64 and mips use objects instead of shared libraries */
-#if !defined(__amd64__) && !defined(__mips__)
int elf_cpu_parse_dynamic(linker_file_t, Elf_Dyn *);
-#endif
/* values for type */
#define ELF_RELOC_REL 1
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
