cctools-927.0.2

Imported from cctools-927.0.2.tar.gz

Makefile

@@ -5,7 +5,7 @@ RC_OS = macos
 RC_CFLAGS =
 
 INSTALLSRC_SUBDIRS = $(COMMON_SUBDIRS) $(SUBDIRS_32) ar include efitools \
-		     libmacho
+		     libmacho tests
 COMMON_SUBDIRS = libstuff as gprof misc man cbtlibs otool
 APPLE_SUBDIRS = ar
 SUBDIRS_32 = ld
@@ -442,7 +442,9 @@ fromGASsrc:
 installhdrs: $(DSTROOT)
 	@if [ $(SRCROOT) ];						\
 	then								\
-	    projName=`basename $(SRCROOT) | sed 's/-[0-9.]*//'`;	\
+	    projName=`basename $(SRCROOT) | sed 's/Branch.*//' |        \
+		sed 's/_PONDEROSA//' | sed 's/_Fall2018//' |		\
+		sed 's/-[-0-9.]*//' | sed 's/\.cvs//'`; 		\
 	    rcName=`echo $(RC_ProjectName) | 				\
 		sed 's/\(cctools_ofiles\).*/\1/'`;			\
 	    if [ "$$projName" = cctools -a $(RC_OS) = macos ] &&        \
@@ -462,7 +464,9 @@ installhdrs: $(DSTROOT)
 installapi: $(DSTROOT)
 	@if [ $(SRCROOT) ];						\
 	then								\
-	    projName=`basename $(SRCROOT) | sed 's/-[0-9.]*//'`;	\
+	    projName=`basename $(SRCROOT) | sed 's/Branch.*//' |        \
+		sed 's/_PONDEROSA//' | sed 's/_Fall2018//' |		\
+		sed 's/-[-0-9.]*//' | sed 's/\.cvs//'`; 		\
 	    rcName=`echo $(RC_ProjectName) | 				\
 		sed 's/\(cctools_ofiles\).*/\1/'`;			\
 	    if [ "$$projName" = cctools -a $(RC_OS) = macos ] &&        \

ar/archive.c

@@ -371,13 +371,13 @@ put_arobj(cfp, sb)
 	 * which is required for object files in archives.
 	 */
 	if (lname) {
-		if (write(cfp->wfd, name, lname) != (int)lname)
+		if (write(cfp->wfd, name, lname) != (ssize_t)lname)
 			error(cfp->wname);
 		already_written = lname;
 		if ((lname % 4) != 0) {
 			static char pad[3] = "\0\0\0";
 			if (write(cfp->wfd, pad, 4-(lname%4)) !=
-			    (int)(4-(lname%4)))
+			    (ssize_t)(4-(lname%4)))
 				error(cfp->wname);
 			already_written += 4 - (lname % 4);
 		}

as/write_object.c

@@ -45,6 +45,7 @@
 #include "messages.h"
 #include "xmalloc.h"
 #include "input-scrub.h"
+#include "stuff/write64.h"
 #if defined(I386) && defined(ARCH64)
 #include "i386.h"
 #endif
@@ -635,7 +636,7 @@ char *out_file_name)
 	}
 	if((fd = open(out_file_name, O_WRONLY | O_CREAT | O_TRUNC, 0666)) == -1)
 	    as_fatal("can't create output file: %s", out_file_name);
-	if(write(fd, output_addr, output_size) != (int)output_size)
+	if(write64(fd, output_addr, output_size) != (ssize_t)output_size)
 	    as_fatal("can't write output file");
 	if(close(fd) == -1)
 	    as_fatal("can't close output file");

efitools/makerelocs.c

@@ -31,6 +31,7 @@
 #include "stuff/ofile.h"
 #include "stuff/errors.h"
 #include "stuff/reloc.h"
+#include "stuff/write64.h"
 #include "coff/base_relocs.h"
 #include "coff/bytesex.h"
 #include "mach-o/x86_64/reloc.h"
@@ -474,7 +475,8 @@ char *out)
 					       target_byte_sex);
 		}
 		// write out the block then start a new one
-		write(f, fb, size);
+		if (write64(f, fb, size) != size)
+                    fatal("failed to write block");
 
 		entries = 0;
 		blockcnt++;
@@ -501,7 +503,8 @@ char *out)
 	    swap_base_relocation_entry(b, entries, target_byte_sex);
 	}
 	/* write out the last block */
