| Message ID | 20201210134752.780923-14-marcandre.lureau@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Remove GCC < 4.8 checks | expand |
Hi On Thu, Dec 10, 2020 at 6:07 PM <marcandre.lureau@redhat.com> wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > When needed, the G_GNUC_CHECK_VERSION() glib macro can be used instead. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > include/qemu/compiler.h | 11 ----------- > scripts/cocci-macro-file.h | 1 - > 2 files changed, 12 deletions(-) > > diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h > index 5e6cf2c8e8..1b9e58e82b 100644 > --- a/include/qemu/compiler.h > +++ b/include/qemu/compiler.h > @@ -11,17 +11,6 @@ > #define QEMU_STATIC_ANALYSIS 1 > #endif > > > -/*---------------------------------------------------------------------------- > -| The macro QEMU_GNUC_PREREQ tests for minimum version of the GNU C > compiler. > -| The code is a copy of SOFTFLOAT_GNUC_PREREQ, see softfloat-macros.h. > > -*----------------------------------------------------------------------------*/ > -#if defined(__GNUC__) && defined(__GNUC_MINOR__) > -# define QEMU_GNUC_PREREQ(maj, min) \ > - ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) > -#else > -# define QEMU_GNUC_PREREQ(maj, min) 0 > -#endif > - > #define QEMU_NORETURN __attribute__ ((__noreturn__)) > > #define QEMU_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) > diff --git a/scripts/cocci-macro-file.h b/scripts/cocci-macro-file.h > index c6bbc05ba3..20eea6b708 100644 > --- a/scripts/cocci-macro-file.h > +++ b/scripts/cocci-macro-file.h > @@ -19,7 +19,6 @@ > */ > > /* From qemu/compiler.h */ > -#define QEMU_GNUC_PREREQ(maj, min) 1 > #define QEMU_NORETURN __attribute__ ((__noreturn__)) > #define QEMU_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) > #define QEMU_SENTINEL __attribute__((sentinel)) > ping, thanks
diff --git a/include/qemu/compiler.h b/include/qemu/compiler.h index 5e6cf2c8e8..1b9e58e82b 100644 --- a/include/qemu/compiler.h +++ b/include/qemu/compiler.h @@ -11,17 +11,6 @@ #define QEMU_STATIC_ANALYSIS 1 #endif -/*---------------------------------------------------------------------------- -| The macro QEMU_GNUC_PREREQ tests for minimum version of the GNU C compiler. -| The code is a copy of SOFTFLOAT_GNUC_PREREQ, see softfloat-macros.h. -*----------------------------------------------------------------------------*/ -#if defined(__GNUC__) && defined(__GNUC_MINOR__) -# define QEMU_GNUC_PREREQ(maj, min) \ - ((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min)) -#else -# define QEMU_GNUC_PREREQ(maj, min) 0 -#endif - #define QEMU_NORETURN __attribute__ ((__noreturn__)) #define QEMU_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) diff --git a/scripts/cocci-macro-file.h b/scripts/cocci-macro-file.h index c6bbc05ba3..20eea6b708 100644 --- a/scripts/cocci-macro-file.h +++ b/scripts/cocci-macro-file.h @@ -19,7 +19,6 @@ */ /* From qemu/compiler.h */ -#define QEMU_GNUC_PREREQ(maj, min) 1 #define QEMU_NORETURN __attribute__ ((__noreturn__)) #define QEMU_WARN_UNUSED_RESULT __attribute__((warn_unused_result)) #define QEMU_SENTINEL __attribute__((sentinel))