From 5aefc1ca23bd14fa7b462fea41500a7df423a515 Mon Sep 17 00:00:00 2001 From: Fred Fish Date: Fri, 16 Apr 1993 23:22:41 +0000 Subject: [PATCH] Remove chill sanitizations, which are no longer necessary. --- gdb/Makefile.in | 11 ------- gdb/c-typeprint.c | 2 -- gdb/defs.h | 9 +----- gdb/dwarfread.c | 6 ---- gdb/gdbtypes.h | 2 -- gdb/language.c | 20 +------------ gdb/language.h | 2 -- gdb/symfile.c | 45 +++++++++++++++++----------- gdb/symtab.h | 23 ++------------- gdb/testsuite/.Sanitize | 54 ++-------------------------------- gdb/testsuite/ChangeLog | 11 ------- gdb/testsuite/Makefile.in | 28 ++---------------- gdb/testsuite/config/.Sanitize | 34 --------------------- gdb/utils.c | 2 -- 14 files changed, 38 insertions(+), 211 deletions(-) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index fb5c8d8af5..f5112700fe 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -185,11 +185,9 @@ FLAGS_TO_PASS = \ "AR_FLAGS=$(AR_FLAGS)" \ "CC=$(CC)" \ "CFLAGS=$(CFLAGS)" \ -$(start-sanitize-chill)\ "CHILLFLAGS=$(CHILLFLAGS)" \ "CHILL=$(CHILL)" \ "CHILL_LIB=$(CHILL_LIB)" \ -$(end-sanitize-chill)\ "CXX=$(CXX)" \ "CXXFLAGS=$(CXXFLAGS)" \ "RANLIB=$(RANLIB)" \ @@ -227,7 +225,6 @@ CXX_FOR_TARGET = ` \ fi; \ fi` -$(start-sanitize-chill) CHILLFLAGS = $(CFLAGS) CHILL = gcc CHILL_FOR_TARGET = ` \ @@ -242,8 +239,6 @@ CHILL_FOR_TARGET = ` \ fi` CHILL_LIB = -lchill -$(end-sanitize-chill) - # The use of $$(x_FOR_TARGET) reduces the command line length by not # duplicating the lengthy definition. TARGET_FLAGS_TO_PASS = \ @@ -253,12 +248,10 @@ TARGET_FLAGS_TO_PASS = \ 'CC=$$(CC_FOR_TARGET)' \ "CC_FOR_TARGET=$(CC_FOR_TARGET)" \ "CFLAGS=$(CFLAGS)" \ -$(start-sanitize-chill)\ "CHILLFLAGS=$(CHILLFLAGS)" \ 'CHILL=$$(CHILL_FOR_TARGET)' \ "CHILL_FOR_TARGET=$(CHILL_FOR_TARGET)" \ "CHILL_LIB=$(CHILL_LIB)" \ -$(end-sanitize-chill)\ 'CXX=$$(CXX_FOR_TARGET)' \ "CXX_FOR_TARGET=$(CXX_FOR_TARGET)" \ "CXXFLAGS=$(CXXFLAGS)" \ @@ -738,7 +731,6 @@ c-exp.tab.c: $(srcdir)/c-exp.y $(srcdir)/Makefile.in < y.tab.c > ././c-exp.tab.c -rm y.tab.c -# start-sanitize-chill # ch-exp.tab.c is generated in target dir from ch-exp.y if it doesn't exist # in srcdir, then compiled in target dir to ch-exp.tab.o. # Remove bogus decls for malloc/realloc/free which conflict with everything @@ -755,7 +747,6 @@ ch-exp.tab.c: $(srcdir)/ch-exp.y $(srcdir)/Makefile.in -e 's/realloc/xrealloc/g' \ < y.tab.c > ././ch-exp.tab.c -rm y.tab.c -# end-sanitize-chill # m2-exp.tab.c is generated in target dir from m2-exp.y if it doesn't exist # in srcdir, then compiled in target dir to m2-exp.tab.o. @@ -857,12 +848,10 @@ force_update: # will remove them. MAKEOVERRIDES= -$(start-sanitize-chill) ## This is ugly, but I don't want GNU make to put these variables in ## the environment. Older makes will see this as a set of targets ## with no dependencies and no actions. unexport CHILLFLAGS CHILL_LIB CHILL_FOR_TARGET : -$(end-sanitize-chill) # This is the end of "Makefile.in". When built into "Makefile" # by the configure script, two things are added below this point: diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c index 86c5234a4d..479d5d7c54 100644 --- a/gdb/c-typeprint.c +++ b/gdb/c-typeprint.c @@ -87,12 +87,10 @@ c_typedef_print (type, new, stream) type_print(type,"",stream,0); break; #endif -/* start-sanitize-chill */ #ifdef _LANG_chill case language_chill: error ("Missing Chill support in function c_typedef_print."); /*FIXME*/ #endif -/* end-sanitize-chill */ default: error("Language not supported."); } diff --git a/gdb/defs.h b/gdb/defs.h index 9c1388142e..58aa9f5112 100644 --- a/gdb/defs.h +++ b/gdb/defs.h @@ -83,9 +83,7 @@ enum language language_auto, /* Placeholder for automatic setting */ language_c, /* C */ language_cplus, /* C++ */ - /* start-sanitize-chill */ language_chill, /* Chill */ - /* end-sanitize-chill */ language_m2 /* Modula-2 */ }; @@ -117,12 +115,10 @@ inside_entry_file PARAMS ((CORE_ADDR addr)); extern int inside_main_func PARAMS ((CORE_ADDR pc)); -/* start-sanitize-chill */ /* From ch-lang.c, for the moment. (FIXME) */ extern char * chill_demangle PARAMS ((const char *)); -/* end-sanitize-chill */ /* From libiberty.a */ @@ -261,10 +257,7 @@ extern void gdb_printchar PARAMS ((int, FILE *, int)); extern void -fprint_symbol PARAMS ((FILE *, char *)); - -extern void -fputs_demangled PARAMS ((char *, FILE *, int, enum language)); +fprintf_symbol_filtered PARAMS ((FILE *, char *, enum language, int)); extern void perror_with_name PARAMS ((char *)); diff --git a/gdb/dwarfread.c b/gdb/dwarfread.c index 998f1dda27..5dc0c30717 100644 --- a/gdb/dwarfread.c +++ b/gdb/dwarfread.c @@ -197,11 +197,9 @@ typedef unsigned int DIE_REF; /* Reference to a DIE */ #define LCC_PRODUCER "NCR C/C++" #endif -/* start-sanitize-chill */ #ifndef CHILL_PRODUCER #define CHILL_PRODUCER "GNU Chill " #endif -/* end-sanitize-chill */ /* Flags to target_to_host() that tell whether or not the data object is expected to be signed. Used, for example, when fetching a signed @@ -674,11 +672,9 @@ set_cu_language (dip) case LANG_C_PLUS_PLUS: cu_language = language_cplus; break; - /* start-sanitize-chill */ case LANG_CHILL: cu_language = language_chill; break; - /* end-sanitize-chill */ case LANG_MODULA2: cu_language = language_m2; break; @@ -1903,9 +1899,7 @@ handle_producer (producer) processing_gcc_compilation = STREQN (producer, GPLUS_PRODUCER, strlen (GPLUS_PRODUCER)) - /* start-sanitize-chill */ || STREQN (producer, CHILL_PRODUCER, strlen (CHILL_PRODUCER)) - /* end-sanitize-chill */ || STREQN (producer, GCC_PRODUCER, strlen (GCC_PRODUCER)); /* Select a demangling style if we can identify the producer and if diff --git a/gdb/gdbtypes.h b/gdb/gdbtypes.h index da4fdffc40..a28bf900ec 100644 --- a/gdb/gdbtypes.h +++ b/gdb/gdbtypes.h @@ -503,7 +503,6 @@ extern struct type *builtin_type_m2_card; extern struct type *builtin_type_m2_real; extern struct type *builtin_type_m2_bool; -/* start-sanitize-chill */ /* Chill types */ extern struct type *builtin_type_chill_bool; @@ -511,7 +510,6 @@ extern struct type *builtin_type_chill_char; extern struct type *builtin_type_chill_long; extern struct type *builtin_type_chill_ulong; extern struct type *builtin_type_chill_real; -/* end-sanitize-chill */ /* LONG_LONG is defined if the host has "long long". */ diff --git a/gdb/language.c b/gdb/language.c index a58fd2232e..4f88b0a264 100644 --- a/gdb/language.c +++ b/gdb/language.c @@ -165,9 +165,7 @@ set_language_command (ignore, from_tty) printf ("local or auto Automatic setting based on source file\n"); printf ("c Use the C language\n"); printf ("c++ Use the C++ language\n"); - /* start-sanitize-chill */ printf ("chill Use the Chill language\n"); - /* end-sanitize-chill */ printf ("modula-2 Use the Modula-2 language\n"); /* Restore the silly string. */ set_language(current_language->la_language); @@ -460,10 +458,8 @@ binop_result_type(v1,v2) not needed. */ return l1 > l2 ? VALUE_TYPE(v1) : VALUE_TYPE(v2); break; - /* start-sanitize-chill */ - case language_chill: + case language_chill: error ("Missing Chill support in function binop_result_check.");/*FIXME*/ - /* end-sanitize-chill */ } abort(); return (struct type *)0; /* For lint */ @@ -634,10 +630,8 @@ integral_type (type) (TYPE_CODE(type) != TYPE_CODE_ENUM) ? 0 : 1; case language_m2: return TYPE_CODE(type) != TYPE_CODE_INT ? 0 : 1; - /* start-sanitize-chill */ case language_chill: error ("Missing Chill support in function integral_type."); /*FIXME*/ - /* end-sanitize-chill */ default: error ("Language not supported."); } @@ -665,9 +659,7 @@ character_type (type) { switch(current_language->la_language) { - /* start-sanitize-chill */ case language_chill: - /* end-sanitize-chill */ case language_m2: return TYPE_CODE(type) != TYPE_CODE_CHAR ? 0 : 1; @@ -688,9 +680,7 @@ string_type (type) { switch(current_language->la_language) { - /* start-sanitize-chill */ case language_chill: - /* end-sanitize-chill */ case language_m2: return TYPE_CODE(type) != TYPE_CODE_STRING ? 0 : 1; @@ -710,9 +700,7 @@ boolean_type (type) { switch(current_language->la_language) { - /* start-sanitize-chill */ case language_chill: - /* end-sanitize-chill */ case language_m2: return TYPE_CODE(type) != TYPE_CODE_BOOL ? 0 : 1; @@ -757,10 +745,8 @@ structured_type(type) return (TYPE_CODE(type) == TYPE_CODE_STRUCT) || (TYPE_CODE(type) == TYPE_CODE_SET) || (TYPE_CODE(type) == TYPE_CODE_ARRAY); - /* start-sanitize-chill */ case language_chill: error ("Missing Chill support in function structured_type."); /*FIXME*/ - /* end-sanitize-chill */ default: return (0); } @@ -805,10 +791,8 @@ value_true(val) return 0; /* BOOLEAN with value FALSE */ break; - /* start-sanitize-chill */ case language_chill: error ("Missing Chill support in function value_type."); /*FIXME*/ - /* end-sanitize-chill */ default: error ("Language not supported."); @@ -979,12 +963,10 @@ binop_type_check(arg1,arg2,op) } #endif -/* start-sanitize-chill */ #ifdef _LANG_chill case language_chill: error ("Missing Chill support in function binop_type_check.");/*FIXME*/ #endif -/* end-sanitize-chill */ } } diff --git a/gdb/language.h b/gdb/language.h index bd2a5a7818..ac32290cb7 100644 --- a/gdb/language.h +++ b/gdb/language.h @@ -33,9 +33,7 @@ struct objfile; /* #include "lang_def.h" */ #define _LANG_c #define _LANG_m2 -/* start-sanitize-chill */ #define _LANG_chill -/* end-sanitize-chill */ /* range_mode == range_mode_auto: range_check set automatically to default of language. diff --git a/gdb/symfile.c b/gdb/symfile.c index d47a443f74..7a29fa67f6 100644 --- a/gdb/symfile.c +++ b/gdb/symfile.c @@ -442,6 +442,34 @@ syms_from_objfile (objfile, addr, mainline, verbo) section_offsets = (*objfile -> sf -> sym_offsets) (objfile, addr); objfile->section_offsets = section_offsets; + /* This is a hack. As far as I can tell, section offsets are not + target dependent. They are all set to addr with a couple of + exceptions. The exceptions are sysvr4 shared libraries, whose + offsets are kept in solib structures anyway and rs6000 xcoff + which handles shared libraries in a completely unique way. + + Section offsets are built similarly, except that they are built + by adding addr in all cases because there is no clear mapping + from section_offsets into actual sections. Note that solib.c + has a different algorythm for finding section offsets. + + These should probably all be collapsed into some target + independent form of shared library support. FIXME. */ + + if (addr) + { + struct obj_section *s; + + for (s = objfile->sections; s < objfile->sections_end; ++s) + { + s->addr -= s->offset; + s->addr += addr; + s->endaddr -= s->offset; + s->endaddr += addr; + s->offset += addr; + } + } + (*objfile -> sf -> sym_read) (objfile, section_offsets, mainline); /* Don't allow char * to have a typename (else would get caddr_t.) */ @@ -942,10 +970,8 @@ deduce_language_from_filename (filename) return language_c; else if(STREQ(c,".cc") || STREQ(c,".C")) return language_cplus; - /* start-sanitize-chill */ else if(STREQ(c,".ch") || STREQ(c,".c186") || STREQ(c,".c286")) return language_chill; - /* end-sanitize-chill */ return language_unknown; /* default */ } @@ -1331,21 +1357,6 @@ add_psymbol_addr_to_list (name, namelength, namespace, class, list, val, #endif /* !INLINE_ADD_PSYMBOL */ -/* Returns a section whose range includes PC or NULL if none found. */ - -struct section_table * -find_pc_section(pc) - CORE_ADDR pc; -{ - struct section_table *s; - - s = find_pc_section_from_targets(pc); - if (s == NULL) - s = find_pc_section_from_so_list(pc); - - return(s); -} - void _initialize_symfile () diff --git a/gdb/symtab.h b/gdb/symtab.h index 4b11258517..0661c5a197 100644 --- a/gdb/symtab.h +++ b/gdb/symtab.h @@ -91,13 +91,11 @@ struct general_symbol_info { char *demangled_name; } cplus_specific; - /* start-sanitize-chill */ /* For Chill */ struct chill_specific { char *demangled_name; } chill_specific; - /* end-sanitize-chill */ } lang_u; } lang_specific; @@ -134,12 +132,10 @@ extern int demangle; /* We reference it, so go ahead and declare it. */ { \ SYMBOL_CPLUS_DEMANGLED_NAME (symbol) = NULL; \ } \ - /* start-sanitize-chill */ \ else if (SYMBOL_LANGUAGE (symbol) == language_chill) \ { \ SYMBOL_CHILL_DEMANGLED_NAME (symbol) = NULL; \ } \ - /* end-sanitize-chill */ \ else \ { \ memset (&(symbol)->ginfo.lang_specific.lang_u, 0, \ @@ -176,7 +172,6 @@ extern int demangle; /* We reference it, so go ahead and declare it. */ SYMBOL_CPLUS_DEMANGLED_NAME (symbol) = NULL; \ } \ } \ - /* start-sanitize-chill */ \ if (demangled == NULL \ && (SYMBOL_LANGUAGE (symbol) == language_chill \ || SYMBOL_LANGUAGE (symbol) == language_auto)) \ @@ -195,7 +190,6 @@ extern int demangle; /* We reference it, so go ahead and declare it. */ SYMBOL_CHILL_DEMANGLED_NAME (symbol) = NULL; \ } \ } \ - /* end-sanitize-chill */ \ if (SYMBOL_LANGUAGE (symbol) == language_auto) \ { \ SYMBOL_LANGUAGE (symbol) = language_unknown; \ @@ -205,20 +199,6 @@ extern int demangle; /* We reference it, so go ahead and declare it. */ /* Macro that returns the demangled name for a symbol based on the language for that symbol. If no demangled name exists, returns NULL. */ -#define SYMBOL_DEMANGLED_NAME(symbol) \ - (SYMBOL_LANGUAGE (symbol) == language_cplus \ - ? SYMBOL_CPLUS_DEMANGLED_NAME (symbol) \ - : NULL) - -/* start-sanitize-chill */ - -#define SYMBOL_CHILL_DEMANGLED_NAME(symbol) \ - (symbol)->ginfo.lang_specific.lang_u.chill_specific.demangled_name - -/* Redefine SYMBOL_DEMANGLED_NAME. This is simplier than trying to - devise a macro for which part of it can be cleanly sanitized away. */ - -#undef SYMBOL_DEMANGLED_NAME #define SYMBOL_DEMANGLED_NAME(symbol) \ (SYMBOL_LANGUAGE (symbol) == language_cplus \ ? SYMBOL_CPLUS_DEMANGLED_NAME (symbol) \ @@ -226,7 +206,8 @@ extern int demangle; /* We reference it, so go ahead and declare it. */ ? SYMBOL_CHILL_DEMANGLED_NAME (symbol) \ : NULL)) -/* end-sanitize-chill */ +#define SYMBOL_CHILL_DEMANGLED_NAME(symbol) \ + (symbol)->ginfo.lang_specific.lang_u.chill_specific.demangled_name /* Macro that returns the "natural source name" of a symbol. In C++ this is the "demangled" form of the name if demangle is on and the "mangled" form diff --git a/gdb/testsuite/.Sanitize b/gdb/testsuite/.Sanitize index 40bb221e9b..7e59bff01e 100644 --- a/gdb/testsuite/.Sanitize +++ b/gdb/testsuite/.Sanitize @@ -15,10 +15,6 @@ Do-first: -if ( echo $* | grep keep\-chill > /dev/null ) ; then - keep_these_too="gdb.t30 gdb.t31" -fi - # All files listed between the "Things-to-keep:" line and the # "Do-last:" line will be kept. All other files will be removed. # Directories listed in this section will have their own Sanitize @@ -55,6 +51,9 @@ gdb.t20 gdb.t21 gdb.t22 gdb.t23 +gdb.t30 +gdb.t31 + lib # are executed as a /bin/sh shell script after everything else is @@ -62,53 +61,6 @@ lib Do-last: -echo Thawing away the \"chill\"... - -# Don't try to clean directories here, as the 'mv' command will fail. -# Also, grep fails on NFS mounted directories. -if ( echo $* | grep keep\-chill > /dev/null ) ; then - for i in * ; do - if test ! -d $i && (grep sanitize-chill $i > /dev/null) ; then - echo Keeping chill stuff in $i - fi - done -else - for i in * ; do - if test ! -d $i && (grep sanitize-chill $i > /dev/null) ; then - echo Thawing the \"chill\" out of $i... - cp $i new - sed '/start\-sanitize\-chill/,/end-\sanitize\-chill/d' < $i > new - if [ -n "${safe}" -a ! -f .Recover/$i ] ; then - echo Caching $i in .Recover... - mv $i .Recover - fi - mv new $i - fi - done - echo Thawing the \"chill\" out of configure.in... - cp configure.in new - sed -e ' - s/gdb.t30//g - s/gdb.t31//g - ' < configure.in > new - if [ -n "${safe}" -a ! -f .Recover/configure.in ] ; then - echo Caching configure.in in .Recover... - mv configure.in .Recover - fi - mv new configure.in - echo Thawing the \"chill\" out of Makefile.in... - cp Makefile.in new - sed -e ' - /CHILL=/d - /CHILLFLAGS=/d - s/gdb.t30//g - s/gdb.t31//g - ' < Makefile.in > new - if [ -n "${safe}" -a ! -f .Recover/Makefile.in ] ; then - echo Caching Makefile.in in .Recover... - mv Makefile.in .Recover - fi - mv new Makefile.in fi # eof diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ccb503f9b9..429d6a6091 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -115,21 +115,17 @@ Wed Mar 24 14:43:38 1993 david d `zoo' zuhn (zoo at poseidon.cygnus.com) Wed Mar 24 09:48:03 1993 Fred Fish (fnf@cygnus.com) - **** start-sanitize-chill **** * gdb.t31/gdbme.ch: Re-enable code that previously caused compiler to coredump. * gdb.t31/chillvars.exp: Re-enable tests that depend on that code. - **** end-sanitize-chill **** Tue Mar 23 08:53:42 1993 Fred Fish (fnf@cygnus.com) - **** start-sanitize-chill **** * gdb.t31/gdbme.ch: Comment out code that causes chill compiler coredump. * gdb.t31/chillvars.exp: Comment out tests that depend on that code. - **** end-sanitize-chill **** Sun Mar 21 17:56:47 1993 Rob Savoye (rob at darkstar.cygnus.com) @@ -159,12 +155,9 @@ Tue Mar 16 15:37:11 1993 Fred Fish (fnf@cygnus.com) setting sevenbit-strings. * gdb.t04/setvar.exp, gdb.t13/bitfields.exp: Make commands to set sevenbit-strings consistent across tests. - **** start-sanitize-chill **** gdb.t30/chexp.exp, gdb.t31/chillvars.exp: Make commands to set sevenbit-strings consistent across tests. - **** end-sanitize-chill **** ->>>>>>> 1.16 Fri Mar 12 08:47:20 1993 Fred Fish (fnf@cygnus.com) * gdb.t21/demangle.exp (proc demangle): Adjust quotes in an @@ -253,7 +246,6 @@ Wed Feb 24 08:05:38 1993 Ian Lance Taylor (ian@cygnus.com) Wed Feb 24 08:03:38 1993 Fred Fish (fnf@cygnus.com) - **** start-sanitize-chill **** * gdb.t31/chillvars.exp (test_structs): New proc to test printing of Chill STRUCT types and STRUCT values. * gdb.t31/chillvars.exp (test_strings): Expect "CHAR" now, rather @@ -261,7 +253,6 @@ Wed Feb 24 08:03:38 1993 Fred Fish (fnf@cygnus.com) * gdb.t31/in-gdbme.ch (simple_struct, nested_struct, struct1, struct2): New struct definitions and initializations to test simple Chill STRUCT types. - **** end-sanitize-chill **** Tue Feb 23 11:55:06 1993 Fred Fish (fnf@cygnus.com) @@ -282,11 +273,9 @@ Tue Feb 23 11:55:06 1993 Fred Fish (fnf@cygnus.com) * gdb.t21/demangle.exp: Add many new test strings to demangle, and fix a whole bunch that had incorrect expected output but were passing anyway because of the bug in "proc demangle". - **** start-sanitize-chill **** * gdb.t31/chillvars.exp: Remove setup_xfail for printing string type. * gdb.t31/in-gdbme.ch: Uncomment string4, now compiles. - **** end-sanitize-chill **** Mon Feb 22 07:54:03 1993 Mike Werner (mtw@poseidon.cygnus.com) diff --git a/gdb/testsuite/Makefile.in b/gdb/testsuite/Makefile.in index 29aa2aee9d..dc7db23a2c 100644 --- a/gdb/testsuite/Makefile.in +++ b/gdb/testsuite/Makefile.in @@ -30,11 +30,9 @@ INSTALL_PROGRAM = $(INSTALL) INSTALL_DATA = $(INSTALL) CFLAGS = -g -$(start-sanitize-chill) CHILLFLAGS = $(CFLAGS) CHILL_LIB = -lchill -$(end-sanitize-chill) -CXXFLAGS = -g -O +CXXFLAGS = -g LINK= ln -s SUBDIRS= @@ -52,7 +50,6 @@ CC = ` \ fi; \ fi` -$(start-sanitize-chill) CHILL = ` \ if [ -f $${rootme}../../gcc/Makefile ] ; then \ echo $${rootme}../../gcc/xgcc -B$${rootme}../../gcc/ -L$${rootme}../../chillrt/; \ @@ -63,7 +60,6 @@ CHILL = ` \ t='$(program_transform_name)'; echo gcc | sed -e '' $$t; \ fi; \ fi` -$(end-sanitize-chill) CXX = ` \ if [ -f $${rootme}../../gcc/Makefile ] ; then \ @@ -96,11 +92,9 @@ FLAGS_TO_PASS = \ "CXXFLAGS=$(CXXFLAGS)" \ "CC=$(CC)" \ "CFLAGS=$(CFLAGS)" \ - $(start-sanitize-chill)\ "CHILLFLAGS=$(CHILLFLAGS)" \ "CHILL=$(CHILL)" \ "CHILL_LIB=$(CHILL_LIB)" \ - $(end-sanitize-chill)\ "INSTALL=$(INSTALL)" \ "INSTALL_DATA=$(INSTALL_DATA)" \ "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ @@ -120,24 +114,8 @@ install-info: dvi: install: - -parent=`echo $(datadir)|sed -e 's@/[^/]*$$@@'`; \ - if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi - -if [ -d $(datadir) ] ; then true ; else mkdir $(datadir) ; fi - -parent=`echo $(targetdir)|sed -e 's@/[^/]*$$@@'`; \ - if [ -d $$parent ] ; then true ; else mkdir $$parent ; fi - -if [ -d $(targetdir) ] ; then true ; else mkdir $(targetdir) ; fi - -for file in ./lib/*.exp; \ - do \ - $(INSTALL_DATA) $$file $(datadir) ; \ - done - -for file in ./*-init.exp; \ - do \ - $(INSTALL_DATA) $$file $(targetdir) ; \ - done uninstall: force -# -rm -f $(datadir)/*.exp - -rm -fr $(targetdir) site.exp: ./config.status @echo "Making a new config file..." @@ -165,8 +143,8 @@ site.exp: ./config.status @rm -f ./tmp1 ./tmp0 installcheck: -check: all site.exp - $(RUNTEST) $(RUNTESTFLAGS) --tool gdb GDB=$(GDB) +check: all + $(RUNTEST) $(RUNTESTFLAGS) --tool gdb GDB=$(GDB) --srcdir $(srcdir) subdir_do: force @for i in $(DODIRS); do \ diff --git a/gdb/testsuite/config/.Sanitize b/gdb/testsuite/config/.Sanitize index 8a523caaa4..c2a365d7bf 100644 --- a/gdb/testsuite/config/.Sanitize +++ b/gdb/testsuite/config/.Sanitize @@ -15,10 +15,6 @@ Do-first: -if ( echo $* | grep keep\-chill > /dev/null ) ; then - keep_these_too="" -fi - # All files listed between the "Things-to-keep:" line and the # "Do-last:" line will be kept. All other files will be removed. # Directories listed in this section will have their own Sanitize @@ -38,35 +34,5 @@ vx-gdb.exp # done. Do-last: -echo Thawing away the \"chill\"... - -# Don't try to clean directories here, as the 'mv' command will fail. -# Also, grep fails on NFS mounted directories. -if ( echo $* | grep keep\-chill > /dev/null ) ; then - for i in * ; do - if test ! -d $i && (grep sanitize-chill $i > /dev/null) ; then - echo Keeping chill stuff in $i - fi - done -else - for i in * ; do - if test ! -d $i && (grep sanitize-chill $i > /dev/null) ; then - echo Thawing the \"chill\" out of $i... - cp $i new - sed '/start\-sanitize\-chill/,/end-\sanitize\-chill/d' < $i > new - if [ -n "${safe}" -a ! -f .Recover/$i ] ; then - echo Caching $i in .Recover... - mv $i .Recover - fi - mv new $i - fi - done -fi # eof -CVS -mips-gdb.exp -nind-gdb.exp -udi-gdb.exp -unix-gdb.exp -vx-gdb.exp diff --git a/gdb/utils.c b/gdb/utils.c index b69b21453f..099a72e944 100644 --- a/gdb/utils.c +++ b/gdb/utils.c @@ -1348,11 +1348,9 @@ fprintf_symbol_filtered (stream, name, lang, arg_mode) case language_cplus: demangled = cplus_demangle (name, arg_mode); break; - /* start-sanitize-chill */ case language_chill: demangled = chill_demangle (name); break; - /* end-sanitize-chill */ default: demangled = NULL; break;