This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
PATCH: correct and simplify fragment handling
- To: egcs-patches at cygnus dot com
- Subject: PATCH: correct and simplify fragment handling
- From: Franz Sirl <Franz dot Sirl-kernel at lauterbach dot com>
- Date: Sat, 30 Jan 1999 17:06:23 +0100
- Cc: rth at cygnus dot com
Hi,
this small patch corrects (on alpha/ppc-linux) and simplifies fragment handling
a bit. This is only a first try and I would like the
configure/crossbuild gurus to have a look at it. Richard already checked in a
similar fix into egcs_1_1_branch, but hasn't done a "nicer" :-) one for the
mainline yet.
Franz.
* configure.in: special case AIX, no -fPIC flag needed here
* libiberty/config.table: use generated mh-frag instead of
trying to find the right one again
' libio/configure.in: Likewise
' libstdc++/configure.in: Likewise
Index: configure.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/configure.in,v
retrieving revision 1.31
diff -u -p -r1.31 configure.in
--- configure.in 1999/01/30 07:07:41 1.31
+++ configure.in 1999/01/30 15:42:45
@@ -295,6 +295,8 @@ if [ x${shared} = xyes ]; then
sparc64-*)
host_makefile_frag="${host_makefile_frag} config/mh-sparcpic"
;;
+ powerpc*-*-aix*)
+ ;;
powerpc*-*)
host_makefile_frag="${host_makefile_frag} config/mh-ppcpic"
;;
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/libio/configure.in,v
retrieving revision 1.15
diff -u -p -r1.15 configure.in
--- configure.in 1998/11/26 01:48:29 1.15
+++ configure.in 1999/01/30 15:43:24
@@ -66,13 +66,7 @@ case "${enable_shared}" in
esac
if [ "${shared}" = "yes" ]; then
- case "${target}" in
- hppa*-*) frags="${frags} ../../config/mh-papic" ;;
- i[3456]86-*) frags="${frags} ../../config/mh-x86pic" ;;
- alpha*-*-linux*)
- frags="${frags} ../../config/mh-elfalphapic" ;;
- *) frags="${frags} ../../config/mh-${target_cpu}pic" ;;
- esac
+ frags="${frags} $r/mh-frag"
fi
# Take care of header file lossage.
@@ -115,7 +109,9 @@ for frag in ${frags}; do
fi
;;
esac
- frag=${srcdir}/config/$frag
+ if [ ! -f ${frag} ]; then
+ frag=${srcdir}/config/$frag
+ fi
if [ -f ${frag} ]; then
echo "Appending ${frag} to target-mkfrag"
echo "# Following fragment copied from ${frag}" >> temp.mt
Index: libstdc++/configure.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/libstdc++/configure.in,v
retrieving revision 1.16
diff -u -p -r1.16 configure.in
--- configure.in 1999/01/30 07:09:10 1.16
+++ configure.in 1999/01/30 15:43:25
@@ -52,12 +52,8 @@ case "${enable_shared}" in
esac
if [ "${shared}" = "yes" ]; then
+ frags=$r/mh-frag
case "${target}" in
- hppa*-*-*) frags=../../config/mh-papic ;;
- i[3456]86-*-*) frags=../../config/mh-x86pic ;;
- *-*-*) frags=../../config/mh-${target_cpu}pic ;;
- esac
- case "${target}" in
*-dec-osf*) frags="${frags} dec-osf.ml";;
*-*-hpux*) frags="${frags} hpux.ml" ;;
*-*-irix[56]*) frags="${frags} irix5.ml" ;;
@@ -88,7 +84,9 @@ for frag in ${frags}; do
fi
;;
esac
- frag=${srcdir}/config/$frag
+ if [ ! -f ${frag} ]; then
+ frag=${srcdir}/config/$frag
+ fi
if [ -f ${frag} ]; then
echo "Appending ${frag} to target-mkfrag"
echo "# Following fragment copied from ${frag}" >> temp.mt
Index: config.table
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/libiberty/config.table,v
retrieving revision 1.10
diff -u -p -r1.10 config.table
--- config.table 1998/10/08 22:48:50 1.10
+++ config.table 1999/01/30 15:51:02
@@ -17,12 +17,7 @@ case "${enable_shared}" in
*) shared=yes ;;
esac
if [ "${shared}" = "yes" ]; then
- case "${host}" in
- *-*-cygwin32*) ;;
- hppa*-*-*) frags="${frags} ../../config/mh-papic" ;;
- i[3456]86-*-*) frags="${frags} ../../config/mh-x86pic" ;;
- *-*-*) frags="${frags} ../../config/mh-${host_cpu}pic" ;;
- esac
+ frags="${frags} $r/mh-frag"
fi
echo "# Warning: this fragment is automatically generated" > temp-frag
@@ -36,7 +31,9 @@ for frag in ${frags}; do
fi
;;
esac
- frag=${srcdir}/${xsrcdir}config/$frag
+ if [ ! -f ${frag} ]; then
+ frag=${srcdir}/${xsrcdir}config/$frag
+ fi
if [ -f ${frag} ]; then
echo "Appending ${frag} to xhost-mkfrag"
echo "# Following fragment copied from ${frag}" >> temp-frag
Index: configure.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/configure.in,v
retrieving revision 1.31
diff -u -p -r1.31 configure.in
--- configure.in 1999/01/30 07:07:41 1.31
+++ configure.in 1999/01/30 15:42:45
@@ -295,6 +295,8 @@ if [ x${shared} = xyes ]; then
sparc64-*)
host_makefile_frag="${host_makefile_frag} config/mh-sparcpic"
;;
+ powerpc*-*-aix*)
+ ;;
powerpc*-*)
host_makefile_frag="${host_makefile_frag} config/mh-ppcpic"
;;
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/libio/configure.in,v
retrieving revision 1.15
diff -u -p -r1.15 configure.in
--- configure.in 1998/11/26 01:48:29 1.15
+++ configure.in 1999/01/30 15:43:24
@@ -66,13 +66,7 @@ case "${enable_shared}" in
esac
if [ "${shared}" = "yes" ]; then
- case "${target}" in
- hppa*-*) frags="${frags} ../../config/mh-papic" ;;
- i[3456]86-*) frags="${frags} ../../config/mh-x86pic" ;;
- alpha*-*-linux*)
- frags="${frags} ../../config/mh-elfalphapic" ;;
- *) frags="${frags} ../../config/mh-${target_cpu}pic" ;;
- esac
+ frags="${frags} $r/mh-frag"
fi
# Take care of header file lossage.
@@ -115,7 +109,9 @@ for frag in ${frags}; do
fi
;;
esac
- frag=${srcdir}/config/$frag
+ if [ ! -f ${frag} ]; then
+ frag=${srcdir}/config/$frag
+ fi
if [ -f ${frag} ]; then
echo "Appending ${frag} to target-mkfrag"
echo "# Following fragment copied from ${frag}" >> temp.mt
Index: libstdc++/configure.in
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/libstdc++/configure.in,v
retrieving revision 1.16
diff -u -p -r1.16 configure.in
--- configure.in 1999/01/30 07:09:10 1.16
+++ configure.in 1999/01/30 15:43:25
@@ -52,12 +52,8 @@ case "${enable_shared}" in
esac
if [ "${shared}" = "yes" ]; then
+ frags=$r/mh-frag
case "${target}" in
- hppa*-*-*) frags=../../config/mh-papic ;;
- i[3456]86-*-*) frags=../../config/mh-x86pic ;;
- *-*-*) frags=../../config/mh-${target_cpu}pic ;;
- esac
- case "${target}" in
*-dec-osf*) frags="${frags} dec-osf.ml";;
*-*-hpux*) frags="${frags} hpux.ml" ;;
*-*-irix[56]*) frags="${frags} irix5.ml" ;;
@@ -88,7 +84,9 @@ for frag in ${frags}; do
fi
;;
esac
- frag=${srcdir}/config/$frag
+ if [ ! -f ${frag} ]; then
+ frag=${srcdir}/config/$frag
+ fi
if [ -f ${frag} ]; then
echo "Appending ${frag} to target-mkfrag"
echo "# Following fragment copied from ${frag}" >> temp.mt
Index: config.table
===================================================================
RCS file: /egcs/carton/cvsfiles/egcs/libiberty/config.table,v
retrieving revision 1.10
diff -u -p -r1.10 config.table
--- config.table 1998/10/08 22:48:50 1.10
+++ config.table 1999/01/30 15:51:02
@@ -17,12 +17,7 @@ case "${enable_shared}" in
*) shared=yes ;;
esac
if [ "${shared}" = "yes" ]; then
- case "${host}" in
- *-*-cygwin32*) ;;
- hppa*-*-*) frags="${frags} ../../config/mh-papic" ;;
- i[3456]86-*-*) frags="${frags} ../../config/mh-x86pic" ;;
- *-*-*) frags="${frags} ../../config/mh-${host_cpu}pic" ;;
- esac
+ frags="${frags} $r/mh-frag"
fi
echo "# Warning: this fragment is automatically generated" > temp-frag
@@ -36,7 +31,9 @@ for frag in ${frags}; do
fi
;;
esac
- frag=${srcdir}/${xsrcdir}config/$frag
+ if [ ! -f ${frag} ]; then
+ frag=${srcdir}/${xsrcdir}config/$frag
+ fi
if [ -f ${frag} ]; then
echo "Appending ${frag} to xhost-mkfrag"
echo "# Following fragment copied from ${frag}" >> temp-frag