* [PATCH] Remove __warndecl
@ 2020-11-05 4:55 Siddhesh Poyarekar
2020-11-05 9:32 ` Florian Weimer
0 siblings, 1 reply; 4+ messages in thread
From: Siddhesh Poyarekar @ 2020-11-05 4:55 UTC (permalink / raw)
To: libc-alpha; +Cc: fweimer
The macro is not used anymore, so get rid of it.
---
debug/warning-nop.c | 8 --------
misc/sys/cdefs.h | 3 ---
2 files changed, 11 deletions(-)
diff --git a/debug/warning-nop.c b/debug/warning-nop.c
index 4ab7e182b7..544ea58e3c 100644
--- a/debug/warning-nop.c
+++ b/debug/warning-nop.c
@@ -43,17 +43,9 @@ nop (void)
/* Don't insert any other #include's before this #undef! */
-#undef __warndecl
-#define __warndecl(name, msg) \
- extern void name (void) __attribute__ ((alias ("nop"))) attribute_hidden; \
- link_warning (name, msg)
-
#undef __USE_FORTIFY_LEVEL
#define __USE_FORTIFY_LEVEL 99
-/* Following here we need an #include for each public header file
- that uses __warndecl. */
-
/* Define away to avoid warnings with compilers that do not have these
builtins. */
#define __builtin___memcpy_chk(dest, src, len, bos) NULL
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index 86906c2478..e94d09d7dd 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -128,13 +128,10 @@
#define __bos0(ptr) __builtin_object_size (ptr, 0)
#if __GNUC_PREREQ (4,3)
-# define __warndecl(name, msg) \
- extern void name (void) __attribute__((__warning__ (msg)))
# define __warnattr(msg) __attribute__((__warning__ (msg)))
# define __errordecl(name, msg) \
extern void name (void) __attribute__((__error__ (msg)))
#else
-# define __warndecl(name, msg) extern void name (void)
# define __warnattr(msg)
# define __errordecl(name, msg) extern void name (void)
#endif
--
2.26.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] Remove __warndecl
2020-11-05 4:55 [PATCH] Remove __warndecl Siddhesh Poyarekar
@ 2020-11-05 9:32 ` Florian Weimer
2020-11-05 9:38 ` [PATCH v2] " Siddhesh Poyarekar
0 siblings, 1 reply; 4+ messages in thread
From: Florian Weimer @ 2020-11-05 9:32 UTC (permalink / raw)
To: Siddhesh Poyarekar via Libc-alpha; +Cc: Siddhesh Poyarekar
* Siddhesh Poyarekar via Libc-alpha:
> The macro is not used anymore, so get rid of it.
> ---
> debug/warning-nop.c | 8 --------
You should remove the debug/warning-nop.c file.
Thanks,
Florian
--
Red Hat GmbH, https://de.redhat.com/ , Registered seat: Grasbrunn,
Commercial register: Amtsgericht Muenchen, HRB 153243,
Managing Directors: Charles Cachera, Brian Klemm, Laurie Krebs, Michael O'Neill
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH v2] Remove __warndecl
2020-11-05 9:32 ` Florian Weimer
@ 2020-11-05 9:38 ` Siddhesh Poyarekar
2020-11-05 9:45 ` Florian Weimer
0 siblings, 1 reply; 4+ messages in thread
From: Siddhesh Poyarekar @ 2020-11-05 9:38 UTC (permalink / raw)
To: libc-alpha; +Cc: fweimer
The macro is not used anymore, so remove it and warning-nop.c.
---
debug/Makefile | 2 +-
debug/warning-nop.c | 70 ---------------------------------------------
misc/sys/cdefs.h | 3 --
3 files changed, 1 insertion(+), 74 deletions(-)
delete mode 100644 debug/warning-nop.c
diff --git a/debug/Makefile b/debug/Makefile
index 3a60d7af7a..0036edd187 100644
--- a/debug/Makefile
+++ b/debug/Makefile
@@ -51,7 +51,7 @@ routines = backtrace backtracesyms backtracesymsfd noophooks \
explicit_bzero_chk \
stack_chk_fail fortify_fail \
$(static-only-routines)
-static-only-routines := warning-nop stack_chk_fail_local
+static-only-routines := stack_chk_fail_local
# Don't add stack_chk_fail_local.o to libc.a since __stack_chk_fail_local
# is an alias of __stack_chk_fail in stack_chk_fail.o.
diff --git a/debug/warning-nop.c b/debug/warning-nop.c
deleted file mode 100644
index 4ab7e182b7..0000000000
--- a/debug/warning-nop.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/* Dummy nop functions to elicit link-time warnings.
- Copyright (C) 2005-2020 Free Software Foundation, Inc.
- This file is part of the GNU C Library.
-
- The GNU C Library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation; either
- version 2.1 of the License, or (at your option) any later version.
-
- In addition to the permissions in the GNU Lesser General Public
- License, the Free Software Foundation gives you unlimited
- permission to link the compiled version of this file with other
- programs, and to distribute those programs without any restriction
- coming from the use of this file. (The GNU Lesser General Public
- License restrictions do apply in other respects; for example, they
- cover modification of the file, and distribution when not linked
- into another program.)
-
- Note that people who make modified versions of this file are not
- obligated to grant this special exception for their modified
- versions; it is their choice whether to do so. The GNU Lesser
- General Public License gives permission to release a modified
- version without this exception; this exception also makes it
- possible to release a modified version which carries forward this
- exception.
-
- The GNU C Library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
-
- You should have received a copy of the GNU Lesser General Public
- License along with the GNU C Library; if not, see
- <https://www.gnu.org/licenses/>. */
-
-#include <sys/cdefs.h>
-
-static void
-__attribute__ ((used))
-nop (void)
-{
-}
-
-/* Don't insert any other #include's before this #undef! */
-
-#undef __warndecl
-#define __warndecl(name, msg) \
- extern void name (void) __attribute__ ((alias ("nop"))) attribute_hidden; \
- link_warning (name, msg)
-
-#undef __USE_FORTIFY_LEVEL
-#define __USE_FORTIFY_LEVEL 99
-
-/* Following here we need an #include for each public header file
- that uses __warndecl. */
-
-/* Define away to avoid warnings with compilers that do not have these
- builtins. */
-#define __builtin___memcpy_chk(dest, src, len, bos) NULL
-#define __builtin___memmove_chk(dest, src, len, bos) NULL
-#define __builtin___mempcpy_chk(dest, src, len, bos) NULL
-#define __builtin___memset_chk(dest, ch, len, bos) NULL
-#define __builtin___stpcpy_chk(dest, src, bos) NULL
-#define __builtin___strcat_chk(dest, src, bos) NULL
-#define __builtin___strcpy_chk(dest, src, bos) NULL
-#define __builtin___strncat_chk(dest, src, len, bos) NULL
-#define __builtin___strncpy_chk(dest, src, len, bos) NULL
-#define __builtin_object_size(bos, level) 0
-
-#include <string.h>
diff --git a/misc/sys/cdefs.h b/misc/sys/cdefs.h
index 86906c2478..e94d09d7dd 100644
--- a/misc/sys/cdefs.h
+++ b/misc/sys/cdefs.h
@@ -128,13 +128,10 @@
#define __bos0(ptr) __builtin_object_size (ptr, 0)
#if __GNUC_PREREQ (4,3)
-# define __warndecl(name, msg) \
- extern void name (void) __attribute__((__warning__ (msg)))
# define __warnattr(msg) __attribute__((__warning__ (msg)))
# define __errordecl(name, msg) \
extern void name (void) __attribute__((__error__ (msg)))
#else
-# define __warndecl(name, msg) extern void name (void)
# define __warnattr(msg)
# define __errordecl(name, msg) extern void name (void)
#endif
--
2.26.2
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH v2] Remove __warndecl
2020-11-05 9:38 ` [PATCH v2] " Siddhesh Poyarekar
@ 2020-11-05 9:45 ` Florian Weimer
0 siblings, 0 replies; 4+ messages in thread
From: Florian Weimer @ 2020-11-05 9:45 UTC (permalink / raw)
To: Siddhesh Poyarekar; +Cc: libc-alpha
* Siddhesh Poyarekar:
> The macro is not used anymore, so remove it and warning-nop.c.
This version looks good to me. Thanks.
Florian
--
Red Hat GmbH, https://de.redhat.com/ , Registered seat: Grasbrunn,
Commercial register: Amtsgericht Muenchen, HRB 153243,
Managing Directors: Charles Cachera, Brian Klemm, Laurie Krebs, Michael O'Neill
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-11-05 9:45 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-11-05 4:55 [PATCH] Remove __warndecl Siddhesh Poyarekar
2020-11-05 9:32 ` Florian Weimer
2020-11-05 9:38 ` [PATCH v2] " Siddhesh Poyarekar
2020-11-05 9:45 ` Florian Weimer
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).