Skip to content

fix: refactor linker scripts for mold compatibility #347

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

Open
wallentx wants to merge 1 commit into
base: main
Choose a base branch
from
+36 −55
Open

fix: refactor linker scripts for mold compatibility #347

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
7 changes: 3 additions & 4 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,8 +96,7 @@ BIN_SRCS := $(SRCS_DIR)/cli/common.c \
$(SRCS_DIR)/error_generic.c \
$(SRCS_DIR)/utils.c

LIB_SCRIPT = $(SRCS_DIR)/$(LIB_NAME).lds
BIN_SCRIPT = $(SRCS_DIR)/cli/$(BIN_NAME).lds
LIB_SCRIPT = $(SRCS_DIR)/$(LIB_NAME).ver

##### Target definitions #####

Expand Down Expand Up @@ -221,7 +220,7 @@ $(BIN_OBJS): %.o: %.c | shared

$(LIB_SHARED): $(LIB_OBJS)
$(MKDIR) -p $(DEBUG_DIR)
$(CC) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(LIB_LDFLAGS) $(OUTPUT_OPTION) $^ $(LIB_SCRIPT) $(LIB_LDLIBS)
$(CC) $(LIB_CFLAGS) $(LIB_CPPFLAGS) $(LIB_LDFLAGS) $(OUTPUT_OPTION) $^ -Wl,--version-script=$(LIB_SCRIPT) -Wl,-e,nvc_entrypoint -Wl,-u,interpreter -Wl,-u,abitag $(LIB_LDLIBS)
$(OBJCPY) --only-keep-debug $@ $(LIB_SONAME)
$(OBJCPY) --add-gnu-debuglink=$(LIB_SONAME) $@
$(MV) $(LIB_SONAME) $(DEBUG_DIR)
Expand All @@ -234,7 +233,7 @@ $(LIB_STATIC_OBJ): $(LIB_OBJS)
$(STRIP) --strip-unneeded -R .comment $@

$(BIN_NAME): $(BIN_OBJS)
$(CC) $(BIN_CFLAGS) $(BIN_CPPFLAGS) $(BIN_LDFLAGS) $(OUTPUT_OPTION) $^ $(BIN_SCRIPT) $(BIN_LDLIBS)
$(CC) $(BIN_CFLAGS) $(BIN_CPPFLAGS) $(BIN_LDFLAGS) $(OUTPUT_OPTION) $^ -Wl,-u,argp_err_exit_status -Wl,-u,argp_program_version_hook -Wl,-u,argp_program_bug_address $(BIN_LDLIBS)
$(STRIP) --strip-unneeded -R .comment $@

##### Public rules #####
Expand Down
3 changes: 0 additions & 3 deletions src/cli/nvidia-container-cli.lds
View file
Open in desktop

This file was deleted.

48 changes: 0 additions & 48 deletions src/libnvidia-container.lds
View file
Open in desktop

This file was deleted.

33 changes: 33 additions & 0 deletions src/libnvidia-container.ver
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
NVC_1.0 {
global:
nvc_version;
nvc_context_new;
nvc_context_free;
nvc_config_new;
nvc_config_free;
nvc_init;
nvc_shutdown;
nvc_error;
nvc_ldcache_update;
nvc_container_config_new;
nvc_container_config_free;
nvc_container_new;
nvc_container_free;
nvc_driver_info_new;
nvc_driver_info_free;
nvc_device_info_new;
nvc_device_info_free;
nvc_driver_mount;
nvc_device_mount;
nvc_nvcaps_style;
nvc_nvcaps_device_from_proc_path;
nvc_mig_device_access_caps_mount;
nvc_mig_config_global_caps_mount;
nvc_mig_monitor_global_caps_mount;
nvc_device_mig_caps_mount;
nvc_imex_channel_mount;

__ubsan_default_options;
local:
*;
};