| Message ID | 20201210134752.780923-9-marcandre.lureau@redhat.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Remove GCC < 4.8 checks | expand |
On 12/10/20 2:47 PM, marcandre.lureau@redhat.com wrote: > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > QEMU requires either GCC or Clang, which both advertize __GNUC__. > Drop MSVC fallback path. > > Note: I intentionally left further cleanups for a later work. > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > --- > audio/audio.c | 8 +------- > 1 file changed, 1 insertion(+), 7 deletions(-) > > diff --git a/audio/audio.c b/audio/audio.c > index 46578e4a58..d7a00294de 100644 > --- a/audio/audio.c > +++ b/audio/audio.c > @@ -122,13 +122,7 @@ int audio_bug (const char *funcname, int cond) > > #if defined AUDIO_BREAKPOINT_ON_BUG > # if defined HOST_I386 > -# if defined __GNUC__ > - __asm__ ("int3"); > -# elif defined _MSC_VER > - _asm _emit 0xcc; > -# else > - abort (); > -# endif > + __asm__ ("int3"); This was 15 years ago... Why not simply use abort() today? > # else > abort (); > # endif >
On Thu, 10 Dec 2020 at 14:26, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > On 12/10/20 2:47 PM, marcandre.lureau@redhat.com wrote: > > From: Marc-André Lureau <marcandre.lureau@redhat.com> > > > > QEMU requires either GCC or Clang, which both advertize __GNUC__. > > Drop MSVC fallback path. > > > > Note: I intentionally left further cleanups for a later work. > > > > Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > > --- > > audio/audio.c | 8 +------- > > 1 file changed, 1 insertion(+), 7 deletions(-) > > > > diff --git a/audio/audio.c b/audio/audio.c > > index 46578e4a58..d7a00294de 100644 > > --- a/audio/audio.c > > +++ b/audio/audio.c > > @@ -122,13 +122,7 @@ int audio_bug (const char *funcname, int cond) > > > > #if defined AUDIO_BREAKPOINT_ON_BUG > > # if defined HOST_I386 > > -# if defined __GNUC__ > > - __asm__ ("int3"); > > -# elif defined _MSC_VER > > - _asm _emit 0xcc; > > -# else > > - abort (); > > -# endif > > + __asm__ ("int3"); > > This was 15 years ago... Why not simply use abort() today? That's what I suggested when I looked at this patch in the previous version of the patchset, yes... -- PMM
On 12/10/20 3:27 PM, Peter Maydell wrote: > On Thu, 10 Dec 2020 at 14:26, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: >> >> On 12/10/20 2:47 PM, marcandre.lureau@redhat.com wrote: >>> From: Marc-André Lureau <marcandre.lureau@redhat.com> >>> >>> QEMU requires either GCC or Clang, which both advertize __GNUC__. >>> Drop MSVC fallback path. >>> >>> Note: I intentionally left further cleanups for a later work. >>> >>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> >>> --- >>> audio/audio.c | 8 +------- >>> 1 file changed, 1 insertion(+), 7 deletions(-) >>> >>> diff --git a/audio/audio.c b/audio/audio.c >>> index 46578e4a58..d7a00294de 100644 >>> --- a/audio/audio.c >>> +++ b/audio/audio.c >>> @@ -122,13 +122,7 @@ int audio_bug (const char *funcname, int cond) >>> >>> #if defined AUDIO_BREAKPOINT_ON_BUG >>> # if defined HOST_I386 >>> -# if defined __GNUC__ >>> - __asm__ ("int3"); >>> -# elif defined _MSC_VER >>> - _asm _emit 0xcc; >>> -# else >>> - abort (); >>> -# endif >>> + __asm__ ("int3"); >> >> This was 15 years ago... Why not simply use abort() today? > > That's what I suggested when I looked at this patch in > the previous version of the patchset, yes... Ah, I went back to read v2 thread. Actually I even prefer Gerd's suggestion to remove this dead code. Regards, Phil.
Hi On Thu, Dec 10, 2020 at 6:35 PM Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > > On 12/10/20 3:27 PM, Peter Maydell wrote: > > On Thu, 10 Dec 2020 at 14:26, Philippe Mathieu-Daudé <philmd@redhat.com> wrote: > >> > >> On 12/10/20 2:47 PM, marcandre.lureau@redhat.com wrote: > >>> From: Marc-André Lureau <marcandre.lureau@redhat.com> > >>> > >>> QEMU requires either GCC or Clang, which both advertize __GNUC__. > >>> Drop MSVC fallback path. > >>> > >>> Note: I intentionally left further cleanups for a later work. > >>> > >>> Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com> > >>> --- > >>> audio/audio.c | 8 +------- > >>> 1 file changed, 1 insertion(+), 7 deletions(-) > >>> > >>> diff --git a/audio/audio.c b/audio/audio.c > >>> index 46578e4a58..d7a00294de 100644 > >>> --- a/audio/audio.c > >>> +++ b/audio/audio.c > >>> @@ -122,13 +122,7 @@ int audio_bug (const char *funcname, int cond) > >>> > >>> #if defined AUDIO_BREAKPOINT_ON_BUG > >>> # if defined HOST_I386 > >>> -# if defined __GNUC__ > >>> - __asm__ ("int3"); > >>> -# elif defined _MSC_VER > >>> - _asm _emit 0xcc; > >>> -# else > >>> - abort (); > >>> -# endif > >>> + __asm__ ("int3"); > >> > >> This was 15 years ago... Why not simply use abort() today? > > > > That's what I suggested when I looked at this patch in > > the previous version of the patchset, yes... > > Ah, I went back to read v2 thread. Actually I even prefer > Gerd's suggestion to remove this dead code. > And I totally agree. However, I don't want to mix concerns. I am just removing dead-code.
diff --git a/audio/audio.c b/audio/audio.c index 46578e4a58..d7a00294de 100644 --- a/audio/audio.c +++ b/audio/audio.c @@ -122,13 +122,7 @@ int audio_bug (const char *funcname, int cond) #if defined AUDIO_BREAKPOINT_ON_BUG # if defined HOST_I386 -# if defined __GNUC__ - __asm__ ("int3"); -# elif defined _MSC_VER - _asm _emit 0xcc; -# else - abort (); -# endif + __asm__ ("int3"); # else abort (); # endif