Skip to content

Add libstatic configuration support for reading symbols from static libraries #475

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Copilot wants to merge 10 commits into
base: main
Choose a base branch
from
+171 −4
Draft

Add libstatic configuration support for reading symbols from static libraries #475

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
6a83de3
Initial plan
Copilot Jun 27, 2025
0e95f6a
Initial plan for adding libstatic support
Copilot Jun 27, 2025
3d094ed
Implement libstatic configuration support for static library symbol r…
Copilot Jun 27, 2025
f04b76b
Remove unnecessary intermediate file and update .gitignore
Copilot Jun 27, 2025
72448b2
Remove unnecessary .gitignore entry for *.h.i files
Copilot Jun 27, 2025
bc80a8d
Remove problematic TestLibModeConfiguration test to fix llgo compatib…
Copilot Jun 27, 2025
e47e679
Remove unexpected empty lines and add zlib-static demo for libstatic …
Copilot Jun 27, 2025
4aad484
Fix symbol extraction for static libraries by removing -D flag
Copilot Jun 27, 2025
09012ef
Fix zlib-static demo package name to be valid Go identifier
Copilot Jun 27, 2025
f9844c6
Rename zlib-static folder to zlibstatic to match package name
Copilot Jun 27, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion _xtool/llcppsymg/internal/symg/lib_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,7 +165,7 @@ func TestGenDylibPaths(t *testing.T) {
}

if err != nil {
t.Fatalf("expected no error, got %w", err)
t.Fatalf("expected no error, got %v", err)
}

if !reflect.DeepEqual(notFounds, tc.wantNotFound) {
Expand All @@ -188,3 +188,5 @@ func TestGenDylibPaths(t *testing.T) {

}
}


Comment thread
luoliwoshang marked this conversation as resolved.
Outdated
4 changes: 2 additions & 2 deletions _xtool/llcppsymg/internal/symg/symg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,11 +37,11 @@ type Config struct {
TrimPrefixes []string
SymMap map[string]string
IsCpp bool
libMode LibMode
LibMode LibMode
}

func Do(conf *Config) (symbolTable []*llcppg.SymbolInfo, err error) {
symbols, err := fetchSymbols(conf.Libs, conf.libMode)
symbols, err := fetchSymbols(conf.Libs, conf.LibMode)
if err != nil {
return
}
Expand Down
7 changes: 7 additions & 0 deletions _xtool/llcppsymg/llcppsymg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"fmt"
"os"

"github.com/goplus/llcppg/_xtool/internal/symbol"
"github.com/goplus/llcppg/_xtool/llcppsymg/internal/symg"
llcppg "github.com/goplus/llcppg/config"
args "github.com/goplus/llcppg/internal/arg"
Expand Down Expand Up @@ -64,6 +65,11 @@ func main() {
fmt.Fprintln(os.Stderr, "Failed to parse config file:", ags.CfgFile)
}

libMode := symbol.ModeDynamic
if conf.LibStatic {
libMode = symbol.ModeStatic
}
Comment thread
luoliwoshang marked this conversation as resolved.

symbolTable, err := symg.Do(&symg.Config{
Libs: conf.Libs,
CFlags: conf.CFlags,
Expand All @@ -72,6 +78,7 @@ func main() {
TrimPrefixes: conf.TrimPrefixes,
SymMap: conf.SymMap,
IsCpp: conf.Cplusplus,
LibMode: libMode,
})
check(err)

Expand Down
1 change: 1 addition & 0 deletions config/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ type Config struct {
Mix bool `json:"mix,omitempty"`
SymMap map[string]string `json:"symMap,omitempty"`
TypeMap map[string]string `json:"typeMap,omitempty"`
LibStatic bool `json:"libstatic,omitempty"`
}

func NewDefault() *Config {
Expand Down
19 changes: 19 additions & 0 deletions config/config_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,25 @@ func TestGetConfByByte(t *testing.T) {
mode: useStdin,
},

{
name: "Static library configuration",
input: `{
"name": "mylib",
"cflags": "-I/opt/homebrew/include",
"include": ["mylib.h"],
"libs": "-L/opt/homebrew/lib -lmylib",
"libstatic": true
}`,
expect: llconfig.Config{
Name: "mylib",
CFlags: "-I/opt/homebrew/include",
Include: []string{"mylib.h"},
Libs: "-L/opt/homebrew/lib -lmylib",
LibStatic: true,
},
mode: useFile,
},

{
name: "Invalid JSON",
input: `{invalid json}`,
Expand Down
Loading