[PATCH] [Bug bootstrap/12179] [3.4/3.5 Regression] --enable-version-specific-runtime-libs put files in the wrong place
Vaclav Haisman
V.Haisman@sh.cvut.cz
Sat Jan 17 10:26:00 GMT 2004
Hi,
this is the updated patch for PR 12179.
http://gcc.gnu.org/bugzilla/show_bug.cgi?id=12179
2004-01-17 Vaclav Haisman <V.Haisman@sh.cvut.cz>
Andrew Pinski <pinskia@physics.uc.edu>
PR 12179
* boehm-gc/configure: Rename all occurences of gcc-lib to gcc.
* boehm-gc/configure.in: Ditto.
* config/acinclude.m4: Ditto.
* gcc/configure: Ditto.
* gcc/configure.ac: Ditto.
* gcc/mkheaders.in: Ditto.
* gcc/protoize.c: Ditto.
* gcc/ada/Makefile.adalib: Ditto.
* gcc/ada/gnat_ug.texi: Ditto.
* gcc/ada/gnat_ug_unx.texi: Ditto.
* gcc/ada/gnat_ug_vms.texi: Ditto.
* gcc/ada/gnat_ug_vxw.texi: Ditto.
* gcc/ada/gnat_ug_wnt.texi: Ditto.
* gcc/ada/gnatlink.adb: Ditto.
* gcc/ada/osint.adb: Ditto.
* gcc/ada/osint.ads: Ditto.
* gcc/config/alpha/vms.h: Ditto.
* gcc/config/alpha/x-vms: Ditto.
* gcc/config/i386/svr3.ifile: Ditto.
* gcc/config/i386/svr3z.ifile: Ditto.
* gcc/f/news.texi: Ditto.
* gcc/f/news.texi: Ditto.
* gcc/java/jcf-path.c: Ditto.
* libf2c/Makefile.in: Ditto.
* libf2c/aclocal.m4: Ditto.
* libf2c/configure: Ditto.
* libffi/configure: Ditto.
* libffi/configure.in: Ditto.
* libjava/configure: Ditto.
* libjava/configure.in: Ditto.
* libobjc/aclocal.m4: Ditto.
* libobjc/configure: Ditto.
* libstdc++-v3/acinclude.m4: Ditto.
* libstdc++-v3/aclocal.m4: Ditto.
* libstdc++-v3/configure: Ditto.
* libstdc++-v3/docs/html/configopts.html: Ditto.
* libstdc++-v3/docs/html/install.html: Ditto.
* zlib/configure: Ditto.
* zlib/configure.in: Ditto.
-------------- next part --------------
? gcc/c-parse.c
? gcc/c-parse.y
? gcc/gengtype-lex.c
? gcc/gengtype-yacc.c
? gcc/gengtype-yacc.h
? gcc/doc/cpp.1
? gcc/doc/cpp.info
? gcc/doc/cppinternals.info
? gcc/doc/gcc.1
? gcc/doc/gcc.info
? gcc/doc/gccint.info
? gcc/doc/gcov.1
Index: boehm-gc/configure
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/configure,v
retrieving revision 1.65
diff -c -p -r1.65 configure
*** boehm-gc/configure 3 Oct 2003 19:38:05 -0000 1.65
--- boehm-gc/configure 17 Jan 2004 09:57:36 -0000
*************** if test -n "$with_cross_host" &&
*** 3454,3460 ****
toolexecdir='$(exec_prefix)/$(target_alias)'
toolexeclibdir='$(toolexecdir)/lib'
else
! toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
toolexeclibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
--- 3454,3460 ----
toolexecdir='$(exec_prefix)/$(target_alias)'
toolexeclibdir='$(toolexecdir)/lib'
else
! toolexecdir='$(libdir)/gcc/$(target_alias)'
toolexeclibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
Index: boehm-gc/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/boehm-gc/configure.in,v
retrieving revision 1.51
diff -c -p -r1.51 configure.in
*** boehm-gc/configure.in 3 Oct 2003 18:43:06 -0000 1.51
--- boehm-gc/configure.in 17 Jan 2004 09:57:36 -0000
*************** if test -n "$with_cross_host" &&
*** 418,424 ****
toolexecdir='$(exec_prefix)/$(target_alias)'
toolexeclibdir='$(toolexecdir)/lib'
else
! toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
toolexeclibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
--- 418,424 ----
toolexecdir='$(exec_prefix)/$(target_alias)'
toolexeclibdir='$(toolexecdir)/lib'
else
! toolexecdir='$(libdir)/gcc/$(target_alias)'
toolexeclibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
Index: config/acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/config/acinclude.m4,v
retrieving revision 1.5
diff -c -p -r1.5 acinclude.m4
*** config/acinclude.m4 19 May 2003 18:09:58 -0000 1.5
--- config/acinclude.m4 17 Jan 2004 09:57:37 -0000
*************** if test x"${ac_cv_prog_gxx}" = xyes ; th
*** 73,79 ****
else
gccfiles=no
fi
! gcclibs=`echo $libgccpath | sed -e 's:lib/gcc-lib/::' -e 's:/libgcc.a::' -e 's,\(.*\)/.*,\1,g'`/lib
if test -d ${gcclibs}/ldscripts -a -f ${gcclibs}/libc.a -a -f ${gcclibs}/libstdc++.a ; then
gcclibs=yes
else
--- 73,79 ----
else
gccfiles=no
fi
! gcclibs=`echo $libgccpath | sed -e 's:lib/gcc/::' -e 's:/libgcc.a::' -e 's,\(.*\)/.*,\1,g'`/lib
if test -d ${gcclibs}/ldscripts -a -f ${gcclibs}/libc.a -a -f ${gcclibs}/libstdc++.a ; then
gcclibs=yes
else
*************** if test x"${ac_cv_prog_gcc}" = xyes ; th
*** 169,175 ****
else
gccfiles=no
fi
! gcclibs=`echo $libgccpath | sed -e 's:lib/gcc-lib/::' -e 's:/libgcc.a::' -e 's,\(.*\)/.*,\1,g'`/lib
if test -d ${gcclibs}/ldscripts -a -f ${gcclibs}/libc.a -a -f ${gcclibs}/libstdc++.a ; then
gcclibs=yes
else
--- 169,175 ----
else
gccfiles=no
fi
! gcclibs=`echo $libgccpath | sed -e 's:lib/gcc/::' -e 's:/libgcc.a::' -e 's,\(.*\)/.*,\1,g'`/lib
if test -d ${gcclibs}/ldscripts -a -f ${gcclibs}/libc.a -a -f ${gcclibs}/libstdc++.a ; then
gcclibs=yes
else
*************** dnl AC_MSG_CHECKING(for the simulato
*** 439,445 ****
dnl Get G++'s full path to libgcc.a
changequote(,)
! gccpath=`${CROSS_GCC} --print-libgcc | sed -e 's:[a-z0-9A-Z\.\-]*/libgcc.a::' -e 's:lib/gcc-lib/::'`lib
changequote([,])
if test -f $gccpath/libsim.a -o -f $gccpath/libsim.so ; then
ac_cv_c_simlib="$gccpath/"
--- 439,445 ----
dnl Get G++'s full path to libgcc.a
changequote(,)
! gccpath=`${CROSS_GCC} --print-libgcc | sed -e 's:[a-z0-9A-Z\.\-]*/libgcc.a::' -e 's:lib/gcc/::'`lib
changequote([,])
if test -f $gccpath/libsim.a -o -f $gccpath/libsim.so ; then
ac_cv_c_simlib="$gccpath/"
*************** if test x"${ILULIB}" = x; then
*** 731,737 ****
NATIVE_GCC=`echo gcc | sed -e "${program_transform_name}"`
dnl Get G++'s full path to it's libraries
! ac_cv_c_ilulib5=`${NATIVE_GCC} --print-libgcc | sed -e 's:lib/gcc-lib/.*::'`lib
if test -f $ac_cv_c_ilulib5/libilu-c.a -o -f $ac_cv_c_ilulib5/libilu-c.so ; then
if test x"${ILUHDIR}" = x; then
ILUHDIR="-I${ac_cv_c_ilulib5}/../include"
--- 731,737 ----
NATIVE_GCC=`echo gcc | sed -e "${program_transform_name}"`
dnl Get G++'s full path to it's libraries
! ac_cv_c_ilulib5=`${NATIVE_GCC} --print-libgcc | sed -e 's:lib/gcc/.*::'`lib
if test -f $ac_cv_c_ilulib5/libilu-c.a -o -f $ac_cv_c_ilulib5/libilu-c.so ; then
if test x"${ILUHDIR}" = x; then
ILUHDIR="-I${ac_cv_c_ilulib5}/../include"
Index: gcc/configure
===================================================================
RCS file: /cvs/gcc/gcc/gcc/configure,v
retrieving revision 1.793
diff -c -p -r1.793 configure
*** gcc/configure 9 Jan 2004 21:20:53 -0000 1.793
--- gcc/configure 17 Jan 2004 09:57:38 -0000
*************** if test "x$gcc_cv_as" = x; then
*** 9422,9429 ****
gcc_cv_as=`echo as | sed ${program_transform_name}`$host_exeext
fi
! test_dirs="$test_prefix/lib/gcc-lib/$target_noncanonical/$gcc_version \
! $test_prefix/lib/gcc-lib/$target_noncanonical \
/usr/lib/gcc/$target_noncanonical/$gcc_version \
/usr/lib/gcc/$target_noncanonical \
$test_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version \
--- 9422,9429 ----
gcc_cv_as=`echo as | sed ${program_transform_name}`$host_exeext
fi
! test_dirs="$test_prefix/lib/gcc/$target_noncanonical/$gcc_version \
! $test_prefix/lib/gcc/$target_noncanonical \
/usr/lib/gcc/$target_noncanonical/$gcc_version \
/usr/lib/gcc/$target_noncanonical \
$test_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version \
*************** if test "x$gcc_cv_ld" = x; then
*** 9537,9544 ****
gcc_cv_ld=`echo ld | sed ${program_transform_name}`$host_exeext
fi
! test_dirs="$test_prefix/lib/gcc-lib/$target_noncanonical/$gcc_version \
! $test_prefix/lib/gcc-lib/$target_noncanonical \
/usr/lib/gcc/$target_noncanonical/$gcc_version \
/usr/lib/gcc/$target_noncanonical \
$test_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version \
--- 9537,9544 ----
gcc_cv_ld=`echo ld | sed ${program_transform_name}`$host_exeext
fi
! test_dirs="$test_prefix/lib/gcc/$target_noncanonical/$gcc_version \
! $test_prefix/lib/gcc/$target_noncanonical \
/usr/lib/gcc/$target_noncanonical/$gcc_version \
/usr/lib/gcc/$target_noncanonical \
$test_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version \
Index: gcc/configure.ac
===================================================================
RCS file: /cvs/gcc/gcc/gcc/configure.ac,v
retrieving revision 2.5
diff -c -p -r2.5 configure.ac
*** gcc/configure.ac 9 Jan 2004 21:20:52 -0000 2.5
--- gcc/configure.ac 17 Jan 2004 09:57:39 -0000
*************** if test "x$gcc_cv_as" = x; then
*** 1603,1610 ****
gcc_cv_as=`echo as | sed ${program_transform_name}`$host_exeext
fi
! test_dirs="$test_prefix/lib/gcc-lib/$target_noncanonical/$gcc_version \
! $test_prefix/lib/gcc-lib/$target_noncanonical \
/usr/lib/gcc/$target_noncanonical/$gcc_version \
/usr/lib/gcc/$target_noncanonical \
$test_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version \
--- 1603,1610 ----
gcc_cv_as=`echo as | sed ${program_transform_name}`$host_exeext
fi
! test_dirs="$test_prefix/lib/gcc/$target_noncanonical/$gcc_version \
! $test_prefix/lib/gcc/$target_noncanonical \
/usr/lib/gcc/$target_noncanonical/$gcc_version \
/usr/lib/gcc/$target_noncanonical \
$test_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version \
*************** if test "x$gcc_cv_ld" = x; then
*** 1719,1726 ****
gcc_cv_ld=`echo ld | sed ${program_transform_name}`$host_exeext
fi
! test_dirs="$test_prefix/lib/gcc-lib/$target_noncanonical/$gcc_version \
! $test_prefix/lib/gcc-lib/$target_noncanonical \
/usr/lib/gcc/$target_noncanonical/$gcc_version \
/usr/lib/gcc/$target_noncanonical \
$test_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version \
--- 1719,1726 ----
gcc_cv_ld=`echo ld | sed ${program_transform_name}`$host_exeext
fi
! test_dirs="$test_prefix/lib/gcc/$target_noncanonical/$gcc_version \
! $test_prefix/lib/gcc/$target_noncanonical \
/usr/lib/gcc/$target_noncanonical/$gcc_version \
/usr/lib/gcc/$target_noncanonical \
$test_prefix/$target_noncanonical/bin/$target_noncanonical/$gcc_version \
Index: gcc/mkheaders.in
===================================================================
RCS file: /cvs/gcc/gcc/gcc/mkheaders.in,v
retrieving revision 1.3
diff -c -p -r1.3 mkheaders.in
*** gcc/mkheaders.in 14 Oct 2003 03:41:42 -0000 1.3
--- gcc/mkheaders.in 17 Jan 2004 09:57:39 -0000
*************** exec_prefix=@exec_prefix@
*** 66,72 ****
libdir=@libdir@
libexecdir=@libexecdir@
# Directory in which the compiler finds libraries, etc.
! libsubdir=${libdir}/gcc-lib/${target_noncanonical}/${version}
# Directory in which the compiler finds executables
libexecsubdir=${libexecdir}/gcc/${target_noncanonical}/${version}
# Since gcc_tooldir does not exist at build-time, use -B${build_tooldir}/bin/
--- 66,72 ----
libdir=@libdir@
libexecdir=@libexecdir@
# Directory in which the compiler finds libraries, etc.
! libsubdir=${libdir}/gcc/${target_noncanonical}/${version}
# Directory in which the compiler finds executables
libexecsubdir=${libexecdir}/gcc/${target_noncanonical}/${version}
# Since gcc_tooldir does not exist at build-time, use -B${build_tooldir}/bin/
Index: gcc/protoize.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/protoize.c,v
retrieving revision 1.87
diff -c -p -r1.87 protoize.c
*** gcc/protoize.c 14 Aug 2003 06:04:46 -0000 1.87
--- gcc/protoize.c 17 Jan 2004 09:57:39 -0000
*************** static void do_processing (void);
*** 117,123 ****
#ifndef UNPROTOIZE
#ifndef STANDARD_EXEC_PREFIX
! #define STANDARD_EXEC_PREFIX "/usr/local/lib/gcc-lib/"
#endif /* !defined STANDARD_EXEC_PREFIX */
static const char * const standard_exec_prefix = STANDARD_EXEC_PREFIX;
--- 117,123 ----
#ifndef UNPROTOIZE
#ifndef STANDARD_EXEC_PREFIX
! #define STANDARD_EXEC_PREFIX "/usr/local/lib/gcc/"
#endif /* !defined STANDARD_EXEC_PREFIX */
static const char * const standard_exec_prefix = STANDARD_EXEC_PREFIX;
Index: gcc/ada/Makefile.adalib
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/Makefile.adalib,v
retrieving revision 1.5
diff -c -p -r1.5 Makefile.adalib
*** gcc/ada/Makefile.adalib 21 Oct 2003 13:41:53 -0000 1.5
--- gcc/ada/Makefile.adalib 17 Jan 2004 09:57:40 -0000
***************
*** 10,16 ****
# $ cd adalib
#
# 2. Copy this Makefile from the standard Adalib directory, e.g.
! # $ cp /usr/local/gnat/lib/gcc-lib/<target>/<version>/adalib/Makefile.adalib .
#
# 3. If needed (e.g for pragma Normalize_Scalars), create a gnat.adc
# containing the configuration pragmas you want to use to build the library
--- 10,16 ----
# $ cd adalib
#
# 2. Copy this Makefile from the standard Adalib directory, e.g.
! # $ cp /usr/local/gnat/lib/gcc/<target>/<version>/adalib/Makefile.adalib .
#
# 3. If needed (e.g for pragma Normalize_Scalars), create a gnat.adc
# containing the configuration pragmas you want to use to build the library
*************** endif
*** 53,61 ****
target = $(shell $(CC) -dumpmachine)
version = $(shell $(CC) -dumpversion)
! ADA_INCLUDE_PATH = $(GNAT_ROOT)lib/gcc-lib/$(target)/$(version)/adainclude/
! GCC_INCLUDE_PATH = $(GNAT_ROOT)lib/gcc-lib/$(target)/$(version)/gcc-include/
! ADA_OBJECTS_PATH = $(GNAT_ROOT)lib/gcc-lib/$(target)/$(version)/adalib/
vpath %.adb $(ADA_INCLUDE_PATH)
vpath %.ads $(ADA_INCLUDE_PATH)
--- 53,61 ----
target = $(shell $(CC) -dumpmachine)
version = $(shell $(CC) -dumpversion)
! ADA_INCLUDE_PATH = $(GNAT_ROOT)lib/gcc/$(target)/$(version)/adainclude/
! GCC_INCLUDE_PATH = $(GNAT_ROOT)lib/gcc/$(target)/$(version)/gcc-include/
! ADA_OBJECTS_PATH = $(GNAT_ROOT)lib/gcc/$(target)/$(version)/adalib/
vpath %.adb $(ADA_INCLUDE_PATH)
vpath %.ads $(ADA_INCLUDE_PATH)
Index: gcc/ada/gnat_ug.texi
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/gnat_ug.texi,v
retrieving revision 1.12
diff -c -p -r1.12 gnat_ug.texi
*** gcc/ada/gnat_ug.texi 24 Dec 2003 00:16:52 -0000 1.12
--- gcc/ada/gnat_ug.texi 17 Jan 2004 09:57:43 -0000
*************** package body ada_main is
*** 6278,6285 ****
-- BEGIN Object file/option list
-- ./hello.o
-- -L./
! -- -L/usr/local/gnat/lib/gcc-lib/i686-pc-linux-gnu/2.8.1/adalib/
! -- /usr/local/gnat/lib/gcc-lib/i686-pc-linux-gnu/2.8.1/adalib/libgnat.a
-- END Object file/option list
end ada_main;
--- 6278,6285 ----
-- BEGIN Object file/option list
-- ./hello.o
-- -L./
! -- -L/usr/local/gnat/lib/gcc/i686-pc-linux-gnu/2.8.1/adalib/
! -- /usr/local/gnat/lib/gcc/i686-pc-linux-gnu/2.8.1/adalib/libgnat.a
-- END Object file/option list
end ada_main;
*************** hello (body)
*** 6732,6739 ****
/* BEGIN Object file/option list
./hello.o
-L./
! -L/usr/local/gnat/lib/gcc-lib/alpha-dec-osf5.1/2.8.1/adalib/
! /usr/local/gnat/lib/gcc-lib/alpha-dec-osf5.1/2.8.1/adalib/libgnat.a
-lexc
END Object file/option list */
--- 6732,6739 ----
/* BEGIN Object file/option list
./hello.o
-L./
! -L/usr/local/gnat/lib/gcc/alpha-dec-osf5.1/2.8.1/adalib/
! /usr/local/gnat/lib/gcc/alpha-dec-osf5.1/2.8.1/adalib/libgnat.a
-lexc
END Object file/option list */
*************** Source Search Path:
*** 14764,14770 ****
Object Search Path:
<Current_Directory>
../
! /home/comar/local/lib/gcc-lib/mips-sni-sysv4/2.7.2/adalib/
./demo1.o
Unit =>
--- 14764,14770 ----
Object Search Path:
<Current_Directory>
../
! /home/comar/local/lib/gcc/mips-sni-sysv4/2.7.2/adalib/
./demo1.o
Unit =>
*************** Edit your makefile and add on the @code{
*** 22951,22957 ****
of the GCC library file provided with GNAT.
@smallexample
LIBS = $(WIND_BASE)/target/lib/libPPC604gnuvx.a \
! /opt/gnu/gnat/lib/gcc-lib/powerpc-wrs-vxworks/2.8.1/libgcc.a
@end smallexample
@noindent
--- 22951,22957 ----
of the GCC library file provided with GNAT.
@smallexample
LIBS = $(WIND_BASE)/target/lib/libPPC604gnuvx.a \
! /opt/gnu/gnat/lib/gcc/powerpc-wrs-vxworks/2.8.1/libgcc.a
@end smallexample
@noindent
*************** To know the exact name and location of t
*** 22960,22966 ****
one provided with GNAT.
@smallexample
~ >powerpc-wrs-vxworks-gcc -print-libgcc-file-name
! /opt/gnu/gnat/lib/gcc-lib/powerpc-wrs-vxworks/2.8.1/libgcc.a
@end smallexample
@end itemize
--- 22960,22966 ----
one provided with GNAT.
@smallexample
~ >powerpc-wrs-vxworks-gcc -print-libgcc-file-name
! /opt/gnu/gnat/lib/gcc/powerpc-wrs-vxworks/2.8.1/libgcc.a
@end smallexample
@end itemize
*************** At installation time:
*** 23096,23102 ****
@itemize @bullet
@item
Create a file @file{ada_object_path} under the directory
! @file{BASE\lib\gcc-lib\powerpc-wrs-vxworks\2.8.1}
(by default @file{BASE}=@file{c:\gnatpro})
containing the following line:
@smallexample
--- 23096,23102 ----
@itemize @bullet
@item
Create a file @file{ada_object_path} under the directory
! @file{BASE\lib\gcc\powerpc-wrs-vxworks\2.8.1}
(by default @file{BASE}=@file{c:\gnatpro})
containing the following line:
@smallexample
*************** rts-soft-float\adalib
*** 23105,23111 ****
@item
Create a file @file{ada_source_path} under the directory
! @file{BASE\lib\gcc-lib\powerpc-wrs-vxworks\2.8.1}
(by default @file{BASE}=@file{c:\gnatpro})
containing the following line:
@smallexample
--- 23105,23111 ----
@item
Create a file @file{ada_source_path} under the directory
! @file{BASE\lib\gcc\powerpc-wrs-vxworks\2.8.1}
(by default @file{BASE}=@file{c:\gnatpro})
containing the following line:
@smallexample
Index: gcc/ada/gnat_ug_unx.texi
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/gnat_ug_unx.texi,v
retrieving revision 1.7
diff -c -p -r1.7 gnat_ug_unx.texi
*** gcc/ada/gnat_ug_unx.texi 24 Dec 2003 00:16:53 -0000 1.7
--- gcc/ada/gnat_ug_unx.texi 17 Jan 2004 09:57:46 -0000
*************** package body ada_main is
*** 5624,5631 ****
-- BEGIN Object file/option list
-- ./hello.o
-- -L./
! -- -L/usr/local/gnat/lib/gcc-lib/i686-pc-linux-gnu/2.8.1/adalib/
! -- /usr/local/gnat/lib/gcc-lib/i686-pc-linux-gnu/2.8.1/adalib/libgnat.a
-- END Object file/option list
end ada_main;
--- 5624,5631 ----
-- BEGIN Object file/option list
-- ./hello.o
-- -L./
! -- -L/usr/local/gnat/lib/gcc/i686-pc-linux-gnu/2.8.1/adalib/
! -- /usr/local/gnat/lib/gcc/i686-pc-linux-gnu/2.8.1/adalib/libgnat.a
-- END Object file/option list
end ada_main;
*************** hello (body)
*** 6078,6085 ****
/* BEGIN Object file/option list
./hello.o
-L./
! -L/usr/local/gnat/lib/gcc-lib/alpha-dec-osf5.1/2.8.1/adalib/
! /usr/local/gnat/lib/gcc-lib/alpha-dec-osf5.1/2.8.1/adalib/libgnat.a
-lexc
END Object file/option list */
--- 6078,6085 ----
/* BEGIN Object file/option list
./hello.o
-L./
! -L/usr/local/gnat/lib/gcc/alpha-dec-osf5.1/2.8.1/adalib/
! /usr/local/gnat/lib/gcc/alpha-dec-osf5.1/2.8.1/adalib/libgnat.a
-lexc
END Object file/option list */
*************** Source Search Path:
*** 13821,13827 ****
Object Search Path:
<Current_Directory>
../
! /home/comar/local/lib/gcc-lib/mips-sni-sysv4/2.7.2/adalib/
./demo1.o
Unit =>
--- 13821,13827 ----
Object Search Path:
<Current_Directory>
../
! /home/comar/local/lib/gcc/mips-sni-sysv4/2.7.2/adalib/
./demo1.o
Unit =>
Index: gcc/ada/gnat_ug_vms.texi
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/gnat_ug_vms.texi,v
retrieving revision 1.8
diff -c -p -r1.8 gnat_ug_vms.texi
*** gcc/ada/gnat_ug_vms.texi 24 Dec 2003 00:16:53 -0000 1.8
--- gcc/ada/gnat_ug_vms.texi 17 Jan 2004 09:57:49 -0000
*************** package body ada_main is
*** 5466,5473 ****
-- BEGIN Object file/option list
-- ./HELLO.OBJ
-- -L./
! -- -L/usr/local/gnat/lib/gcc-lib/i686-pc-linux-gnu/2.8.1/adalib/
! -- /usr/local/gnat/lib/gcc-lib/i686-pc-linux-gnu/2.8.1/adalib/libgnat.a
-- END Object file/option list
end ada_main;
--- 5466,5473 ----
-- BEGIN Object file/option list
-- ./HELLO.OBJ
-- -L./
! -- -L/usr/local/gnat/lib/gcc/i686-pc-linux-gnu/2.8.1/adalib/
! -- /usr/local/gnat/lib/gcc/i686-pc-linux-gnu/2.8.1/adalib/libgnat.a
-- END Object file/option list
end ada_main;
*************** hello (body)
*** 5920,5927 ****
/* BEGIN Object file/option list
./HELLO.OBJ
-L./
! -L/usr/local/gnat/lib/gcc-lib/alpha-dec-osf5.1/2.8.1/adalib/
! /usr/local/gnat/lib/gcc-lib/alpha-dec-osf5.1/2.8.1/adalib/libgnat.a
-lexc
END Object file/option list */
--- 5920,5927 ----
/* BEGIN Object file/option list
./HELLO.OBJ
-L./
! -L/usr/local/gnat/lib/gcc/alpha-dec-osf5.1/2.8.1/adalib/
! /usr/local/gnat/lib/gcc/alpha-dec-osf5.1/2.8.1/adalib/libgnat.a
-lexc
END Object file/option list */
Index: gcc/ada/gnat_ug_vxw.texi
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/gnat_ug_vxw.texi,v
retrieving revision 1.8
diff -c -p -r1.8 gnat_ug_vxw.texi
*** gcc/ada/gnat_ug_vxw.texi 24 Dec 2003 00:16:53 -0000 1.8
--- gcc/ada/gnat_ug_vxw.texi 17 Jan 2004 09:57:51 -0000
*************** package body ada_main is
*** 5751,5758 ****
-- BEGIN Object file/option list
-- ./hello.o
-- -L./
! -- -L/usr/local/gnat/lib/gcc-lib/i686-pc-linux-gnu/2.8.1/adalib/
! -- /usr/local/gnat/lib/gcc-lib/i686-pc-linux-gnu/2.8.1/adalib/libgnat.a
-- END Object file/option list
end ada_main;
--- 5751,5758 ----
-- BEGIN Object file/option list
-- ./hello.o
-- -L./
! -- -L/usr/local/gnat/lib/gcc/i686-pc-linux-gnu/2.8.1/adalib/
! -- /usr/local/gnat/lib/gcc/i686-pc-linux-gnu/2.8.1/adalib/libgnat.a
-- END Object file/option list
end ada_main;
*************** hello (body)
*** 6205,6212 ****
/* BEGIN Object file/option list
./hello.o
-L./
! -L/usr/local/gnat/lib/gcc-lib/alpha-dec-osf5.1/2.8.1/adalib/
! /usr/local/gnat/lib/gcc-lib/alpha-dec-osf5.1/2.8.1/adalib/libgnat.a
-lexc
END Object file/option list */
--- 6205,6212 ----
/* BEGIN Object file/option list
./hello.o
-L./
! -L/usr/local/gnat/lib/gcc/alpha-dec-osf5.1/2.8.1/adalib/
! /usr/local/gnat/lib/gcc/alpha-dec-osf5.1/2.8.1/adalib/libgnat.a
-lexc
END Object file/option list */
*************** Source Search Path:
*** 13953,13959 ****
Object Search Path:
<Current_Directory>
../
! /home/comar/local/lib/gcc-lib/mips-sni-sysv4/2.7.2/adalib/
./demo1.o
Unit =>
--- 13953,13959 ----
Object Search Path:
<Current_Directory>
../
! /home/comar/local/lib/gcc/mips-sni-sysv4/2.7.2/adalib/
./demo1.o
Unit =>
*************** Edit your makefile and add on the @code{
*** 18188,18194 ****
of the GCC library file provided with GNAT.
@smallexample
LIBS = $(WIND_BASE)/target/lib/libPPC604gnuvx.a \
! /opt/gnu/gnat/lib/gcc-lib/powerpc-wrs-vxworks/2.8.1/libgcc.a
@end smallexample
@noindent
--- 18188,18194 ----
of the GCC library file provided with GNAT.
@smallexample
LIBS = $(WIND_BASE)/target/lib/libPPC604gnuvx.a \
! /opt/gnu/gnat/lib/gcc/powerpc-wrs-vxworks/2.8.1/libgcc.a
@end smallexample
@noindent
*************** To know the exact name and location of t
*** 18197,18203 ****
one provided with GNAT.
@smallexample
~ >powerpc-wrs-vxworks-gcc -print-libgcc-file-name
! /opt/gnu/gnat/lib/gcc-lib/powerpc-wrs-vxworks/2.8.1/libgcc.a
@end smallexample
@end itemize
--- 18197,18203 ----
one provided with GNAT.
@smallexample
~ >powerpc-wrs-vxworks-gcc -print-libgcc-file-name
! /opt/gnu/gnat/lib/gcc/powerpc-wrs-vxworks/2.8.1/libgcc.a
@end smallexample
@end itemize
*************** At installation time:
*** 18333,18339 ****
@itemize @bullet
@item
Create a file @file{ada_object_path} under the directory
! @file{BASE\lib\gcc-lib\powerpc-wrs-vxworks\2.8.1}
(by default @file{BASE}=@file{c:\gnatpro})
containing the following line:
@smallexample
--- 18333,18339 ----
@itemize @bullet
@item
Create a file @file{ada_object_path} under the directory
! @file{BASE\lib\gcc\powerpc-wrs-vxworks\2.8.1}
(by default @file{BASE}=@file{c:\gnatpro})
containing the following line:
@smallexample
*************** rts-soft-float\adalib
*** 18342,18348 ****
@item
Create a file @file{ada_source_path} under the directory
! @file{BASE\lib\gcc-lib\powerpc-wrs-vxworks\2.8.1}
(by default @file{BASE}=@file{c:\gnatpro})
containing the following line:
@smallexample
--- 18342,18348 ----
@item
Create a file @file{ada_source_path} under the directory
! @file{BASE\lib\gcc\powerpc-wrs-vxworks\2.8.1}
(by default @file{BASE}=@file{c:\gnatpro})
containing the following line:
@smallexample
Index: gcc/ada/gnat_ug_wnt.texi
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/gnat_ug_wnt.texi,v
retrieving revision 1.7
diff -c -p -r1.7 gnat_ug_wnt.texi
*** gcc/ada/gnat_ug_wnt.texi 24 Dec 2003 00:16:53 -0000 1.7
--- gcc/ada/gnat_ug_wnt.texi 17 Jan 2004 09:57:54 -0000
*************** package body ada_main is
*** 5638,5645 ****
-- BEGIN Object file/option list
-- ./hello.o
-- -L./
! -- -L/usr/local/gnat/lib/gcc-lib/i686-pc-linux-gnu/2.8.1/adalib/
! -- /usr/local/gnat/lib/gcc-lib/i686-pc-linux-gnu/2.8.1/adalib/libgnat.a
-- END Object file/option list
end ada_main;
--- 5638,5645 ----
-- BEGIN Object file/option list
-- ./hello.o
-- -L./
! -- -L/usr/local/gnat/lib/gcc/i686-pc-linux-gnu/2.8.1/adalib/
! -- /usr/local/gnat/lib/gcc/i686-pc-linux-gnu/2.8.1/adalib/libgnat.a
-- END Object file/option list
end ada_main;
*************** hello (body)
*** 6092,6099 ****
/* BEGIN Object file/option list
./hello.o
-L./
! -L/usr/local/gnat/lib/gcc-lib/alpha-dec-osf5.1/2.8.1/adalib/
! /usr/local/gnat/lib/gcc-lib/alpha-dec-osf5.1/2.8.1/adalib/libgnat.a
-lexc
END Object file/option list */
--- 6092,6099 ----
/* BEGIN Object file/option list
./hello.o
-L./
! -L/usr/local/gnat/lib/gcc/alpha-dec-osf5.1/2.8.1/adalib/
! /usr/local/gnat/lib/gcc/alpha-dec-osf5.1/2.8.1/adalib/libgnat.a
-lexc
END Object file/option list */
*************** Source Search Path:
*** 13839,13845 ****
Object Search Path:
<Current_Directory>
../
! /home/comar/local/lib/gcc-lib/mips-sni-sysv4/2.7.2/adalib/
./demo1.o
Unit =>
--- 13839,13845 ----
Object Search Path:
<Current_Directory>
../
! /home/comar/local/lib/gcc/mips-sni-sysv4/2.7.2/adalib/
./demo1.o
Unit =>
Index: gcc/ada/gnatlink.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/gnatlink.adb,v
retrieving revision 1.13
diff -c -p -r1.13 gnatlink.adb
*** gcc/ada/gnatlink.adb 13 Jan 2004 11:51:32 -0000 1.13
--- gcc/ada/gnatlink.adb 17 Jan 2004 09:57:55 -0000
*************** procedure Gnatlink is
*** 1063,1076 ****
-- relevant.
-- To find the location of the shared version
! -- of libgcc, we look for "gcc-lib" in the
-- path of the library. However, this
-- subdirectory is no longer present in
-- in recent version of GCC. So, we look for
-- the last subdirectory "lib" in the path.
GCC_Index :=
! Index (File_Path.all, "gcc-lib");
if GCC_Index /= 0 then
-- The shared version of libgcc is
--- 1063,1076 ----
-- relevant.
-- To find the location of the shared version
! -- of libgcc, we look for "gcc" in the
-- path of the library. However, this
-- subdirectory is no longer present in
-- in recent version of GCC. So, we look for
-- the last subdirectory "lib" in the path.
GCC_Index :=
! Index (File_Path.all, "gcc");
if GCC_Index /= 0 then
-- The shared version of libgcc is
Index: gcc/ada/osint.adb
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/osint.adb,v
retrieving revision 1.16
diff -c -p -r1.16 osint.adb
*** gcc/ada/osint.adb 5 Jan 2004 15:20:45 -0000 1.16
--- gcc/ada/osint.adb 17 Jan 2004 09:57:55 -0000
*************** package body Osint is
*** 88,94 ****
function Executable_Prefix return String_Ptr;
-- Returns the name of the root directory where the executable is stored.
-- The executable must be located in a directory called "bin", or
! -- under root/lib/gcc-lib/..., or under root/libexec/gcc/... Thus, if
-- the executable is stored in directory "/foo/bar/bin", this routine
-- returns "/foo/bar/". Return "" if the location is not recognized
-- as described above.
--- 88,94 ----
function Executable_Prefix return String_Ptr;
-- Returns the name of the root directory where the executable is stored.
-- The executable must be located in a directory called "bin", or
! -- under root/lib/gcc/..., or under root/libexec/gcc/... Thus, if
-- the executable is stored in directory "/foo/bar/bin", this routine
-- returns "/foo/bar/". Return "" if the location is not recognized
-- as described above.
Index: gcc/ada/osint.ads
===================================================================
RCS file: /cvs/gcc/gcc/gcc/ada/osint.ads,v
retrieving revision 1.11
diff -c -p -r1.11 osint.ads
*** gcc/ada/osint.ads 5 Jan 2004 15:20:45 -0000 1.11
--- gcc/ada/osint.ads 17 Jan 2004 09:57:55 -0000
*************** package Osint is
*** 304,311 ****
-- 'adainclude' will be scanned:
--
-- - current directory (from which the tool has been spawned)
! -- - $GNAT_ROOT/gcc/gcc-lib/$targ/$vers/
! -- - $GNAT_ROOT/gcc/gcc-lib/$targ/$vers/rts-
--
-- The scan will stop as soon as the directory being searched for (adalib
-- or adainclude) is found. If the scan fails, null is returned.
--- 304,311 ----
-- 'adainclude' will be scanned:
--
-- - current directory (from which the tool has been spawned)
! -- - $GNAT_ROOT/gcc/gcc/$targ/$vers/
! -- - $GNAT_ROOT/gcc/gcc/$targ/$vers/rts-
--
-- The scan will stop as soon as the directory being searched for (adalib
-- or adainclude) is found. If the scan fails, null is returned.
Index: gcc/config/alpha/vms.h
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/alpha/vms.h,v
retrieving revision 1.78
diff -c -p -r1.78 vms.h
*** gcc/config/alpha/vms.h 25 Dec 2003 15:17:35 -0000 1.78
--- gcc/config/alpha/vms.h 17 Jan 2004 09:57:56 -0000
*************** do { \
*** 437,449 ****
#define NAME__MAIN "__gccmain"
#define SYMBOL__MAIN __gccmain
! #define MD_EXEC_PREFIX "/gnu/lib/gcc-lib/"
! #define MD_STARTFILE_PREFIX "/gnu/lib/gcc-lib/"
/* Specify the list of include file directories. */
#define INCLUDE_DEFAULTS \
{ \
! { "/gnu/lib/gcc-lib/include", 0, 0, 0 }, \
{ "/gnu_gxx_include", 0, 1, 1 }, \
{ "/gnu_cc_include", 0, 0, 0 }, \
{ "/gnu/include", 0, 0, 0 }, \
--- 437,449 ----
#define NAME__MAIN "__gccmain"
#define SYMBOL__MAIN __gccmain
! #define MD_EXEC_PREFIX "/gnu/lib/gcc/"
! #define MD_STARTFILE_PREFIX "/gnu/lib/gcc/"
/* Specify the list of include file directories. */
#define INCLUDE_DEFAULTS \
{ \
! { "/gnu/lib/gcc/include", 0, 0, 0 }, \
{ "/gnu_gxx_include", 0, 1, 1 }, \
{ "/gnu_cc_include", 0, 0, 0 }, \
{ "/gnu/include", 0, 0, 0 }, \
Index: gcc/config/alpha/x-vms
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/alpha/x-vms,v
retrieving revision 1.8
diff -c -p -r1.8 x-vms
*** gcc/config/alpha/x-vms 13 Feb 2002 15:32:02 -0000 1.8
--- gcc/config/alpha/x-vms 17 Jan 2004 09:57:56 -0000
***************
*** 1,7 ****
# Under VMS, directory names cannot contain dots.
version:=$(shell echo $(gcc_version) | sed -e 's/\./_/g')
! libsubdir=$(libdir)/gcc-lib
# Rules for linker and compiler wrappers. These are only useful on
# a VMS host.
--- 1,7 ----
# Under VMS, directory names cannot contain dots.
version:=$(shell echo $(gcc_version) | sed -e 's/\./_/g')
! libsubdir=$(libdir)/gcc
# Rules for linker and compiler wrappers. These are only useful on
# a VMS host.
Index: gcc/config/i386/svr3.ifile
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i386/svr3.ifile,v
retrieving revision 1.2
diff -c -p -r1.2 svr3.ifile
*** gcc/config/i386/svr3.ifile 16 Dec 1998 21:04:17 -0000 1.2
--- gcc/config/i386/svr3.ifile 17 Jan 2004 09:57:57 -0000
***************
*** 2,8 ****
* svr3.ifile - for collectless G++ on i386 System V.
* Leaves memory configured at address 0.
*
! * Install this file as $prefix/gcc-lib/TARGET/VERSION/gcc.ifile
*
* BLOCK to an offset that leaves room for many headers ( the value
* here allows for a file header, an outheader, and up to 11 section
--- 2,8 ----
* svr3.ifile - for collectless G++ on i386 System V.
* Leaves memory configured at address 0.
*
! * Install this file as $prefix/gcc/TARGET/VERSION/gcc.ifile
*
* BLOCK to an offset that leaves room for many headers ( the value
* here allows for a file header, an outheader, and up to 11 section
Index: gcc/config/i386/svr3z.ifile
===================================================================
RCS file: /cvs/gcc/gcc/gcc/config/i386/svr3z.ifile,v
retrieving revision 1.2
diff -c -p -r1.2 svr3z.ifile
*** gcc/config/i386/svr3z.ifile 16 Dec 1998 21:04:20 -0000 1.2
--- gcc/config/i386/svr3z.ifile 17 Jan 2004 09:57:57 -0000
***************
*** 2,8 ****
* svr3z.ifile - for collectless G++ on i386 System V.
* Leaves memory unconfigured at address 0.
*
! * Install this file as $prefix/gcc-lib/TARGET/VERSION/gccz.ifile
*
* BLOCK to an offset that leaves room for many headers ( the value
* here allows for a file header, an outheader, and up to 11 section
--- 2,8 ----
* svr3z.ifile - for collectless G++ on i386 System V.
* Leaves memory unconfigured at address 0.
*
! * Install this file as $prefix/gcc/TARGET/VERSION/gccz.ifile
*
* BLOCK to an offset that leaves room for many headers ( the value
* here allows for a file header, an outheader, and up to 11 section
Index: gcc/f/news.texi
===================================================================
RCS file: /cvs/gcc/gcc/gcc/f/news.texi,v
retrieving revision 1.105
diff -c -p -r1.105 news.texi
*** gcc/f/news.texi 21 Sep 2003 16:19:01 -0000 1.105
--- gcc/f/news.texi 17 Jan 2004 09:57:58 -0000
*************** See the installation documentation for m
*** 773,779 ****
The @file{libf2c.a} library produced by @command{g77} has been
renamed to @file{libg2c.a}.
It is installed only in the @command{gcc} ``private''
! directory hierarchy, @file{gcc-lib}.
This allows system administrators and users to choose which
version of the @code{libf2c} library from @code{netlib} they
wish to use on a case-by-case basis.
--- 773,779 ----
The @file{libf2c.a} library produced by @command{g77} has been
renamed to @file{libg2c.a}.
It is installed only in the @command{gcc} ``private''
! directory hierarchy, @file{gcc}.
This allows system administrators and users to choose which
version of the @code{libf2c} library from @code{netlib} they
wish to use on a case-by-case basis.
*************** See the installation documentation for m
*** 785,791 ****
The @file{f2c.h} include (header) file produced by @command{g77}
has been renamed to @file{g2c.h}.
It is installed only in the @command{gcc} ``private''
! directory hierarchy, @file{gcc-lib}.
This allows system administrators and users to choose which
version of the include file from @code{netlib} they
wish to use on a case-by-case basis.
--- 785,791 ----
The @file{f2c.h} include (header) file produced by @command{g77}
has been renamed to @file{g2c.h}.
It is installed only in the @command{gcc} ``private''
! directory hierarchy, @file{gcc}.
This allows system administrators and users to choose which
version of the include file from @code{netlib} they
wish to use on a case-by-case basis.
*************** See the installation documentation for m
*** 1102,1108 ****
The @file{libf2c.a} library produced by @command{g77} has been
renamed to @file{libg2c.a}.
It is installed only in the @command{gcc} ``private''
! directory hierarchy, @file{gcc-lib}.
This allows system administrators and users to choose which
version of the @code{libf2c} library from @code{netlib} they
wish to use on a case-by-case basis.
--- 1102,1108 ----
The @file{libf2c.a} library produced by @command{g77} has been
renamed to @file{libg2c.a}.
It is installed only in the @command{gcc} ``private''
! directory hierarchy, @file{gcc}.
This allows system administrators and users to choose which
version of the @code{libf2c} library from @code{netlib} they
wish to use on a case-by-case basis.
*************** See the installation documentation for m
*** 1114,1120 ****
The @file{f2c.h} include (header) file produced by @command{g77}
has been renamed to @file{g2c.h}.
It is installed only in the @command{gcc} ``private''
! directory hierarchy, @file{gcc-lib}.
This allows system administrators and users to choose which
version of the include file from @code{netlib} they
wish to use on a case-by-case basis.
--- 1114,1120 ----
The @file{f2c.h} include (header) file produced by @command{g77}
has been renamed to @file{g2c.h}.
It is installed only in the @command{gcc} ``private''
! directory hierarchy, @file{gcc}.
This allows system administrators and users to choose which
version of the include file from @code{netlib} they
wish to use on a case-by-case basis.
Index: gcc/java/jcf-path.c
===================================================================
RCS file: /cvs/gcc/gcc/gcc/java/jcf-path.c,v
retrieving revision 1.29
diff -c -p -r1.29 jcf-path.c
*** gcc/java/jcf-path.c 3 Jul 2003 04:24:01 -0000 1.29
--- gcc/java/jcf-path.c 17 Jan 2004 09:57:58 -0000
*************** jcf_path_init (void)
*** 230,236 ****
{
try = alloca (strlen (cp) + 50);
/* The exec prefix can be something like
! /usr/local/bin/../lib/gcc-lib/. We want to change this
into a pointer to the share/java directory. We support two
configurations: one where prefix and exec-prefix are the
same, and one where exec-prefix is `prefix/SOMETHING'. */
--- 230,236 ----
{
try = alloca (strlen (cp) + 50);
/* The exec prefix can be something like
! /usr/local/bin/../lib/gcc/. We want to change this
into a pointer to the share/java directory. We support two
configurations: one where prefix and exec-prefix are the
same, and one where exec-prefix is `prefix/SOMETHING'. */
Index: libf2c/Makefile.in
===================================================================
RCS file: /cvs/gcc/gcc/libf2c/Makefile.in,v
retrieving revision 1.57
diff -c -p -r1.57 Makefile.in
*** libf2c/Makefile.in 4 Jul 2003 19:45:54 -0000 1.57
--- libf2c/Makefile.in 17 Jan 2004 09:58:03 -0000
*************** glibcpp_toolexeclibdir = @glibcpp_toolex
*** 42,48 ****
top_builddir = .
libdir = $(exec_prefix)/lib
! libsubdir = $(libdir)/gcc-lib/$(target_alias)/$(gcc_version)
#
# Versions should start at 0:0:0 - See libtool manual.
VERSION_MAJOR=0
--- 42,48 ----
top_builddir = .
libdir = $(exec_prefix)/lib
! libsubdir = $(libdir)/gcc/$(target_alias)/$(gcc_version)
#
# Versions should start at 0:0:0 - See libtool manual.
VERSION_MAJOR=0
Index: libf2c/aclocal.m4
===================================================================
RCS file: /cvs/gcc/gcc/libf2c/aclocal.m4,v
retrieving revision 1.7
diff -c -p -r1.7 aclocal.m4
*** libf2c/aclocal.m4 12 Mar 2003 21:34:19 -0000 1.7
--- libf2c/aclocal.m4 17 Jan 2004 09:58:03 -0000
*************** if test $version_specific_libs = yes; th
*** 196,202 ****
# and header files if --enable-version-specific-runtime-libs option
# is selected.
changequote(,)dnl
! glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
changequote([,])dnl
fi
--- 196,202 ----
# and header files if --enable-version-specific-runtime-libs option
# is selected.
changequote(,)dnl
! glibcpp_toolexecdir='$(libdir)/gcc/$(target_alias)'
glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
changequote([,])dnl
fi
*************** if test x"$glibcpp_toolexecdir" = x"no";
*** 209,215 ****
glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
glibcpp_toolexeclibdir='$(toolexecdir)/lib'
else
! glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
glibcpp_toolexeclibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
--- 209,215 ----
glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
glibcpp_toolexeclibdir='$(toolexecdir)/lib'
else
! glibcpp_toolexecdir='$(libdir)/gcc/$(target_alias)'
glibcpp_toolexeclibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
Index: libf2c/configure
===================================================================
RCS file: /cvs/gcc/gcc/libf2c/configure,v
retrieving revision 1.42
diff -c -p -r1.42 configure
*** libf2c/configure 14 Oct 2003 21:01:09 -0000 1.42
--- libf2c/configure 17 Jan 2004 09:58:03 -0000
*************** if test $version_specific_libs = yes; th
*** 1251,1257 ****
# Need the gcc compiler version to know where to install libraries
# and header files if --enable-version-specific-runtime-libs option
# is selected.
! glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
fi
--- 1251,1257 ----
# Need the gcc compiler version to know where to install libraries
# and header files if --enable-version-specific-runtime-libs option
# is selected.
! glibcpp_toolexecdir='$(libdir)/gcc/$(target_alias)'
glibcpp_toolexeclibdir='$(toolexecdir)/'${gcc_version}'$(MULTISUBDIR)'
fi
*************** if test x"$glibcpp_toolexecdir" = x"no";
*** 1263,1269 ****
glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
glibcpp_toolexeclibdir='$(toolexecdir)/lib'
else
! glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
glibcpp_toolexeclibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
--- 1263,1269 ----
glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
glibcpp_toolexeclibdir='$(toolexecdir)/lib'
else
! glibcpp_toolexecdir='$(libdir)/gcc/$(target_alias)'
glibcpp_toolexeclibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
Index: libffi/configure
===================================================================
RCS file: /cvs/gcc/gcc/libffi/configure,v
retrieving revision 1.55
diff -c -p -r1.55 configure
*** libffi/configure 22 Nov 2003 13:41:32 -0000 1.55
--- libffi/configure 17 Jan 2004 09:58:04 -0000
*************** if test -n "$with_cross_host" &&
*** 3705,3711 ****
toolexecdir='$(exec_prefix)/$(target_alias)'
toolexeclibdir='$(toolexecdir)/lib'
else
! toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
toolexeclibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
--- 3705,3711 ----
toolexecdir='$(exec_prefix)/$(target_alias)'
toolexeclibdir='$(toolexecdir)/lib'
else
! toolexecdir='$(libdir)/gcc/$(target_alias)'
toolexeclibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
Index: libffi/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libffi/configure.in,v
retrieving revision 1.47
diff -c -p -r1.47 configure.in
*** libffi/configure.in 21 Nov 2003 11:24:08 -0000 1.47
--- libffi/configure.in 17 Jan 2004 09:58:04 -0000
*************** if test -n "$with_cross_host" &&
*** 222,228 ****
toolexecdir='$(exec_prefix)/$(target_alias)'
toolexeclibdir='$(toolexecdir)/lib'
else
! toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
toolexeclibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
--- 222,228 ----
toolexecdir='$(exec_prefix)/$(target_alias)'
toolexeclibdir='$(toolexecdir)/lib'
else
! toolexecdir='$(libdir)/gcc/$(target_alias)'
toolexeclibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
Index: libjava/configure
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure,v
retrieving revision 1.200
diff -c -p -r1.200 configure
*** libjava/configure 4 Jan 2004 09:18:06 -0000 1.200
--- libjava/configure 17 Jan 2004 09:58:06 -0000
*************** if test -n "$with_cross_host" &&
*** 7937,7943 ****
toolexecdir='$(exec_prefix)/$(target_alias)'
toolexecmainlibdir='$(toolexecdir)/lib'
else
! toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
toolexecmainlibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
--- 7937,7943 ----
toolexecdir='$(exec_prefix)/$(target_alias)'
toolexecmainlibdir='$(toolexecdir)/lib'
else
! toolexecdir='$(libdir)/gcc/$(target_alias)'
toolexecmainlibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
Index: libjava/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/libjava/configure.in,v
retrieving revision 1.177
diff -c -p -r1.177 configure.in
*** libjava/configure.in 31 Dec 2003 08:58:28 -0000 1.177
--- libjava/configure.in 17 Jan 2004 09:58:06 -0000
*************** if test -n "$with_cross_host" &&
*** 1021,1027 ****
toolexecdir='$(exec_prefix)/$(target_alias)'
toolexecmainlibdir='$(toolexecdir)/lib'
else
! toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
toolexecmainlibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
--- 1021,1027 ----
toolexecdir='$(exec_prefix)/$(target_alias)'
toolexecmainlibdir='$(toolexecdir)/lib'
else
! toolexecdir='$(libdir)/gcc/$(target_alias)'
toolexecmainlibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
Index: libobjc/aclocal.m4
===================================================================
RCS file: /cvs/gcc/gcc/libobjc/aclocal.m4,v
retrieving revision 1.8
diff -c -p -r1.8 aclocal.m4
*** libobjc/aclocal.m4 28 Aug 2003 01:15:06 -0000 1.8
--- libobjc/aclocal.m4 17 Jan 2004 09:58:10 -0000
*************** if test x"$glibcpp_toolexecdir" = x"no";
*** 209,215 ****
glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
glibcpp_toolexeclibdir='$(toolexecdir)/lib'
else
! glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
glibcpp_toolexeclibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
--- 209,215 ----
glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
glibcpp_toolexeclibdir='$(toolexecdir)/lib'
else
! glibcpp_toolexecdir='$(libdir)/gcc/$(target_alias)'
glibcpp_toolexeclibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
Index: libobjc/configure
===================================================================
RCS file: /cvs/gcc/gcc/libobjc/configure,v
retrieving revision 1.32
diff -c -p -r1.32 configure
*** libobjc/configure 9 Sep 2003 06:24:21 -0000 1.32
--- libobjc/configure 17 Jan 2004 09:58:10 -0000
*************** if test x"$glibcpp_toolexecdir" = x"no";
*** 1267,1273 ****
glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
glibcpp_toolexeclibdir='$(toolexecdir)/lib'
else
! glibcpp_toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
glibcpp_toolexeclibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
--- 1267,1273 ----
glibcpp_toolexecdir='$(exec_prefix)/$(target_alias)'
glibcpp_toolexeclibdir='$(toolexecdir)/lib'
else
! glibcpp_toolexecdir='$(libdir)/gcc/$(target_alias)'
glibcpp_toolexeclibdir='$(libdir)'
fi
multi_os_directory=`$CC -print-multi-os-directory`
Index: libstdc++-v3/acinclude.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/acinclude.m4,v
retrieving revision 1.280
diff -c -p -r1.280 acinclude.m4
*** libstdc++-v3/acinclude.m4 29 Dec 2003 20:13:21 -0000 1.280
--- libstdc++-v3/acinclude.m4 17 Jan 2004 09:58:11 -0000
*************** AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [
*** 764,772 ****
# and header files if --enable-version-specific-runtime-libs option
# is selected.
if test x"$gxx_include_dir" = x"no"; then
! gxx_include_dir='${libdir}/gcc-lib/${host_alias}/'$gcc_version/include/c++
fi
! glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}'
glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
fi
--- 764,772 ----
# and header files if --enable-version-specific-runtime-libs option
# is selected.
if test x"$gxx_include_dir" = x"no"; then
! gxx_include_dir='${libdir}/gcc/${host_alias}/'$gcc_version/include/c++
fi
! glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
fi
*************** AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [
*** 778,784 ****
glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
glibcxx_toolexeclibdir='${toolexecdir}/lib'
else
! glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}'
glibcxx_toolexeclibdir='${libdir}'
fi
multi_os_directory=`$CXX -print-multi-os-directory`
--- 778,784 ----
glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
glibcxx_toolexeclibdir='${toolexecdir}/lib'
else
! glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
glibcxx_toolexeclibdir='${libdir}'
fi
multi_os_directory=`$CXX -print-multi-os-directory`
Index: libstdc++-v3/aclocal.m4
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/aclocal.m4,v
retrieving revision 1.296
diff -c -p -r1.296 aclocal.m4
*** libstdc++-v3/aclocal.m4 7 Jan 2004 22:16:28 -0000 1.296
--- libstdc++-v3/aclocal.m4 17 Jan 2004 09:58:11 -0000
*************** AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [
*** 777,785 ****
# and header files if --enable-version-specific-runtime-libs option
# is selected.
if test x"$gxx_include_dir" = x"no"; then
! gxx_include_dir='${libdir}/gcc-lib/${host_alias}/'$gcc_version/include/c++
fi
! glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}'
glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
fi
--- 777,785 ----
# and header files if --enable-version-specific-runtime-libs option
# is selected.
if test x"$gxx_include_dir" = x"no"; then
! gxx_include_dir='${libdir}/gcc/${host_alias}/'$gcc_version/include/c++
fi
! glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
fi
*************** AC_DEFUN(GLIBCXX_EXPORT_INSTALL_INFO, [
*** 791,797 ****
glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
glibcxx_toolexeclibdir='${toolexecdir}/lib'
else
! glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}'
glibcxx_toolexeclibdir='${libdir}'
fi
multi_os_directory=`$CXX -print-multi-os-directory`
--- 791,797 ----
glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
glibcxx_toolexeclibdir='${toolexecdir}/lib'
else
! glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
glibcxx_toolexeclibdir='${libdir}'
fi
multi_os_directory=`$CXX -print-multi-os-directory`
Index: libstdc++-v3/configure
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/configure,v
retrieving revision 1.373
diff -c -p -r1.373 configure
*** libstdc++-v3/configure 7 Jan 2004 22:16:29 -0000 1.373
--- libstdc++-v3/configure 17 Jan 2004 09:58:19 -0000
*************** echo "${ECHO_T}$version_specific_libs" >
*** 62291,62299 ****
# and header files if --enable-version-specific-runtime-libs option
# is selected.
if test x"$gxx_include_dir" = x"no"; then
! gxx_include_dir='${libdir}/gcc-lib/${host_alias}/'$gcc_version/include/c++
fi
! glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}'
glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
fi
--- 62291,62299 ----
# and header files if --enable-version-specific-runtime-libs option
# is selected.
if test x"$gxx_include_dir" = x"no"; then
! gxx_include_dir='${libdir}/gcc/${host_alias}/'$gcc_version/include/c++
fi
! glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
glibcxx_toolexeclibdir='${toolexecdir}/'$gcc_version'$(MULTISUBDIR)'
fi
*************** echo "${ECHO_T}$version_specific_libs" >
*** 62305,62311 ****
glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
glibcxx_toolexeclibdir='${toolexecdir}/lib'
else
! glibcxx_toolexecdir='${libdir}/gcc-lib/${host_alias}'
glibcxx_toolexeclibdir='${libdir}'
fi
multi_os_directory=`$CXX -print-multi-os-directory`
--- 62305,62311 ----
glibcxx_toolexecdir='${exec_prefix}/${host_alias}'
glibcxx_toolexeclibdir='${toolexecdir}/lib'
else
! glibcxx_toolexecdir='${libdir}/gcc/${host_alias}'
glibcxx_toolexeclibdir='${libdir}'
fi
multi_os_directory=`$CXX -print-multi-os-directory`
Index: libstdc++-v3/docs/html/configopts.html
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/docs/html/configopts.html,v
retrieving revision 1.33
diff -c -p -r1.33 configopts.html
*** libstdc++-v3/docs/html/configopts.html 18 Nov 2003 20:56:06 -0000 1.33
--- libstdc++-v3/docs/html/configopts.html 17 Jan 2004 09:58:19 -0000
*************** options</a></h1>
*** 65,75 ****
<dt><code>--enable-version-specific-runtime-libs </code></dt>
<dd><p>Specify that run-time libraries should be installed in the
compiler-specific subdirectory (i.e.,
! <code>${libdir}/gcc-lib/${target_alias}/${gcc_version}</code>)
instead of <code>${libdir}</code>. This option is useful if you
intend to use several versions of gcc in parallel. In addition,
libstdc++'s include files will be installed in
! <code>${libdir}/gcc-lib/${target_alias}/${gcc_version}/include/g++</code>,
unless you also specify
<code>--with-gxx-include-dir=<em>dirname</em></code> during configuration.
</p>
--- 65,75 ----
<dt><code>--enable-version-specific-runtime-libs </code></dt>
<dd><p>Specify that run-time libraries should be installed in the
compiler-specific subdirectory (i.e.,
! <code>${libdir}/gcc/${target_alias}/${gcc_version}</code>)
instead of <code>${libdir}</code>. This option is useful if you
intend to use several versions of gcc in parallel. In addition,
libstdc++'s include files will be installed in
! <code>${libdir}/gcc/${target_alias}/${gcc_version}/include/g++</code>,
unless you also specify
<code>--with-gxx-include-dir=<em>dirname</em></code> during configuration.
</p>
Index: libstdc++-v3/docs/html/install.html
===================================================================
RCS file: /cvs/gcc/gcc/libstdc++-v3/docs/html/install.html,v
retrieving revision 1.28
diff -c -p -r1.28 install.html
*** libstdc++-v3/docs/html/install.html 18 Nov 2003 20:56:07 -0000 1.28
--- libstdc++-v3/docs/html/install.html 17 Jan 2004 09:58:20 -0000
*************** se_NO.UTF-8 UTF-8
*** 311,317 ****
ext/</pre>
<p>If you used the version-specific-libs configure option, then most of
the headers and library files will be moved under
! <code>lib/gcc-lib/</code> instead.
</p>
<hr />
--- 311,317 ----
ext/</pre>
<p>If you used the version-specific-libs configure option, then most of
the headers and library files will be moved under
! <code>lib/gcc/</code> instead.
</p>
<hr />
Index: zlib/configure
===================================================================
RCS file: /cvs/gcc/gcc/zlib/configure,v
retrieving revision 1.27
diff -c -p -r1.27 configure
*** zlib/configure 9 Sep 2003 06:24:39 -0000 1.27
--- zlib/configure 17 Jan 2004 09:58:25 -0000
*************** if test -n "$with_cross_host" &&
*** 2734,2740 ****
toolexecdir='$(exec_prefix)/$(target_alias)'
toolexeclibdir='$(toolexecdir)/lib'
else
! toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
toolexeclibdir='$(libdir)'
fi
if test "$GCC" = yes && $CC -print-multi-os-directory > /dev/null 2>&1; then
--- 2734,2740 ----
toolexecdir='$(exec_prefix)/$(target_alias)'
toolexeclibdir='$(toolexecdir)/lib'
else
! toolexecdir='$(libdir)/gcc/$(target_alias)'
toolexeclibdir='$(libdir)'
fi
if test "$GCC" = yes && $CC -print-multi-os-directory > /dev/null 2>&1; then
Index: zlib/configure.in
===================================================================
RCS file: /cvs/gcc/gcc/zlib/configure.in,v
retrieving revision 1.20
diff -c -p -r1.20 configure.in
*** zlib/configure.in 12 Jul 2003 02:04:33 -0000 1.20
--- zlib/configure.in 17 Jan 2004 09:58:25 -0000
*************** if test -n "$with_cross_host" &&
*** 118,124 ****
toolexecdir='$(exec_prefix)/$(target_alias)'
toolexeclibdir='$(toolexecdir)/lib'
else
! toolexecdir='$(libdir)/gcc-lib/$(target_alias)'
toolexeclibdir='$(libdir)'
fi
if test "$GCC" = yes && $CC -print-multi-os-directory > /dev/null 2>&1; then
--- 118,124 ----
toolexecdir='$(exec_prefix)/$(target_alias)'
toolexeclibdir='$(toolexecdir)/lib'
else
! toolexecdir='$(libdir)/gcc/$(target_alias)'
toolexeclibdir='$(libdir)'
fi
if test "$GCC" = yes && $CC -print-multi-os-directory > /dev/null 2>&1; then
More information about the Gcc-patches
mailing list