aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog19
-rw-r--r--Makefile.in15
-rw-r--r--configure.in16
3 files changed, 20 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog
index f20efac..274f00f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,22 @@
+2002-04-15 Mark Mitchell <mark@codesourcery.com>
+
+ * MAINTAINERS: Remove chill maintainers.
+ * Makefile.in (CHILLFLAGS): Remove.
+ (CHILL_LIB): Remove.
+ (TARGET_CONFIGDIRS): Remove libchill.
+ (CHILL_FOR_TARGET): Remove.
+ (BASE_FLAGS_TO_PASS): Don't pass CHILLFLAGS, CHILL_FOR_TARGET, or
+ CHILL_LIB.
+ (CONFIGURE_TARGET_MODULES): Remove configure-target-libchill.
+ (CHECK_TARGET_MODULES): Likewise.
+ (INSTALL_TARGET_MODULES): Likewise.
+ (CLEAN_TARGET_MODULES): Likewise.
+ (configure-target-libchill): Remove.
+ (all-target-libchill): Remove.
+ * configure.in (target_libs): Remove target-libchill.
+ Do not compute CHILL_FOR_TARGET.
+ * libchill: Remove directory.
+
2002-04-15 DJ Delorie <dj@redhat.com>
* Makefile.in, configure.in, configure: Sync with gcc, entries
diff --git a/Makefile.in b/Makefile.in
index 94f4692..94f0a35 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -100,8 +100,6 @@ LIBCFLAGS_FOR_TARGET = $(CFLAGS_FOR_TARGET)
PICFLAG =
PICFLAG_FOR_TARGET =
-CHILLFLAGS = $(CFLAGS)
-CHILL_LIB = -lchill
CXX = c++
# Use -O2 to stress test the compiler.
@@ -178,7 +176,7 @@ OTHERS =
# This is set by the configure script to the list of directories which
# should be built using the target tools.
-TARGET_CONFIGDIRS = libiberty libgloss $(SPECIAL_LIBS) newlib librx winsup opcodes bsp libstub cygmon libf2c libchill libobjc
+TARGET_CONFIGDIRS = libiberty libgloss $(SPECIAL_LIBS) newlib librx winsup opcodes bsp libstub cygmon libf2c libobjc
# Target libraries are put under this directory:
# Changed by configure to $(target_alias) if cross.
@@ -235,7 +233,6 @@ INSTALL_TARGET_CROSS = installdirs \
# Should be substed by configure.in
FLAGS_FOR_TARGET =
CC_FOR_TARGET =
-CHILL_FOR_TARGET =
CXX_FOR_TARGET =
CXX_FOR_TARGET_FOR_RECURSIVE_MAKE =
GCJ_FOR_TARGET =
@@ -359,9 +356,6 @@ BASE_FLAGS_TO_PASS = \
"CC_FOR_TARGET=$(CC_FOR_TARGET)" \
"CFLAGS=$(CFLAGS)" \
"CFLAGS_FOR_TARGET=$(CFLAGS_FOR_TARGET)" \
- "CHILLFLAGS=$(CHILLFLAGS)" \
- "CHILL_FOR_TARGET=$(CHILL_FOR_TARGET)" \
- "CHILL_LIB=$(CHILL_LIB)" \
"GCJ_FOR_TARGET=$(GCJ_FOR_TARGET)" \
"CXX_FOR_BUILD=$(CXX_FOR_BUILD)" \
"CXXFLAGS=$(CXXFLAGS)" \
@@ -789,7 +783,6 @@ ALL_TARGET_MODULES = \
all-target-librx \
all-target-newlib \
all-target-libf2c \
- all-target-libchill \
all-target-libobjc \
all-target-libtermcap \
all-target-winsup \
@@ -813,7 +806,6 @@ CONFIGURE_TARGET_MODULES = \
configure-target-librx \
configure-target-newlib \
configure-target-libf2c \
- configure-target-libchill \
configure-target-libobjc \
configure-target-libtermcap \
configure-target-winsup \
@@ -836,7 +828,6 @@ CHECK_TARGET_MODULES = \
check-target-libstdc++-v3 \
check-target-newlib \
check-target-libf2c \
- check-target-libchill \
check-target-libobjc \
check-target-winsup \
check-target-libiberty \
@@ -853,7 +844,6 @@ INSTALL_TARGET_MODULES = \
install-target-libstdc++-v3 \
install-target-newlib \
install-target-libf2c \
- install-target-libchill \
install-target-libobjc \
install-target-libtermcap \
install-target-winsup \
@@ -942,7 +932,6 @@ CLEAN_TARGET_MODULES = \
clean-target-librx \
clean-target-newlib \
clean-target-libf2c \
- clean-target-libchill \
clean-target-libobjc \
clean-target-winsup \
clean-target-libgloss \
@@ -1787,8 +1776,6 @@ all-target-libstub: configure-target-libstub
all-libtool:
configure-target-libf2c: $(ALL_GCC_C)
all-target-libf2c: configure-target-libf2c all-target-libiberty
-configure-target-libchill: $(ALL_GCC_C)
-all-target-libchill: configure-target-libchill all-target-libiberty
configure-target-libobjc: $(ALL_GCC_C)
all-target-libobjc: configure-target-libobjc all-target-libiberty
all-m4: all-libiberty all-texinfo
diff --git a/configure.in b/configure.in
index 7e04254..9d71f6e 100644
--- a/configure.in
+++ b/configure.in
@@ -73,7 +73,6 @@ target_libs="target-libiberty \
target-librx \
${libstdcxx_version} \
target-libf2c \
- target-libchill \
${libgcj}
target-libobjc"
@@ -1526,20 +1525,6 @@ case $CC_FOR_TARGET in
*) CC_FOR_TARGET=$CC_FOR_TARGET' $(FLAGS_FOR_TARGET)' ;;
esac
-if test "x${CHILL_FOR_TARGET+set}" = xset; then
- :
-elif test -d ${topsrcdir}/gcc; then
- CHILL_FOR_TARGET='$$r/gcc/xgcc -B$$r/gcc/ -L$$r/gcc/ch/runtime/'
-elif test "$host" = "$target"; then
- CHILL_FOR_TARGET='$(CC)'
-else
- CHILL_FOR_TARGET=`echo gcc | sed -e 's/x/x/' ${program_transform_name}`
-fi
-case $CHILL_FOR_TARGET in
-*' $(FLAGS_FOR_TARGET)') ;;
-*) CHILL_FOR_TARGET=$CHILL_FOR_TARGET' $(FLAGS_FOR_TARGET)' ;;
-esac
-
if test "x${GCJ_FOR_TARGET+set}" = xset; then
:
elif test -d ${topsrcdir}/gcc; then
@@ -1586,7 +1571,6 @@ s:^TARGET_CONFIGDIRS[ ]*=.*$:TARGET_CONFIGDIRS = ${target_configdirs}:
s%^TARGET_CONFIGARGS[ ]*=.*$%TARGET_CONFIGARGS = ${targargs}%
s%^FLAGS_FOR_TARGET[ ]*=.*$%FLAGS_FOR_TARGET = ${FLAGS_FOR_TARGET}%
s%^CC_FOR_TARGET[ ]*=.*$%CC_FOR_TARGET = ${CC_FOR_TARGET}%
-s%^CHILL_FOR_TARGET[ ]*=.*$%CHILL_FOR_TARGET = ${CHILL_FOR_TARGET}%
s%^GCJ_FOR_TARGET[ ]*=.*$%GCJ_FOR_TARGET = ${GCJ_FOR_TARGET}%
s%^CXX_FOR_TARGET[ ]*=.*$%CXX_FOR_TARGET = ${qCXX_FOR_TARGET}%
s%^CXX_FOR_TARGET_FOR_RECURSIVE_MAKE[ ]*=.*$%CXX_FOR_TARGET_FOR_RECURSIVE_MAKE = ${qqCXX_FOR_TARGET}%