X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=driver%2Ffirm_machine.c;h=7c016fb09c959642c20e91616b53552832787c86;hb=6e169254d1b4dd25d46351c8c1867f5bb79dd069;hp=23a24833ec4afb7d7318fc3acc2ed79a5376350a;hpb=e8b6008fb191413535961886b0ea73413d0f24d6;p=cparser

diff --git a/driver/firm_machine.c b/driver/firm_machine.c
index 23a2483..7c016fb 100644
--- a/driver/firm_machine.c
+++ b/driver/firm_machine.c
@@ -2,7 +2,7 @@
 
 #include <assert.h>
 #include <stdbool.h>
-#include "firm_os.h"
+#include "firm_machine.h"
 #include "adt/strutil.h"
 #include "adt/xmalloc.h"
 #include <libfirm/firm.h>
@@ -14,6 +14,17 @@ static void set_be_option(const char *arg)
 	assert(res);
 }
 
+static ir_entity *underscore_compilerlib_entity_creator(ident *id, ir_type *mt)
+{
+	ir_entity *entity = new_entity(get_glob_type(), id, mt);
+	ident     *ldname = id_mangle3("_", id, "");
+
+	set_entity_visibility(entity, ir_visibility_external);
+	set_entity_ld_ident(entity, ldname);
+
+	return entity;
+}
+
 /**
  * Initialize firm codegeneration for a specific operating system.
  * The argument is the operating system part of a target-triple
@@ -27,8 +38,10 @@ static bool setup_os_support(const char *os)
 		set_be_option("ia32-gasmode=macho");
 		set_be_option("ia32-stackalign=4");
 		set_be_option("pic=true");
+		set_compilerlib_entity_creator(underscore_compilerlib_entity_creator);
 	} else if (strstr(os, "mingw") != NULL || streq(os, "win32")) {
 		set_be_option("ia32-gasmode=mingw");
+		set_compilerlib_entity_creator(underscore_compilerlib_entity_creator);
 	} else {
 		return false;
 	}
@@ -119,7 +132,7 @@ machine_triple_t *firm_parse_machine_triple(const char *triple_string)
 
 	machine_triple_t *triple = XMALLOCZ(machine_triple_t);
 
-	size_t cpu_type_len = manufacturer-cpu+1;
+	size_t cpu_type_len = manufacturer-cpu;
 	triple->cpu_type = XMALLOCN(char, cpu_type_len);
 	memcpy(triple->cpu_type, cpu, cpu_type_len-1);
 	triple->cpu_type[cpu_type_len-1] = '\0';
@@ -130,7 +143,7 @@ machine_triple_t *firm_parse_machine_triple(const char *triple_string)
 		triple->manufacturer = xstrdup("unknown");
 		os = manufacturer;
 	} else {
-		size_t manufacturer_len = os-manufacturer+1;
+		size_t manufacturer_len = os-manufacturer;
 		triple->manufacturer = XMALLOCN(char, manufacturer_len);
 		memcpy(triple->manufacturer, manufacturer, manufacturer_len-1);
 		triple->manufacturer[manufacturer_len-1] = '\0';