X-Git-Url: http://nsz.repo.hu/git/?a=blobdiff_plain;f=ir%2Fbe%2Fbegnuas.c;h=f9a3bb0d04d9166046f69790f031c0f3ffb55f27;hb=ebdaa596d904a0651c8d794481288d2d629bdb3a;hp=e8f376077e8941de99dadf2c0e84c8aa3a7bfa16;hpb=d882970a19c9cc213452030740e1f2203b26abe4;p=libfirm

diff --git a/ir/be/begnuas.c b/ir/be/begnuas.c
index e8f376077..f9a3bb0d0 100644
--- a/ir/be/begnuas.c
+++ b/ir/be/begnuas.c
@@ -24,9 +24,7 @@
  * @date        04.11.2005
  * @version     $Id$
  */
-#ifdef HAVE_CONFIG_H
 #include "config.h"
-#endif
 
 #include "begnuas.h"
 
@@ -39,7 +37,6 @@
 #include "tv.h"
 #include "irnode.h"
 #include "irprog.h"
-#include "pdeq.h"
 #include "entity_t.h"
 #include "error.h"
 
@@ -47,10 +44,12 @@
 #include "beemitter.h"
 #include "be_dbgout.h"
 
-typedef struct obstack obstack_t;
-
 /** by default, we generate assembler code for the Linux gas */
-be_gas_flavour_t be_gas_flavour = GAS_FLAVOUR_NORMAL;
+object_file_format_t  be_gas_object_file_format = OBJECT_FILE_FORMAT_ELF;
+bool                  be_gas_emit_types         = true;
+char                  be_gas_elf_type_char      = '@';
+
+static be_gas_section_t current_section = (be_gas_section_t) -1;
 
 /**
  * Return the pseudo-instruction to be issued for a section switch
@@ -60,50 +59,159 @@ be_gas_flavour_t be_gas_flavour = GAS_FLAVOUR_NORMAL;
  *
  * @return  the pseudo-instruction
  */
