From 2542b94a0a8791d2f5317a1136fb8ff75cb646df Mon Sep 17 00:00:00 2001 From: bryce Date: Tue, 30 Nov 2004 00:38:57 +0000 Subject: [PATCH] 2004-11-29 Bryce McKinlay PR libgcj/18699 Revert patches of 2004-11-26 and 2004-11-27. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91505 138bc75d-0d04-0410-961f-82ee72b054a4 --- boehm-gc/ChangeLog | 5 ++ boehm-gc/configure | 14 ++-- boehm-gc/configure.ac | 2 +- boehm-gc/include/config.h.in | 152 --------------------------------------- boehm-gc/include/gc.h | 2 +- boehm-gc/include/gc_config.h.in | 153 ++++++++++++++++++++++++++++++++++++++-- 6 files changed, 166 insertions(+), 162 deletions(-) delete mode 100644 boehm-gc/include/config.h.in diff --git a/boehm-gc/ChangeLog b/boehm-gc/ChangeLog index 4b87af7e66a..eb7c8b22c33 100644 --- a/boehm-gc/ChangeLog +++ b/boehm-gc/ChangeLog @@ -1,3 +1,8 @@ +2004-11-29 Bryce McKinlay + + PR libgcj/18699 + Revert patches of 2004-11-26 and 2004-11-27. + 2004-11-29 Kelley Cook * configure: Regenerate for libtool change. diff --git a/boehm-gc/configure b/boehm-gc/configure index a3afdda9467..b950a0706c4 100755 --- a/boehm-gc/configure +++ b/boehm-gc/configure @@ -4317,7 +4317,14 @@ irix5* | irix6*) # This must be Linux ELF. linux-gnu*) - lt_cv_deplibs_check_method=pass_all + case $host_cpu in + alpha* | mips* | hppa* | i*86 | powerpc* | sparc* | ia64* | sh* ) + lt_cv_deplibs_check_method=pass_all ;; + *) + # glibc up to 2.1.1 does not perform some relocations on ARM + lt_cv_deplibs_check_method='file_magic ELF [0-9][0-9]*-bit [LM]SB (shared object|dynamic lib )' ;; + esac + lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so` ;; netbsd* | knetbsd*-gnu) @@ -4712,7 +4719,7 @@ test x"$pic_mode" = xno && libtool_flags="$libtool_flags --prefer-non-pic" case $host in *-*-irix6*) # Find out which ABI we are using. - echo '#line 4715 "configure"' > conftest.$ac_ext + echo '#line 4722 "configure"' > conftest.$ac_ext if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 (eval $ac_compile) 2>&5 ac_status=$? @@ -6580,7 +6587,7 @@ else multilib_arg= fi - ac_config_headers="$ac_config_headers include/config.h include/gc_config.h" + ac_config_headers="$ac_config_headers include/gc_config.h" ac_config_files="$ac_config_files Makefile include/Makefile" @@ -7177,7 +7184,6 @@ do "include/Makefile" ) CONFIG_FILES="$CONFIG_FILES include/Makefile" ;; "default-1" ) CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;; "depfiles" ) CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;; - "include/config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/config.h" ;; "include/gc_config.h" ) CONFIG_HEADERS="$CONFIG_HEADERS include/gc_config.h" ;; *) { { echo "$as_me:$LINENO: error: invalid argument: $ac_config_target" >&5 echo "$as_me: error: invalid argument: $ac_config_target" >&2;} diff --git a/boehm-gc/configure.ac b/boehm-gc/configure.ac index 474e2c9bcce..7d1c6e3df1b 100644 --- a/boehm-gc/configure.ac +++ b/boehm-gc/configure.ac @@ -468,7 +468,7 @@ else multilib_arg= fi -AC_CONFIG_HEADERS([include/config.h include/gc_config.h]) +AC_CONFIG_HEADERS([include/gc_config.h]) AC_CONFIG_FILES(Makefile include/Makefile) AC_OUTPUT diff --git a/boehm-gc/include/config.h.in b/boehm-gc/include/config.h.in deleted file mode 100644 index ba593b23ee0..00000000000 --- a/boehm-gc/include/config.h.in +++ /dev/null @@ -1,152 +0,0 @@ -/* include/config.h.in. Generated from configure.ac by autoheader. */ - -/* allows all pointers to the interior of objects to be recognized */ -#undef ALL_INTERIOR_POINTERS - -/* include code for GC_malloc_atomic_uncollectable */ -#undef ATOMIC_UNCOLLECTABLE - -/* No description */ -#undef DATASTART_IS_ETEXT - -/* Make sure that all objects have debug headers */ -#undef DBG_HDRS_ALL - -/* No description */ -#undef DGUX_THREADS - -/* Target is ECOS */ -#undef ECOS - -/* support AIX threads */ -#undef GC_AIX_THREADS - -/* support for Mac OS X pthreads */ -#undef GC_DARWIN_THREADS - -/* support for DB/UX on I386 threads */ -#undef GC_DGUX386_THREADS - -/* support FreeBSD threads */ -#undef GC_FREEBSD_THREADS - -/* include support for gcj */ -#undef GC_GCJ_SUPPORT - -/* enables support for HP/UX 11 pthreads */ -#undef GC_HPUX_THREADS - -/* support for Irix pthreads */ -#undef GC_IRIX_THREADS - -/* support for Xavier Leroy's Linux threads */ -#undef GC_LINUX_THREADS - -/* support for Tru64 pthreads */ -#undef GC_OSF1_THREADS - -/* support for Solaris pthreads */ -#undef GC_SOLARIS_PTHREADS - -/* support for Solaris (thr_) threads */ -#undef GC_SOLARIS_THREADS - -/* support for win32 threads */ -#undef GC_WIN32_THREADS - -/* Define to 1 if you have the header file. */ -#undef HAVE_INTTYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_MEMORY_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDINT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STDLIB_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRINGS_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_STRING_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_STAT_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_SYS_TYPES_H - -/* Define to 1 if you have the header file. */ -#undef HAVE_UNISTD_H - -/* make it somewhat safer to finalize objects out of order */ -#undef JAVA_FINALIZATION - -/* Add code to save back pointers */ -#undef KEEP_BACK_PTRS - -/* Enable GC_PRINT_BACK_HEIGHT environment variable */ -#undef MAKE_BACK_GRAPH - -/* removes GC_dump */ -#undef NO_DEBUGGING - -/* cause some or all of the heap to not have execute permission */ -#undef NO_EXECUTE_PERMISSION - -/* Define to 1 if your C compiler doesn't accept -c and -o together. */ -#undef NO_MINUS_C_MINUS_O - -/* does not disable signals */ -#undef NO_SIGNALS - -/* use empty GC_disable_signals and GC_enable_signals */ -#undef NO_SIGSET - -/* Define to the address where bug reports for this package should be sent. */ -#undef PACKAGE_BUGREPORT - -/* Define to the full name of this package. */ -#undef PACKAGE_NAME - -/* Define to the full name and version of this package. */ -#undef PACKAGE_STRING - -/* Define to the one symbol short name of this package. */ -#undef PACKAGE_TARNAME - -/* Define to the version of this package. */ -#undef PACKAGE_VERSION - -/* allow the marker to run in multiple threads */ -#undef PARALLEL_MARK - -/* number of call frames saved with objects allocated through the debugging - interface */ -#undef SAVE_CALL_COUNT - -/* disables statistics printing */ -#undef SILENT - -/* PROC_VDB in Solaris 2.5 gives wrong values for dirty bits */ -#undef SOLARIS25_PROC_VDB_BUG_FIXED - -/* No description */ -#undef STACKBASE - -/* Define to 1 if you have the ANSI C header files. */ -#undef STDC_HEADERS - -/* Avoid Solaris 5.3 dynamic library bug */ -#undef SUNOS53_SHARED_LIB - -/* define GC_local_malloc() & GC_local_malloc_atomic() */ -#undef THREAD_LOCAL_ALLOC - -/* POSIX version of C Source */ -#undef _POSIX_C_SOURCE - -/* Use reentrant code */ -#undef _REENTRANT diff --git a/boehm-gc/include/gc.h b/boehm-gc/include/gc.h index 99d70d1db02..e1f2aa8f80f 100644 --- a/boehm-gc/include/gc.h +++ b/boehm-gc/include/gc.h @@ -30,7 +30,7 @@ # define _GC_H -# include +# include # include "gc_config_macros.h" # if defined(__STDC__) || defined(__cplusplus) diff --git a/boehm-gc/include/gc_config.h.in b/boehm-gc/include/gc_config.h.in index e236c5745ba..60ffb9741b6 100644 --- a/boehm-gc/include/gc_config.h.in +++ b/boehm-gc/include/gc_config.h.in @@ -1,7 +1,152 @@ -/* gc_config.h. This autoconf header contains macro definitions that are -used by GC clients, such as libjava. +/* include/gc_config.h.in. Generated from configure.ac by autoheader. */ -This file is not generated by autoheader. We only want to define what we -really need in order to avoid namespace pollution. */ +/* allows all pointers to the interior of objects to be recognized */ +#undef ALL_INTERIOR_POINTERS +/* include code for GC_malloc_atomic_uncollectable */ +#undef ATOMIC_UNCOLLECTABLE + +/* No description */ +#undef DATASTART_IS_ETEXT + +/* Make sure that all objects have debug headers */ +#undef DBG_HDRS_ALL + +/* No description */ +#undef DGUX_THREADS + +/* Target is ECOS */ +#undef ECOS + +/* support AIX threads */ +#undef GC_AIX_THREADS + +/* support for Mac OS X pthreads */ +#undef GC_DARWIN_THREADS + +/* support for DB/UX on I386 threads */ +#undef GC_DGUX386_THREADS + +/* support FreeBSD threads */ +#undef GC_FREEBSD_THREADS + +/* include support for gcj */ +#undef GC_GCJ_SUPPORT + +/* enables support for HP/UX 11 pthreads */ +#undef GC_HPUX_THREADS + +/* support for Irix pthreads */ +#undef GC_IRIX_THREADS + +/* support for Xavier Leroy's Linux threads */ +#undef GC_LINUX_THREADS + +/* support for Tru64 pthreads */ +#undef GC_OSF1_THREADS + +/* support for Solaris pthreads */ +#undef GC_SOLARIS_PTHREADS + +/* support for Solaris (thr_) threads */ +#undef GC_SOLARIS_THREADS + +/* support for win32 threads */ +#undef GC_WIN32_THREADS + +/* Define to 1 if you have the header file. */ +#undef HAVE_INTTYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_MEMORY_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDINT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STDLIB_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRINGS_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_STRING_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_STAT_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_SYS_TYPES_H + +/* Define to 1 if you have the header file. */ +#undef HAVE_UNISTD_H + +/* make it somewhat safer to finalize objects out of order */ +#undef JAVA_FINALIZATION + +/* Add code to save back pointers */ +#undef KEEP_BACK_PTRS + +/* Enable GC_PRINT_BACK_HEIGHT environment variable */ +#undef MAKE_BACK_GRAPH + +/* removes GC_dump */ +#undef NO_DEBUGGING + +/* cause some or all of the heap to not have execute permission */ +#undef NO_EXECUTE_PERMISSION + +/* Define to 1 if your C compiler doesn't accept -c and -o together. */ +#undef NO_MINUS_C_MINUS_O + +/* does not disable signals */ +#undef NO_SIGNALS + +/* use empty GC_disable_signals and GC_enable_signals */ +#undef NO_SIGSET + +/* Define to the address where bug reports for this package should be sent. */ +#undef PACKAGE_BUGREPORT + +/* Define to the full name of this package. */ +#undef PACKAGE_NAME + +/* Define to the full name and version of this package. */ +#undef PACKAGE_STRING + +/* Define to the one symbol short name of this package. */ +#undef PACKAGE_TARNAME + +/* Define to the version of this package. */ +#undef PACKAGE_VERSION + +/* allow the marker to run in multiple threads */ +#undef PARALLEL_MARK + +/* number of call frames saved with objects allocated through the debugging + interface */ +#undef SAVE_CALL_COUNT + +/* disables statistics printing */ +#undef SILENT + +/* PROC_VDB in Solaris 2.5 gives wrong values for dirty bits */ +#undef SOLARIS25_PROC_VDB_BUG_FIXED + +/* No description */ +#undef STACKBASE + +/* Define to 1 if you have the ANSI C header files. */ +#undef STDC_HEADERS + +/* Avoid Solaris 5.3 dynamic library bug */ +#undef SUNOS53_SHARED_LIB + +/* define GC_local_malloc() & GC_local_malloc_atomic() */ #undef THREAD_LOCAL_ALLOC + +/* POSIX version of C Source */ +#undef _POSIX_C_SOURCE + +/* Use reentrant code */ +#undef _REENTRANT -- 2.11.0