review by Steve Ellcey.
This patch is a fixed in I386 and IA64 regression relative to the autoconfig
2010/7/19 <s...@open64.net>:
> Author: ycwu
> Date: 2010-07-18 21:46:34 -0400 (Sun, 18 Jul 2010)
> New Revision: 3284
>
> Modified:
> trunk/Makefile.in
> trunk/configure
> trunk/configure.ac
> trunk/install_compiler.sh
> trunk/osprey/driver/phases.c
> Log:
> 1. do not build 64bit library in i386 system
> 2. do not build share library in IA64 system, there is some problem in
> building share library
> 3. install the libstdc++.so.6 into a different directory other than be.so, or
> the compiler will issue an compatible problem.
>
>
>
> Modified: trunk/Makefile.in
> ===================================================================
> --- trunk/Makefile.in 2010-07-15 00:23:26 UTC (rev 3283)
> +++ trunk/Makefile.in 2010-07-19 01:46:34 UTC (rev 3284)
> @@ -322,6 +322,9 @@
> export toolro...@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)
> +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)
>
> .PHONY: library lib clean-library clean-lib
>
> Modified: trunk/configure
> ===================================================================
> --- trunk/configure 2010-07-15 00:23:26 UTC (rev 3283)
> +++ trunk/configure 2010-07-19 01:46:34 UTC (rev 3284)
> @@ -1497,7 +1497,6 @@
> GCC_CONFIGURE_TARG=x86_64-redhat-linux
> GCC_CONFIGURE_COMPILER+=" -m64"
> GCC_CONFIGURE_CFLAGS+=" -DTARG_X8664"
> - BUILD_MULTILIB=YES
> ;;
> i*86*-*-linux*)
> MACHINE_TYPE=i386
> @@ -1515,7 +1514,6 @@
> GCC_CONFIGURE_COMPILER+=" -m32"
> GCC_CONFIGURE_CFLAGS+=" -DTARG_X8664"
> CYGNUS_CONFIGURE_CFLAGS="-m32"
> - BUILD_MULTILIB=YES
> ;;
> ia64*-*-linux*)
> MACHINE_TYPE=ia64
> @@ -1532,6 +1530,10 @@
> ;;
> esac
>
> +UNAME_MACHINE=`uname -m`
> +if test "$UNAME_MACHINE" = "x86_64"; then
> + BUILD_MULTILIB=YES
> +fi
> # Set default values for LIB_* and LIB2_* variables that were not set above.
> if test "$LIB_MACHINE_TYPE" = ""; then
> LIB_MACHINE_TYPE=$MACHINE_TYPE
>
> Modified: trunk/configure.ac
> ===================================================================
> --- trunk/configure.ac 2010-07-15 00:23:26 UTC (rev 3283)
> +++ trunk/configure.ac 2010-07-19 01:46:34 UTC (rev 3284)
> @@ -173,7 +173,6 @@
> GCC_CONFIGURE_TARG=x86_64-redhat-linux
> GCC_CONFIGURE_COMPILER+=" -m64"
> GCC_CONFIGURE_CFLAGS+=" -DTARG_X8664"
> - BUILD_MULTILIB=YES
> ;;
> i*86*-*-linux*)
> MACHINE_TYPE=i386
> @@ -191,7 +190,6 @@
> GCC_CONFIGURE_COMPILER+=" -m32"
> GCC_CONFIGURE_CFLAGS+=" -DTARG_X8664"
> CYGNUS_CONFIGURE_CFLAGS="-m32"
> - BUILD_MULTILIB=YES
> ;;
> ia64*-*-linux*)
> MACHINE_TYPE=ia64
> @@ -206,6 +204,10 @@
> ;;
> esac
>
> +UNAME_MACHINE=`uname -m`
> +if test "$UNAME_MACHINE" = "x86_64"; then
> + BUILD_MULTILIB=YES
> +fi
> # Set default values for LIB_* and LIB2_* variables that were not set above.
> if test "$LIB_MACHINE_TYPE" = ""; then
> LIB_MACHINE_TYPE=$MACHINE_TYPE
>
> Modified: trunk/install_compiler.sh
> ===================================================================
> --- trunk/install_compiler.sh 2010-07-15 00:23:26 UTC (rev 3283)
> +++ trunk/install_compiler.sh 2010-07-19 01:46:34 UTC (rev 3284)
> @@ -206,12 +206,13 @@
>
> # Make links to gcc runtime libraries
> cd ${ROOT}
> + mkdir $PHASEPATH/64
> if [ "$TARG_HOST" = "x8664" ]
> then
> for i in open64-gcc-4.2.0/lib64/lib*.so*; do
> if [ -e "$i" ]
> then
> - (cd $PHASEPATH; ln -sf ../../../../$i `basename $i`)
> + (cd $PHASEPATH/64; ln -sf ../../../../../$i `basename $i`)
> fi
> done
> for i in open64-gcc-4.2.0/lib/lib*.so*; do
> @@ -225,7 +226,7 @@
> for i in open64-gcc-4.2.0/lib/lib*.so*; do
> if [ -e "$i" ]
> then
> - (cd $PHASEPATH; ln -sf ../../../../$i `basename $i`)
> + (cd $PHASEPATH/64; ln -sf ../../../../../$i `basename $i`)
> fi
> done
> fi
>
> Modified: trunk/osprey/driver/phases.c
> ===================================================================
> --- trunk/osprey/driver/phases.c 2010-07-15 00:23:26 UTC (rev 3283)
> +++ trunk/osprey/driver/phases.c 2010-07-19 01:46:34 UTC (rev 3284)
> @@ -562,19 +562,14 @@
> asprintf(&our_path, "%s/lib/",root_prefix);
> #endif
> } else {
> - asprintf(&our_path, "%s/" LIBPATH, global_toolroot);
> + asprintf(&our_path, "%s/" LIBPATH "/64", global_toolroot);
> + add_string(args, concat_strings("-L", our_path));
> + asprintf(&our_path, "%s/" LIBPATH, global_toolroot);
> }
>
> add_string(args, concat_strings("-L", our_path));
>
> free(our_path);
> -#ifdef TARG_IA64
> - our_path = get_phase_dir(P_library);
> - add_string (args, concat_strings("-L", our_path));
> -
> - our_path= get_phase_dir(P_alt_library);
> - add_string (args, concat_strings("-L", our_path));
> -#endif
> }
>
> /*
>
>
> ------------------------------------------------------------------------------
> This SF.net email is sponsored by Sprint
> What will you do first with EVO, the first 4G phone?
> Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
> _______________________________________________
> Open64-devel mailing list
> Open64-devel@lists.sourceforge.net
> https://lists.sourceforge.net/lists/listinfo/open64-devel
>
--
yongchong
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Open64-devel mailing list
Open64-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/open64-devel
