Skip to content

Move ctor for _libcglue_fdman_path_ops to same compilation unit #882

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

Merged
uyjulian merged 1 commit into from
Jul 6, 2026
Merged

Move ctor for _libcglue_fdman_path_ops to same compilation unit #882

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
1 change: 1 addition & 0 deletions ee/libcglue/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@ PS2SDKAPI_OBJS = \
__fioMkdirHelper.o \
__fioGetstatHelper.o \
__fioOpsInitializeImpl.o \
_ps2sdk_get_default_fdman_path_ops.o \
_libcglue_fdman_path_ops.o \
_libcglue_fdman_socket_ops.o \
_libcglue_fdman_inet_ops.o
Expand Down
15 changes: 14 additions & 1 deletion ee/libcglue/src/ps2sdkapi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -474,7 +474,6 @@ void __fioOpsInitializeImpl(void)
if (&rmdir) __fio_fdman_path_ops.rmdir = fioRmdir;
// cppcheck-suppress knownConditionTrueFalse
if ((&_stat) || (&_fstat)) __fio_fdman_path_ops.stat = __fioGetstatHelper;
if (!_libcglue_fdman_path_ops) _libcglue_fdman_path_ops = &__fio_fdman_path_ops;

memset(&__fio_fdman_ops_file, 0, sizeof(__fio_fdman_ops_file));
__fio_fdman_ops_file.getfd = __fioGetFdHelper;
Expand Down Expand Up @@ -502,8 +501,22 @@ void __fioOpsInitializeImpl(void)
}
#endif

extern _libcglue_fdman_path_ops_t * __attribute__((weak)) _ps2sdk_get_default_fdman_path_ops(void);
#ifdef F__ps2sdk_get_default_fdman_path_ops
_libcglue_fdman_path_ops_t * __attribute__((weak)) _ps2sdk_get_default_fdman_path_ops(void)
{
return &__fio_fdman_path_ops;
}
#endif

#ifdef F__libcglue_fdman_path_ops
_libcglue_fdman_path_ops_t *_libcglue_fdman_path_ops = NULL;

__attribute__((constructor))
static void __libcglue_fdman_path_ops_initialize(void)
{
_libcglue_fdman_path_ops = _ps2sdk_get_default_fdman_path_ops();
}
#endif

#ifdef F__libcglue_fdman_socket_ops
Expand Down
Loading