Index: configure
===================================================================
--- configure	(revision 3309)
+++ configure	(working copy)
@@ -273,7 +273,7 @@
 
 ac_subdirs_all="$ac_subdirs_all osprey/cygnus"
 ac_subdirs_all="$ac_subdirs_all osprey-gcc-4.2.0"
-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os MACHINE_TYPE BUILD_ABI BUILD_ARCH BUILD_HOST BUILD_TARGET BUILD_VENDOR BUILD_OPTIMIZE BUILD_COMPILER BUILD_BOTH LIB_MACHINE_TYPE LIB_BUILD_TARGET LIB_BUILD_ABI LIB_BUILD_ARCH LIB_BUILD_HOST LIB2_MACHINE_TYPE LIB2_BUILD_TARGET LIB2_BUILD_ABI LIB2_BUILD_ARCH LIB2_BUILD_HOST BUILD_MULTILIB COMPILER_TARG_DIR TARG_INFO_NAME BUILD_GNU3 GCC_CONFIGURE_TARG GCC_DIR LIBLIST subdirs LIBOBJS LTLIBOBJS'
+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os MACHINE_TYPE BUILD_ABI BUILD_ARCH BUILD_HOST BUILD_TARGET BUILD_VENDOR BUILD_OPTIMIZE BUILD_LIB_OPTIMIZE BUILD_COMPILER BUILD_BOTH LIB_MACHINE_TYPE LIB_BUILD_TARGET LIB_BUILD_ABI LIB_BUILD_ARCH LIB_BUILD_HOST LIB2_MACHINE_TYPE LIB2_BUILD_TARGET LIB2_BUILD_ABI LIB2_BUILD_ARCH LIB2_BUILD_HOST BUILD_MULTILIB COMPILER_TARG_DIR TARG_INFO_NAME BUILD_GNU3 GCC_CONFIGURE_TARG GCC_DIR LIBLIST subdirs LIBOBJS LTLIBOBJS'
 ac_subst_files=''
 
 # Initialize some variables set by options.
@@ -792,7 +792,9 @@
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
   --with-build-compiler=GNU|OSP	Use GNU or OSP compilers in build
-  --with-build-optimize=DEFAULT|DEBUG	Use DEFAULT or DEBUG flags in build
+  --with-build-optimize=DEFAULT|DEBUG	Use DEFAULT or DEBUG flags in compiler build
+  --with-build-lib-optimize=DEFAULT|DEBUG Use DEFAULT or DEBUG flags in library build.
+    Note that --with-build-lib-optimize=DEBUG is currently not well tested.
 
 _ACEOF
 fi
@@ -1416,6 +1418,29 @@
     ;;
 esac
 
+
+# Check whether --with-build-lib-optimize or --without-build-lib-optimize was given.
+if test "${with_build_lib_optimize+set}" = set; then
+  withval="$with_build_lib_optimize"
+  BUILD_LIB_OPTIMIZE="$with_build_lib_optimize"
+else
+  BUILD_LIB_OPTIMIZE=DEFAULT
+fi;
+
+case "$BUILD_LIB_OPTIMIZE" in
+  DEFAULT|default)
+    BUILD_LIB_OPTIMIZE=DEFAULT
+    ;;
+  DEBUG|debug)
+    BUILD_LIB_OPTIMIZE=DEBUG
+    ;;
+  *)
+    { { echo "$as_me:$LINENO: error: \"BUILD_LIB_OPTIMIZE=$BUILD_LIB_OPTIMIZE is not supported\"" >&5
+echo "$as_me: error: \"BUILD_LIB_OPTIMIZE=$BUILD_LIB_OPTIMIZE is not supported\"" >&2;}
+   { (exit 1); exit 1; }; }
+    ;;
+esac
+
 # BUILD_MULTILIB supports building libraries twice, this is used on x86
 # targets to have 32 and 64 bit libraries available.
 BUILD_MULTILIB=NO
@@ -1620,6 +1645,7 @@
 
 
 
