archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-08-28 15:24:43 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

8336529: (fs) UnixFileAttributeViews setTimes() failing on armhf, Ubuntu noble

Browse source 
Reviewed-by: bpb, alanb
This commit is contained in:
Vladimir Petko 2024-08-20 15:51:40 +00:00
parent 55a97ec879
commit 285ceb9ee5
1 changed files with 26 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/java.base/unix/native/libnio/fs/UnixNativeDispatcher.c
View file

@ -254,6 +254,23 @@ static int statx_wrapper(int dirfd, const char *restrict pathname, int flags,
} }
#endif #endif
#if defined(__linux__) && defined(__arm__)
/**
* Lookup functions with time_t parameter. Try to use 64 bit symbol
* if sizeof(time_t) exceeds 32 bit.
*/
static void* lookup_time_t_function(const char* symbol, const char* symbol64) {
void *func_ptr = NULL;
if (sizeof(time_t) > 4) {
func_ptr = dlsym(RTLD_DEFAULT, symbol64);
}
if (func_ptr == NULL) {
return dlsym(RTLD_DEFAULT, symbol);
}
return func_ptr;
}
#endif
/** /**
* Call this to throw an internal UnixException when a system/library * Call this to throw an internal UnixException when a system/library
* call fails * call fails
@ -351,11 +368,20 @@ Java_sun_nio_fs_UnixNativeDispatcher_init(JNIEnv* env, jclass this)
#endif #endif
my_unlinkat_func = (unlinkat_func*) dlsym(RTLD_DEFAULT, "unlinkat"); my_unlinkat_func = (unlinkat_func*) dlsym(RTLD_DEFAULT, "unlinkat");
my_renameat_func = (renameat_func*) dlsym(RTLD_DEFAULT, "renameat"); my_renameat_func = (renameat_func*) dlsym(RTLD_DEFAULT, "renameat");
#if defined(__linux__) && defined(__arm__)
my_futimesat_func = (futimesat_func*) lookup_time_t_function("futimesat",
"__futimesat64");
my_lutimes_func = (lutimes_func*) lookup_time_t_function("lutimes",
"__lutimes64");
my_futimens_func = (futimens_func*) lookup_time_t_function("futimens",
"__futimens64");
#else
#ifndef _ALLBSD_SOURCE #ifndef _ALLBSD_SOURCE
my_futimesat_func = (futimesat_func*) dlsym(RTLD_DEFAULT, "futimesat"); my_futimesat_func = (futimesat_func*) dlsym(RTLD_DEFAULT, "futimesat");
my_lutimes_func = (lutimes_func*) dlsym(RTLD_DEFAULT, "lutimes"); my_lutimes_func = (lutimes_func*) dlsym(RTLD_DEFAULT, "lutimes");
#endif #endif
my_futimens_func = (futimens_func*) dlsym(RTLD_DEFAULT, "futimens"); my_futimens_func = (futimens_func*) dlsym(RTLD_DEFAULT, "futimens");
#endif
#if defined(_AIX) #if defined(_AIX)
// Make sure we link to the 64-bit version of the function // Make sure we link to the 64-bit version of the function
my_fdopendir_func = (fdopendir_func*) dlsym(RTLD_DEFAULT, "fdopendir64"); my_fdopendir_func = (fdopendir_func*) dlsym(RTLD_DEFAULT, "fdopendir64");