-	write(f, fb, size);
+        if (write64(f, fb, size) != size)
+            fatal("failed to write last block");
 
 	blockcnt++;
 	close(f);

efitools/mtoc.c

@@ -35,6 +35,7 @@
 #include "stuff/allocate.h"
 #include "stuff/reloc.h"
 #include "stuff/rnd.h"
+#include "stuff/write64.h"
 
 #include "coff/ms_dos_stub.h"
 #include "coff/filehdr.h"
@@ -1670,7 +1671,7 @@ char *out)
 	if(f == -1)
 	    system_fatal("Can't create output file: %s", out);
 
-	if(write(f, buf, output_size) != output_size)
+	if(write64(f, buf, output_size) != (ssize_t)output_size)
 	    system_fatal("Can't write output file: %s", out);
 
 	if(close(f) == -1)

gprof/gprof.c

@@ -1205,7 +1205,7 @@ char *sumfile)
 	    data.type = GMONTYPE_SAMPLES;
 	    data.size = sample_sets[i].sampbytes + sizeof(header);
 	    if(write(fd, &data, sizeof(struct gmon_data)) !=
-					sizeof(struct gmon_data))
+               sizeof(struct gmon_data))
 		fatal("can't write gmon_data struct to gmon.sum file: %s",
 		      sumfile);
 
@@ -1245,7 +1245,7 @@ char *sumfile)
 	    }
 	}
 	if(write(fd, &data, sizeof(struct gmon_data)) !=
-				    sizeof(struct gmon_data))
+	   sizeof(struct gmon_data))
 	    fatal("can't write gmon_data struct to gmon.sum file: %s",
 		  sumfile);
 
@@ -1256,7 +1256,7 @@ char *sumfile)
 		arc_order.raw_count  = arcp->arc_count;
 		arc_order.raw_order  = arcp->arc_order;
 		if(write(fd, &arc_order, sizeof(struct rawarc_order)) != 
-			 sizeof(struct rawarc_order))
+		   sizeof(struct rawarc_order))
 		    fatal("can't write arc to gmon.sum file: %s", sumfile);
 #ifdef DEBUG
 		if(debug & SAMPLEDEBUG){

include/Makefile

@@ -43,6 +43,7 @@ OTHER_SRCS = notes gnu/symseg.h \
 	     stuff/SymLoc.h stuff/dylib_roots.h stuff/guess_short_name.h \
 	     stuff/macosx_deployment_target.h stuff/symbol_list.h \
 	     stuff/symbol.h stuff/unix_standard_mode.h \
+	     stuff/write64.h \
 	     coff/base_relocs.h coff/bytesex.h coff/ms_dos_stub.h \
 	     coff/filehdr.h coff/aouthdr.h coff/scnhdr.h coff/syment.h \
 	     coff/debug_directory.h elf/dwarf2.h llvm-c/Disassembler.h \

include/mach-o/loader.h

@@ -315,6 +315,8 @@ struct load_command {
 #define LC_VERSION_MIN_WATCHOS 0x30 /* build for Watch min OS version */
 #define LC_NOTE 0x31 /* arbitrary data included within a Mach-O file */
 #define LC_BUILD_VERSION 0x32 /* build for platform min OS version */
+#define LC_DYLD_EXPORTS_TRIE (0x33 | LC_REQ_DYLD) /* used with linkedit_data_command, payload is trie */
+#define LC_DYLD_CHAINED_FIXUPS (0x34 | LC_REQ_DYLD) /* used with linkedit_data_command */
 
 /*
  * A variable length string in a load command is represented by an lc_str
@@ -392,6 +394,9 @@ struct segment_command_64 { /* for 64-bit architectures */
 				       first page of the segment is not
 				       protected.  All other pages of the
 				       segment are protected. */
+#define SG_READ_ONLY    0x10 /* This segment is made read-only after fixups */
+
+
 
 /*
  * A segment is made up of zero or more sections.  Non-MH_OBJECT files have

include/mach/i386/_structs.h

@@ -627,6 +627,7 @@ _STRUCT_X86_AVX_STATE64
 	_STRUCT_XMM_REG		__fpu_ymmh15;		/* YMMH 15  */
 };
 
+#endif /* not __OPEN_SOURCE__ */
 
 #else /* !__DARWIN_UNIX03 */
 #define	_STRUCT_X86_FLOAT_STATE64	struct x86_float_state64
@@ -799,4 +800,3 @@ _STRUCT_X86_DEBUG_STATE64
 };
 #endif /* !__DARWIN_UNIX03 */
 
