Author: jkim
Date: Tue Nov 24 23:04:03 2015
New Revision: 291268
URL: https://svnweb.freebsd.org/changeset/base/291268

Log:
  MFC:  r289425
  
  Add support for ARM EABI.  Note it is not a direct MFC because some macros
  are not defined in this branch.

Modified:
  stable/10/usr.bin/ldd/ldd.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/usr.bin/ldd/ldd.c
==============================================================================
--- stable/10/usr.bin/ldd/ldd.c Tue Nov 24 22:47:19 2015        (r291267)
+++ stable/10/usr.bin/ldd/ldd.c Tue Nov 24 23:04:03 2015        (r291268)
@@ -377,9 +377,19 @@ is_executable(const char *fname, int fd,
                        return (0);
                }
                if (hdr.elf.e_type == ET_DYN) {
-                       if (hdr.elf.e_ident[EI_OSABI] == ELFOSABI_FREEBSD) {
+                       switch (hdr.elf.e_ident[EI_OSABI]) {
+                       case ELFOSABI_FREEBSD:
                                *is_shlib = 1;
                                return (1);
+#ifdef __ARM_EABI__
+                       case ELFOSABI_NONE:
+                               if (hdr.elf.e_machine != EM_ARM)
+                                       break;
+                               if (((hdr.elf.e_flags & 0xff000000) >> 24) < 4)
+                                       break;
+                               *is_shlib = 1;
+                               return (1);
+#endif
                        }
                        warnx("%s: not a FreeBSD ELF shared object", fname);
                        return (0);
_______________________________________________
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"

Reply via email to