llcppsymg:syspath.GetLibPaths

Author: luoliwoshang

_xtool/llcppsymg/_cmptest/syspath_test/llgo.expect

@@ -0,0 +1,7 @@
+#stdout
+=== TestLdOutput ===
+[/usr/local/lib/aarch64-linux-gnu /lib/aarch64-linux-gnu /usr/lib/aarch64-linux-gnu /usr/local/lib /lib /usr/lib /usr/aarch64-linux-gnu/lib]
+
+#stderr
+
+#exit 0

_xtool/llcppsymg/_cmptest/syspath_test/syspath.go

@@ -0,0 +1,54 @@
+package main
+
+import (
+	"fmt"
+
+	"github.com/goplus/llcppg/_xtool/llcppsymg/syspath"
+)
+
+func main() {
+	TestLdOutput()
+}
+
+func TestLdOutput() {
+	fmt.Println("=== TestLdOutput ===")
+	res := syspath.ParseLdOutput(
+		`GNU ld (GNU Binutils for Ubuntu) 2.42
+  Supported emulations:
+   aarch64linux
+   aarch64elf
+   aarch64elf32
+   aarch64elf32b
+   aarch64elfb
+   armelf
+   armelfb
+   aarch64linuxb
+   aarch64linux32
+   aarch64linux32b
+   armelfb_linux_eabi
+   armelf_linux_eabi
+using internal linker script:
+==================================================
+/* Script for -z combreloc */
+/* Copyright (C) 2014-2024 Free Software Foundation, Inc.
+   Copying and distribution of this script, with or without modification,
+   are permitted in any medium without royalty provided the copyright
+   notice and this notice are preserved.  */
+OUTPUT_FORMAT("elf64-littleaarch64", "elf64-bigaarch64",
+              "elf64-littleaarch64")
+OUTPUT_ARCH(aarch64)
+ENTRY(_start)
+SEARCH_DIR("=/usr/local/lib/aarch64-linux-gnu"); SEARCH_DIR("=/lib/aarch64-linux-gnu"); SEARCH_DIR("=/usr/lib/aarch64-linux-gnu"); SEARCH_DIR("=/usr/local/lib"); SEARCH_DIR("=/lib"); SEARCH_DIR("=/usr/lib"); SEARCH_DIR("=/usr/aarch64-linux-gnu/lib");
+SECTIONS
+{
+  /* Read-only sections, merged into text segment: */
+  PROVIDE (__executable_start = SEGMENT_START("text-segment", 0x400000)); . = SEGMENT_START("text-segment", 0x400000) + SIZEOF_HEADERS;
+  .interp         : { *(.interp) }
+  .note.gnu.build-id  : { *(.note.gnu.build-id) }
+  .hash           : { *(.hash) }
+  .gnu.hash       : { *(.gnu.hash) }
+  .dynsym         : { *(.dynsym) }
+  .dynstr         : { *(.dynstr) }
+`)
+	fmt.Println(res)
+}

_xtool/llcppsymg/config/cfgparse/parse.go

@@ -82,7 +82,7 @@ func ParseCFlags(cflags string) *CFlags {
 	return cf
 }
 
