rpms/libfaketime
7
0
Fork 0
Code Issues Pull Requests Releases Activity

- Use symver attribute instead of asms for symbol versioning

Browse Source 
- Enable LTO
This commit is contained in:
Jeff Law 2020-09-02 13:49:04 -06:00
parent bb262d786d
commit 82e0a8e741
2 changed files with 111 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

104
libfaketime-symver.patch Normal file
View File

@ -0,0 +1,104 @@
diff --git a/src/libfaketime.c b/src/libfaketime.c
index b70a3d3..19f6234 100644
--- a/src/libfaketime.c
+++ b/src/libfaketime.c
@@ -1643,6 +1643,7 @@ timer_settime_common(timer_t_or_int timerid, int flags,
/*
* Faked timer_settime() compatible with implementation in GLIBC 2.2
*/
+__attribute__ ((symver ("timer_settime@GLIBC_2.2")))
int timer_settime_22(int timerid, int flags,
const struct itimerspec *new_value,
struct itimerspec *old_value)
@@ -1665,6 +1666,7 @@ int timer_settime_22(int timerid, int flags,
/*
* Faked timer_settime() compatible with implementation in GLIBC 2.3.3
*/
+__attribute__ ((symver ("timer_settime@@GLIBC_2.3.3")))
int timer_settime_233(timer_t timerid, int flags,
const struct itimerspec *new_value,
struct itimerspec *old_value)
@@ -1735,6 +1737,7 @@ int timer_gettime_common(timer_t_or_int timerid, struct itimerspec *curr_value,
/*
* Faked timer_gettime() compatible with implementation in GLIBC 2.2
*/
+__attribute__ ((symver ("timer_gettime@GLIBC_2.2")))
int timer_gettime_22(timer_t timerid, struct itimerspec *curr_value)
{
if (!initialized)
@@ -1755,6 +1758,7 @@ int timer_gettime_22(timer_t timerid, struct itimerspec *curr_value)
/*
* Faked timer_gettime() compatible with implementation in GLIBC 2.3.3
*/
+__attribute__ ((symver ("timer_gettime@@GLIBC_2.3.3")))
int timer_gettime_233(timer_t timerid, struct itimerspec *curr_value)
{
if (!initialized)
@@ -1772,10 +1776,6 @@ int timer_gettime_233(timer_t timerid, struct itimerspec *curr_value)
}
}
-__asm__(".symver timer_gettime_22, timer_gettime@GLIBC_2.2");
-__asm__(".symver timer_gettime_233, timer_gettime@@GLIBC_2.3.3");
-__asm__(".symver timer_settime_22, timer_settime@GLIBC_2.2");
-__asm__(".symver timer_settime_233, timer_settime@@GLIBC_2.3.3");
#endif
#endif
@@ -3012,6 +3012,11 @@ struct pthread_cond_monotonic {
static struct pthread_cond_monotonic *monotonic_conds = NULL;
+#if defined __ARM_ARCH || defined FORCE_PTHREAD_NONVER
+__attribute__ ((symver ("pthread_cond_init@@")))
+#else
+__attribute__ ((symver ("pthread_cond_init@@GLIBC_2.3.2")))
+#endif
int pthread_cond_init_232(pthread_cond_t *restrict cond, const pthread_condattr_t *restrict attr)
{
clockid_t clock_id;
@@ -3039,6 +3044,11 @@ int pthread_cond_init_232(pthread_cond_t *restrict cond, const pthread_condattr_
return result;
}
+#if defined __ARM_ARCH || defined FORCE_PTHREAD_NONVER
+__attribute__ ((symver ("pthread_cond_destroy@@")))
+#else
+__attribute__ ((symver ("pthread_cond_destroy@@GLIBC_2.3.2")))
+#endif
int pthread_cond_destroy_232(pthread_cond_t *cond)
{
struct pthread_cond_monotonic* e;
@@ -3146,26 +3156,22 @@ int pthread_cond_timedwait_common(pthread_cond_t *cond, pthread_mutex_t *mutex,
return result;
}
+__attribute__ ((symver ("pthread_cond_timedwait@GLIBC_2.2.5")))
int pthread_cond_timedwait_225(pthread_cond_t *cond, pthread_mutex_t *mutex, const struct timespec *abstime)
{
return pthread_cond_timedwait_common(cond, mutex, abstime, FT_COMPAT_GLIBC_2_2_5);
}
+#if defined __ARM_ARCH || defined FORCE_PTHREAD_NONVER
+__attribute__ ((symver ("pthread_cond_timedwait@@")))
+#else
+__attribute__ ((symver ("pthread_cond_timedwait@@GLIBC_2.3.2")))
+#endif
int pthread_cond_timedwait_232(pthread_cond_t *cond, pthread_mutex_t *mutex, const struct timespec *abstime)
{
return pthread_cond_timedwait_common(cond, mutex, abstime, FT_COMPAT_GLIBC_2_3_2);
}
-__asm__(".symver pthread_cond_timedwait_225, pthread_cond_timedwait@GLIBC_2.2.5");
-#if defined __ARM_ARCH || defined FORCE_PTHREAD_NONVER
-__asm__(".symver pthread_cond_timedwait_232, pthread_cond_timedwait@@");
-__asm__(".symver pthread_cond_init_232, pthread_cond_init@@");
-__asm__(".symver pthread_cond_destroy_232, pthread_cond_destroy@@");
-#else
-__asm__(".symver pthread_cond_timedwait_232, pthread_cond_timedwait@@GLIBC_2.3.2");
-__asm__(".symver pthread_cond_init_232, pthread_cond_init@@GLIBC_2.3.2");
-__asm__(".symver pthread_cond_destroy_232, pthread_cond_destroy@@GLIBC_2.3.2");
-#endif
#endif

13
libfaketime.spec
View File

@ -1,11 +1,12 @@
Summary: Manipulate system time per process for testing purposes
Name: libfaketime
Version: 0.9.8
Release: 8%{?dist}
Release: 9%{?dist}
License: GPLv2+
Url: https://github.com/wolfcw/libfaketime
Source: libfaketime-0.9.8.tar.xz
Patch0: libfaketime-0.9.8-FORCE_PTHREAD_NONVER.patch
Patch1: libfaketime-symver.patch
Provides: faketime
@ -23,13 +24,9 @@ time system- wide.
%prep
%setup -q
%patch0 -p1
%patch1 -p1
%build
# This package uses toplevel ASMs to implement symbol versioning which is
# incompatible with LTO. So disable LTO until the package uses the attribute
# mechanism to handle symbol versioning
%define _lto_cflags %{nil}
cd src
# https://github.com/wolfcw/libfaketime/blob/master/README.packagers
@ -105,6 +102,10 @@ chmod a+rx %{buildroot}/%{_libdir}/faketime/*.so.*
%{_mandir}/man1/*
%changelog
* Wed Sep 02 2020 Jeff Law <law@redhat.com> - 0.9.8-9
- Use symver attribute instead of asms for symbol versioning
- Enable LTO
* Tue Jul 28 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.9.8-8
- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild