From 2599d13f54c22ae76eaa33810eb6c32adc9e4b10 Mon Sep 17 00:00:00 2001
From: John van Groningen
Date: Mon, 30 May 2016 10:04:17 +0000
Subject: add data_object_section_align_p2 for MACH_O64, because data_object
 doesn't exist

---
 cgaas.c | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/cgaas.c b/cgaas.c
index 8979a9e..2804cf6 100644
--- a/cgaas.c
+++ b/cgaas.c
@@ -111,6 +111,10 @@ struct object_label {
 	unsigned char			object_section_align_p2; /* 2 for 4, 3 for 8, 4 for 16 */
 };
 
+#ifdef G_MACH_O64
+static unsigned char data_object_section_align_p2; /* 2 for 4, 3 for 8, 4 for 16 */
+#endif
+
 #define object_label_offset object_label_u1.offset
 #define object_label_label object_label_u1.label
 
@@ -375,6 +379,10 @@ void initialize_assembler (FILE *output_file_d)
 	data_object_label->object_section_align_p2=2;
 # endif
 #endif
+
+#ifdef G_MACH_O64
+	data_object_section_align_p2=2;
+#endif
 }
 
 static void store_c (int c)
@@ -3986,11 +3994,13 @@ static void as_f_i (int code1,int code2,DOUBLE *r_p,int d_freg)
 	if (data_object_label==NULL)
 		as_new_data_module();
 #endif
+#ifndef G_MACH_O64
 	if (data_object_label->object_section_align_p2<3)
 		data_object_label->object_section_align_p2=3;
-#ifndef G_MACH_O64
 	if ((data_buffer_p-current_data_buffer->data-data_object_label->object_label_offset) & 4)
 #else
+	if (data_object_section_align_p2<3)
+		data_object_section_align_p2=3;
 	if ((data_buffer_p-current_data_buffer->data) & 4)
 #endif
 		store_long_word_in_data_section (0);
@@ -4193,11 +4203,13 @@ static void as_float_neg_instruction (struct instruction *instruction)
 		if (data_object_label==NULL)
 			as_new_data_module();
 #endif
+#ifndef G_MACH_O64
 		if (data_object_label->object_section_align_p2<4)
 			data_object_label->object_section_align_p2=4;
-#ifndef G_MACH_O64
 		while ((data_buffer_p-current_data_buffer->data-data_object_label->object_label_offset) & 0xc)
 #else
+		if (data_object_section_align_p2<4)
+			data_object_section_align_p2=4;
 		while ((data_buffer_p-current_data_buffer->data) & 0xc)
 #endif
 			store_long_word_in_data_section (0);
@@ -4269,11 +4281,13 @@ static void as_float_abs_instruction (struct instruction *instruction)
 		if (data_object_label==NULL)
 			as_new_data_module();
 #endif
+#ifndef G_MACH_O64
 		if (data_object_label->object_section_align_p2<4)
 			data_object_label->object_section_align_p2=4;
-#ifndef G_MACH_O64
 		while ((data_buffer_p-current_data_buffer->data-data_object_label->object_label_offset) & 0xc)
 #else
+		if (data_object_section_align_p2<4)
+			data_object_section_align_p2=4;
 		while ((data_buffer_p-current_data_buffer->data) & 0xc)
 #endif
 			store_long_word_in_data_section (0);
-- 
cgit v1.2.3