osx-arm64 target

recipe/patches/0001-codesign-all-arm64-binaries.patch

@@ -1,25 +1,39 @@
-From e4605b27c51769c93202d9f9e0f11715cb390b3d Mon Sep 17 00:00:00 2001
+From 0a2270ff6adaab8dd47a8c8e5e5dd16f19a38cf1 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
-Date: Wed, 30 Sep 2020 19:43:53 -0500
-Subject: [PATCH 1/2] codesign all arm64 binaries
+Date: Fri, 2 Oct 2020 17:03:07 -0500
+Subject: [PATCH] codesign after linker is done
 
 ---
- cctools/ld64/src/ld/ld.cpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ cctools/ld64/src/ld/ld.cpp | 16 ++++++++++++++--
+ 1 file changed, 14 insertions(+), 2 deletions(-)
 
 diff --git a/cctools/ld64/src/ld/ld.cpp b/cctools/ld64/src/ld/ld.cpp
-index 05ff299..cb2d698 100644
+index 05ff299..cf4bb78 100644
 --- a/cctools/ld64/src/ld/ld.cpp
 +++ b/cctools/ld64/src/ld/ld.cpp
-@@ -1434,7 +1434,7 @@ int main(int argc, const char* argv[])
+@@ -1434,8 +1434,20 @@ int main(int argc, const char* argv[])
  			fprintf(stderr, "processed %3u dylib files\n", inputFiles._totalDylibsLoaded);
  			fprintf(stderr, "wrote output file            totaling %15s bytes\n", commatize(out.fileSize(), temp));
  		}
 -		if ( getenv("IOS_SIGN_CODE_WHEN_BUILD") || getenv("IOS_FAKE_CODE_SIGN") ) { // ld64-port   (keep IOS_SIGN_CODE_WHEN_BUILD for compatibility with the 'iOS toolchain based on clang for linux' project)
+-			std::string ldid = std::string("ldid -S ") + std::string(options.outputFilePath());
 +		if ( getenv("IOS_SIGN_CODE_WHEN_BUILD") || getenv("IOS_FAKE_CODE_SIGN") || strcmp(archName, "arm64") == 0) { // ld64-port   (keep IOS_SIGN_CODE_WHEN_BUILD for compatibility with the 'iOS toolchain based on clang for linux' project)
- 			std::string ldid = std::string("ldid -S ") + std::string(options.outputFilePath());
++			unsigned bufsize = MAXPATHLEN;
++			char *p, *prefix, buf[MAXPATHLEN], resolved_name[PATH_MAX];
++			p = buf;
++			int i = _NSGetExecutablePath(p, &bufsize);
++			if(i == -1){
++				p = new char[bufsize];
++				_NSGetExecutablePath(p, &bufsize);
++			}
++			prefix = realpath(p, resolved_name);
++			p = rindex(prefix, '/');
++			if(p != NULL)
++				p[1] = '\0';
++			std::string ldid = std::string(prefix) + std::string("ldid -S ") + std::string(options.outputFilePath());
  			system(ldid.c_str());
  		}
+ 		// <rdar://problem/6780050> Would like linker warning to be build error.
 -- 
 2.28.0
 

recipe/patches/0002-run-ldid-after-install_name_tool.patch

@@ -1,57 +1,76 @@
-From a489b296b895216167ed6b44833731d448b7b5db Mon Sep 17 00:00:00 2001
+From fea8e31e4029cb1914042c1cf72db3f941928614 Mon Sep 17 00:00:00 2001
 From: Isuru Fernando <isuruf@gmail.com>
-Date: Wed, 30 Sep 2020 21:01:34 -0500
-Subject: [PATCH 2/2] run ldid after install_name_tool
+Date: Fri, 2 Oct 2020 16:02:19 -0500
+Subject: [PATCH] Run ldid after install_name_tool
 
 ---
- cctools/misc/install_name_tool.c | 26 +++++++++++++++++++++++++-
- 1 file changed, 25 insertions(+), 1 deletion(-)
+ cctools/misc/install_name_tool.c | 38 +++++++++++++++++++++++++++++++-
+ 1 file changed, 37 insertions(+), 1 deletion(-)
 
 diff --git a/cctools/misc/install_name_tool.c b/cctools/misc/install_name_tool.c
-index 34d063d..e976ede 100644
+index 34d063d..f4d34e1 100644
 --- a/cctools/misc/install_name_tool.c
 +++ b/cctools/misc/install_name_tool.c
-@@ -131,6 +131,8 @@ char **envp)
+@@ -31,6 +31,7 @@
+ #include "stuff/rnd.h"
+ #include "stuff/allocate.h"
+ #include "stuff/write64.h"
++#include <sys/param.h>
+
+ /* used by error routines as the name of the program */
+ char *progname = NULL;
+@@ -131,6 +132,9 @@ char **envp)
      uint32_t narchs;
      char *input;
      char *output;
-+    char *ldidcommand;
-+    int isarm64;
++    char *ldidcommand;  // cctools-port
++    int isarm64, bufsize;        // cctools-port
++    char *p, *prefix, buf[MAXPATHLEN], resolved_name[PATH_MAX];  // cctools-port
 
  	output = NULL;
  	progname = argv[0];
-@@ -312,11 +314,33 @@ char **envp)
+@@ -312,11 +316,43 @@ char **envp)
  	if(errors)
  	    exit(EXIT_FAILURE);
 
-+    isarm64 = 0;
-+    for (i = 0; i < narchs; i++) {
-+        if (archs[i].object->mh != NULL) {
-+            if (archs[i].object->mh->cputype == CPU_TYPE_ARM64) {
-+                isarm64 = 1;
-+            }
-+        } else {
-+            if (archs[i].object->mh64->cputype == CPU_TYPE_ARM64) {
-+                isarm64 = 1;
-+            }
++	isarm64 = 0;  /* cctools-port */
++	for (i = 0; i < narchs; i++) {
++	    if (archs[i].object->mh != NULL) {
++	        if (archs[i].object->mh->cputype == CPU_TYPE_ARM64) {
++	            isarm64 = 1;
++	        }
++	    } else {
++	        if (archs[i].object->mh64->cputype == CPU_TYPE_ARM64) {
++	            isarm64 = 1;
++	        }
 +	    }
-+    }
++	}  /* cctools-port */
 +
  	if(output != NULL)
  	    writeout(archs, narchs, output, 0777, TRUE, FALSE, FALSE, FALSE,
  		     NULL);
 -	else
 +	else {
  	    write_on_input(archs, narchs, input);
-+        output = input;
-+    }
++	    output = input;
++	}
 +
-+    if (isarm64 == 1) {
-+        ldidcommand = allocate(strlen(output) + 9);
-+        memcpy(ldidcommand, "ldid -S ", 8);
-+        memcpy(ldidcommand + 8, input, strlen(output) + 1);
-+        system(ldidcommand);
-+    }
++	if (isarm64 == 1) { /* cctools-port */
++	    bufsize = MAXPATHLEN;
++	    p = buf;
++	    i = _NSGetExecutablePath(p, &bufsize);
++	    if(i == -1){
++		p = allocate(bufsize);
++		_NSGetExecutablePath(p, &bufsize);
++	    }
++	    prefix = realpath(p, resolved_name);
++	    p = rindex(prefix, '/');
++	    if(p != NULL)
++		p[1] = '\0';
++	    ldidcommand = makestr(prefix, "ldid -S ", output, NULL);
++	    system(ldidcommand);
++	    free(ldidcommand);
++	} /* cctools-port */
 
  	if(errors)
  	    return(EXIT_FAILURE);