diff options
| author | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-26 16:21:10 +0200 |
|---|---|---|
| committer | Thomas Schwinge <thomas@codesourcery.com> | 2013-05-26 16:21:10 +0200 |
| commit | d9e11d0c51182483d30760f3c66000a0e9b8c922 (patch) | |
| tree | e1d147b2d9d270f8cec60e499bc5fd738144d4c2 /configure | |
| parent | d5ce2d1c5dfae01688cad679b2fbd071e70a1f3a (diff) | |
| parent | 9a079e270a9bec7e1fe28aeda63e07c1bb808d44 (diff) | |
Merge branch 'baseline' into refs/top-bases/tschwinge/Roger_Whittaker
Conflicts:
sysdeps/mach/hurd/i386/init-first.c
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3937,7 +3937,7 @@ fi # type and particular chip. If an add-on configure fragment already set # base_machine, we don't change it. test -n "$base_machine" || case "$machine" in -i[34567]86) base_machine=i386 machine=i386/$machine ;; +i[4567]86) base_machine=i386 machine=i386/$machine ;; powerpc) base_machine=powerpc machine=powerpc/powerpc32 ;; powerpc64) base_machine=powerpc machine=powerpc/powerpc64 ;; s390) base_machine=s390 machine=s390/s390-32 ;; |