-static const char *get_section_name(be_gas_section_t section) {
-	static const char *text[GAS_FLAVOUR_MAX][GAS_SECTION_MAX] = {
-		{
+static const char *get_section_name(be_gas_section_t section)
+{
+	static const char *text[OBJECT_FILE_FORMAT_LAST+1][GAS_SECTION_LAST+1] = {
+		{ /* OBJECT_FILE_FORMAT_ELF */
 			".section\t.text",
 			".section\t.data",
 			".section\t.rodata",
 			".section\t.bss",
 			".section\t.tbss,\"awT\",@nobits",
-			".section\t.ctors,\"aw\",@progbits"
+			".section\t.ctors,\"aw\",@progbits",
+			".section\t.dtors,\"aw\",@progbits",
+			NULL, /* no cstring section */
+			NULL,
+			NULL
 		},
-		{
+		{ /* OBJECT_FILE_FORMAT_COFF */
 			".section\t.text",
 			".section\t.data",
 			".section .rdata,\"dr\"",
 			".section\t.bss",
 			".section\t.tbss,\"awT\",@nobits",
-			".section\t.ctors,\"aw\",@progbits"
+			".section\t.ctors,\"w\"",
+			".section\t.dtors,\"w\"",
+			NULL,
+			NULL,
+			NULL
 		},
-		{
-			".section\t.text",
-				".section\t.data",
-				".section\t.rodata",
-				".section\t.bss",
-				".section\t.tbss,\"awT\",@nobits",
-				".section\t.ctors,\"aw\",@progbits"
+		{ /* OBJECT_FILE_FORMAT_MACH_O */
+			".text",
+			".data",
+			".const",
+			".data",
+			NULL,             /* TLS is not supported on Mach-O */
+			".mod_init_func",
+			NULL,             /* are there destructors on mach-o? */
+			".cstring",
+			".section\t__IMPORT,__jump_table,symbol_stubs,self_modifying_code+pure_instructions,5",
+			".section\t__IMPORT,__pointers,non_lazy_symbol_pointers"
 		}
 	};
 
-	assert((int) be_gas_flavour >= 0 && be_gas_flavour < GAS_FLAVOUR_MAX);
-	assert((int) section >= 0 && section < GAS_SECTION_MAX);
-	return text[be_gas_flavour][section];
+	assert((int) be_gas_object_file_format >= 0
+			&& be_gas_object_file_format <= OBJECT_FILE_FORMAT_LAST);
+	assert((int) section >= 0 && section <= GAS_SECTION_LAST);
+	return text[be_gas_object_file_format][section];
 }
 
-/**
- * Emit necessary code to switch to a section.
- *
- * @param env      the emitter environment
- * @param section  the section to switch to
- */
-void be_gas_emit_switch_section(be_gas_section_t section) {
+void be_gas_emit_switch_section(be_gas_section_t section)
+{
+	if (current_section == section)
+		return;
+
 	be_emit_char('\t');
 	be_emit_string(get_section_name(section));
 	be_emit_char('\n');
 	be_emit_write_line();
+	current_section = section;
+}
+
+static void emit_entity_visibility(const ir_entity *entity)
+{
+	ir_linkage linkage = get_entity_linkage(entity);
+
+	if (! (linkage & IR_LINKAGE_LOCAL)) {
+		be_emit_cstring(".globl ");
+		be_emit_ident(get_entity_ld_ident(entity));
+		be_emit_char('\n');
+		be_emit_write_line();
+	}
+	if (linkage & IR_LINKAGE_WEAK) {
+		if (! (linkage & IR_LINKAGE_MERGE)) {
+			panic("Weak symbols only supported in combination with IR_LINKAGE_MERGE on this architecture");
+		}
+		be_emit_cstring(".weak ");
+		be_emit_ident(get_entity_ld_ident(entity));
+		be_emit_char('\n');
+		be_emit_write_line();
+	}
+}
+
+void be_gas_emit_function_prolog(ir_entity *entity, unsigned po2alignment)
+{
+	const char *name = get_entity_ld_name(entity);
+
+	be_gas_emit_switch_section(GAS_SECTION_TEXT);
+
+	/* write the begin line (makes the life easier for scripts parsing the
+	 * assembler) */
+	be_emit_write_line();
+	be_emit_cstring("# -- Begin  ");
+	be_emit_string(name);
+	be_emit_char('\n');
+	be_emit_write_line();
+
+	if (po2alignment > 0) {
+		const char *fill_byte = "";
+		unsigned    maximum_skip = (1 << po2alignment) - 1;
+		/* gcc fills space between function with 0x90... */
+		if (be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O) {
+			fill_byte = "0x90";
+		}
+		be_emit_cstring("\t.p2align ");
+		be_emit_irprintf("%u,%s,%u\n", po2alignment, fill_byte, maximum_skip);
+		be_emit_write_line();
+	}
+	emit_entity_visibility(entity);
+
+	switch (be_gas_object_file_format) {
+	case OBJECT_FILE_FORMAT_ELF:
+		be_emit_cstring("\t.type\t");
+		be_emit_string(name);
+		be_emit_cstring(", ");
+		be_emit_char(be_gas_elf_type_char);
+		be_emit_cstring("function\n");
+		be_emit_write_line();
+		break;
+	case OBJECT_FILE_FORMAT_COFF:
+		be_emit_cstring("\t.def\t");
+		be_emit_string(name);
+		be_emit_cstring(";");
+		if (get_entity_linkage(entity) & IR_LINKAGE_LOCAL) {
+			be_emit_cstring("\t.scl\t3;");
+		} else {
+			be_emit_cstring("\t.scl\t2;");
+		}
+		be_emit_cstring("\t.type\t32;\t.endef\n");
+		be_emit_write_line();
+		break;
+	case OBJECT_FILE_FORMAT_MACH_O:
+		break;
+	}
+	be_emit_string(name);
+	be_emit_cstring(":\n");
+	be_emit_write_line();
+}
+
+void be_gas_emit_function_epilog(ir_entity *entity)
+{
+	const char *name = get_entity_ld_name(entity);
+
+	if (be_gas_object_file_format == OBJECT_FILE_FORMAT_ELF) {
+		be_emit_cstring("\t.size\t");
+		be_emit_string(name);
+		be_emit_cstring(", .-");
+		be_emit_string(name);
+		be_emit_char('\n');
+		be_emit_write_line();
+	}
+
+	be_emit_cstring("# -- End  ");
+	be_emit_string(name);
+	be_emit_char('\n');
+	be_emit_write_line();
 }
 
 /**
@@ -113,12 +221,8 @@ void be_gas_emit_switch_section(be_gas_section_t section) {
  * and even there NOT needed. So we might change it in the future.
  */
 typedef struct _be_gas_decl_env {
-	obstack_t *rodata_obst;        /**< An obstack that will be filled with all rodata entities. */
-	obstack_t *data_obst;          /**< An obstack that will be filled with the initialized entities. */
-	obstack_t *bss_obst;           /**< An obstack that will be filled with the uninitialized entities. */
-	obstack_t *ctor_obst;          /**< An obstack that will be filled with the constructor entities. */
-	const be_main_env_t *main_env; /**< The main backend environment, used for it's debug handle. */
-	waitq     *worklist;           /**< A worklist we use to place not yet handled entities on. */
+	be_gas_section_t     section;
+	const be_main_env_t *main_env;
 } be_gas_decl_env_t;
 
 /************************************************************************/
@@ -126,69 +230,90 @@ typedef struct _be_gas_decl_env {
 /**
  * Output a tarval.
  *
- * @param obst   the obstack where the data is written too
  * @param tv     the tarval
  * @param bytes  the width of the tarvals value in bytes
  */
-static void dump_arith_tarval(obstack_t *obst, tarval *tv, int bytes)
+static void dump_arith_tarval(tarval *tv, int bytes)
 {
 	switch (bytes) {
-
 	case 1:
-		obstack_printf(obst, "0x%02x", get_tarval_sub_bits(tv, 0));
-		break;
+		be_emit_irprintf("0x%02x", get_tarval_sub_bits(tv, 0));
+		return;
 
 	case 2:
-		obstack_printf(obst, "0x%02x%02x", get_tarval_sub_bits(tv, 1), get_tarval_sub_bits(tv, 0));
-		break;
+		be_emit_irprintf("0x%02x%02x", get_tarval_sub_bits(tv, 1), get_tarval_sub_bits(tv, 0));
+		return;
 
 	case 4:
-		obstack_printf(obst, "0x%02x%02x%02x%02x",
+		be_emit_irprintf("0x%02x%02x%02x%02x",
 			get_tarval_sub_bits(tv, 3), get_tarval_sub_bits(tv, 2), get_tarval_sub_bits(tv, 1), get_tarval_sub_bits(tv, 0));
-		break;
+		return;
 
 	case 8:
-		obstack_printf(obst, "0x%02x%02x%02x%02x%02x%02x%02x%02x",
+		be_emit_irprintf("0x%02x%02x%02x%02x%02x%02x%02x%02x",
 			get_tarval_sub_bits(tv, 7), get_tarval_sub_bits(tv, 6), get_tarval_sub_bits(tv, 5), get_tarval_sub_bits(tv, 4),
 			get_tarval_sub_bits(tv, 3), get_tarval_sub_bits(tv, 2), get_tarval_sub_bits(tv, 1), get_tarval_sub_bits(tv, 0));
-		break;
+		return;
 
-	case 10:
 	case 12:
-		break;
+		/* Beware: Mixed endian output!  One little endian number emitted as
+		 * three longs.  Each long initializer is written in big endian. */
+		be_emit_irprintf(
+			"\t.long\t0x%02x%02x%02x%02x\n"
+			"\t.long\t0x%02x%02x%02x%02x\n"
+			"\t.long\t0x%02x%02x%02x%02x",
+			get_tarval_sub_bits(tv,  3), get_tarval_sub_bits(tv,  2),
+			get_tarval_sub_bits(tv,  1), get_tarval_sub_bits(tv,  0),
+			get_tarval_sub_bits(tv,  7), get_tarval_sub_bits(tv,  6),
+			get_tarval_sub_bits(tv,  5), get_tarval_sub_bits(tv,  4),
+			get_tarval_sub_bits(tv, 11), get_tarval_sub_bits(tv, 10),
+			get_tarval_sub_bits(tv,  9), get_tarval_sub_bits(tv,  8)
+		);
+		return;
 
 	case 16:
-		obstack_printf(obst, "0x%02x%02x%02x%02x%02x%02x%02x%02x"
-				               "%02x%02x%02x%02x%02x%02x%02x%02x",
+		be_emit_irprintf(
+			"\t.long\t0x%02x%02x%02x%02x0x%02x%02x%02x%02x0x%02x%02x%02x%02x0x%02x%02x%02x%02x",
 			get_tarval_sub_bits(tv, 15), get_tarval_sub_bits(tv, 16),
 			get_tarval_sub_bits(tv, 13), get_tarval_sub_bits(tv, 12),
 			get_tarval_sub_bits(tv, 11), get_tarval_sub_bits(tv, 10),
-			get_tarval_sub_bits(tv, 9), get_tarval_sub_bits(tv, 8),
-			get_tarval_sub_bits(tv, 7), get_tarval_sub_bits(tv, 6),
-			get_tarval_sub_bits(tv, 5), get_tarval_sub_bits(tv, 4),
-			get_tarval_sub_bits(tv, 3), get_tarval_sub_bits(tv, 2),
-			get_tarval_sub_bits(tv, 1), get_tarval_sub_bits(tv, 0));
-		break;
-
-
-	default:
-		fprintf(stderr, "Try to dump an tarval with %d bytes\n", bytes);
-		assert(0);
+			get_tarval_sub_bits(tv,  9), get_tarval_sub_bits(tv,  8),
+			get_tarval_sub_bits(tv,  7), get_tarval_sub_bits(tv,  6),
+			get_tarval_sub_bits(tv,  5), get_tarval_sub_bits(tv,  4),
+			get_tarval_sub_bits(tv,  3), get_tarval_sub_bits(tv,  2),
+			get_tarval_sub_bits(tv,  1), get_tarval_sub_bits(tv,  0)
+		);
+		return;
 	}
+
+	panic("Can't dump a tarval with %d bytes", bytes);
 }
 
 /**
  * Return the label prefix for labeled blocks.
  */
-const char *be_gas_label_prefix(void) {
+const char *be_gas_block_label_prefix(void)
+{
 	return ".LG";
 }
 
 /**
- * Dump a label.
+ * Return the label prefix for labeled instructions.
  */
-static void dump_label(obstack_t *obst, ir_label_t label) {
-	obstack_printf(obst, "%s%ld", be_gas_label_prefix(), label);
+const char *be_gas_insn_label_prefix(void)
+{
+	return ".LE";
+}
+
+void be_gas_emit_entity(ir_entity *entity)
+{
+	if (entity->type == firm_code_type) {
+		ir_label_t label = get_entity_label(entity);
+		be_emit_string(be_gas_block_label_prefix());
+		be_emit_irprintf("%lu", label);
+	} else {
+		be_emit_ident(get_entity_ld_ident(entity));
+	}
 }
 
 /**
@@ -230,9 +355,6 @@ static tarval *get_atomic_init_tv(ir_node *init)
 			case symconst_enum_const:
 				return get_enumeration_value(get_SymConst_enum(init));
 
-			case symconst_label:
-				return NULL;
-
 			default:
 				return NULL;
 			}
@@ -247,77 +369,60 @@ static tarval *get_atomic_init_tv(ir_node *init)
  * Dump an atomic value.
  *
  * @param env   the gas output environment
- * @param obst  an obstack the output is written to
  * @param init  a node representing the atomic value (on the const code irg)
  */
-static void do_dump_atomic_init(be_gas_decl_env_t *env, obstack_t *obst,
-                                ir_node *init)
+static void do_dump_atomic_init(be_gas_decl_env_t *env, ir_node *init)
 {
 	ir_mode *mode = get_irn_mode(init);
 	int bytes     = get_mode_size_bytes(mode);
 	tarval *tv;
-	ir_label_t label;
 	ir_entity *ent;
 
-	switch (get_irn_opcode(init)) {
+	init = skip_Id(init);
 
+	switch (get_irn_opcode(init)) {
 	case iro_Cast:
-		do_dump_atomic_init(env, obst, get_Cast_op(init));
+		do_dump_atomic_init(env, get_Cast_op(init));
 		return;
 
 	case iro_Conv:
-		do_dump_atomic_init(env, obst, get_Conv_op(init));
+		do_dump_atomic_init(env, get_Conv_op(init));
 		return;
 
 	case iro_Const:
 		tv = get_Const_tarval(init);
 
 		/* it's a arithmetic value */
-		dump_arith_tarval(obst, tv, bytes);
+		dump_arith_tarval(tv, bytes);
 		return;
 
 	case iro_SymConst:
 		switch (get_SymConst_kind(init)) {
 		case symconst_addr_name:
-			obstack_printf(obst, "%s", get_id_str(get_SymConst_name(init)));
+			be_emit_ident(get_SymConst_name(init));
 			break;
 
 		case symconst_addr_ent:
 			ent = get_SymConst_entity(init);
-			if(!is_entity_backend_marked(ent)) {
-				waitq_put(env->worklist, ent);
-				set_entity_backend_marked(ent, 1);
-			}
-			obstack_printf(obst, "%s", get_entity_ld_name(ent));
+			be_gas_emit_entity(ent);
 			break;
 
 		case symconst_ofs_ent:
 			ent = get_SymConst_entity(init);
-#if 0       /* not needed, is it? */
-			if(!is_entity_backend_marked(ent)) {
-				waitq_put(env->worklist, ent);
-				set_entity_backend_marked(ent, 1);
-			}
-#endif
-			obstack_printf(obst, "%d", get_entity_offset(ent));
+			be_emit_irprintf("%d", get_entity_offset(ent));
 			break;
 
 		case symconst_type_size:
-			obstack_printf(obst, "%u", get_type_size_bytes(get_SymConst_type(init)));
+			be_emit_irprintf("%u", get_type_size_bytes(get_SymConst_type(init)));
 			break;
 
 		case symconst_type_align:
-			obstack_printf(obst, "%u", get_type_alignment_bytes(get_SymConst_type(init)));
+			be_emit_irprintf("%u", get_type_alignment_bytes(get_SymConst_type(init)));
 			break;
 
 		case symconst_enum_const:
 			tv = get_enumeration_value(get_SymConst_enum(init));
-			dump_arith_tarval(obst, tv, bytes);
-			break;
-
-		case symconst_label:
-			label = get_SymConst_label(init);
-			dump_label(obst, label);
+			dump_arith_tarval(tv, bytes);
 			break;
 
 		default:
@@ -325,52 +430,63 @@ static void do_dump_atomic_init(be_gas_decl_env_t *env, obstack_t *obst,
 		}
 		return;
 
-		case iro_Add:
-			do_dump_atomic_init(env, obst, get_Add_left(init));
-			obstack_printf(obst, " + ");
-			do_dump_atomic_init(env, obst, get_Add_right(init));
-			return;
+	case iro_Add:
+		if (!mode_is_int(mode) && !mode_is_reference(mode)) {
+			panic("Constant must be int or pointer for '+' to work");
+		}
+		do_dump_atomic_init(env, get_Add_left(init));
+		be_emit_cstring(" + ");
+		do_dump_atomic_init(env, get_Add_right(init));
+		return;
 
-		case iro_Sub:
-			do_dump_atomic_init(env, obst, get_Sub_left(init));
-			obstack_printf(obst, " - ");
-			do_dump_atomic_init(env, obst, get_Sub_right(init));
-			return;
+	case iro_Sub:
+		if (!mode_is_int(mode) && !mode_is_reference(mode)) {
+			panic("Constant must be int or pointer for '-' to work");
+		}
+		do_dump_atomic_init(env, get_Sub_left(init));
+		be_emit_cstring(" - ");
+		do_dump_atomic_init(env, get_Sub_right(init));
+		return;
 
-		case iro_Mul:
-			do_dump_atomic_init(env, obst, get_Mul_left(init));
-			obstack_printf(obst, " * ");
-			do_dump_atomic_init(env, obst, get_Mul_right(init));
-			return;
+	case iro_Mul:
+		if (!mode_is_int(mode) && !mode_is_reference(mode)) {
+			panic("Constant must be int or pointer for '*' to work");
+		}
+		do_dump_atomic_init(env, get_Mul_left(init));
+		be_emit_cstring(" * ");
+		do_dump_atomic_init(env, get_Mul_right(init));
+		return;
 
-		default:
-			assert(0 && "dump_atomic_init(): unknown IR-node");
+	case iro_Unknown:
+		be_emit_cstring("0");
+		return;
+
+	default:
+		panic("dump_atomic_init(): unsupported IR-node %+F", init);
 	}
 }
 
 /**
  * Dumps the type for given size (.byte, .long, ...)
  *
- * @param obst  an obstack the output is written to
  * @param size  the size in bytes
  */
-static void dump_size_type(obstack_t *obst, size_t size) {
+static void dump_size_type(size_t size) {
 	switch (size) {
-
 	case 1:
-		obstack_printf(obst, "\t.byte\t");
+		be_emit_cstring("\t.byte\t");
 		break;
 
 	case 2:
-		obstack_printf(obst, "\t.value\t");
+		be_emit_cstring("\t.short\t");
 		break;
 
 	case 4:
-		obstack_printf(obst, "\t.long\t");
+		be_emit_cstring("\t.long\t");
 		break;
 
 	case 8:
-		obstack_printf(obst, "\t.quad\t");
+		be_emit_cstring("\t.quad\t");
 		break;
 
 	case 10:
@@ -379,31 +495,29 @@ static void dump_size_type(obstack_t *obst, size_t size) {
 		break;
 
 	case 16:
-		obstack_printf(obst, "\t.octa\t");
+		be_emit_cstring("\t.octa\t");
 		break;
 
 	default:
-		fprintf(stderr, "Try to dump a type with %d bytes\n", size);
-		assert(0);
+		panic("Try to dump a type with %u bytes", (unsigned)size);
 	}
 }
 
 /**
- * Dump an atomic value to an obstack.
+ * Emit an atomic value.
  *
  * @param env   the gas output environment
- * @param obst  an obstack the output is written to
  * @param init  a node representing the atomic value (on the const code irg)
  */
-static void dump_atomic_init(be_gas_decl_env_t *env, obstack_t *obst,
-                             ir_node *init)
+static void dump_atomic_init(be_gas_decl_env_t *env, ir_node *init)
 {
 	ir_mode *mode = get_irn_mode(init);
 	int bytes     = get_mode_size_bytes(mode);
 
-	dump_size_type(obst, bytes);
-	do_dump_atomic_init(env, obst, init);
-	obstack_printf(obst, "\n");
+	dump_size_type(bytes);
+	do_dump_atomic_init(env, init);
+	be_emit_char('\n');
+	be_emit_write_line();
 }
 
 /************************************************************************/
@@ -413,35 +527,41 @@ static void dump_atomic_init(be_gas_decl_env_t *env, obstack_t *obst,
 static int initializer_is_string_const(const ir_initializer_t *initializer)
 {
 	size_t i, len;
+	int found_printable = 0;
 
-	if(initializer->kind != IR_INITIALIZER_COMPOUND)
+	if (initializer->kind != IR_INITIALIZER_COMPOUND)
 		return 0;
 
 	len = initializer->compound.n_initializers;
-	for(i = 0; i < len; ++i) {
+	if (len < 1)
+		return 0;
+	for (i = 0; i < len; ++i) {
 		int               c;
 		tarval           *tv;
 		ir_mode          *mode;
 		ir_initializer_t *sub_initializer
 			= initializer->compound.initializers[i];
 
-		if(sub_initializer->kind != IR_INITIALIZER_TARVAL)
+		if (sub_initializer->kind != IR_INITIALIZER_TARVAL)
 			return 0;
 
 		tv   = sub_initializer->tarval.value;
 		mode = get_tarval_mode(tv);
 
-		if (!mode_is_int(mode)
-				|| get_mode_size_bits(mode) != get_mode_size_bits(mode_Bs))
+		if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8)
 			return 0;
 
 		c = get_tarval_long(tv);
-		if((i < len - 1 && !(isgraph(c) || isspace(c)))
-				|| (i >= len - 1 && c != 0))
+		if (isgraph(c) || isspace(c))
+			found_printable = 1;
+		else if (c != 0)
+			return 0;
+
+		if (i == len - 1 && c != '\0')
 			return 0;
 	}
 
-	return 1;
+	return found_printable;
 }
 
 /**
@@ -449,7 +569,7 @@ static int initializer_is_string_const(const ir_initializer_t *initializer)
  * @param ent The entity
  * @return 1 if it is a string constant, 0 otherwise
  */
-static int ent_is_string_const(ir_entity *ent)
+static int ent_is_string_const(const ir_entity *ent)
 {
 	ir_type *type, *element_type;
 	ir_mode *mode;
@@ -470,14 +590,13 @@ static int ent_is_string_const(ir_entity *ent)
 	/* and the mode of the element type is an int of
 	 * the same size as the byte mode */
 	mode = get_type_mode(element_type);
-	if (!mode_is_int(mode)
-		|| get_mode_size_bits(mode) != get_mode_size_bits(mode_Bs))
+	if (!mode_is_int(mode) || get_mode_size_bits(mode) != 8)
 		return 0;
 
-	if(ent->has_initializer) {
-		/* TODO */
-		return 0;
-	} else {
+	if (ent->initializer != NULL) {
+		return initializer_is_string_const(ent->initializer);
+	} else if (entity_has_compound_ent_values(ent)) {
+		int found_printable = 0;
 		/* if it contains only printable chars and a 0 at the end */
 		n = get_compound_ent_n_values(ent);
 		for (i = 0; i < n; ++i) {
@@ -487,34 +606,44 @@ static int ent_is_string_const(ir_entity *ent)
 
 			c = (int) get_tarval_long(get_Const_tarval(irn));
 
-			if((i < n - 1 && !(isgraph(c) || isspace(c)))
-					|| (i == n - 1 && c != '\0'))
+			if (isgraph(c) || isspace(c))
+				found_printable = 1;
+			else if (c != 0)
+				return 0;
+
+			if (i == n - 1 && c != '\0')
 				return 0;
 		}
+		return found_printable;
 	}
 
-	/* then we can emit it as a string constant */
-	return 1;
+	return 0;
 }
 
 /**
  * Dump a string constant.
  * No checks are made!!
  *
- * @param obst The obst to dump on.
  * @param ent  The entity to dump.
  */
-static void dump_string_cst(obstack_t *obst, ir_entity *ent)
+static void dump_string_cst(const ir_entity *ent)
 {
-	int      i, n;
+	int      i, len;
+	int      output_len;
 	ir_type *type;
 	int      type_size;
 	int      remaining_space;
 
-	obstack_printf(obst, "\t.string \"");
-	n = get_compound_ent_n_values(ent);
+	len        = get_compound_ent_n_values(ent);
+	output_len = len;
+	if (be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O) {
+		be_emit_cstring("\t.ascii \"");
+	} else {
+		be_emit_cstring("\t.string \"");
+		output_len -= 1;
+	}
 
-	for (i = 0; i < n-1; ++i) {
+	for (i = 0; i < output_len; ++i) {
 		ir_node *irn;
 		int c;
 
@@ -522,39 +651,44 @@ static void dump_string_cst(obstack_t *obst, ir_entity *ent)
 		c = (int) get_tarval_long(get_Const_tarval(irn));
 
 		switch (c) {
-		case '"' : obstack_printf(obst, "\\\""); break;
-		case '\n': obstack_printf(obst, "\\n"); break;
-		case '\r': obstack_printf(obst, "\\r"); break;
-		case '\t': obstack_printf(obst, "\\t"); break;
-		case '\\': obstack_printf(obst, "\\\\"); break;
+		case '"' : be_emit_cstring("\\\""); break;
+		case '\n': be_emit_cstring("\\n"); break;
+		case '\r': be_emit_cstring("\\r"); break;
+		case '\t': be_emit_cstring("\\t"); break;
+		case '\\': be_emit_cstring("\\\\"); break;
 		default  :
 			if (isprint(c))
-				obstack_printf(obst, "%c", c);
+				be_emit_char(c);
 			else
-				obstack_printf(obst, "\\%o", c);
+				be_emit_irprintf("\\%o", c);
 			break;
 		}
 	}
-	obstack_printf(obst, "\"\n");
+	be_emit_cstring("\"\n");
+	be_emit_write_line();
 
 	type            = get_entity_type(ent);
 	type_size       = get_type_size_bytes(type);
-	remaining_space = type_size - n;
+	remaining_space = type_size - len;
 	assert(remaining_space >= 0);
-	if(remaining_space > 0) {
-		obstack_printf(obst, "\t.skip\t%d\n", remaining_space);
+	if (remaining_space > 0) {
+		be_emit_irprintf("\t.space\t%d\n", remaining_space);
 	}
 }
 
-static void dump_string_initializer(obstack_t *obst,
-                                    const ir_initializer_t *initializer)
+static void dump_string_initializer(const ir_initializer_t *initializer)
 {
 	size_t i, len;
 
-	obstack_printf(obst, "\t.string \"");
-
 	len = initializer->compound.n_initializers;
-	for(i = 0; i < len - 1; ++i) {
+	if (be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O) {
+		be_emit_cstring("\t.ascii \"");
+	} else {
+		be_emit_cstring("\t.string \"");
+		len -= 1;
+	}
+
+	for (i = 0; i < len; ++i) {
 		const ir_initializer_t *sub_initializer
 			= get_initializer_compound_value(initializer, i);
 
@@ -562,20 +696,21 @@ static void dump_string_initializer(obstack_t *obst,
 		int     c  = get_tarval_long(tv);
 
 		switch (c) {
-		case '"' : obstack_printf(obst, "\\\""); break;
-		case '\n': obstack_printf(obst, "\\n"); break;
-		case '\r': obstack_printf(obst, "\\r"); break;
-		case '\t': obstack_printf(obst, "\\t"); break;
-		case '\\': obstack_printf(obst, "\\\\"); break;
+		case '"' : be_emit_cstring("\\\""); break;
+		case '\n': be_emit_cstring("\\n"); break;
+		case '\r': be_emit_cstring("\\r"); break;
+		case '\t': be_emit_cstring("\\t"); break;
+		case '\\': be_emit_cstring("\\\\"); break;
 		default  :
 			if (isprint(c))
-				obstack_printf(obst, "%c", c);
+				be_emit_char(c);
 			else
-				obstack_printf(obst, "\\%o", c);
+				be_emit_irprintf("\\%o", c);
 			break;
 		}
 	}
-	obstack_printf(obst, "\"\n");
+	be_emit_cstring("\"\n");
+	be_emit_write_line();
 }
 
 enum normal_or_bitfield_kind {
@@ -603,23 +738,22 @@ static int is_type_variable_size(ir_type *type)
 static size_t get_initializer_size(const ir_initializer_t *initializer,
                                    ir_type *type)
 {
-	switch(get_initializer_kind(initializer)) {
-	case IR_INITIALIZER_TARVAL: {
+	switch (get_initializer_kind(initializer)) {
+	case IR_INITIALIZER_TARVAL:
 		assert(get_tarval_mode(get_initializer_tarval_value(initializer)) == get_type_mode(type));
 		return get_type_size_bytes(type);
-	}
 	case IR_INITIALIZER_CONST:
 	case IR_INITIALIZER_NULL:
 		return get_type_size_bytes(type);
-	case IR_INITIALIZER_COMPOUND: {
-		if(!is_type_variable_size(type)) {
+	case IR_INITIALIZER_COMPOUND:
+		if (!is_type_variable_size(type)) {
 			return get_type_size_bytes(type);
 		} else {
 			unsigned n_entries
 				= get_initializer_compound_n_entries(initializer);
 			unsigned i;
 			unsigned initializer_size = get_type_size_bytes(type);
-			for(i = 0; i < n_entries; ++i) {
+			for (i = 0; i < n_entries; ++i) {
 				ir_entity *entity = get_compound_member(type, i);
 				ir_type   *type   = get_entity_type(entity);
 
@@ -629,14 +763,13 @@ static size_t get_initializer_size(const ir_initializer_t *initializer,
 				unsigned offset = get_entity_offset(entity);
 				unsigned size   = get_initializer_size(sub_initializer, type);
 
-				if(offset + size > initializer_size) {
+				if (offset + size > initializer_size) {
 					initializer_size = offset + size;
 				}
 			}
 			return initializer_size;
 		}
 	}
-	}
 
 	panic("found invalid initializer");
 }
@@ -656,7 +789,7 @@ static void dump_bitfield(normal_or_bitfield *vals, size_t offset_bits,
 	int            value_len;
 	int            j;
 
-	switch(get_initializer_kind(initializer)) {
+	switch (get_initializer_kind(initializer)) {
 	case IR_INITIALIZER_NULL:
 		return;
 	case IR_INITIALIZER_TARVAL:
@@ -664,7 +797,7 @@ static void dump_bitfield(normal_or_bitfield *vals, size_t offset_bits,
 		break;
 	case IR_INITIALIZER_CONST: {
 		ir_node *node = get_initializer_const_value(initializer);
-		if(!is_Const(node)) {
+		if (!is_Const(node)) {
 			panic("bitfield initializer not a Const node");
 		}
 		tv = get_Const_tarval(node);
@@ -674,8 +807,9 @@ static void dump_bitfield(normal_or_bitfield *vals, size_t offset_bits,
 		panic("bitfield initializer is compound");
 	}
 	if (tv == NULL) {
-		panic("Couldn't get numeric value for bitfield initializer\n");
+		panic("Couldn't get numeric value for bitfield initializer");
 	}
+	tv = tarval_convert_to(tv, get_type_mode(type));
 
 	/* normalize offset */
 	vals        += offset_bits >> 3;
@@ -702,7 +836,7 @@ static void dump_ir_initializer(normal_or_bitfield *vals,
 {
 	assert((size_t) (vals - glob_vals) < max_vals);
 
-	switch(get_initializer_kind(initializer)) {
+	switch (get_initializer_kind(initializer)) {
 	case IR_INITIALIZER_NULL:
 		return;
 	case IR_INITIALIZER_TARVAL: {
@@ -712,7 +846,7 @@ static void dump_ir_initializer(normal_or_bitfield *vals,
 		vals->kind     = TARVAL;
 		vals->v.tarval = get_initializer_tarval_value(initializer);
 		assert(get_type_mode(type) == get_tarval_mode(vals->v.tarval));
-		for(i = 1; i < get_type_size_bytes(type); ++i) {
+		for (i = 1; i < get_type_size_bytes(type); ++i) {
 			vals[i].kind    = NORMAL;
 			vals[i].v.value = NULL;
 		}
@@ -724,7 +858,7 @@ static void dump_ir_initializer(normal_or_bitfield *vals,
 		assert(vals->kind != BITFIELD);
 		vals->kind    = NORMAL;
 		vals->v.value = get_initializer_const_value(initializer);
-		for(i = 1; i < get_type_size_bytes(type); ++i) {
+		for (i = 1; i < get_type_size_bytes(type); ++i) {
 			vals[i].kind    = NORMAL;
 			vals[i].v.value = NULL;
 		}
@@ -734,16 +868,16 @@ static void dump_ir_initializer(normal_or_bitfield *vals,
 		size_t i = 0;
 		size_t n = get_initializer_compound_n_entries(initializer);
 
-		if(is_Array_type(type)) {
+		if (is_Array_type(type)) {
 			ir_type *element_type = get_array_element_type(type);
 			size_t   skip         = get_type_size_bytes(element_type);
 			size_t   alignment    = get_type_alignment_bytes(element_type);
 			size_t   misalign     = skip % alignment;
-			if(misalign != 0) {
+			if (misalign != 0) {
 				skip += alignment - misalign;
 			}
 
-			for(i = 0; i < n; ++i) {
+			for (i = 0; i < n; ++i) {
 				ir_initializer_t *sub_initializer
 					= get_initializer_compound_value(initializer, i);
 
@@ -755,7 +889,7 @@ static void dump_ir_initializer(normal_or_bitfield *vals,
 			size_t n_members, i;
 			assert(is_compound_type(type));
 			n_members = get_compound_n_members(type);
-			for(i = 0; i < n_members; ++i) {
+			for (i = 0; i < n_members; ++i) {
 				ir_entity        *member    = get_compound_member(type, i);
 				size_t            offset    = get_entity_offset(member);
 				ir_type          *subtype   = get_entity_type(member);
@@ -766,12 +900,12 @@ static void dump_ir_initializer(normal_or_bitfield *vals,
 				sub_initializer
 					= get_initializer_compound_value(initializer, i);
 
-				if(mode != NULL) {
+				if (mode != NULL) {
 					size_t offset_bits
 						= get_entity_offset_bits_remainder(member);
 					size_t value_len   = get_mode_size_bits(mode);
 
-					if(offset_bits != 0 ||
+					if (offset_bits != 0 ||
 						(value_len != 8 && value_len != 16 && value_len != 32
 						 && value_len != 64)) {
 						dump_bitfield(&vals[offset], offset_bits,
@@ -790,28 +924,30 @@ static void dump_ir_initializer(normal_or_bitfield *vals,
 	panic("invalid ir_initializer kind found");
 }
 
-static void dump_initializer(be_gas_decl_env_t *env, obstack_t *obst,
-                             ir_entity *entity)
+static void dump_initializer(be_gas_decl_env_t *env, const ir_entity *entity)
 {
-	const ir_initializer_t *initializer = entity->attr.initializer;
+	const ir_initializer_t *initializer = entity->initializer;
 	ir_type                *type;
 	normal_or_bitfield     *vals;
 	size_t                  size;
 	size_t                  k;
 
-	if(initializer_is_string_const(initializer)) {
-		dump_string_initializer(obst, initializer);
+	if (initializer_is_string_const(initializer)) {
+		dump_string_initializer(initializer);
 		return;
 	}
 
 	type = get_entity_type(entity);
 	size = get_initializer_size(initializer, type);
 
+	if (size == 0)
+		return;
+
 	/*
 	 * In the worst case, every initializer allocates one byte.
 	 * Moreover, initializer might be big, do not allocate on stack.
 	 */
-	vals = xcalloc(size, sizeof(vals[0]));
+	vals = XMALLOCNZ(normal_or_bitfield, size);
 
 #ifndef NDEBUG
 	glob_vals = vals;
@@ -822,57 +958,56 @@ static void dump_initializer(be_gas_decl_env_t *env, obstack_t *obst,
 
 	/* now write values sorted */
 	for (k = 0; k < size; ) {
-		int space = 0, skip = 0;
+		int space     = 0;
+		int elem_size = 1;
 		if (vals[k].kind == NORMAL) {
-			if(vals[k].v.value != NULL) {
-				dump_atomic_init(env, obst, vals[k].v.value);
-				skip = get_mode_size_bytes(get_irn_mode(vals[k].v.value)) - 1;
+			if (vals[k].v.value != NULL) {
+				dump_atomic_init(env, vals[k].v.value);
+				elem_size = get_mode_size_bytes(get_irn_mode(vals[k].v.value));
 	 		} else {
-	 			space = 1;
+	 			elem_size = 0;
 	 		}
-		} else if(vals[k].kind == TARVAL) {
+		} else if (vals[k].kind == TARVAL) {
 			tarval *tv   = vals[k].v.tarval;
 			size_t  size = get_mode_size_bytes(get_tarval_mode(tv));
 
 			assert(tv != NULL);
 
-			skip = size - 1;
-			dump_size_type(obst, size);
-			dump_arith_tarval(obst, tv, size);
-			obstack_1grow(obst, '\n');
+			elem_size = size;
+			dump_size_type(size);
+			dump_arith_tarval(tv, size);
+			be_emit_char('\n');
+			be_emit_write_line();
 		} else {
 			assert(vals[k].kind == BITFIELD);
-			obstack_printf(obst, "\t.byte\t%d\n", vals[k].v.bf_val);
+			be_emit_irprintf("\t.byte\t%d\n", vals[k].v.bf_val);
+			be_emit_write_line();
 		}
 
-		++k;
+		k += elem_size;
 		while (k < size && vals[k].kind == NORMAL && vals[k].v.value == NULL) {
 			++space;
 			++k;
 		}
-		space -= skip;
-		assert(space >= 0);
 
 		/* a gap */
-		if (space > 0)
-			obstack_printf(obst, "\t.skip\t%d\n", space);
+		if (space > 0) {
+			be_emit_irprintf("\t.space\t%d\n", space);
+			be_emit_write_line();
+		}
 	}
 	xfree(vals);
-
 }
 
-/**
- * Dump an initializer for a compound entity.
- */
-static void dump_compound_init(be_gas_decl_env_t *env, obstack_t *obst,
-                               ir_entity *ent)
+static void dump_compound_graph_init(be_gas_decl_env_t *env,
+                                     const ir_entity *ent)
 {
 	normal_or_bitfield *vals;
 	int i, j, n;
 	unsigned k, last_ofs;
 
-	if(ent->has_initializer) {
-		dump_initializer(env, obst, ent);
+	if (ent_is_string_const(ent)) {
+		dump_string_cst(ent);
 		return;
 	}
 
@@ -899,7 +1034,7 @@ static void dump_compound_init(be_gas_decl_env_t *env, obstack_t *obst,
 	 * In the worst case, every initializer allocates one byte.
 	 * Moreover, initializer might be big, do not allocate on stack.
 	 */
-	vals = xcalloc(last_ofs, sizeof(vals[0]));
+	vals = XMALLOCNZ(normal_or_bitfield, last_ofs);
 
 	/* collect the values and store them at the offsets */
 	for (i = 0; i < n; ++i) {
@@ -911,12 +1046,12 @@ static void dump_compound_init(be_gas_decl_env_t *env, obstack_t *obst,
 		assert(offset_bits >= 0);
 
 		if (offset_bits != 0 ||
-			(value_len != 8 && value_len != 16 && value_len != 32 && value_len != 64)) {
+				(value_len != 8 && value_len != 16 && value_len != 32 && value_len != 64)) {
 			tarval *tv = get_atomic_init_tv(value);
 			unsigned char curr_bits, last_bits = 0;
 			if (tv == NULL) {
-				panic("Couldn't get numeric value for bitfield initializer '%s'\n",
-				      get_entity_ld_name(ent));
+				panic("Couldn't get numeric value for bitfield initializer '%s'",
+						get_entity_ld_name(ent));
 			}
 			/* normalize offset */
 			offset += offset_bits >> 3;
@@ -947,15 +1082,15 @@ static void dump_compound_init(be_gas_decl_env_t *env, obstack_t *obst,
 	for (k = 0; k < last_ofs; ) {
 		int space = 0, skip = 0;
 		if (vals[k].kind == NORMAL) {
-			if(vals[k].v.value != NULL) {
-				dump_atomic_init(env, obst, vals[k].v.value);
+			if (vals[k].v.value != NULL) {
+				dump_atomic_init(env, vals[k].v.value);
 				skip = get_mode_size_bytes(get_irn_mode(vals[k].v.value)) - 1;
-	 		} else {
-	 			space = 1;
-	 		}
+			} else {
+				space = 1;
+			}
 		} else {
 			assert(vals[k].kind == BITFIELD);
-			obstack_printf(obst, "\t.byte\t%d\n", vals[k].v.bf_val);
+			be_emit_irprintf("\t.byte\t%d\n", vals[k].v.bf_val);
 		}
 
 		++k;
@@ -967,111 +1102,156 @@ static void dump_compound_init(be_gas_decl_env_t *env, obstack_t *obst,
 		assert(space >= 0);
 
 		/* a gap */
-		if (space > 0)
-			obstack_printf(obst, "\t.skip\t%d\n", space);
+		if (space > 0) {
+			be_emit_irprintf("\t.space\t%d\n", space);
+			be_emit_write_line();
+		}
 	}
 	xfree(vals);
 }
 
+static void emit_align(unsigned p2alignment)
+{
+	be_emit_irprintf("\t.p2align\t%u\n", log2_floor(p2alignment));
+	be_emit_write_line();
+}
+
+static unsigned get_effective_entity_alignment(const ir_entity *entity)
+{
+	unsigned alignment = get_entity_alignment(entity);
+	if (alignment == 0) {
+		ir_type *type = get_entity_type(entity);
+		alignment     = get_type_alignment_bytes(type);
+	}
+	return alignment;
+}
+
+static be_gas_section_t determine_section(be_gas_decl_env_t *env,
+                                          const ir_entity *entity)
+{
+	ir_type *owner = get_entity_owner(entity);
+
+	if (owner == get_segment_type(IR_SEGMENT_GLOBAL)) {
+		ir_linkage linkage = get_entity_linkage(entity);
+		if (linkage & IR_LINKAGE_CONSTANT) {
+			/* mach-o is the only one with a cstring section */
+			if (be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O
+					&& ent_is_string_const(entity))
+				return GAS_SECTION_CSTRING;
+
+			return GAS_SECTION_RODATA;
+		}
+		if (!entity_has_definition(entity))
+			return GAS_SECTION_BSS;
+
+		return GAS_SECTION_DATA;
+
+	} else if (owner == env->main_env->pic_symbols_type) {
+		return GAS_SECTION_PIC_SYMBOLS;
+	} else if (owner == env->main_env->pic_trampolines_type) {
+		return GAS_SECTION_PIC_TRAMPOLINES;
+	} else if (owner == get_segment_type(IR_SEGMENT_CONSTRUCTORS)) {
+		return GAS_SECTION_CONSTRUCTORS;
+	} else if (owner == get_segment_type(IR_SEGMENT_DESTRUCTORS)) {
+		return GAS_SECTION_DESTRUCTORS;
+	} else if (owner == get_segment_type(IR_SEGMENT_THREAD_LOCAL)) {
+		return GAS_SECTION_TLS;
+	}
+
+	panic("Couldn't determine section for %+F?!?", entity);
+}
+
+static void emit_common(const ir_entity *ent)
+{
+	const char *name      = get_entity_ld_name(ent);
+	unsigned    size      = get_type_size_bytes(get_entity_type(ent));
+	unsigned    alignment = get_effective_entity_alignment(ent);
+
+	switch (be_gas_object_file_format) {
+	case OBJECT_FILE_FORMAT_MACH_O:
+		be_emit_irprintf("\t.comm %s,%u,%u\n", name, size,
+		                 log2_floor(alignment));
+		be_emit_write_line();
+		return;
+	case OBJECT_FILE_FORMAT_ELF:
+		be_emit_irprintf("\t.comm %s,%u,%u\n", name, size, alignment);
+		be_emit_write_line();
+		return;
+	case OBJECT_FILE_FORMAT_COFF:
+		be_emit_irprintf("\t.comm %s,%u # %u\n", name, size, alignment);
+		be_emit_write_line();
+		return;
+	}
+	panic("invalid object file format");
+}
+
 /**
  * Dump a global entity.
  *
- * @param env           the gas output environment
- * @param ent           the entity to be dumped
- * @param emit_commons  if non-zero, emit commons (non-local uninitialized entities)
+ * @param env  the gas output environment
+ * @param ent  the entity to be dumped
  */
-static void dump_global(be_gas_decl_env_t *env, ir_entity *ent, int emit_commons)
+static void dump_global(be_gas_decl_env_t *env, const ir_entity *ent)
 {
-	obstack_t *obst;
-	ir_type *type = get_entity_type(ent);
-	const char *ld_name = get_entity_ld_name(ent);
-	unsigned align = get_type_alignment_bytes(type);
-	int emit_as_common = 0;
-	ir_variability variability;
-	ir_visibility visibility;
-
-	obst = env->data_obst;
-	if (is_Method_type(type)) {
-		if (get_method_img_section(ent) == section_constructors) {
-			obst = env->ctor_obst;
-			obstack_printf(obst, ".balign\t%u\n", align);
-			dump_size_type(obst, align);
-			obstack_printf(obst, "%s\n", ld_name);
-		}
+	ir_type          *type           = get_entity_type(ent);
+	ident            *ld_ident       = get_entity_ld_ident(ent);
+	unsigned          alignment      = get_effective_entity_alignment(ent);
+	be_gas_section_t  section        = determine_section(env, ent);
+	ir_linkage        linkage        = get_entity_linkage(ent);
+
+	/* we already emitted all methods. Except for the trampolines which
+	 * the assembler/linker generates */
+	if (is_Method_type(type) && section != GAS_SECTION_PIC_TRAMPOLINES) {
 		return;
 	}
+	/* block labels are already emittet in the code */
+	if (type == firm_code_type)
+		return;
 
-	variability = get_entity_variability(ent);
-	visibility = get_entity_visibility(ent);
-	if (variability == variability_constant) {
-		/* a constant entity, put it on the rdata */
-		obst = env->rodata_obst;
-	} else if (variability == variability_uninitialized) {
-		/* uninitialized entity put it in bss segment */
-		obst = env->bss_obst;
-		if (emit_commons && visibility != visibility_local)
-			emit_as_common = 1;
-	}
+	be_dbg_variable(ent);
 
-	be_dbg_variable(env->main_env->db_handle, obst, ent);
+	/* nothing to do for externally defined values */
+	if (linkage & IR_LINKAGE_EXTERN)
+		return;
+
+	if (!is_po2(alignment))
+		panic("alignment not a power of 2");
 
-	/* global or not global */
-	if (visibility == visibility_external_visible && !emit_as_common) {
-		obstack_printf(obst, ".global\t%s\n", ld_name);
-	} else if(visibility == visibility_external_allocated) {
-		obstack_printf(obst, ".global\t%s\n", ld_name);
-		/* we can return now... */
+	if (section == GAS_SECTION_BSS &&
+			(get_entity_linkage(ent) & IR_LINKAGE_MERGE)) {
+		emit_common(ent);
 		return;
 	}
+
+	be_gas_emit_switch_section(section);
+
 	/* alignment */
-	if (align > 1 && !emit_as_common) {
-		obstack_printf(obst, ".balign\t%u\n", align);
+	if (alignment > 1) {
+		emit_align(alignment);
 	}
-
-	if (!emit_as_common) {
-		obstack_printf(obst, "%s:\n", ld_name);
+	emit_entity_visibility(ent);
+	if (be_gas_object_file_format == OBJECT_FILE_FORMAT_ELF
+			&& be_gas_emit_types) {
+		be_emit_cstring("\t.type\t");
+		be_emit_ident(ld_ident);
+		be_emit_cstring(", ");
+		be_emit_char(be_gas_elf_type_char);
+		be_emit_cstring("object\n\t.size\t");
+		be_emit_ident(ld_ident);
+		be_emit_irprintf(", %u\n", get_type_size_bytes(type));
 	}
+	be_emit_ident(ld_ident);
+	be_emit_cstring(":\n");
+	be_emit_write_line();
 
-	if (variability == variability_uninitialized) {
-		if (emit_as_common) {
-			switch (be_gas_flavour) {
-			case GAS_FLAVOUR_NORMAL:
-			case GAS_FLAVOUR_YASM:
-				obstack_printf(obst, "\t.comm %s,%u,%u\n",
-					ld_name, get_type_size_bytes(type), align);
-				break;
-			case GAS_FLAVOUR_MINGW:
-				obstack_printf(obst, "\t.comm %s,%u # %u\n",
-					ld_name, get_type_size_bytes(type), align);
-				break;
-			case GAS_FLAVOUR_MAX:
-				panic("invalid gas flavour selected");
-			}
-		} else {
-			obstack_printf(obst, "\t.zero %u\n", get_type_size_bytes(type));
-		}
+	if (ent->initializer != NULL) {
+		dump_initializer(env, ent);
+	} else if(entity_has_compound_ent_values(ent)) {
+		dump_compound_graph_init(env, ent);
 	} else {
-		if (is_atomic_entity(ent)) {
-			dump_atomic_init(env, obst, get_atomic_ent_value(ent));
-		} else {
-			/* sort_compound_ent_values(ent); */
-
-			switch (get_type_tpop_code(get_entity_type(ent))) {
-			case tpo_array:
-				if (ent_is_string_const(ent))
-					dump_string_cst(obst, ent);
-				else
-					dump_compound_init(env, obst, ent);
-				break;
-			case tpo_struct:
-			case tpo_class:
-			case tpo_union:
-				dump_compound_init(env, obst, ent);
-				break;
-			default:
-				assert(0);
-			}
-		}
+		/* uninitialized */
+		be_emit_irprintf("\t.space %u\n", get_type_size_bytes(type));
+		be_emit_write_line();
 	}
 }
 
@@ -1080,129 +1260,45 @@ static void dump_global(be_gas_decl_env_t *env, ir_entity *ent, int emit_commons
  *
  * @param gt                a global like type, either the global or the TLS one
  * @param env               an environment
- * @param emit_commons      if non-zero, emit commons (non-local uninitialized entities)
- * @param only_emit_marked  if non-zero, external allocated entities that do not have
- *                          its visited flag set are ignored
  */
-static void be_gas_dump_globals(ir_type *gt, be_gas_decl_env_t *env,
-                              int emit_commons, int only_emit_marked)
+static void be_gas_dump_globals(ir_type *gt, be_gas_decl_env_t *env)
 {
 	int i, n = get_compound_n_members(gt);
-	waitq *worklist = new_waitq();
-
-	if (only_emit_marked) {
-		for (i = 0; i < n; i++) {
-			ir_entity *ent = get_compound_member(gt, i);
-			if (is_entity_backend_marked(ent) ||
-			    get_entity_visibility(ent) != visibility_external_allocated) {
-				waitq_put(worklist, ent);
-				set_entity_backend_marked(ent, 1);
-			}
-		}
-	} else {
-		for (i = 0; i < n; i++) {
-			ir_entity *ent = get_compound_member(gt, i);
-			set_entity_backend_marked(ent, 1);
-			waitq_put(worklist, ent);
-		}
-	}
-
-	env->worklist = worklist;
 
-	while (!waitq_empty(worklist)) {
-		ir_entity *ent = waitq_get(worklist);
-
-		dump_global(env, ent, emit_commons);
+	for (i = 0; i < n; i++) {
+		ir_entity *ent = get_compound_member(gt, i);
+		dump_global(env, ent);
 	}
-
-	del_waitq(worklist);
-	env->worklist = NULL;
 }
 
 /************************************************************************/
 
 /* Generate all entities. */
-void be_gas_emit_decls(const be_main_env_t *main_env,
-                       int only_emit_marked_entities)
+void be_gas_emit_decls(const be_main_env_t *main_env)
 {
 	be_gas_decl_env_t env;
-	obstack_t         rodata;
-	obstack_t         data;
-	obstack_t         bss;
-	obstack_t         ctor;
-	int               size;
-	char              *cp;
-
-	/* dump the global type */
-	obstack_init(&rodata);
-	obstack_init(&data);
-	obstack_init(&bss);
-	obstack_init(&ctor);
-
-	env.rodata_obst = &rodata;
-	env.data_obst   = &data;
-	env.bss_obst    = &bss;
-	env.ctor_obst   = &ctor;
-	env.main_env    = main_env;
-
-	be_gas_dump_globals(get_glob_type(), &env, 1, only_emit_marked_entities);
-
-	size = obstack_object_size(&data);
-	cp   = obstack_finish(&data);
-	if (size > 0) {
-		be_gas_emit_switch_section(GAS_SECTION_DATA);
-		be_emit_string_len(cp, size);
-		be_emit_write_line();
-	}
-
-	size = obstack_object_size(&rodata);
-	cp   = obstack_finish(&rodata);
-	if (size > 0) {
-		be_gas_emit_switch_section(GAS_SECTION_RODATA);
-		be_emit_string_len(cp, size);
-		be_emit_write_line();
-	}
-
-	size = obstack_object_size(&bss);
-	cp   = obstack_finish(&bss);
-	if (size > 0) {
-		be_gas_emit_switch_section(GAS_SECTION_COMMON);
-		be_emit_string_len(cp, size);
-		be_emit_write_line();
-	}
-
-	size = obstack_object_size(&ctor);
-	cp   = obstack_finish(&ctor);
-	if (size > 0) {
-		be_gas_emit_switch_section(GAS_SECTION_CTOR);
-		be_emit_string_len(cp, size);
-		be_emit_write_line();
-	}
-
-	obstack_free(&rodata, NULL);
-	obstack_free(&data, NULL);
-	obstack_free(&bss, NULL);
-	obstack_free(&ctor, NULL);
-
-	/* dump the Thread Local Storage */
-	obstack_init(&data);
-
-	env.rodata_obst = &data;
-	env.data_obst   = &data;
-	env.bss_obst    = &data;
-	env.ctor_obst   = NULL;
-
-	be_gas_dump_globals(get_tls_type(), &env, 0, only_emit_marked_entities);
-
-	size = obstack_object_size(&data);
-	cp   = obstack_finish(&data);
-	if (size > 0) {
-		be_gas_emit_switch_section(GAS_SECTION_TLS);
-		be_emit_cstring(".balign\t32\n");
-		be_emit_write_line();
-		be_emit_string_len(cp, size);
+	memset(&env, 0, sizeof(env));
+
+	/* dump global type */
+	env.main_env = main_env;
+	env.section  = (be_gas_section_t) -1;
+
+	be_gas_dump_globals(get_glob_type(), &env);
+	be_gas_dump_globals(get_tls_type(), &env);
+	be_gas_dump_globals(get_segment_type(IR_SEGMENT_CONSTRUCTORS), &env);
+	be_gas_dump_globals(get_segment_type(IR_SEGMENT_DESTRUCTORS), &env);
+	be_gas_dump_globals(main_env->pic_symbols_type, &env);
+	be_gas_dump_globals(main_env->pic_trampolines_type, &env);
+
+	/**
+	 * ".subsections_via_symbols marks object files which are OK to divide
+	 * their section contents into individual blocks".
+	 * From my understanding this means no label points in the middle of an
+	 * object which we want to address as a whole. Firm code should be fine
+	 * with this.
+	 */
+	if (be_gas_object_file_format == OBJECT_FILE_FORMAT_MACH_O) {
+		be_emit_cstring("\t.subsections_via_symbols\n");
 		be_emit_write_line();
 	}
-
-	obstack_free(&data, NULL);
 }