public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r14-6220] build: unbreak bootstrap on uclinux targets [PR112762]
@ 2023-12-06 13:34 Marek Polacek
  0 siblings, 0 replies; only message in thread
From: Marek Polacek @ 2023-12-06 13:34 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:e0eca4a55bd14d506708fb0396b31e7f7383160c

commit r14-6220-ge0eca4a55bd14d506708fb0396b31e7f7383160c
Author: Marek Polacek <polacek@redhat.com>
Date:   Tue Dec 5 13:39:49 2023 -0500

    build: unbreak bootstrap on uclinux targets [PR112762]
    
    Currently, cross-compiling with --target=c6x-uclinux (and several other)
    fails due to:
    
    ../../src/gcc/config/linux.h:221:45: error: 'linux_fortify_source_default_level' was not declared in this scope
     #define TARGET_FORTIFY_SOURCE_DEFAULT_LEVEL linux_fortify_source_default_level
    
    In the PR Andrew mentions that another fix would be in config.gcc,
    but really, here I meant to use the target hook for glibc only, not
    uclibc.  This trivial patch fixes the build problem.  It means that
    -fhardened with uclibc will use -D_FORTIFY_SOURCE=2 and not =3.
    
            PR target/112762
    
    gcc/ChangeLog:
    
            * config/linux.h: Redefine TARGET_FORTIFY_SOURCE_DEFAULT_LEVEL for
            glibc only.

Diff:
---
 gcc/config/linux.h | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gcc/config/linux.h b/gcc/config/linux.h
index 79b6537dcf1..73f39d3c603 100644
--- a/gcc/config/linux.h
+++ b/gcc/config/linux.h
@@ -215,7 +215,7 @@ see the files COPYING3 and COPYING.RUNTIME respectively.  If not, see
 # undef TARGET_LIBM_FUNCTION_MAX_ERROR
 # define TARGET_LIBM_FUNCTION_MAX_ERROR linux_libm_function_max_error
 
-#endif
-
 #undef TARGET_FORTIFY_SOURCE_DEFAULT_LEVEL
 #define TARGET_FORTIFY_SOURCE_DEFAULT_LEVEL linux_fortify_source_default_level
+
+#endif

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-12-06 13:34 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-12-06 13:34 [gcc r14-6220] build: unbreak bootstrap on uclinux targets [PR112762] Marek Polacek

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).