[Darwin, X86] Backport fix for tests using .p2align.

This fixes a number of testcases that expect use of .p2align, which
was somehow omitted from the darwin X86 port (but is available in all
assemblers used with it).

2019-09-06  Iain Sandoe  <iain@sandoe.co.uk>

	Backport from mainline
	2019-05-31  Iain Sandoe  <iain@sandoe.co.uk>

	* config/i386/darwin.h (ASM_OUTPUT_MAX_SKIP_ALIGN): New.

From-SVN: r275465

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 7b533b54e469b253ce927de8747f64d08db35a70..412a16442a059a82d8d46ca121fe0d422c02388f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2019-09-06  Iain Sandoe  <iain@sandoe.co.uk>
+
+       Backport from mainline
+       2019-05-31  Iain Sandoe  <iain@sandoe.co.uk>
+
+       * config/i386/darwin.h (ASM_OUTPUT_MAX_SKIP_ALIGN): New.
+
 2019-09-05  Iain Sandoe  <iain@sandoe.co.uk>
 
        Backport from mainline

diff --git a/gcc/config/i386/darwin.h b/gcc/config/i386/darwin.h
index 58c174cbb92d31b0906edf903559179e08f33638..bd12055d03ecbe36869a5886cba2cc11346ae7d7 100644 (file)
--- a/gcc/config/i386/darwin.h
+++ b/gcc/config/i386/darwin.h
@@ -220,6 +220,18 @@ extern int darwin_emit_branch_islands;
         }                              \
     } while (0)
 
+#ifdef HAVE_GAS_MAX_SKIP_P2ALIGN
+#define ASM_OUTPUT_MAX_SKIP_ALIGN(FILE,LOG,MAX_SKIP)                    \
+  do {                                                                  \
+    if ((LOG) != 0) {                                                   \
+      if ((MAX_SKIP) == 0 || (MAX_SKIP) >= (1 << (LOG)) - 1)            \
+        fprintf ((FILE), "\t.p2align %d\n", (LOG));                     \
+      else                                                              \
+        fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP));     \
+    }                                                                   \
+  } while (0)
+#endif
+
 /* Darwin profiling -- call mcount.  */
 #undef FUNCTION_PROFILER
 #define FUNCTION_PROFILER(FILE, LABELNO)                               \