Handle structmemberalign for non-visual studio actions

Author: Jarod42

modules/vstudio/_preload.lua

@@ -422,19 +422,6 @@
 		kind = "boolean"
 	}
 
-	p.api.register {
-		name = "structmemberalign",
-		scope = "config",
-		kind = "integer",
-		allowed = {
-			"1",
-			"2",
-			"4",
-			"8",
-			"16",
-		}
-	}
-
 	p.api.register {
 		name = "symbolspath",
 		scope = "config",

modules/vstudio/tests/vc2019/test_compile_settings.lua

@@ -93,6 +93,24 @@
 		]]
 	end
 
+--
+-- Check StructMemberAlignment
+--
+
+	function suite.structMemberAlignmentWithClang()
+		toolset "clang"
+		structmemberalign(2)
+		prepare()
+		test.capture [[
+<ClCompile>
+	<PrecompiledHeader>NotUsing</PrecompiledHeader>
+	<WarningLevel>Level3</WarningLevel>
+	<Optimization>Disabled</Optimization>
+	<AdditionalOptions>/Zp2 %(AdditionalOptions)</AdditionalOptions>
+	<StructMemberAlignment>2Bytes</StructMemberAlignment>
+]]
+	end
+
 --
 -- Check ClCompile for ScanForModuleDependencies
 --

modules/vstudio/vs2010_vcxproj.lua

@@ -2157,6 +2157,10 @@
 			if cfg.openmp == "On" then
 				table.insert(opts, 1, '/openmp')
 			end
+			-- <StructMemberAlignment>N</StructMemberAlignment> is unfortunately partially ignored with clang toolset
+			if cfg.structmemberalign then
+				table.insert(opts, 1, '/Zp' .. tostring(cfg.structmemberalign))
+			end
 		end
 
 		if #opts > 0 then

modules/xcode/tests/test_xcode_project.lua

@@ -3214,6 +3214,32 @@
 		]]
 	end
 
+	function suite.XCBuildConfigurationProject_OnStructmemberalign()
+		structmemberalign(2)
+		prepare()
+		xcode.XCBuildConfiguration_Project(tr, tr.configs[1])
+		test.capture [[
+		A14350AC4595EE5E57CE36EC /* Debug */ = {
+			isa = XCBuildConfiguration;
+			buildSettings = {
+				ARCHS = "$(NATIVE_ARCH_ACTUAL)";
+				CONFIGURATION_BUILD_DIR = "$(SYMROOT)";
+				CONFIGURATION_TEMP_DIR = "$(OBJROOT)";
+				GCC_OPTIMIZATION_LEVEL = 0;
+				GCC_SYMBOLS_PRIVATE_EXTERN = NO;
+				GCC_WARN_ABOUT_RETURN_TYPE = YES;
+				GCC_WARN_UNUSED_VARIABLE = YES;
+				OBJROOT = obj/Debug;
+				ONLY_ACTIVE_ARCH = NO;
+				OTHER_CFLAGS = (
+					"-fpack-struct=2",
+				);
+				SYMROOT = bin/Debug;
+			};
+			name = Debug;
+		};
+		]]
+	end
 
 	function suite.XCBuildConfigurationProject_OnNoPCH()
 		pchheader "MyProject_Prefix.pch"

modules/xcode/xcode_common.lua

@@ -1588,6 +1588,10 @@
 
 		settings['OTHER_CFLAGS'] = table.join(flags, cfg.buildoptions)
 
+		if cfg.structmemberalign then
+			table.insert(settings['OTHER_CFLAGS'], "-fpack-struct=" .. tostring(cfg.structmemberalign))
+		end
+
 		-- build list of "other" linked flags.
 		flags = { }
 		for _, lib in ipairs(config.getlinks(cfg, "system")) do

src/_premake_init.lua

@@ -822,6 +822,19 @@
 		}
 	}
 
+	api.register {
+		name = "structmemberalign",
+		scope = "config",
+		kind = "integer",
+		allowed = {
+			"1",
+			"2",
+			"4",
+			"8",
+			"16",
+		}
+	}
+
 	api.register {
 		name = "symbols",
 		scope = "config",

src/base/config.lua

@@ -575,7 +575,7 @@
 				-- result if the corresponding value is not present
 
 				for key, replacement in pairs(map) do
-					if #key > 1 and key:startswith("_") then
+					if type(key) == "string" and #key > 1 and key:startswith("_") then
 						key = key:sub(2)
 						if values[key] == nil then
 							add(replacement)

src/tools/gcc.lua

@@ -154,6 +154,13 @@
 			Thread = "-fsanitize=thread",
 			UndefinedBehavior = "-fsanitize=undefined",
 		},
+		structmemberalign = {
+			[1] = "-fpack-struct=1",
+			[2] = "-fpack-struct=2",
+			[4] = "-fpack-struct=4",
+			[8] = "-fpack-struct=8",
+			[16] = "-fpack-struct=16",
+		},
 		visibility = {
 			Default = "-fvisibility=default",
 			Hidden = "-fvisibility=hidden",

src/tools/msc.lua

@@ -139,6 +139,13 @@
 			On = "/GF",
 			Off = "/GF-",
 		},
+		structmemberalign = {
+			[1] = "/Zp1",
+			[2] = "/Zp2",
+			[4] = "/Zp4",
+			[8] = "/Zp8",
+			[16] = "/Zp16",
+		},
 		symbols = {
 			On = "/Z7"
 		},

tests/tools/test_gcc.lua

@@ -183,6 +183,32 @@
 		test.contains({ "-ffloat-store" }, gcc.getcflags(cfg))
 	end
 
+	function suite.cflags_onStructmemberalign1()
+		structmemberalign(1)
+		prepare()
+		test.contains({ "-fpack-struct=1" }, gcc.getcflags(cfg))
+	end
+	function suite.cflags_onStructmemberalign2()
+		structmemberalign(2)
+		prepare()
+		test.contains({ "-fpack-struct=2" }, gcc.getcflags(cfg))
+	end
+	function suite.cflags_onStructmemberalign4()
+		structmemberalign(4)
+		prepare()
+		test.contains({ "-fpack-struct=4" }, gcc.getcflags(cfg))
+	end
+	function suite.cflags_onStructmemberalign8()
+		structmemberalign(8)
+		prepare()
+		test.contains({ "-fpack-struct=8" }, gcc.getcflags(cfg))
+	end
+	function suite.cflags_onStructmemberalign16()
+		structmemberalign(16)
+		prepare()
+		test.contains({ "-fpack-struct=16" }, gcc.getcflags(cfg))
+	end
+
 	function suite.cflags_onSSE()
 		vectorextensions "SSE"
 		prepare()