This is the mail archive of the
gcc-bugs@gcc.gnu.org
mailing list for the GCC project.
[971016]: PICFLAG vs. multilib - solution
- To: egcs-bugs at cygnus dot com
- Subject: [971016]: PICFLAG vs. multilib - solution
- From: Manfred Hollstein <manfred at s-direktnet dot de>
- Date: Thu, 23 Oct 97 14:38:40 +0200
- Reply-To: Manfred Hollstein <manfred at s-direktnet dot de>
Hi there,
as I mentioned earlier on the egcs mailing list, there are problems
with configurations which use a) shared libraries *and* b) multilib'ed
libs. One example is SunOS:
On Fri, 10 October 1997, 09:47:36, manfred@lts.sel.alcatel.de wrote:
Take a look at the command line how the various libstdc++.so get built
$ /u/b60/manfred/work/GNU/egcs-971008-sparc-sun-sunos4.1.4/gcc/xgcc -B/u/b60/manfred/work/GNU/egcs-971008-sparc-sun-sunos4.1.4/gcc/ -g -O2 -fno-implicit-templates -fpic -mcpu=v8 -fPIC -shared -o libstdc++.so.2.8.0 `cat piclist`
As you can see, both `-fpic' and `-fPIC' are used; the former comes from
for i in `${compiler} --print-multi-lib 2>/dev/null`; do \
while the latter comes hardcoded from config/mh-sparcpic which defines
PICFLAG=-fPIC
What we end up with is shared libs all built with -fPIC instead of what was
intended by --print-multi-lib.
The problem here is, that $(PICFLAG) overrides everything that the multilib stuff
defines differently. Even more, since both flags are used, (x)gcc fails to add the
proper -L<directory-which-contains-the-appropriate-libgcc.a> hence using the
libgcc.a in ${libsubdir} which hasn't been built using any pic flags :-( This is
the reason, why it fails with SunOS's native ld. It doesn't fail with GNU ld,
because:
`-assert KEYWORD'
This option is ignored for SunOS compatibility.
IMHO, we have to find a way
- to ignore what PICFLAG defines if the passed multi-lib options include
any pic related option
- and to use PICFLAG, if the multi-lib options don't include any pic flags.
I believe to have found a solution which I checked successfully on the
following configurations:
Native compilers:
i586-linux-gnulibc1 --enable-shared but *no* multilib conf.
sparc-sun-solaris2.5.1 --enable-shared but *no* multilib conf.
sparc-sun-sunos4.1.4 --enable-shared *and* multilib conf.
m68k-motorola-sysv *no* --enable-shared but *with* multilib conf.
m88k-motorola-sysv3 *no* --enable-shared and *no* multilib conf.
Cross compilers:
sparc-sun-solaris2.5.1 -> sparc-sun-sunos4.1.4
sparc-sun-solaris2.5.1 -> m68k-motorola-sysv
sparc-sun-solaris2.5.1 -> m88k-motorola-sysv3
The logic behind the appended patch is as follows:
- Instead of letting a hard-coded value for PICFLAG(_FOR_TARGET)
from the various mh-*pic and mt-*pic files decide, if we're going to
build a shared library, use a macro `enable_shared' to be
defined during configure.
- Don't pass PICFLAG(_FOR_TARGET) down to sub-makes; instead
use a `dynamic definition' from the mh-*pic/mt-*pic files,
which looks at the current value of "$(LIBCFLAGS) $(LIBCXXFLAGS)"
to see if they do already contain a pic related option and,
if not, to echo the default option.
I would appreciate, if the patch will be merged into one of the next
snapshots.
PS: Jeff, perhaps the linenumbers are not absolutely correct, because
I have several other patches installed; but the context is ok.
Thanks,
--
Manfred Hollstein If you have any questions about GNU SW:
Hindenburgstr. 13/1 <mailto:manfred@s-direktnet.de>
75446 Wiernsheim or take a look at
FRG <http://www.s-direktnet.de/HomePages/manfred/>
Public PGP key from
<http://www.s-direktnet.de/HomePages/manfred/manfred.asc>
ChangeLogs:
toplevel dir:
Thu Oct 23 14:03:59 1997 Manfred Hollstein <manfred@s-direktnet.de>
* Makefile.in (BASE_FLAGS_TO_PASS): Don't pass PICFLAG and
PICFLAG_FOR_TARGET.
(EXTRA_TARGET_FLAGS): Don't pass PICFLAG_FOR_TARGET.
* configure: Emit a definition for the new macro enable_shared
into each Makefile.
* config/mh-sparcpic (PICFLAG): Define to properly according
to current multilib configuration.
* config/mt-sparcpic (PICFLAG_FOR_TARGET): Define to properly
according to current multilib configuration.
libiberty:
Thu Oct 23 14:09:09 1997 Manfred Hollstein <manfred@s-direktnet.de>
* Makefile.in (FLAGS_TO_PASS): Don't pass PICFLAG.
(.c.o): Check value of enable_shared, not PICFLAG.
(stamp-picdir): Dito.
libio:
Thu Oct 23 14:11:22 1997 Manfred Hollstein <manfred@s-direktnet.de>
* config.shared (FLAGS_TO_PASS): Don't emit PICFLAG.
(.c.o): Check value of enable_shared, not PICFLAG.
(.C.o): Dito.
(.cc.o): Dito.
(stamp-picdir): Dito.
libstdc++:
Thu Oct 23 14:14:06 1997 Manfred Hollstein <manfred@s-direktnet.de>
* Makefile.in (piclist): Check value of enable_shared, not PICFLAG.
(stmp-string, ...): Dito.
(bigstmp-string, ...): Dito.
<<<<<<<<<<<<<<<<<<<<<<<<<< PATCH FOR PICFLAG >>>>>>>>>>>>>>>>>>>>>>>>
diff --context --recursive --show-c-function -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-971016.orig/Makefile.in egcs-971016/Makefile.in
*** egcs-971016.orig/Makefile.in Mon Sep 29 08:37:07 1997
--- egcs-971016/Makefile.in Mon Oct 20 12:20:36 1997
*************** BASE_FLAGS_TO_PASS = \
*** 338,345 ****
"MAKE=$(MAKE)" \
"MAKEINFO=$(MAKEINFO) $(MAKEINFOFLAGS)" \
"NM_FOR_TARGET=$(NM_FOR_TARGET)" \
- "PICFLAG=$(PICFLAG)" \
- "PICFLAG_FOR_TARGET=$(PICFLAG_FOR_TARGET)" \
"RANLIB_FOR_TARGET=$(RANLIB_FOR_TARGET)" \
"SHELL=$(SHELL)" \
"EXPECT=$(EXPECT)" \
--- 338,343 ----
*************** EXTRA_TARGET_FLAGS = \
*** 395,401 ****
'LIBCFLAGS=$$(LIBCFLAGS_FOR_TARGET)' \
'LIBCXXFLAGS=$$(LIBCXXFLAGS_FOR_TARGET)' \
'NM=$$(NM_FOR_TARGET)' \
- 'PICFLAG=$$(PICFLAG_FOR_TARGET)' \
'RANLIB=$$(RANLIB_FOR_TARGET)' \
'WINDRES=$$(WINDRES_FOR_TARGET)'
--- 393,398 ----
diff --context --recursive --show-c-function -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-971016.orig/config/mh-sparcpic egcs-971016/config/mh-sparcpic
*** egcs-971016.orig/config/mh-sparcpic Fri Aug 22 00:58:46 1997
--- egcs-971016/config/mh-sparcpic Thu Oct 23 14:18:54 1997
***************
*** 1 ****
! PICFLAG=-fPIC
--- 1 ----
! PICFLAG=`case "${LIBCFLAGS} ${LIBCXXFLAGS}" in *-fpic* ) echo -fpic ;; * ) echo -fPIC ;; esac`
diff --context --recursive --show-c-function -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-971016.orig/config/mt-sparcpic egcs-971016/config/mt-sparcpic
*** egcs-971016.orig/config/mt-sparcpic Fri Aug 22 00:58:46 1997
--- egcs-971016/config/mt-sparcpic Thu Oct 23 14:18:44 1997
***************
*** 1 ****
! PICFLAG_FOR_TARGET=-fPIC
--- 1 ----
! PICFLAG_FOR_TARGET=`case "${LIBCFLAGS} ${LIBCXXFLAGS}" in *-fpic* ) echo -fpic ;; * ) echo -fPIC ;; esac`
diff --context --recursive --show-c-function -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-971016.orig/configure egcs-971016/configure
*** egcs-971016.orig/configure Wed Oct 8 18:23:35 1997
--- egcs-971016/configure Wed Oct 22 10:34:43 1997
*************** EOF
*** 1171,1176 ****
--- 1171,1183 ----
echo site_makefile_frag = ${invsubdir}${site_makefile_frag} >>${Makefile}
fi
+ # record if we want to build shared libs.
+ if test -z "${enable_shared}"; then
+ echo enable_shared = no >> ${Makefile}
+ else
+ echo enable_shared = ${enable_shared} >> ${Makefile}
+ fi
+
# reset prefix, exec_prefix, srcdir, SUBDIRS, NONSUBDIRS,
# remove any form feeds.
if [ -z "${subdirs}" ]; then
diff --context --recursive --show-c-function -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-971016.orig/libiberty/Makefile.in egcs-971016/libiberty/Makefile.in
*** egcs-971016.orig/libiberty/Makefile.in Sat Oct 18 09:37:44 1997
--- egcs-971016/libiberty/Makefile.in Wed Oct 22 10:59:12 1997
*************** FLAGS_TO_PASS = \
*** 111,117 ****
"INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \
"LDFLAGS=$(LDFLAGS)" \
"LOADLIBES=$(LOADLIBES)" \
- "PICFLAG=$(PICFLAG)" \
"RANLIB=$(RANLIB)" \
"SHELL=$(SHELL)"
--- 111,116 ----
*************** INCDIR=$(srcdir)/$(MULTISRCTOP)../includ
*** 132,138 ****
COMPILE.c = $(CC) -c $(LIBCFLAGS) -I. -I$(INCDIR) $(HDEFINES)
.c.o:
! test -z "$(PICFLAG)" || \
$(COMPILE.c) $(PICFLAG) $< -o pic/$@
$(COMPILE.c) $<
--- 131,137 ----
COMPILE.c = $(CC) -c $(LIBCFLAGS) -I. -I$(INCDIR) $(HDEFINES)
.c.o:
! test x"$(enable_shared)" != xyes || \
$(COMPILE.c) $(PICFLAG) $< -o pic/$@
$(COMPILE.c) $<
*************** $(RULE2): $(REQUIRED_OFILES) $(HOST_OFIL
*** 268,274 ****
$(RANLIB) $(TARGETLIB)
stamp-picdir:
! if [ -n "$(PICFLAG)" ] && [ ! -d pic ]; then \
mkdir pic; \
else true; fi
touch stamp-picdir
--- 267,273 ----
$(RANLIB) $(TARGETLIB)
stamp-picdir:
! if [ x"$(enable_shared)" = xyes ] && [ ! -d pic ]; then \
mkdir pic; \
else true; fi
touch stamp-picdir
diff --context --recursive --show-c-function -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-971016.orig/libio/config.shared egcs-971016/libio/config.shared
*** egcs-971016.orig/libio/config.shared Sat Sep 27 06:06:54 1997
--- egcs-971016/libio/config.shared Wed Oct 22 10:59:55 1997
*************** if [ "${SUBDIRS}" != "" ] ; then
*** 228,234 ****
echo ' "MAKEINFO=$(MAKEINFO)" \'
echo ' "SHLIB=$(SHLIB)" \'
echo ' "SHCURSES=$(SHCURSES)" \'
- echo ' "PICFLAG=$(PICFLAG)" \'
echo ' "RUNTESTFLAGS=$(RUNTESTFLAGS)"'
fi
--- 229,234 ----
*************** echo '.SUFFIXES: .o .C .cc .c'
*** 256,262 ****
echo 'COMPILE.c = $(CC) -c $(XCFLAGS) $(CINCLUDES) $(MT_CFLAGS)'
echo '.c.o:'
if [ "${LIBDIR}" = "yes" ]; then
! echo ' test -z "$(PICFLAG)" ||\'
echo ' $(COMPILE.c) $(PICFLAG) $< -o pic/$@'
fi
echo ' $(COMPILE.c) $<'
--- 256,262 ----
echo 'COMPILE.c = $(CC) -c $(XCFLAGS) $(CINCLUDES) $(MT_CFLAGS)'
echo '.c.o:'
if [ "${LIBDIR}" = "yes" ]; then
! echo ' test x"$(enable_shared)" != xyes ||\'
echo ' $(COMPILE.c) $(PICFLAG) $< -o pic/$@'
fi
echo ' $(COMPILE.c) $<'
*************** echo ' $(COMPILE.c) $<'
*** 264,277 ****
echo 'COMPILE.cc = $(CXX) -c $(XCXXFLAGS) $(CXXINCLUDES) $(MT_CFLAGS)'
echo '.C.o:'
if [ "${LIBDIR}" = "yes" ]; then
! echo ' test -z "$(PICFLAG)" ||\'
echo ' $(COMPILE.cc) $(PICFLAG) $< -o pic/$@'
fi
echo ' $(COMPILE.cc) $<'
[ "${TOUCH_ON_COMPILE}" = "yes" ] && echo ' @touch stamp'
echo '.cc.o:'
if [ "${LIBDIR}" = "yes" ]; then
! echo ' test -z "$(PICFLAG)" || \'
echo ' $(COMPILE.cc) $(PICFLAG) $< -o pic/$@'
fi
echo ' $(COMPILE.cc) $<'
--- 264,277 ----
echo 'COMPILE.cc = $(CXX) -c $(XCXXFLAGS) $(CXXINCLUDES) $(MT_CFLAGS)'
echo '.C.o:'
if [ "${LIBDIR}" = "yes" ]; then
! echo ' test x"$(enable_shared)" != xyes ||\'
echo ' $(COMPILE.cc) $(PICFLAG) $< -o pic/$@'
fi
echo ' $(COMPILE.cc) $<'
[ "${TOUCH_ON_COMPILE}" = "yes" ] && echo ' @touch stamp'
echo '.cc.o:'
if [ "${LIBDIR}" = "yes" ]; then
! echo ' test x"$(enable_shared)" != xyes || \'
echo ' $(COMPILE.cc) $(PICFLAG) $< -o pic/$@'
fi
echo ' $(COMPILE.cc) $<'
*************** fi
*** 288,294 ****
if [ "${LIBDIR}" = "yes" ]; then
echo ''
echo 'stamp-picdir:'
! echo ' if [ -n "$(PICFLAG)" ] && [ ! -d pic ]; then \'
echo ' mkdir pic; \'
echo ' else true; fi'
echo ' touch stamp-picdir'
--- 288,294 ----
if [ "${LIBDIR}" = "yes" ]; then
echo ''
echo 'stamp-picdir:'
! echo ' if [ x"$(enable_shared)" = xyes ] && [ ! -d pic ]; then \'
echo ' mkdir pic; \'
echo ' else true; fi'
echo ' touch stamp-picdir'
diff --context --recursive --show-c-function -x *.o -x *.info* -x *.html* -x *.elc -x *.dvi -x *.orig -x *~ -x version.el egcs-971016.orig/libstdc++/Makefile.in egcs-971016/libstdc++/Makefile.in
*** egcs-971016.orig/libstdc++/Makefile.in Wed Aug 27 08:04:41 1997
--- egcs-971016/libstdc++/Makefile.in Wed Oct 22 10:30:54 1997
*************** stdlist: $(IO_DIR)/iostream.list $(OBJS)
*** 74,80 ****
piclist: stdlist
-rm -f tlist
cp stdlist tlist
! if [ -n "$(PICFLAG)" ]; then \
sed 's,\([A-Za-z_]*\.o\),pic/\1,g' tlist > tlist2 ; \
mv tlist2 tlist ; \
else true ; fi
--- 74,80 ----
piclist: stdlist
-rm -f tlist
cp stdlist tlist
! if [ x"$(enable_shared)" = xyes ]; then \
sed 's,\([A-Za-z_]*\.o\),pic/\1,g' tlist > tlist2 ; \
mv tlist2 tlist ; \
else true ; fi
*************** stmp-string: ${srcdir}/sinst.cc ${srcdir
*** 124,130 ****
${srcdir}/std/bastring.cc ${srcdir}/std/straits.h
for name in $(STRFUNCS) $(STRIO); do \
echo c$${name}; \
! if [ -n "$(PICFLAG)" ]; then \
$(COMPILE.cc) $(PICFLAG) -DC -D$${name} ${srcdir}/sinst.cc \
-o pic/c$${name}.o; \
else true ; fi; \
--- 124,130 ----
${srcdir}/std/bastring.cc ${srcdir}/std/straits.h
for name in $(STRFUNCS) $(STRIO); do \
echo c$${name}; \
! if [ x"$(enable_shared)" = xyes ]; then \
$(COMPILE.cc) $(PICFLAG) -DC -D$${name} ${srcdir}/sinst.cc \
-o pic/c$${name}.o; \
else true ; fi; \
*************** stmp-string: ${srcdir}/sinst.cc ${srcdir
*** 137,143 ****
bigstmp-string: ${srcdir}/sinst.cc ${srcdir}/std/bastring.h \
${srcdir}/std/bastring.cc ${srcdir}/std/straits.h
echo cstring
! if [ -n "$(PICFLAG)" ]; then \
$(COMPILE.cc) $(PICFLAG) -DC \
`for N in $(STRFUNCS); do echo " -D$${N}"; done` \
$(srcdir)/sinst.cc -o pic/cstrmain.o; \
--- 137,143 ----
bigstmp-string: ${srcdir}/sinst.cc ${srcdir}/std/bastring.h \
${srcdir}/std/bastring.cc ${srcdir}/std/straits.h
echo cstring
! if [ x"$(enable_shared)" = xyes ]; then \
$(COMPILE.cc) $(PICFLAG) -DC \
`for N in $(STRFUNCS); do echo " -D$${N}"; done` \
$(srcdir)/sinst.cc -o pic/cstrmain.o; \
*************** bigstmp-string: ${srcdir}/sinst.cc ${src
*** 145,151 ****
$(COMPILE.cc) -DC `for N in $(STRFUNCS); do echo " -D$${N}"; done` \
$(srcdir)/sinst.cc -o cstrmain.o
echo cstrio
! if [ -n "$(PICFLAG)" ]; then \
$(COMPILE.cc) $(PICFLAG) -DC \
`for N in $(STRIO); do echo " -D$${N}"; done` \
$(srcdir)/sinst.cc -o pic/cstrio.o; \
--- 145,151 ----
$(COMPILE.cc) -DC `for N in $(STRFUNCS); do echo " -D$${N}"; done` \
$(srcdir)/sinst.cc -o cstrmain.o
echo cstrio
! if [ x"$(enable_shared)" = xyes ]; then \
$(COMPILE.cc) $(PICFLAG) -DC \
`for N in $(STRIO); do echo " -D$${N}"; done` \
$(srcdir)/sinst.cc -o pic/cstrio.o; \
*************** stmp-complex: ${srcdir}/cinst.cc ${srcdi
*** 164,170 ****
${srcdir}/std/ldcomplex.h
for N in $(COMFUNCS) $(COMIO); do \
echo f$${N}; \
! if [ -n "$(PICFLAG)" ]; then \
$(COMPILE.cc) $(PICFLAG) -DF -D$${N} $(srcdir)/cinst.cc \
-o pic/f$${N}.o; \
else true ; fi; \
--- 164,170 ----
${srcdir}/std/ldcomplex.h
for N in $(COMFUNCS) $(COMIO); do \
echo f$${N}; \
! if [ x"$(enable_shared)" = xyes ]; then \
$(COMPILE.cc) $(PICFLAG) -DF -D$${N} $(srcdir)/cinst.cc \
-o pic/f$${N}.o; \
else true ; fi; \
*************** stmp-complex: ${srcdir}/cinst.cc ${srcdi
*** 172,178 ****
$(COMPILE.cc) -DF -D$${N} ${srcdir}/cinst.cc -o f$${N}.o; \
if [ $$? -eq 0 ]; then true; else exit 1; fi; \
echo d$${N}; \
! if [ -n "$(PICFLAG)" ]; then \
$(COMPILE.cc) $(PICFLAG) -DD -D$${N} $(srcdir)/cinst.cc \
-o pic/d$${N}.o; \
else true ; fi; \
--- 172,178 ----
$(COMPILE.cc) -DF -D$${N} ${srcdir}/cinst.cc -o f$${N}.o; \
if [ $$? -eq 0 ]; then true; else exit 1; fi; \
echo d$${N}; \
! if [ x"$(enable_shared)" = xyes ]; then \
$(COMPILE.cc) $(PICFLAG) -DD -D$${N} $(srcdir)/cinst.cc \
-o pic/d$${N}.o; \
else true ; fi; \
*************** stmp-complex: ${srcdir}/cinst.cc ${srcdi
*** 180,186 ****
$(COMPILE.cc) -DD -D$${N} ${srcdir}/cinst.cc -o d$${N}.o; \
if [ $$? -eq 0 ]; then true; else exit 1; fi; \
echo ld$${N}; \
! if [ -n "$(PICFLAG)" ]; then \
$(COMPILE.cc) $(PICFLAG) -DLD -D$${N} $(srcdir)/cinst.cc \
-o pic/ld$${N}.o; \
else true ; fi; \
--- 180,186 ----
$(COMPILE.cc) -DD -D$${N} ${srcdir}/cinst.cc -o d$${N}.o; \
if [ $$? -eq 0 ]; then true; else exit 1; fi; \
echo ld$${N}; \
! if [ x"$(enable_shared)" = xyes ]; then \
$(COMPILE.cc) $(PICFLAG) -DLD -D$${N} $(srcdir)/cinst.cc \
-o pic/ld$${N}.o; \
else true ; fi; \
*************** bigstmp-complex: ${srcdir}/cinst.cc ${sr
*** 194,200 ****
${srcdir}/std/complext.cc ${srcdir}/std/dcomplex.h \
${srcdir}/std/ldcomplex.h
echo fcomplex
! if [ -n "$(PICFLAG)" ]; then \
$(COMPILE.cc) $(PICFLAG) -DF \
`for N in $(COMFUNCS); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o pic/fcomplex.o; \
--- 194,200 ----
${srcdir}/std/complext.cc ${srcdir}/std/dcomplex.h \
${srcdir}/std/ldcomplex.h
echo fcomplex
! if [ x"$(enable_shared)" = xyes ]; then \
$(COMPILE.cc) $(PICFLAG) -DF \
`for N in $(COMFUNCS); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o pic/fcomplex.o; \
*************** bigstmp-complex: ${srcdir}/cinst.cc ${sr
*** 202,208 ****
$(COMPILE.cc) -DF `for N in $(COMFUNCS); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o fcomplex.o
echo fcomio
! if [ -n "$(PICFLAG)" ]; then \
$(COMPILE.cc) $(PICFLAG) -DF \
`for N in $(COMIO); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o pic/fcomio.o; \
--- 202,208 ----
$(COMPILE.cc) -DF `for N in $(COMFUNCS); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o fcomplex.o
echo fcomio
! if [ x"$(enable_shared)" = xyes ]; then \
$(COMPILE.cc) $(PICFLAG) -DF \
`for N in $(COMIO); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o pic/fcomio.o; \
*************** bigstmp-complex: ${srcdir}/cinst.cc ${sr
*** 210,216 ****
$(COMPILE.cc) -DF `for N in $(COMIO); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o fcomio.o
echo dcomplex
! if [ -n "$(PICFLAG)" ]; then \
$(COMPILE.cc) $(PICFLAG) -DD \
`for N in $(COMFUNCS); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o pic/dcomplex.o; \
--- 210,216 ----
$(COMPILE.cc) -DF `for N in $(COMIO); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o fcomio.o
echo dcomplex
! if [ x"$(enable_shared)" = xyes ]; then \
$(COMPILE.cc) $(PICFLAG) -DD \
`for N in $(COMFUNCS); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o pic/dcomplex.o; \
*************** bigstmp-complex: ${srcdir}/cinst.cc ${sr
*** 218,224 ****
$(COMPILE.cc) -DD `for N in $(COMFUNCS); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o dcomplex.o
echo dcomio
! if [ -n "$(PICFLAG)" ]; then \
$(COMPILE.cc) $(PICFLAG) -DD \
`for N in $(COMIO); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o pic/dcomio.o; \
--- 218,224 ----
$(COMPILE.cc) -DD `for N in $(COMFUNCS); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o dcomplex.o
echo dcomio
! if [ x"$(enable_shared)" = xyes ]; then \
$(COMPILE.cc) $(PICFLAG) -DD \
`for N in $(COMIO); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o pic/dcomio.o; \
*************** bigstmp-complex: ${srcdir}/cinst.cc ${sr
*** 226,232 ****
$(COMPILE.cc) -DD `for N in $(COMIO); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o dcomio.o
echo ldcomplex
! if [ -n "$(PICFLAG)" ]; then \
$(COMPILE.cc) $(PICFLAG) -DLD \
`for N in $(COMFUNCS); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o pic/ldcomplex.o; \
--- 226,232 ----
$(COMPILE.cc) -DD `for N in $(COMIO); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o dcomio.o
echo ldcomplex
! if [ x"$(enable_shared)" = xyes ]; then \
$(COMPILE.cc) $(PICFLAG) -DLD \
`for N in $(COMFUNCS); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o pic/ldcomplex.o; \
*************** bigstmp-complex: ${srcdir}/cinst.cc ${sr
*** 234,240 ****
$(COMPILE.cc) -DLD `for N in $(COMFUNCS); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o ldcomplex.o
echo ldcomio
! if [ -n "$(PICFLAG)" ]; then \
$(COMPILE.cc) $(PICFLAG) -DLD \
`for N in $(COMIO); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o pic/ldcomio.o; \
--- 234,240 ----
$(COMPILE.cc) -DLD `for N in $(COMFUNCS); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o ldcomplex.o
echo ldcomio
! if [ x"$(enable_shared)" = xyes ]; then \
$(COMPILE.cc) $(PICFLAG) -DLD \
`for N in $(COMIO); do echo " -D$${N}"; done` \
$(srcdir)/cinst.cc -o pic/ldcomio.o; \
*************** install:
*** 249,263 ****
if [ -z "$(MULTISUBDIR)" ]; then \
cd $(srcdir); \
for FILE in $(HEADERS) *.h std/*.*; do \
! rm -f $(gxx_includedir)/$$FILE ; \
! $(INSTALL_DATA) $$FILE $(gxx_includedir)/$$FILE ; \
! chmod a-x $(gxx_includedir)/$$FILE ; \
done ; \
cd stl; \
for FILE in *.h; do \
! rm -f $(gxx_includedir)/$$FILE ; \
! $(INSTALL_DATA) $$FILE $(gxx_includedir)/$$FILE ; \
! chmod a-x $(gxx_includedir)/$$FILE ; \
done ; \
else true ; \
fi
--- 249,263 ----
if [ -z "$(MULTISUBDIR)" ]; then \
cd $(srcdir); \
for FILE in $(HEADERS) *.h std/*.*; do \
! rm -f $(gxx_include_dir)/$$FILE ; \
! $(INSTALL_DATA) $$FILE $(gxx_include_dir)/$$FILE ; \
! chmod a-x $(gxx_include_dir)/$$FILE ; \
done ; \
cd stl; \
for FILE in *.h; do \
! rm -f $(gxx_include_dir)/$$FILE ; \
! $(INSTALL_DATA) $$FILE $(gxx_include_dir)/$$FILE ; \
! chmod a-x $(gxx_include_dir)/$$FILE ; \
done ; \
else true ; \
fi
<<<<<<<<<<<<<<<<<<<<<<< END OF PATCH FOR PICFLAG >>>>>>>>>>>>>>>>>>>>