Merge https://github.com/yasm/yasm/commit/01ab853e68ef8aeded716d6f5b34895200f66a51

modules/objfmts/macho/macho-objfmt.c

 /*
  * Mac OS X ABI Mach-O File Format 
  *
  *  Copyright (C) 2007 Henryk Richter, built upon xdf objfmt (C) Peter Johnson
  *   
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
@@ skipping 1480 matching lines @@
     yasm_xfree(realname);
 
     msd = yasm_section_get_data(retval, &macho_section_data_cb);
 
     if (isnew || yasm_section_is_default(retval)) {
         yasm_section_set_default(retval, 0);
         msd->segname = data.f_segname;
         msd->sectname = f_sectname;
         msd->flags = flags;
         yasm_section_set_align(retval, align, line);
-    } else if (flags_override)
-        yasm_warn_set(YASM_WARN_GENERAL,
-                      N_("section flags ignored on section redeclaration"));
+    } else if (flags_override) {
+        // align is the only value used from overrides.
+        if (yasm_section_get_align(retval) != align) {
+            yasm_warn_set(YASM_WARN_GENERAL,
+                          N_("section flags ignored on section redeclaration"));
+        }
+    }
     return retval;
 }
 
 static /*@observer@*/ /*@null@*/ yasm_symrec *
 macho_objfmt_get_special_sym(yasm_object *object, const char *name,
                              const char *parser)
 {
     yasm_objfmt_macho *objfmt_macho = (yasm_objfmt_macho *)object->objfmt;
     if (yasm__strcasecmp(name, "gotpcrel") == 0) {
         return objfmt_macho->gotpcrel_sym;
@@ skipping 101 matching lines @@
     NULL,   /* no directives */
     NULL,   /* no standard macros */
     macho64_objfmt_create,
     macho_objfmt_output,
     macho_objfmt_destroy,
     macho_objfmt_add_default_section,
     macho_objfmt_init_new_section,
     macho_objfmt_section_switch,
     macho_objfmt_get_special_sym
 };