-#endif /* _MACH_I386__STRUCTS_H_ */

include/mach/i386/fp_reg.h

@@ -122,6 +122,7 @@ struct x86_avx512_thread_state {
 typedef union {
 	struct x86_fx_thread_state	fx;
 	struct x86_avx_thread_state	avx;
+	struct x86_avx512_thread_state	avx512;
 } x86_ext_thread_state_t;
 
 #endif /* MACH_KERNEL_PRIVATE */

include/mach/i386/thread_status.h

@@ -119,7 +119,6 @@
 #define x86_AVX512_STATE64		(x86_AVX512_STATE32 + 1)
 #define x86_AVX512_STATE		(x86_AVX512_STATE32 + 2)
 
-
 /*
  * Largest state on this machine:
  * (be sure mach/machine/thread_state.h matches!)

include/stuff/arch.h

@@ -114,47 +114,28 @@ __private_extern__ const struct arch_flag *get_arch_family_from_cputype(
 
 /*
  * get_byte_sex_from_flag() returns the byte sex of the architecture for the
- * specified cputype and cpusubtype if known.  If unknown it returns
- * UNKNOWN_BYTE_SEX.  If the bytesex can be determined directly as in the case
- * of reading a magic number from a file that should be done and this routine
- * should not be used as it could be out of date.
+ * specified cputype and cpusubtype if known.  If unknown it will abort().
+ * If the bytesex can be determined directly as in the case of reading a magic
+ * number from a file that should be done and this routine should not be used
+ * as it could be out of date.
  */
 __private_extern__ enum byte_sex get_byte_sex_from_flag(
     const struct arch_flag *flag);
 
-/*
- * get_stack_direction_from_flag() returns the direction the stack grows as
- * either positive (+1) or negative (-1) of the architecture for the
- * specified cputype and cpusubtype if known.  If unknown it returns 0.
- */
-__private_extern__ int get_stack_direction_from_flag(
-    const struct arch_flag *flag);
-
 /*
  * get_stack_addr_from_flag() returns the default starting address of the user
- * stack.
+ * stack. If unknown it will abort().
  */
 __private_extern__ uint64_t get_stack_addr_from_flag(
     const struct arch_flag *flag);
 
-/*
- * get_stack_size_from_flag() returns the default size of the userstack.
- */
-__private_extern__ uint32_t get_stack_size_from_flag(
-    const struct arch_flag *flag);
-
 /*
  * get_segalign_from_flag() returns the default segment alignment (page size).
+ * If unknown it will abort().
  */
 __private_extern__ uint32_t get_segalign_from_flag(
     const struct arch_flag *flag);
 
-/*
- * get_segprot_from_flag() returns the default segment protection.
- */
-__private_extern__ vm_prot_t get_segprot_from_flag(
-    const struct arch_flag *flag);
-
 /*
  * get_shared_region_size_from_flag() returns the size of the read only shared
  * region.

include/stuff/breakout.h

@@ -176,6 +176,10 @@ struct object {
     struct section_64 **sections64; /* array of 64-bit section structs */
     struct dyld_info_command
 	*dyld_info;		    /* the LC_DYLD_INFO command,if any */
+    struct linkedit_data_command
+	*dyld_chained_fixups;	    /* the fixups */
+    struct linkedit_data_command
+	*dyld_exports_trie;	    /* the exports trie */
 
     /*
      * This is only used for redo_prebinding and is calculated by breakout()

include/stuff/write64.h

@@ -0,0 +1,32 @@
+/*
+ * Copyright (c) 2018 Apple Computer, Inc. All rights reserved.
+ *
+ * @APPLE_LICENSE_HEADER_START@
+ *
+ * This file contains Original Code and/or Modifications of Original Code
+ * as defined in and that are subject to the Apple Public Source License
+ * Version 2.0 (the 'License'). You may not use this file except in
+ * compliance with the License. Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this
+ * file.
+ *
+ * The Original Code and all software distributed under the License are
+ * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
+ * EXPRESS OR IMPLIED, AND APPLE HEREBY DISCLAIMS ALL SUCH WARRANTIES,
+ * INCLUDING WITHOUT LIMITATION, ANY WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE, QUIET ENJOYMENT OR NON-INFRINGEMENT.
+ * Please see the License for the specific language governing rights and
+ * limitations under the License.
+ *
+ * @APPLE_LICENSE_HEADER_END@
+ */
+
+#include <unistd.h>
+
+/*
+ * This is a drop-in write(2) replacement that does the right thing when trying
+ * to write out 31-bits or more of data. While the write(2) system call has
+ * 64-bit wide arguments, it only honors 31 bits for historical reasons.
+ * This restriction does not appear to be unique to Darwin.
+ */
+ssize_t write64(int fildes, const void *buf, size_t nbyte);

ld/layout.c

@@ -178,6 +178,10 @@ static void check_for_overlapping_segments(
 static void check_for_lazy_pointer_relocs_too_far(void);
 static void print_load_map(void);
 static void print_load_map_for_objects(struct merged_section *ms);
+static uint32_t get_stack_size_from_flag(const struct arch_flag *flag);
+static vm_prot_t get_segprot_from_flag(const struct arch_flag *flag);
+static int get_stack_direction_from_flag(const struct arch_flag *flag);
+
 #endif /* !defined(RLD) */
 
 /*
@@ -2553,3 +2557,66 @@ print_thread_info(void)
 	    print("\n");
 }
 #endif /* DEBUG */
+
+#ifndef RLD
+
+/*
+ * get_stack_size_from_flag() returns the default size of the userstack.  This
+ * should be in the header file <bsd/XXX/vmparam.h> as MAXSSIZ. Since some
+ * architectures have come and gone and come back, you can't include all of
+ * these headers in one source and some of the constants covered the whole
+ * address space the common value of 64meg was chosen.
+ */
+static
+uint32_t
+get_stack_size_from_flag(
+			 const struct arch_flag *flag)
+{
+#ifdef __MWERKS__
+    const struct arch_flag *dummy;
+    dummy = flag;
+#endif
+
+    return(64*1024*1024);
+}
+
+/*
+ * get_segprot_from_flag() returns the default segment protection.
+ */
+static
+vm_prot_t
+get_segprot_from_flag(
+		      const struct arch_flag *flag)
+{
+    if(flag->cputype == CPU_TYPE_I386)
+	return(VM_PROT_READ | VM_PROT_WRITE);
+    else
+	return(VM_PROT_READ | VM_PROT_WRITE | VM_PROT_EXECUTE);
+}
+
+/*
+ * get_stack_direction_from_flag() returns the direction the stack grows as
+ * either positive (+1) or negative (-1) of the architecture for the
+ * specified cputype and cpusubtype if known.  If unknown it returns 0.
+ */
+static
+int
+get_stack_direction_from_flag(
+			      const struct arch_flag *flag)
+{
+    if(flag->cputype == CPU_TYPE_MC680x0 ||
+       flag->cputype == CPU_TYPE_MC88000 ||
+       flag->cputype == CPU_TYPE_POWERPC ||
+       flag->cputype == CPU_TYPE_I386 ||
+       flag->cputype == CPU_TYPE_SPARC ||
+       flag->cputype == CPU_TYPE_I860 ||
+       flag->cputype == CPU_TYPE_VEO ||
+       flag->cputype == CPU_TYPE_ARM)
+	return(-1);
+    else if(flag->cputype == CPU_TYPE_HPPA)
+	return(+1);
+    else
+	return(0);
+}
+
+#endif /* !defined(RLD) */

libstuff/Makefile

@@ -42,7 +42,7 @@ endif
 CFILES = allocate.c errors.c arch.c execute.c bytesex.c rnd.c hppa.c \
 	  swap_headers.c reloc.c version_number.c get_toc_byte_sex.c \
 	  best_arch.c fatals.c arch_usage.c ofile.c ofile_error.c print.c \
-	  set_arch_flag_name.c seg_addr_table.c dylib_table.c \
+	  set_arch_flag_name.c seg_addr_table.c dylib_table.c write64.c \
 	  breakout.c writeout.c checkout.c fatal_arch.c ofile_get_word.c \
 	  vm_flush_cache.c hash_string.c dylib_roots.c guess_short_name.c \
 	  SymLoc.c get_arch_from_host.c crc32.c macosx_deployment_target.c \