diff --git a/gcc/ChangeLog b/gcc/ChangeLog index d3e9c9fb53f..a12ae46fdb9 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,11 @@ +2006-01-10 Jan Beulich + + * config/i386/netware.h (TARGET_SUBTARGET_DEFAULT): Include + MASK_ALIGN_DOUBLE. + * config/i386/nwld.h (LINK_SPEC): Add --extensions:GNU option. + * config/i386/t-nwld (SHLIB_LINK): Insert spaces between expr + arguments. + 2006-01-10 Ben Elliston * config/rs6000/predicates.md (easy_fp_constant): Discount decimal diff --git a/gcc/config/i386/netware.h b/gcc/config/i386/netware.h index 197bdc5a6a2..3630765c7aa 100644 --- a/gcc/config/i386/netware.h +++ b/gcc/config/i386/netware.h @@ -71,7 +71,7 @@ Boston, MA 02110-1301, USA. */ returns float values in the 387, and uses MSVC bit field layout. */ #undef TARGET_SUBTARGET_DEFAULT #define TARGET_SUBTARGET_DEFAULT (MASK_80387 | MASK_IEEE_FP | \ - MASK_FLOAT_RETURNS | MASK_MS_BITFIELD_LAYOUT) + MASK_FLOAT_RETURNS | MASK_ALIGN_DOUBLE | MASK_MS_BITFIELD_LAYOUT) #undef MATH_LIBRARY #define MATH_LIBRARY "" diff --git a/gcc/config/i386/nwld.h b/gcc/config/i386/nwld.h index 7585f86974e..fe132afbf84 100644 --- a/gcc/config/i386/nwld.h +++ b/gcc/config/i386/nwld.h @@ -31,7 +31,8 @@ Boston, MA 02110-1301, USA. */ #define LINKER_NAME "nwld" #undef LINK_SPEC -#define LINK_SPEC "--format nlm %{static:%{!nostdlib:%{!nodefaultlib:%eStatic linking is not supported.\n}}}" +#define LINK_SPEC "--format:NLM --extensions:GNU" \ + " %{static:%{!nostdlib:%{!nodefaultlib:%eStatic linking is not supported.\n}}}" #undef LINK_GCC_C_SEQUENCE_SPEC #define LINK_GCC_C_SEQUENCE_SPEC "%L %G" diff --git a/gcc/config/i386/t-nwld b/gcc/config/i386/t-nwld index fbca0dfe933..6f6905541ec 100644 --- a/gcc/config/i386/t-nwld +++ b/gcc/config/i386/t-nwld @@ -40,7 +40,7 @@ SHLIB_LINK = set -e; \ echo "name $(SHLIB_NAME)" >>@shlib_base_name@.def; \ echo "version $(version)" | sed "s!\.!,!g" >>@shlib_base_name@.def; \ touch libgcc/build; \ - echo "build $$$$(expr $$$$(>@shlib_base_name@.def; \ + echo "build $$$$(expr $$$$(>@shlib_base_name@.def; \ echo "export @$(SHLIB_MAP)" >>@shlib_base_name@.def; \ if mpkxdc -n -p @shlib_base_name@.xdc; \ then echo "xdcdata @shlib_base_name@.xdc" >>@shlib_base_name@.def; \ @@ -51,7 +51,7 @@ SHLIB_LINK = set -e; \ -Wl,--Map,--map-info,full,--strip-all,--def-file,@shlib_base_name@.def; \ rm -f @shlib_base_name@.imp; $(LN_S) $(SHLIB_MAP) @shlib_base_name@.imp; \ rm -f libgcc.imp; $(LN_S) @shlib_base_name@.imp libgcc.imp; \ - expr $$$$(libgcc/build + expr $$$$(libgcc/build # $(slibdir) double quoted to protect it from expansion while building # libgcc.mk. We want this delayed until actual install time. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d2a59cbc9f8..1fa45223f15 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,12 @@ +2006-01-10 Jan Beulich + + * lib/target-supports.exp (check_visibility_available): Simplify test + for *-*-netware*. + (check_profiling_available): Fail for *-*-netware*. + * g++.old-deja/g++.law/profile1.C: Remove dg-bogus for *-*-netware*. + * gcc.dg/20021014-1.c: Likewise. + * gcc.dg/nest.c: Likewise. + 2006-01-09 Andrew Pinski fortran/24936 diff --git a/gcc/testsuite/g++.old-deja/g++.law/profile1.C b/gcc/testsuite/g++.old-deja/g++.law/profile1.C index acc20d0ad92..7f17a15de9f 100644 --- a/gcc/testsuite/g++.old-deja/g++.law/profile1.C +++ b/gcc/testsuite/g++.old-deja/g++.law/profile1.C @@ -2,7 +2,6 @@ // { dg-require-profiling "-pg" } // { dg-options "-pg" } // { dg-options "-pg -static" { target hppa*-*-hpux* } } -// { dg-bogus "\[Uu\]nresolved symbol ._mcount" "Profiling unsupported" { xfail *-*-netware* } 0 } // GROUPS passed profiling #include main() diff --git a/gcc/testsuite/gcc.dg/20021014-1.c b/gcc/testsuite/gcc.dg/20021014-1.c index 6ce62c34666..dd8614c9f09 100644 --- a/gcc/testsuite/gcc.dg/20021014-1.c +++ b/gcc/testsuite/gcc.dg/20021014-1.c @@ -4,7 +4,6 @@ /* { dg-options "-O2 -p -static" { target hppa*-*-hpux* } } */ /* { dg-error "profiler" "No profiler support" { target xstormy16-*-* } 0 } */ /* { dg-error "" "consider using `-pg' instead of `-p' with gprof(1)" { target *-*-freebsd* } 0 } */ -/* { dg-bogus "\[Uu\]nresolved symbol ._mcount" "Profiling unsupported" { xfail *-*-netware* } 0 } */ extern void abort (void); extern void exit (int); diff --git a/gcc/testsuite/gcc.dg/nest.c b/gcc/testsuite/gcc.dg/nest.c index b9476600ae2..7178bd82045 100644 --- a/gcc/testsuite/gcc.dg/nest.c +++ b/gcc/testsuite/gcc.dg/nest.c @@ -4,7 +4,6 @@ /* { dg-options "-O2 -pg" } */ /* { dg-options "-O2 -pg -static" { target hppa*-*-hpux* } } */ /* { dg-error "profiler" "No profiler support" { target xstormy16-*-* } 0 } */ -/* { dg-bogus "\[Uu\]nresolved symbol ._mcount" "Profiling unsupported" { xfail *-*-netware* } 0 } */ extern void abort (void); diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index 2e91a161eeb..78ceb540853 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -131,7 +131,7 @@ proc check_visibility_available { what_kind } { global target_triplet # On NetWare, support makes no sense. - if { [string match "*-*-netware*" $target_triplet] } { + if { [istarget *-*-netware*] } { return 0 } @@ -279,6 +279,11 @@ proc check_profiling_available { test_what } { return 0 } + # At present, there is no profiling support on NetWare. + if { [istarget *-*-netware*] } { + return 0 + } + # Now examine the cache variable. if {![info exists profiling_available_saved]} { # Some targets don't have any implementation of __bb_init_func or are