+
 # List of configurable files to create in object directory.
                                                                                                                                                                                                                                                                                                                                                     ac_config_files="$ac_config_files Makefile osprey/Makefile.gsetup osprey/targdir/libspin/Makefile osprey/targdir/libspin_4_2_0/Makefile osprey/targdir/include/Makefile osprey/targdir/driver/Makefile osprey/targdir/libiberty/Makefile osprey/targdir/targ_info/Makefile osprey/targdir/be/Makefile osprey/targdir/libelf/Makefile osprey/targdir/libelfutil/Makefile osprey/targdir/libdwarf/Makefile osprey/targdir/libunwindP/Makefile osprey/targdir/cg/Makefile osprey/targdir/wopt/Makefile osprey/targdir/ipl/Makefile osprey/targdir/lno/Makefile osprey/targdir/lw_inline/Makefile osprey/targdir/ipa/Makefile osprey/targdir/whirl2c/Makefile osprey/targdir/whirl2f/Makefile osprey/targdir/libcomutil/Makefile osprey/targdir/ir_tools/Makefile osprey/targdir/libcmplrs/Makefile osprey/targdir/wgen/Makefile osprey/targdir/libcif/Makefile osprey/targdir/arith/Makefile osprey/targdir/orc_ict/Makefile osprey/targdir/orc_intel/Makefile osprey/targdir/libkapi/Makefile osprey/targdir/crayf90/Makefile osprey/targdir/crayf90/fe90/Makefile osprey/targdir/crayf90/libf90sgi/Makefile osprey/targdir/crayf90/sgi/Makefile"
 
@@ -2385,6 +2411,7 @@
 s,@BUILD_TARGET@,$BUILD_TARGET,;t t
 s,@BUILD_VENDOR@,$BUILD_VENDOR,;t t
 s,@BUILD_OPTIMIZE@,$BUILD_OPTIMIZE,;t t
+s,@BUILD_LIB_OPTIMIZE@,$BUILD_LIB_OPTIMIZE,;t t
 s,@BUILD_COMPILER@,$BUILD_COMPILER,;t t
 s,@BUILD_BOTH@,$BUILD_BOTH,;t t
 s,@LIB_MACHINE_TYPE@,$LIB_MACHINE_TYPE,;t t
Index: osprey/Makefile.gsetup.in
===================================================================
--- osprey/Makefile.gsetup.in	(revision 3309)
+++ osprey/Makefile.gsetup.in	(working copy)
@@ -398,7 +398,7 @@
 
 ifdef BUILD_OPTIMIZE
  ifeq ($(BUILD_OPTIMIZE), DEFAULT)
-   BUILD_OPTIMIZE = NODEBUG
+   override BUILD_OPTIMIZE = NODEBUG
  else
   ifeq ($(BUILD_OPTIMIZE), "")
     ABORT_BUILD = BUILD_OPTIMIZE has no value!
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 3309)
+++ Makefile.in	(working copy)
@@ -155,7 +155,7 @@
 CROSS_PHONY_TARGET = $(shell for i in $(CROSS_COMPONENTS); do basename "$$i" ; done)
 
 PHONY_TARGET = $(shell for i in $(NATIVE_COMPONENTS); do basename "$$i" ; done) 
-.PHONY : $(PHONY_TARGET) all build install clean clobber backend
+.PHONY : $(PHONY_TARGET) all build install install_fe install_compiler clean clobber backend
 
 #define SKIP_DEP_BUILD will disable the unnecessary dependency check
 export SKIP_DEP_BUILD=1 
@@ -299,7 +299,9 @@
 	export TOP_SRCDIR=$(TOP_SRCDIR); \
 		$(TOP_SRCDIR)/INSTALL.cross.sl @abs_top_builddir@
 else
-install:
+install: install_fe install_compiler
+
+install_fe:
 	$(MAKE) -C $(GNUFE_BUILD_DIR)/gcc \
 	    install-common
 	$(MAKE) -C $(GNUFE_BUILD_DIR)/gcc \
@@ -312,6 +314,8 @@
 	    install-driver
 	$(MAKE) -C $(GNUFE_BUILD_DIR)/$(GNUFE_BUILD_HOST)/libstdc++-v3 \
 	    install
+
+install_compiler:
 	export TOOLROOT=@prefix@; \
 	export TOP_SRCDIR=$(TOP_SRCDIR); \
 		$(TOP_SRCDIR)/install_compiler.sh $(MACHINE_TYPE)
@@ -332,11 +336,11 @@
 	    install
 	export TOOLROOT=@prefix@; $(TOP_SRCDIR)/install_compiler.sh ia64-cross
 
