rpms/glibc
7
0
Fork 1
Code Issues Pull Requests Releases Activity

Restore <sys/cdefs.h> compatibility with C90 compilers (RHEL-15867)

Browse Source 
Resolves: RHEL-15867
This commit is contained in:
Florian Weimer 2023-11-24 14:45:50 +01:00
parent 8db9f8aab0
commit 8bd47ef1b2
2 changed files with 52 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
glibc-RHEL-15867.patch Normal file
View File

@ -0,0 +1,47 @@
commit 2337e04e21ba6040926ec871e403533f77043c40
Author: Siddhesh Poyarekar <siddhesh@sourceware.org>
Date: Thu Feb 2 07:49:02 2023 -0500
cdefs: Limit definition of fortification macros
Define the __glibc_fortify and other macros only when __FORTIFY_LEVEL >
0. This has the effect of not defining these macros on older C90
compilers that do not have support for variable length argument lists.
Also trim off the trailing backslashes from the definition of
__glibc_fortify and __glibc_fortify_n macros.
Signed-off-by: Siddhesh Poyarekar <siddhesh@sourceware.org>
Reviewed-by: Florian Weimer <fweimer@redhat.com>
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index f3d7efdd2a9320f7..46ec4ef71e14c569 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -133,6 +133,7 @@
# define __glibc_objsize(__o) __bos (__o)
#endif
+#if __USE_FORTIFY_LEVEL > 0
/* Compile time conditions to choose between the regular, _chk and _chk_warn
variants. These conditions should get evaluated to constant and optimized
away. */
@@ -168,7 +169,7 @@
? __ ## f ## _alias (__VA_ARGS__) \
: (__glibc_unsafe_len (__l, __s, __osz) \
? __ ## f ## _chk_warn (__VA_ARGS__, __osz) \
- : __ ## f ## _chk (__VA_ARGS__, __osz))) \
+ : __ ## f ## _chk (__VA_ARGS__, __osz)))
/* Fortify function f, where object size argument passed to f is the number of
elements and not total size. */
@@ -178,7 +179,8 @@
? __ ## f ## _alias (__VA_ARGS__) \
: (__glibc_unsafe_len (__l, __s, __osz) \
? __ ## f ## _chk_warn (__VA_ARGS__, (__osz) / (__s)) \
- : __ ## f ## _chk (__VA_ARGS__, (__osz) / (__s)))) \
+ : __ ## f ## _chk (__VA_ARGS__, (__osz) / (__s))))
+#endif
#if __GNUC_PREREQ (4,3)
# define __warndecl(name, msg) \

6
glibc.spec
View File

@ -1,6 +1,6 @@
%define glibcsrcdir glibc-2.28
%define glibcversion 2.28
%define glibcrelease 243%{?dist}
%define glibcrelease 244%{?dist}
# Pre-release tarballs are pulled in from git using a command that is
# effectively:
#
@ -1060,6 +1060,7 @@ Patch872: glibc-RHEL-3639.patch
Patch873: glibc-RHEL-10481.patch
Patch874: glibc-RHEL-13720-1.patch
Patch875: glibc-RHEL-13720-2.patch
Patch876: glibc-RHEL-15867.patch
##############################################################################
# Continued list of core "glibc" package information:
@ -2891,6 +2892,9 @@ fi
%files -f compat-libpthread-nonshared.filelist -n compat-libpthread-nonshared
%changelog
* Fri Nov 24 2023 Florian Weimer <fweimer@redhat.com> - 2.28-244
- Restore <sys/cdefs.h> compatibility with C90 compilers (RHEL-15867)
* Tue Nov 21 2023 Florian Weimer <fweimer@redhat.com> - 2.28-243
- ldconfig should skip temporary files created by RPM (RHEL-13720)