This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
3.2 PATCH: Support O32 ABI on IRIX 6
- From: Rainer Orth <ro at TechFak dot Uni-Bielefeld dot DE>
- To: gcc-patches at gcc dot gnu dot org
- Cc: Eric Christopher <echristo at redhat dot com>
- Date: Tue, 11 Jun 2002 23:35:23 +0200 (MEST)
- Subject: 3.2 PATCH: Support O32 ABI on IRIX 6
The patch below implements a new mips-sgi-irix6*o32 configuration, which is
basically the mips-sgi-irix5 config suitably modifed to work on IRIX 6. It
is a first step towards reviving my old patch to integrate O32 ABI support
into the common IRIX 6 config:
http://gcc.gnu.org/ml/gcc-patches/1999-02n/msg00015.html
I've posted a couple of testsuite results based on this patch:
* mips-sgi-irix6.5o32 built with the native as:
http://gcc.gnu.org/ml/gcc-testresults/2002-06/msg00364.html
* mips-sgi-irix6.2o32 built with gas 2.11.2 + patch mentioned in
install.texi:
http://gcc.gnu.org/ml/gcc-testresults/2002-06/msg00366.html
* mips-sgi-irix6.2o32 built as above with --enable-sjlj-exceptions:
http://gcc.gnu.org/ml/gcc-testresults/2002-06/msg00365.html
* mips-sgi-irix6.2o32 built with gas 2.12.1:
http://gcc.gnu.org/ml/gcc-testresults/2002-06/msg00363.html
To achieve them, I needed some DejaGNU patches which I'll submit
separately.
A few comments are probably in order beyond the comments in the patch
below:
* I needed to disable libgcc_visibility in gcc/configure.in since the IRIX
6 o32 ld refused to ld -r the original object files and the new ones
created by gcc/mklibgcc.in: I get errors like
ld: FATAL 64: 1th symbol in libgcc/./_divdi3.o is invalid -- should not have relocation against it.
ld: INFO 152: Output file removed because of error.
collect2: ld returned 4 exit status
make[3]: *** [libgcc/./_divdi3.oS] Error 1
I'm not yet sure which symbol ld is complaining about here; I get a
similar error if linking libg2c.so incrementally with ld -r. The error
may be in ld or gas; but until I find out, I've just disabled this code
which isn't critical.
* I've noticed a generic bug in the LINK_SPEC's: -call_shared
-no_unresolved should only be passed to the linker as default options if
gcc was not invoked with -r: this selects a different output format just
like -non_shared, -shared, or -call_shared and should be treated
accordingly. I've only fixed this in the new iris6-o32.h for the time
being.
* I need TARGET_ASM_NAMED_SECTION in iris5gas.h; since with gas 2.12.1
HAVE_GAS_SHF_MERGE is defined, varasm.c (mergeable_string_section,
mergeable_constant_section) would call default_no_named_section which
just aborts.
* NM_FLAGS needs to be redefined in iris5gas.h, otherwise building
libstdc++.so errors out with assembler errors: e.g. in locale.s, there's
.stabs "_GLOBAL__I__ZNSt6locale4noneE:F23",36,0,499,_GLOBAL__I__ZNSt6locale4noneE
which creates a local symbol
5ffe8d10 d _GLOBAL__I__ZNSt6locale4noneE:F23
collect2 searching for constructors with the regular nm -Bn finds those
in addition to the real constructors and creates stuff like
extern entry_pt x17 __asm__ ("_GLOBAL__I__ZNSt6locale4noneE:F23");
which makes gas choke due to the colon in the symbol name. Omitting
those local symbols with nm -Bng avoids this problem.
* If configuring with the native as, one needs to avoid passing -g to gcc
during the bootstrap since this configuration supports no debugging at
all (unless someone implemented mdebug-in-ELF in mips-tfile). Besides,
the native as always embeds the temporary file name in the object files,
so one needs to bootstrap with -save-temps to get a successful
comparison.
I'd like to get this initial cut at IRIX 6 O32 support in now since it
doesn't affect existing configurations and post followup patches to address
testsuite failures.
One thing bothered me, though: when building with gas, I get tons of ld
warnings:
ld: WARNING 86 : Section .mdebug.abi32 of input file /var/tmp//ccI46H4d.o not included as output.
This section is created by mips.c (mips_asm_file_start) [TARGET_GAS &&
OBJECT_FORMAT_ELF]. Contrary to the comment there, current gdb or bfd
don't seem to need or use this information, so it may well be possible to
get rid of this code completely, unless there are other known uses.
Rainer
Mon Jun 10 21:59:34 2002 Rainer Orth <ro@TechFak.Uni-Bielefeld.DE>
* configure.in (mips*-*-irix6*o32): Enable stabs.
gcc:
* config.gcc (mips-sgi-irix6*o32): New configuration.
* configure.in (libgcc_visibility): Disable for mips-sgi-irix6*o32
configurations.
* config/mips/iris6-o32-as.h: New file.
* config/mips/irix6-o32.h: New file.
* config/mips/iris5gas.h (TARGET_ASM_NAMED_SECTION): Define.
(NM_FLAGS): Define.
* config/mips/t-iris5-as: New file.
* config.gcc (mips-sgi-irix6*o32, mips-sgi-irix5*): Use it.
* config/mips/t-iris6 (SHLIB_EXT, SHLIB_SOLINK, SHLIB_SONAME,
SHLIB_NAME, SHLIB_MAP, SHLIB_OBJS, SHLIB_SLIBDIR_QUAL, SHLIB_LINK,
SHLIB_INSTALL, SHLIB_MKMAP, SHLIB_MAPFILES, FPBIT, DPBIT,
dp-bit.c, fp-bit.c): Move ...
* config/mips/t-iris5-6: ... here.
New file, shared by IRIX 5 and IRIX 6.
* config.gcc (mips-sgi-irix6*o32, mips-sgi-irix6*,
mips-sgi-irix5*): Use it.
gcc/testsuite:
* gcc.misc-tests/linkage.exp: Handle mips-sgi-irix6*o32
configuration and IRIX 6 O32 ABI.
libstdc++-v3:
* configure.target (target_os switch): Allow for irix6*o32
configurations.
Index: configure.in
===================================================================
RCS file: /cvs/gcc/gcc/configure.in,v
retrieving revision 1.151
diff -u -p -r1.151 configure.in
--- configure.in 30 May 2002 02:53:32 -0000 1.151
+++ configure.in 10 Jun 2002 19:56:20 -0000
@@ -515,6 +515,10 @@ fi
# Default to using --with-stabs for certain targets.
if test x${with_stabs} = x ; then
case "${target}" in
+ mips*-*-irix6*o32)
+ with_stabs=yes;
+ withoptions="${withoptions} --with-stabs"
+ ;;
mips*-*-irix6*)
;;
mips*-*-* | alpha*-*-osf*)
Index: gcc/config.gcc
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config.gcc,v
retrieving revision 1.202
diff -u -p -r1.202 config.gcc
--- gcc/config.gcc 31 May 2002 04:00:40 -0000 1.202
+++ gcc/config.gcc 10 Jun 2002 19:56:21 -0000
@@ -1733,6 +1730,29 @@ mcore-*-pe*)
tm_file=mcore/mcore-pe.h
tmake_file=mcore/t-mcore-pe
;;
+mips-sgi-irix6*o32) # SGI System V.4., IRIX 6, O32 ABI
+ if test x$gas = xyes
+ then
+ tm_file="mips/iris5.h mips/iris5gas.h"
+ if test x$stabs = xyes
+ then
+ tm_file="${tm_file} dbx.h"
+ fi
+ else
+ tm_file="mips/iris5.h mips/iris6-o32-as.h"
+ tmake_file=mips/t-iris5-as
+ fi
+ tm_file="${tm_file} mips/iris6-o32.h"
+ tmake_file="${tmake_file} mips/t-iris mips/t-iris5-6"
+ xm_defines=POSIX
+ xm_file=mips/xm-iris5.h
+ # mips-tfile doesn't work yet
+ # See comment in mips/iris5.h file.
+ use_collect2=yes
+# if test x$enable_threads = xyes; then
+# thread_file='irix'
+# fi
+ ;;
mips-sgi-irix6*) # SGI System V.4., IRIX 6
if test "x$gnu_ld" = xyes
then
@@ -1740,7 +1760,7 @@ mips-sgi-irix6*) # SGI System V.4., IRI
else
tm_file=mips/iris6.h
fi
- tmake_file="mips/t-iris mips/t-iris6"
+ tmake_file="mips/t-iris mips/t-iris5-6 mips/t-iris6"
xm_defines=POSIX
# if test x$enable_threads = xyes; then
# thread_file='irix'
@@ -1793,8 +1813,9 @@ mips-sgi-irix5*) # SGI System V.4., IRI
fi
else
tm_file=mips/iris5.h
+ tmake_file=mips/t-iris5-as
fi
- tmake_file=mips/t-iris
+ tmake_file="${tmake_file} mips/t-iris mips/t-iris5-6"
xm_defines=POSIX
xm_file=mips/xm-iris5.h
# mips-tfile doesn't work yet
Index: gcc/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/configure.in,v
retrieving revision 1.594
diff -u -p -r1.594 configure.in
--- gcc/configure.in 27 May 2002 04:24:53 -0000 1.594
+++ gcc/configure.in 10 Jun 2002 19:56:23 -0000
@@ -1574,6 +1576,15 @@ if test x"$gcc_cv_as_hidden" = xyes; the
fi
AC_MSG_RESULT($gcc_cv_as_hidden)
libgcc_visibility=$gcc_cv_as_hidden
+case "$target" in
+ mips-sgi-irix6*o32)
+ if test x"$gnu_ld_flag" = x"no"; then
+ # Even if using gas with .hidden support, the resulting object files
+ # cannot be linked with the IRIX 6 O32 linker.
+ libgcc_visibility=no
+ fi
+ ;;
+esac
AC_SUBST(libgcc_visibility)
AC_MSG_CHECKING(assembler leb128 support)
Index: gcc/config/mips/iris5gas.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mips/iris5gas.h,v
retrieving revision 1.7
diff -u -p -r1.7 iris5gas.h
--- gcc/config/mips/iris5gas.h 11 Nov 2001 05:56:43 -0000 1.7
+++ gcc/config/mips/iris5gas.h 10 Jun 2002 19:56:39 -0000
@@ -34,3 +34,12 @@ do {
extern FILE *asm_out_text_file; \
fprintf (asm_out_text_file, "\t.etype\t0x%x;", (a)); \
} while (0)
+
+/* Switch into a generic section. */
+#undef TARGET_ASM_NAMED_SECTION
+#define TARGET_ASM_NAMED_SECTION default_elf_asm_named_section
+
+/* Add -g to mips.h default to avoid confusing gas with local symbols
+ generated from stabs info. */
+#undef NM_FLAGS
+#define NM_FLAGS "-Bng"
Index: gcc/config/mips/iris6-o32-as.h
===================================================================
RCS file: gcc/config/mips/iris6-o32-as.h
diff -N gcc/config/mips/iris6-o32-as.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gcc/config/mips/iris6-o32-as.h 10 Jun 2002 19:56:39 -0000
@@ -0,0 +1,13 @@
+/* Definitions of target machine for GNU compiler, for MIPS running IRIX 6
+ (O32 ABI) using the SGI assembler. */
+
+/* Override mips.h default: the IRIX 6 O32 assembler warns about -O3:
+
+ as: Warning: -O3 is not supported for assembly compiles for ucode
+ compilers; changing to -O2.
+
+ So avoid passing it in the first place. */
+#undef SUBTARGET_ASM_OPTIMIZING_SPEC
+#define SUBTARGET_ASM_OPTIMIZING_SPEC "\
+%{noasmopt:-O0} \
+%{!noasmopt:%{O|O1|O2|O3:-O2}}"
Index: gcc/config/mips/iris6-o32.h
===================================================================
RCS file: gcc/config/mips/iris6-o32.h
diff -N gcc/config/mips/iris6-o32.h
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gcc/config/mips/iris6-o32.h 10 Jun 2002 19:56:39 -0000
@@ -0,0 +1,63 @@
+/* Definitions of target machine for GNU compiler, for MIPS running IRIX 6
+ (O32 ABI). */
+
+/* The O32 ABI on IRIX 6 defaults to the mips2 ISA. */
+#undef MIPS_ISA_DEFAULT
+#define MIPS_ISA_DEFAULT 2
+
+/* Specify wchar_t and wint_t types. */
+#undef WCHAR_TYPE
+#define WCHAR_TYPE "long int"
+
+#undef WCHAR_TYPE_SIZE
+#define WCHAR_TYPE_SIZE 32
+
+#undef WINT_TYPE
+#define WINT_TYPE "long int"
+
+#undef WINT_TYPE_SIZE
+#define WINT_TYPE_SIZE 32
+
+/* Copied from iris5.h, with _MIPS_SIM definition adapted to SGI cc usage
+ and -D_LONGLONG added as in iris6.h. */
+#undef CPP_PREDEFINES
+#define CPP_PREDEFINES \
+ "-Dunix -Dmips -Dsgi -Dhost_mips -DMIPSEB -D_MIPSEB -DSYSTYPE_SVR4 \
+ -D_LONGLONG -D_SVR4_SOURCE -D_MODERN_C -D__DSO__ \
+ -D_ABIO32=1 -D_MIPS_SIM=_ABIO32 -D_MIPS_SZPTR=32 \
+ -Asystem=unix -Asystem=svr4 -Acpu=mips -Amachine=sgi"
+
+/* Copied from iris5.h, but _MIPS_ISA defaults to _MIPS_ISA_MIPS2. */
+#undef SUBTARGET_CPP_SPEC
+#define SUBTARGET_CPP_SPEC "\
+%{!ansi:-D__EXTENSIONS__ -D_SGI_SOURCE -D_LONGLONG} \
+%{!mfp64: -D_MIPS_FPSET=16}%{mfp64: -D_MIPS_FPSET=32} \
+%{mips1: -D_MIPS_ISA=_MIPS_ISA_MIPS1} \
+%{mips2: -D_MIPS_ISA=_MIPS_ISA_MIPS2} \
+%{mips3: -D_MIPS_ISA=_MIPS_ISA_MIPS3} \
+%{!mips1: %{!mips2: %{!mips3: -D_MIPS_ISA=_MIPS_ISA_MIPS2}}} \
+%{!mint64: -D_MIPS_SZINT=32}%{mint64: -D_MIPS_SZINT=64} \
+%{!mlong64: -D_MIPS_SZLONG=32}%{mlong64: -D_MIPS_SZLONG=64}"
+
+/* Enforce use of O32 assembler, irrespective of SGI_ABI environment variable
+ and machine type (e.g., R8000 systems default to -64). Gas doesn't need
+ this, but doesn't hurt either. Need to pass -mips2 to gas which defaults
+ to -mips1 if no ISA is specified. */
+#undef SUBTARGET_ASM_SPEC
+#define SUBTARGET_ASM_SPEC "-32 %{!mips*:-mips2}"
+
+/* Enforce use of O32 linker, irrespective of SGI_ABI environment variable
+ and machine type (e.g., R8000 systems default to -64). Copied from
+ iris5.h, only adding -32. The default options -call_shared -no_unresolved
+ are only passed if not invoked with -r. */
+#undef LINK_SPEC
+#define LINK_SPEC "\
+%{G*} %{EB} %{EL} %{mips1} %{mips2} %{mips3} \
+%{bestGnum} %{shared} %{non_shared} \
+%{call_shared} %{no_archive} %{exact_version} \
+%{static: -non_shared} \
+%{!static: \
+ %{!shared:%{!non_shared:%{!call_shared:%{!r: -call_shared -no_unresolved}}}}} \
+%{rpath} \
+-_SYSTYPE_SVR4 \
+-32"
Index: gcc/config/mips/t-iris5-6
===================================================================
RCS file: gcc/config/mips/t-iris5-6
diff -N gcc/config/mips/t-iris5-6
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gcc/config/mips/t-iris5-6 10 Jun 2002 19:56:39 -0000
@@ -0,0 +1,45 @@
+# Build a shared libgcc library.
+SHLIB_EXT = .so
+SHLIB_SOLINK = @shlib_base_name@.so
+SHLIB_SONAME = @shlib_so_name@.so.1
+SHLIB_NAME = @shlib_dir@@shlib_so_name@.so.1
+SHLIB_MAP = @shlib_map_file@
+SHLIB_OBJS = @shlib_objs@
+SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
+
+SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
+ -Wl,-soname,$(SHLIB_SONAME) \
+ -o $(SHLIB_NAME) @multilib_flags@ $(SHLIB_OBJS) -lc && \
+ rm -f $(SHLIB_SOLINK) && \
+ $(LN_S) $(SHLIB_NAME) $(SHLIB_SOLINK)
+# ??? Irix 6.5 seems to eat the option fine (if we somehow remove the
+# -hidden_symbol option, which is documented to be ignored in conjunction
+# with -exports_file), but fails to actually hide any symbols.
+# -Wl,-exports_file,$(SHLIB_MAP)
+
+# $(slibdir) double quoted to protect it from expansion while building
+# libgcc.mk. We want this delayed until actual install time.
+SHLIB_INSTALL = \
+ $$(SHELL) $$(srcdir)/mkinstalldirs $$(slibdir)$(SHLIB_SLIBDIR_QUAL); \
+ $(INSTALL_DATA) $(SHLIB_NAME) \
+ $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \
+ rm -f $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \
+ $(LN_S) $(SHLIB_SONAME) \
+ $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
+SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
+SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver
+
+# We want fine grained libraries, so use the new code to build the
+# floating point emulation libraries.
+FPBIT = fp-bit.c
+DPBIT = dp-bit.c
+
+dp-bit.c: $(srcdir)/config/fp-bit.c
+ echo '#undef US_SOFTWARE_GOFAST' > dp-bit.c
+ echo '#undef FLOAT' >> dp-bit.c
+ cat $(srcdir)/config/fp-bit.c >> dp-bit.c
+
+fp-bit.c: $(srcdir)/config/fp-bit.c
+ echo '#define FLOAT' > fp-bit.c
+ echo '#undef US_SOFTWARE_GOFAST' >> fp-bit.c
+ cat $(srcdir)/config/fp-bit.c >> fp-bit.c
Index: gcc/config/mips/t-iris5-as
===================================================================
RCS file: gcc/config/mips/t-iris5-as
diff -N gcc/config/mips/t-iris5-as
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ gcc/config/mips/t-iris5-as 10 Jun 2002 19:56:39 -0000
@@ -0,0 +1,7 @@
+# omit -g, gcc doesn't support the o32 mdebug debugging format and warns about
+# every invokation with -g*
+# add -save-temps to avoid comparison failure due to embedded temp file names
+BOOT_CFLAGS = -O2 -save-temps
+
+# omit -g1
+LIBGCC2_DEBUG_CFLAGS =
Index: gcc/config/mips/t-iris6
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/mips/t-iris6,v
retrieving revision 1.13
diff -u -p -r1.13 t-iris6
--- gcc/config/mips/t-iris6 10 May 2002 15:25:58 -0000 1.13
+++ gcc/config/mips/t-iris6 10 Jun 2002 19:56:39 -0000
@@ -14,52 +14,7 @@ INSTALL_LIBGCC = install-multilib
EXTRA_MULTILIB_PARTS=crtbegin.o crtend.o
CRTSTUFF_T_CFLAGS=-g1
-# Build a shared libgcc library.
-SHLIB_EXT = .so
-SHLIB_SOLINK = @shlib_base_name@.so
-SHLIB_SONAME = @shlib_so_name@.so.1
-SHLIB_NAME = @shlib_dir@@shlib_so_name@.so.1
-SHLIB_MAP = @shlib_map_file@
-SHLIB_OBJS = @shlib_objs@
-SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@
SHLIB_SLIBDIR_SUFFIXES = mabi=64:/mabi=64 mabi=n32:
-
-SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
- -Wl,-soname,$(SHLIB_SONAME) \
- -o $(SHLIB_NAME) @multilib_flags@ $(SHLIB_OBJS) -lc && \
- rm -f $(SHLIB_SOLINK) && \
- $(LN_S) $(SHLIB_NAME) $(SHLIB_SOLINK)
-# ??? Irix 6.5 seems to eat the option fine (if we somehow remove the
-# -hidden_symbol option, which is documented to be ignored in conjunction
-# with -exports_file), but fails to actually hide any symbols.
-# -Wl,-exports_file,$(SHLIB_MAP)
-
-# $(slibdir) double quoted to protect it from expansion while building
-# libgcc.mk. We want this delayed until actual install time.
-SHLIB_INSTALL = \
- $$(SHELL) $$(srcdir)/mkinstalldirs $$(slibdir)$(SHLIB_SLIBDIR_QUAL); \
- $(INSTALL_DATA) $(SHLIB_NAME) \
- $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SONAME); \
- rm -f $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK); \
- $(LN_S) $(SHLIB_SONAME) \
- $$(slibdir)$(SHLIB_SLIBDIR_QUAL)/$(SHLIB_SOLINK)
-SHLIB_MKMAP = $(srcdir)/mkmap-flat.awk
-SHLIB_MAPFILES = $(srcdir)/libgcc-std.ver
-
-# We want fine grained libraries, so use the new code to build the
-# floating point emulation libraries.
-FPBIT = fp-bit.c
-DPBIT = dp-bit.c
-
-dp-bit.c: $(srcdir)/config/fp-bit.c
- echo '#undef US_SOFTWARE_GOFAST' > dp-bit.c
- echo '#undef FLOAT' >> dp-bit.c
- cat $(srcdir)/config/fp-bit.c >> dp-bit.c
-
-fp-bit.c: $(srcdir)/config/fp-bit.c
- echo '#define FLOAT' > fp-bit.c
- echo '#undef US_SOFTWARE_GOFAST' >> fp-bit.c
- cat $(srcdir)/config/fp-bit.c >> fp-bit.c
# This is only needed in the static libgcc as a band-aid until gcc correctly
# implements the N32/N64 ABI structure passing conventions
Index: gcc/testsuite/gcc.misc-tests/linkage.exp
===================================================================
RCS file: /cvs/gcc/gcc/gcc/testsuite/gcc.misc-tests/linkage.exp,v
retrieving revision 1.8
diff -u -p -r1.8 linkage.exp
--- gcc/testsuite/gcc.misc-tests/linkage.exp 4 Apr 2002 00:18:02 -0000 1.8
+++ gcc/testsuite/gcc.misc-tests/linkage.exp 10 Jun 2002 19:57:17 -0000
@@ -35,6 +35,12 @@ if [isnative] then {
if [ string match "*N32*" $file_string ] {
set native_cflags "-n32"
}
+ if [ string match "*ELF 32*" $file_string ] {
+ set native_cflags "-32"
+ }
+ }
+ if [istarget "mips-sgi-iris6*o32" ] {
+ set native_cflags "-32"
}
if [istarget "sparc*-sun-solaris2*"] {
set file_string [exec file "linkage-x.o"]
Index: libstdc++-v3/configure.target
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/configure.target,v
retrieving revision 1.40
diff -u -p -r1.40 configure.target
--- libstdc++-v3/configure.target 7 May 2002 20:43:09 -0000 1.40
+++ libstdc++-v3/configure.target 10 Jun 2002 19:57:25 -0000
@@ -83,11 +83,11 @@ case "${target_os}" in
linux* | gnu*)
os_include_dir="config/os/gnu-linux"
;;
- irix[1-6] | irix[1-5].* | irix6.[0-4])
+ irix[1-6] | irix[1-5].* | irix6.[0-4]*)
# This is known to work on at least IRIX 5.2 and 6.3.
os_include_dir="config/os/irix/irix5.2"
;;
- irix6.5)
+ irix6.5*)
os_include_dir="config/os/irix/irix6.5"
;;
mingw32*)