-LIB_ARGS = BUILD_TARGET=$(LIB_BUILD_TARGET) BUILD_COMPILER=SELF BUILD_AREA=$(LIB_BUILD_AREA) MACHINE_TYPE=$(LIB_MACHINE_TYPE) BUILD_ABI=$(LIB_BUILD_ABI) BUILD_ARCH=$(LIB_BUILD_ARCH) BUILD_HOST=$(LIB_BUILD_HOST)
+LIB_ARGS = BUILD_TARGET=$(LIB_BUILD_TARGET) BUILD_COMPILER=SELF BUILD_AREA=$(LIB_BUILD_AREA) MACHINE_TYPE=$(LIB_MACHINE_TYPE) BUILD_ABI=$(LIB_BUILD_ABI) BUILD_ARCH=$(LIB_BUILD_ARCH) BUILD_HOST=$(LIB_BUILD_HOST) BUILD_OPTIMIZE=@BUILD_LIB_OPTIMIZE@
 ifeq ($(LIB_BUILD_TARGET),IA64)
 LIB_ARGS += BUILD_TYPE=NONSHARED
 endif
-LIB2_ARGS = BUILD_TARGET=$(LIB2_BUILD_TARGET) BUILD_COMPILER=SELF BUILD_AREA=$(LIB2_BUILD_AREA) MACHINE_TYPE=$(LIB2_MACHINE_TYPE) BUILD_ABI=$(LIB2_BUILD_ABI) BUILD_ARCH=$(LIB2_BUILD_ARCH) BUILD_HOST=$(LIB2_BUILD_HOST)
+LIB2_ARGS = BUILD_TARGET=$(LIB2_BUILD_TARGET) BUILD_COMPILER=SELF BUILD_AREA=$(LIB2_BUILD_AREA) MACHINE_TYPE=$(LIB2_MACHINE_TYPE) BUILD_ABI=$(LIB2_BUILD_ABI) BUILD_ARCH=$(LIB2_BUILD_ARCH) BUILD_HOST=$(LIB2_BUILD_HOST) BUILD_OPTIMIZE=@BUILD_LIB_OPTIMIZE@
 
 .PHONY: library lib clean-library clean-lib
 .PHONY: library2 lib2 clean-library2 clean-lib2
Index: configure.ac
===================================================================
--- configure.ac	(revision 3309)
+++ configure.ac	(working copy)
@@ -76,7 +76,7 @@
 esac
 
 AC_ARG_WITH(build-optimize,
-[  --with-build-optimize=DEFAULT|DEBUG	Use DEFAULT or DEBUG flags in build],
+[  --with-build-optimize=DEFAULT|DEBUG	Use DEFAULT or DEBUG flags in compiler build],
 BUILD_OPTIMIZE="$with_build_optimize",
 BUILD_OPTIMIZE=DEFAULT)
 
@@ -94,6 +94,24 @@
     ;;
 esac
 
+AC_ARG_WITH(build-lib-optimize,
+[  --with-build-lib-optimize=DEFAULT|DEBUG Use DEFAULT or DEBUG flags in library build.
+    Note that --with-build-lib-optimize=DEBUG is currently not well tested.],
+BUILD_LIB_OPTIMIZE="$with_build_lib_optimize",
+BUILD_LIB_OPTIMIZE=DEFAULT)
+
+case "$BUILD_LIB_OPTIMIZE" in
+  DEFAULT|default)
+    BUILD_LIB_OPTIMIZE=DEFAULT
+    ;;
+  DEBUG|debug)
+    BUILD_LIB_OPTIMIZE=DEBUG
+    ;;
+  *)
+    AC_MSG_ERROR(["BUILD_LIB_OPTIMIZE=$BUILD_LIB_OPTIMIZE is not supported"])
+    ;;
+esac
+
 # BUILD_MULTILIB supports building libraries twice, this is used on x86
 # targets to have 32 and 64 bit libraries available.
 BUILD_MULTILIB=NO
@@ -275,6 +293,7 @@
 AC_SUBST([BUILD_TARGET])
 AC_SUBST([BUILD_VENDOR])
 AC_SUBST([BUILD_OPTIMIZE])
+AC_SUBST([BUILD_LIB_OPTIMIZE])
 AC_SUBST([BUILD_COMPILER])
 AC_SUBST([BUILD_BOTH])
 AC_SUBST([LIB_MACHINE_TYPE])