Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix linking on AIX/RS6000 by using -mminimal-toc option

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@16124 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2002-07-09 22:41:29 +00:00
parent 125cb99b36
commit 1d1b75ace9
2 changed files with 539 additions and 509 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1024
configure vendored
View File

File diff suppressed because it is too large Load Diff

20
configure.in
View File

@@ -1947,6 +1947,8 @@ equivalent variable and GTK+ is version 1.2.3 or above.
fi fi
fi fi
wxUSE_UNIVERSAL="yes"
TOOLKIT_INCLUDE="-I$MGL_ROOT/include" TOOLKIT_INCLUDE="-I$MGL_ROOT/include"
GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$mgl_lib_type/$mgl_os -lmgl -lmglcpp -lpm" GUI_TK_LIBRARY="-L$MGL_ROOT/lib/$mgl_lib_type/$mgl_os -lmgl -lmglcpp -lpm"
@@ -1973,11 +1975,13 @@ equivalent variable and GTK+ is version 1.2.3 or above.
TOOLKIT_INCLUDE="-I$MICROWINDOWS/include" TOOLKIT_INCLUDE="-I$MICROWINDOWS/include"
GUI_TK_LIBRARY="-L$MICROWINDOWS/lib -lmwin -lmwengine -mwfonts -mwdrivers -mwinlib" GUI_TK_LIBRARY="-L$MICROWINDOWS/lib -lmwin -lmwengine -mwfonts -mwdrivers -mwinlib"
wxUSE_UNIVERSAL="yes"
AFMINSTALL=afminstall AFMINSTALL=afminstall
TOOLKIT=MICROWIN TOOLKIT=MICROWIN
GUIDIST=MICROWIN_DIST GUIDIST=MICROWIN_DIST
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXUNIVERSAL__ -D__WXMSW__ -D__WIN95__ -D__WIN32__ -DMWIN -DMICROWIN_NOCONTROLS -DMICROWIN_TODO=1" TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__WXMSW__ -D__WIN95__ -D__WIN32__ -DMWIN -DMICROWIN_NOCONTROLS -DMICROWIN_TODO=1"
fi fi
if test "$wxUSE_X11" = 1; then if test "$wxUSE_X11" = 1; then
@@ -2036,6 +2040,8 @@ equivalent variable and GTK+ is version 1.2.3 or above.
) )
fi fi
wxUSE_UNIVERSAL="yes"
if test "$wxUSE_NANOX" = "yes"; then if test "$wxUSE_NANOX" = "yes"; then
TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox -I\$(MICROWIN)/src/include $TOOLKIT_INCLUDE" TOOLKIT_INCLUDE="-I\$(top_srcdir)/include/wx/x11/nanox -I\$(MICROWIN)/src/include $TOOLKIT_INCLUDE"
TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DLINUX=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1" TOOLCHAIN_DEFS="${TOOLCHAIN_DEFS} -D__NANOX__ -DMWPIXEL_FORMAT=MWPF_TRUECOLOR0888 -DHAVE_FILEIO -DHAVE_BMP_SUPPORT=1 -DHAVE_GIF_SUPPORT=1 -DHAVE_PNM_SUPPORT=1 -DHAVE_XPM_SUPPORT=1 -DLINUX=1 -DUNIX=1 -DUSE_EXPOSURE -DSCREEN_HEIGHT=480 -DSCREEN_WIDTH=640 -DSCREEN_DEPTH=4 -DX11=1"
@@ -3496,6 +3502,18 @@ if test "$GCC" = "yes" ; then
# they had a reason, right?? # they had a reason, right??
CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return" CODE_GEN_FLAGS="$CODE_GEN_FLAGS -fno-pcc-struct-return"
fi fi
dnl Ian Brown <ian.brown@printsoft.de> reports that versions of gcc before
dnl 3.0 overflow the table of contents on rs6000 as they create an entry
dnl for each subroutine by default -- using the switch below only creates
dnl one entry per file instead at the price of minor performance penalty
dnl
dnl TODO: test for the gcc version here (how?)
case "${host}" in
powerpc*-*-aix* )
CODE_GEN_FLAGS="$CODE_GEN_FLAGS -mminimal-toc"
;;
esac
fi fi
if test "$wxUSE_OPTIMISE" = "no" ; then if test "$wxUSE_OPTIMISE" = "no" ; then