Beefed up the cmd line parsing to cope with linking startgroup and endgroup;5Ds

Author: ianamason

shared/parser.go

@@ -208,6 +208,10 @@ func Parse(argList []string) ParserResult {
 		"-mno-avx2":                    {0, pr.compileUnaryCallback},
 		"-mno-red-zone":                {0, pr.compileUnaryCallback},
 		"-mmmx":                        {0, pr.compileUnaryCallback},
+		"-mbmi":                        {0, pr.compileUnaryCallback},
+		"-mbmi2":                       {0, pr.compileUnaryCallback},
+		"-mf161c":                      {0, pr.compileUnaryCallback},
+		"-mfma":                        {0, pr.compileUnaryCallback},
 		"-mno-mmx":                     {0, pr.compileUnaryCallback},
 		"-mno-global-merge":            {0, pr.compileUnaryCallback}, //iam: linux kernel stuff
 		"-mno-80387":                   {0, pr.compileUnaryCallback}, //iam: linux kernel stuff
@@ -290,6 +294,7 @@ func Parse(argList []string) ParserResult {
 		"-gdwarf-4":             {0, pr.compileUnaryCallback},
 		"-gline-tables-only":    {0, pr.compileUnaryCallback},
 		"-grecord-gcc-switches": {0, pr.compileUnaryCallback},
+		"-ggnu-pubnames":        {0, pr.compileUnaryCallback},
 
 		"-p":  {0, pr.compileUnaryCallback},
 		"-pg": {0, pr.compileUnaryCallback},
@@ -364,7 +369,7 @@ func Parse(argList []string) ParserResult {
 		{`^-W[^l].*$`, flagInfo{0, pr.compileUnaryCallback}},
 		{`^-W[l][^,].*$`, flagInfo{0, pr.compileUnaryCallback}}, //iam: tor has a few -Wl...
 		{`^-fsanitize=.+$`, flagInfo{0, pr.compileLinkUnaryCallback}},
-		{`^-fuse-ld=.+$`, flagInfo{0, pr.linkUnaryCallback}}, //iam:  musl stuff
+		{`^-fuse-ld=.+$`, flagInfo{0, pr.linkUnaryCallback}},         //iam:  musl stuff
 		{`^-flto=.+$`, flagInfo{0, pr.linkTimeOptimizationCallback}}, //iam: new lto stuff
 		{`^-f.+$`, flagInfo{0, pr.compileUnaryCallback}},
 		{`^-rtlib=.+$`, flagInfo{0, pr.linkUnaryCallback}},
@@ -391,32 +396,53 @@ func Parse(argList []string) ParserResult {
 		if fi, ok := argsExactMatches[elem]; ok {
 			fi.handler(elem, argList[1:1+fi.arity])
 			argList = argList[1+fi.arity:]
-			// Else try to match a pattern
+			// else it is more complicated, either a pattern or a group
 		} else {
 			var listShift = 0
-			var matched = false
-
-			for _, argPat := range argPatterns {
-				pattern := argPat.pattern
-				fi := argPat.finfo
-				var regExp = regexp.MustCompile(pattern)
-				if regExp.MatchString(elem) {
-					fi.handler(elem, argList[1:1+fi.arity])
-					listShift = fi.arity
-					matched = true
-					break
+			//need to handle the N-ary grouping flag
+			if elem == "-Wl,--start-group" {
+				endgroup := indexOf("-Wl,--end-group", argList)
+				if endgroup > 0 {
+					pr.linkerGroupCallback(elem, endgroup+1, argList)
+					listShift = endgroup
+				} else {
+					LogWarning("Failed to find '-Wl,--end-group' matching '-Wl,--start-group'\n")
+					pr.compileUnaryCallback(elem, argList[1:1])
+				}
+				//else try to match a pattern
+			} else {
+				var matched = false
+				for _, argPat := range argPatterns {
+					pattern := argPat.pattern
+					fi := argPat.finfo
+					var regExp = regexp.MustCompile(pattern)
+					if regExp.MatchString(elem) {
+						fi.handler(elem, argList[1:1+fi.arity])
+						listShift = fi.arity
+						matched = true
+						break
+					}
+				}
+				if !matched {
+					LogWarning("Did not recognize the compiler flag: %v\n", elem)
+					pr.compileUnaryCallback(elem, argList[1:1])
 				}
-			}
-			if !matched {
-				LogWarning("Did not recognize the compiler flag: %v\n", elem)
-				pr.compileUnaryCallback(elem, argList[1:1])
 			}
 			argList = argList[1+listShift:]
 		}
 	}
 	return pr
 }
 
+func indexOf(value string, slice []string) int {
+	for p, v := range slice {
+		if v == value {
+			return p
+		}
+	}
+	return -1
+}
+
 // Return the object and bc filenames that correspond to the i-th source file
 func getArtifactNames(pr ParserResult, srcFileIndex int, hidden bool) (objBase string, bcBase string) {
 	if len(pr.InputFiles) == 1 && pr.IsCompileOnly && len(pr.OutputFilename) > 0 {
@@ -470,6 +496,11 @@ func (pr *ParserResult) objectFileCallback(flag string, _ []string) {
 	pr.LinkArgs = append(pr.LinkArgs, flag)
 }
 
+func (pr *ParserResult) linkerGroupCallback(start string, count int, args []string) {
+	group := args[0:count]
+	pr.LinkArgs = append(pr.LinkArgs, group...)
+}
+
 func (pr *ParserResult) preprocessOnlyCallback(_ string, _ []string) {
 	pr.IsPreprocessOnly = true
 }

tests/parsing_test.go

@@ -10,15 +10,30 @@ const input0 = `-pthread -c -Wno-unused-result -Wsign-compare -Wunreachable-code
 
 const input1 = `-pthread -c -Wno-unused-result -Wsign-compare -Wunreachable-code -DNDEBUG -g -fwrapv -O3 -Wall -march=x86-64 -mtune=generic -O3 -pipe -fno-plt -g -fdebug-prefix-map=/home/legend/makepkgs/python/src=/usr/src/debug -fno-semantic-interposition -march=x86-64 -mtune=generic -O3 -pipe -fno-plt -g -fdebug-prefix-map=/home/legend/makepkgs/python/src=/usr/src/debug -fno-semantic-interposition -march=x86-64 -mtune=generic -O3 -pipe -fno-plt -g -fdebug-prefix-map=/home/legend/makepkgs/python/src=/usr/src/debug -fno-semantic-interposition -flto=thin -g -std=c99 -Wextra -Wno-unused-result -Wno-unused-parameter -Wno-missing-field-initializers -Wstrict-prototypes -Werror=implicit-function-declaration -fprofile-instr-use=code.profclangd -I./Include/internal  -I. -I./Include -D_FORTIFY_SOURCE=2 -D_FORTIFY_SOURCE=2 -fPIC -DPy_BUILD_CORE -DSOABI='"cpython-38-x86_64-linux-gnu"'	-o Python/dynload_shlib.o ./Python/dynload_shlib.c`
 
-func pt(input string, t *testing.T) {
+const input2 = `-Wl,--fatal-warnings -Wl,--build-id=sha1 -fPIC -Wl,-z,noexecstack -Wl,-z,relro -Wl,-z,now -Wl,-z,defs -Wl,--as-needed -fuse-ld=lld -Wl,--icf=all -Wl,--color-diagnostics -flto=thin -Wl,--thinlto-jobs=8 -Wl,--thinlto-cache-dir=thinlto-cache -Wl,--thinlto-cache-policy,cache_size=10\%:cache_size_bytes=10g:cache_size_files=100000 -Wl,--lto-O0 -fwhole-program-vtables -Wl,--no-call-graph-profile-sort -m64 -Wl,-O2 -Wl,--gc-sections -Wl,--gdb-index -rdynamic -fsanitize=cfi-vcall -fsanitize=cfi-icall -pie -Wl,--disable-new-dtags -Wl,-O1,--sort-common,--as-needed,-z,relro,-z,now -o "./brotli" -Wl,--start-group @"./brotli.rsp"  -Wl,--end-group  -latomic -ldl -lpthread -lrt
+`
+
+const input3 = `1.c 2.c 3.c 4.c 5.c -Wl,--start-group 7.o 8.o 9.o -Wl,--end-group 10.c 11.c 12.c 13.c`
+
+func plto(input string, t *testing.T) {
 	cmds := strings.Fields(input)
 	parsed := shared.Parse(cmds)
 	if !parsed.IsLTO {
-		t.Errorf("Parsing of  %v FAILED %v (not LTO)\n", input, parsed)	
+		t.Errorf("Parsing of  %v FAILED %v (not LTO)\n", input, parsed)
+	}
+}
+
+func pl(input string, t *testing.T, expected int) {
+	cmds := strings.Fields(input)
+	parsed := shared.Parse(cmds)
+	if expected != len(parsed.LinkArgs) {
+		t.Errorf("Linking args %v of length %v NOT the expected length %v\n", parsed.LinkArgs, len(parsed.LinkArgs), expected)
 	}
 }
 
 func Test_parsing(t *testing.T) {
-	pt(input0, t)
-	pt(input1, t)
+	plto(input0, t)
+	plto(input1, t)
+	pl(input2, t, 32)
+	pl(input3, t, 5)
 }