| Message ID | 20220720152631.450903-5-peter.maydell@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | configure: fix some non-portabilities | expand |
On 20/07/2022 17.26, Peter Maydell wrote: > In commit 823eb013452e93d we moved the setting of ARCH from configure > to meson.build, but we accidentally left behind one attempt to use > $ARCH in configure, which was trying to add -msmall-data to the > compiler flags on Alpha hosts. Since ARCH is now never set, the test > always fails and we never add the flag. > > There isn't actually any need to use this compiler flag on Alpha: > the original intent was that it would allow us to simplify our TCG > codegen on that platform, but we never actually made the TCG changes > that would rely on -msmall-data. > > Drop the effectively-dead code from configure, as we don't need it. > > This was spotted by shellcheck: > > In ./configure line 2254: > case "$ARCH" in > ^---^ SC2153: Possible misspelling: ARCH may not be assigned, but arch is. > > Signed-off-by: Peter Maydell <peter.maydell@linaro.org> > --- > configure | 7 ------- > 1 file changed, 7 deletions(-) > > diff --git a/configure b/configure > index c05205b6085..d0e9a51462e 100755 > --- a/configure > +++ b/configure > @@ -2251,13 +2251,6 @@ if test "$fortify_source" = "yes" ; then > QEMU_CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $QEMU_CFLAGS" > fi > > -case "$ARCH" in > -alpha) > - # Ensure there's only a single GP > - QEMU_CFLAGS="-msmall-data $QEMU_CFLAGS" > -;; > -esac > - > if test "$have_asan" = "yes"; then > QEMU_CFLAGS="-fsanitize=address $QEMU_CFLAGS" > QEMU_LDFLAGS="-fsanitize=address $QEMU_LDFLAGS" Reviewed-by: Thomas Huth <thuth@redhat.com>
diff --git a/configure b/configure index c05205b6085..d0e9a51462e 100755 --- a/configure +++ b/configure @@ -2251,13 +2251,6 @@ if test "$fortify_source" = "yes" ; then QEMU_CFLAGS="-U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 $QEMU_CFLAGS" fi -case "$ARCH" in -alpha) - # Ensure there's only a single GP - QEMU_CFLAGS="-msmall-data $QEMU_CFLAGS" -;; -esac - if test "$have_asan" = "yes"; then QEMU_CFLAGS="-fsanitize=address $QEMU_CFLAGS" QEMU_LDFLAGS="-fsanitize=address $QEMU_LDFLAGS"
In commit 823eb013452e93d we moved the setting of ARCH from configure to meson.build, but we accidentally left behind one attempt to use $ARCH in configure, which was trying to add -msmall-data to the compiler flags on Alpha hosts. Since ARCH is now never set, the test always fails and we never add the flag. There isn't actually any need to use this compiler flag on Alpha: the original intent was that it would allow us to simplify our TCG codegen on that platform, but we never actually made the TCG changes that would rely on -msmall-data. Drop the effectively-dead code from configure, as we don't need it. This was spotted by shellcheck: In ./configure line 2254: case "$ARCH" in ^---^ SC2153: Possible misspelling: ARCH may not be assigned, but arch is. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> --- configure | 7 ------- 1 file changed, 7 deletions(-)