-func (cf *CFlags) GenHeaderFilePaths(files []string) ([]string, []string, error) {
+func (cf *CFlags) GenHeaderFilePaths(files []string, defaultPaths []string) ([]string, []string, error) {
 	var foundPaths []string
 	var notFound []string
 

_xtool/llcppsymg/llcppsymg.go

@@ -79,7 +79,7 @@ func main() {
 	check(err)
 
 	cflag := cfgparse.ParseCFlags(conf.CFlags)
-	filepaths, notFounds, err := cflag.GenHeaderFilePaths(conf.Include)
+	filepaths, notFounds, err := cflag.GenHeaderFilePaths(conf.Include, []string{})
 	check(err)
 
 	if ags.Verbose {

_xtool/llcppsymg/symbol/symbol.go

@@ -4,8 +4,6 @@ import (
 	"errors"
 	"fmt"
 	"os"
-	"os/exec"
-	"regexp"
 	"runtime"
 	"strings"
 	"unsafe"
@@ -14,6 +12,7 @@ import (
 	"github.com/goplus/llcppg/_xtool/llcppsymg/config/cfgparse"
 	"github.com/goplus/llcppg/_xtool/llcppsymg/dbg"
 	"github.com/goplus/llcppg/_xtool/llcppsymg/parse"
+	"github.com/goplus/llcppg/_xtool/llcppsymg/syspath"
 	"github.com/goplus/llcppg/types"
 	"github.com/goplus/llgo/c"
 	"github.com/goplus/llgo/c/cjson"
@@ -30,7 +29,11 @@ func ParseDylibSymbols(lib string) ([]*nm.Symbol, error) {
 	if dbg.GetDebugSymbol() {
 		fmt.Println("ParseDylibSymbols:from", lib)
 	}
-	sysPaths := getSysLibPaths()
+	sysPaths = syspath.GetLibPaths()
+	if dbg.GetDebugSymbol() {
+		fmt.Println("ParseDylibSymbols:sysPaths", sysPaths)
+	}
+
 	lbs := cfgparse.ParseLibs(lib)
 	if dbg.GetDebugSymbol() {
 		fmt.Println("ParseDylibSymbols:LibConfig Parse To")
@@ -91,48 +94,6 @@ func ParseDylibSymbols(lib string) ([]*nm.Symbol, error) {
 	return nil, fmt.Errorf("no symbols found in any dylib. Errors: %v", parseErrors)
 }
 
-func getSysLibPaths() []string {
-	var paths []string
-	if runtime.GOOS == "linux" {
-		if dbg.GetDebugSymbol() {
-			fmt.Println("getSysLibPaths:find sys lib path from linux")
-		}
-		//resolution from https://github.com/goplus/llcppg/commit/02307485db9269481297a4dc5e8449fffaa4f562
-		cmd := exec.Command("ld", "--verbose")
-		output, err := cmd.Output()
-		if err != nil {
-			panic(err)
-		}
-		matches := regexp.MustCompile(`SEARCH_DIR\("=([^"]+)"\)`).FindAllStringSubmatch(string(output), -1)
-		for _, match := range matches {
-			paths = append(paths, match[1])
-		}
-		return paths
-	}
-	return paths
-}
-
-func getPath(file string) []string {
-	if dbg.GetDebugSymbol() {
-		fmt.Println("getPath:from", file)
-	}
-	var paths []string
-	content, err := os.ReadFile(file)
-	if err != nil {
-		return paths
-	}
-	lines := strings.Split(string(content), "\n")
-	for _, line := range lines {
-		line = strings.TrimSpace(line)
-		if line != "" && !strings.HasPrefix(line, "#") {
-			if file, err := os.Stat(line); err == nil && file.IsDir() {
-				paths = append(paths, line)
-			}
-		}
-	}
-	return paths
-}
-
 // finds the intersection of symbols from the dynamic library's symbol table and the symbols parsed from header files.
 // It returns a list of symbols that can be externally linked.
 func GetCommonSymbols(dylibSymbols []*nm.Symbol, headerSymbols map[string]*parse.SymbolInfo) []*types.SymbolInfo {

cmd/gogensig/convert/deps.go

@@ -164,7 +164,7 @@ func (p *PkgInfo) GetIncPaths() ([]string, []string, error) {
 	}
 	expandedIncFlags := env.ExpandEnv(p.CppgConf.CFlags)
 	cflags := cfgparse.ParseCFlags(expandedIncFlags)
-	incPaths, notFounds, err := cflags.GenHeaderFilePaths(p.CppgConf.Include)
+	incPaths, notFounds, err := cflags.GenHeaderFilePaths(p.CppgConf.Include, []string{})
 	p.includes = incPaths
 	return incPaths, notFounds, err
 }