Add wrapper for llvm-objcopy

Author: Kartatz

tools/gcc-wrapper/Makefile

@@ -36,7 +36,7 @@ STRIP_SOURCES = $(SOURCES) strip.c
 gcc:
 	$(CC) -D $(FLAVOR) -I $(SOURCE_DIRECTORY) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) $(GCC_SOURCES) -o $(PREFIX)/gcc-wrapper
 
-strip:
-	$(CC) -D $(FLAVOR) -I $(SOURCE_DIRECTORY) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) $(STRIP_SOURCES) -o $(PREFIX)/strip-wrapper
+binutils:
+	$(CC) -D $(FLAVOR) -I $(SOURCE_DIRECTORY) $(CFLAGS) $(LDFLAGS) $(CPPFLAGS) $(STRIP_SOURCES) -o $(PREFIX)/binutils-wrapper
 
 all: gcc strip

tools/gcc-wrapper/errors.c

@@ -9,6 +9,8 @@ const char* obggcc_strerror(const int err) {
 			return "Memory allocation failed";
 		case ERR_UNKNOWN_COMPILER:
 			return "Unrecognized or unsupported C/C++ compiler";
+		case ERR_UNKNOWN_BINUTILS_WRAPPER:
+			return "Unrecognized or unsupported binutils wrapper";
 		case ERR_GET_APP_FILENAME_FAILURE:
 			return "Failed to retrieve application filename";
 		case ERR_EXECVE_FAILURE:

tools/gcc-wrapper/errors.h

@@ -14,6 +14,7 @@
 #define ERR_BINFMT_GUESS_FAILURE -10
 #define ERR_FORK_FAILURE -11
 #define ERR_EXECVE_SUBPROCESS_FAILURE -12
+#define ERR_UNKNOWN_BINUTILS_WRAPPER -13
 
 const char* obggcc_strerror(const int err);
 

tools/gcc-wrapper/strip.c

@@ -20,6 +20,11 @@ extern char** environ;
 static const char HYPHEN[] = "-";
 static const char BINUTILS_STRIP[] = "strip";
 
+static const char LLVM_STRIP[] = "llvm-strip";
+static const char LLVM_OBJCOPY[] = "llvm-objcopy";
+
+static const char LLVM_COMMAND_PREFIX[] = "llvm-";
+
 #define BINFMT_X86_64 (0x01)
 #define BINFMT_i386 (0x02)
 #define BINFMT_MIPS64EL (0x03)
@@ -203,6 +208,7 @@ int main(int argc, char* argv[], char* envp[]) {
 	const char* triplet = NULL;
 	char* input = NULL;
 
+	const char* file_name = NULL;
 	char* parent_directory = NULL;
 	char* app_filename = NULL;
 
@@ -269,6 +275,13 @@ int main(int argc, char* argv[], char* envp[]) {
 		goto end;
 	}
 
+	file_name = basename(app_filename);
+	
+	if (!(strcmp(file_name, LLVM_STRIP) == 0 || strcmp(file_name, LLVM_OBJCOPY) == 0)) {
+		err = ERR_UNKNOWN_BINUTILS_WRAPPER;
+		goto end;
+	}
+	
 	parent_directory = malloc(strlen(app_filename) + 1);
 
 	if (parent_directory == NULL) {
@@ -314,7 +327,7 @@ int main(int argc, char* argv[], char* envp[]) {
 
 		free(executable);
 
-		executable = malloc(strlen(parent_directory) + strlen(PATHSEP_S) + strlen(triplet) + strlen(HYPHEN) + strlen(BINUTILS_STRIP) + 1);
+		executable = malloc(strlen(parent_directory) + strlen(PATHSEP_S) + strlen(triplet) + strlen(HYPHEN) + strlen(file_name) + 1);
 
 		if (executable == NULL) {
 			err = ERR_MEM_ALLOC_FAILURE;
@@ -325,7 +338,7 @@ int main(int argc, char* argv[], char* envp[]) {
 		strcat(executable, PATHSEP_S);
 		strcat(executable, triplet);
 		strcat(executable, HYPHEN);
-		strcat(executable, BINUTILS_STRIP);
+		strcat(executable, file_name + strlen(LLVM_COMMAND_PREFIX));
 
 		args[0] = executable;
 		args[kargc] = input;