From: Nick Clifton <nickc@redhat.com>
Date: Tue, 6 Nov 2018 17:09:40 +0000 (+0000)
Subject: Add support for a couple of new Mach-O commands.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=ddea148b3da27eb681504bf341f45abb7a74580b;p=binutils-gdb.git

Add support for a couple of new Mach-O commands.

	PR 23742
	* mach-o.c (bfd_mach_o_read_command): Accept and ignore
	BFD_MACH_O_LC_LINKER_OPTIONS and BFD_MACH_O_LC_BUILD_VERSION
	commands.

	* mach-o/loader.h: Add BFD_MACH_O_LC_BUILD_VERSION.
---

diff --git a/bfd/ChangeLog b/bfd/ChangeLog
index d8b50f53817..155251d3d4d 100644
--- a/bfd/ChangeLog
+++ b/bfd/ChangeLog
@@ -1,3 +1,10 @@
+2018-11-06  Romain Margheriti  <lilrom13@gmail.com>
+
+	PR 23742
+	* mach-o.c (bfd_mach_o_read_command): Accept and ignore
+	BFD_MACH_O_LC_LINKER_OPTIONS and BFD_MACH_O_LC_BUILD_VERSION
+	commands.
+
 2018-11-02  Alan Modra  <amodra@gmail.com>
 
 	PR 23850
diff --git a/bfd/mach-o.c b/bfd/mach-o.c
index 1b461f59887..1d0ade3a02c 100644
--- a/bfd/mach-o.c
+++ b/bfd/mach-o.c
@@ -4888,6 +4888,9 @@ bfd_mach_o_read_command (bfd *abfd, bfd_mach_o_load_command *command)
       if (!bfd_mach_o_read_source_version (abfd, command))
 	return FALSE;
       break;
+    case BFD_MACH_O_LC_LINKER_OPTIONS:
+    case BFD_MACH_O_LC_BUILD_VERSION:
+      break;
     default:
       command->len = 0;
       _bfd_error_handler (_("%pB: unknown load command %#x"),
diff --git a/include/ChangeLog b/include/ChangeLog
index 124efb1775e..3bcf18047b4 100644
--- a/include/ChangeLog
+++ b/include/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-06  Romain Margheriti  <lilrom13@gmail.com>
+
+	PR 23742
+	* mach-o/loader.h: Add BFD_MACH_O_LC_BUILD_VERSION.
+
 2018-11-06  Sudakshina Das  <sudi.das@arm.com>
 
 	* opcode/arm.h (ARM_ARCH_V8_5A): Move ARM_EXT2_PREDRES and
diff --git a/include/mach-o/loader.h b/include/mach-o/loader.h
index c075a8e0234..9abc51c35dd 100644
--- a/include/mach-o/loader.h
+++ b/include/mach-o/loader.h
@@ -185,7 +185,8 @@ typedef enum bfd_mach_o_load_command_type
   BFD_MACH_O_LC_ENCRYPTION_INFO_64 = 0x2c, /* Encrypted 64 bit seg info.  */
   BFD_MACH_O_LC_LINKER_OPTIONS = 0x2d,	/* Linker options.  */
   BFD_MACH_O_LC_LINKER_OPTIMIZATION_HINT = 0x2e, /* Optimization hints.  */
-  BFD_MACH_O_LC_VERSION_MIN_WATCHOS = 0x30 /* Minimal WatchOS version.  */
+  BFD_MACH_O_LC_VERSION_MIN_WATCHOS = 0x30, /* Minimal WatchOS version.  */
+  BFD_MACH_O_LC_BUILD_VERSION = 0x32     /* Records linker, SDK, OS, and tools version used.  */
 }
 bfd_mach_o_load_command_type;