[SM-Commit] GIT changes to master sorcery by Jaka Kranjc (c66d120060bcc8d27280f7527c05aa08ea8f1de6)

Jaka Kranjc scm at sourcemage.org
Sat Oct 10 06:48:25 EDT 2009


GIT changes to master sorcery by Jaka Kranjc <lynxlynxlynx at sourcemage.org>:

 ChangeLog                          |    2 ++
 usr/sbin/sorcery                   |    4 +---
 var/lib/sorcery/modules/libsorcery |   10 ++--------
 3 files changed, 5 insertions(+), 11 deletions(-)

New commits:
commit c66d120060bcc8d27280f7527c05aa08ea8f1de6
Author: Jaka Kranjc <lynxlynxlynx at sourcemage.org>
Commit: Jaka Kranjc <lynxlynxlynx at sourcemage.org>

    sorcery, libsorcery: removed combreloc, it is on by default where
          appropriate #10750

diff --git a/ChangeLog b/ChangeLog
index 81c8f41..d2fbc77 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,8 @@
 	* cast: moved override_grimoires to libsorcery
 	* delve: added support for overriding grimoires with -g #15211
 	* api2: call delve with -g when not working with all grimoires #15211
+	* sorcery, libsorcery: removed combreloc, it is on by default where
+	  appropriate #10750
 
 2009-09-04 Jaka Kranjc <lynxlynxlynx at sourcemage.org>
 	* api2: fixed two debug statements
diff --git a/usr/sbin/sorcery b/usr/sbin/sorcery
index 82560ee..b3c76c4 100755
--- a/usr/sbin/sorcery
+++ b/usr/sbin/sorcery
@@ -759,13 +759,12 @@ architecture_menu() {
 optimization_menu(){
 
   local OPTIMIZATIONS=${OPTIMIZATIONS}
-  # this is here so COMBRELOC, PRELINK, RISKY, etc. are set
+  # this is here so PRELINK, RISKY, etc. are set
   # and appear in the menu
   optimize
   local      OPT_TITLE="Optimization Menu"
   local       OPT_HELP="Please select optimizations"
 
-  local COMBRELOC_HELP="Speed up loading libs, also needed for prelink (LDFLAGS=-z combreloc)"
   local   PRELINK_HELP="Speed up loading applications by pre-linking libraries (CFLAGS=-DPIC -fPIC)"
   local     RISKY_HELP="Optimize by violating ANSI/IEEE (unsafe) (CFLAGS=-ffast-math -funroll-loops)"
   local    SPEEDY_HELP="Optimize generated code, conflicts with 'tiny' (CFLAGS=$FAST)"
@@ -779,7 +778,6 @@ optimization_menu(){
                               --checklist               \
                               "$OPT_HELP"               \
                                0 0 0                    \
-        "combreloc" "         ++speed"  "$COMBRELOC" "$COMBRELOC_HELP" \
         "prelink"   "          +speed"  "$PRELINK"   "$PRELINK_HELP"   \
         "risky"     "          +speed"  "$RISKY"     "$RISKY_HELP"     \
         "speedy"    "  +size  ++speed"  "$SPEEDY"    "$SPEEDY_HELP"    \
diff --git a/var/lib/sorcery/modules/libsorcery b/var/lib/sorcery/modules/libsorcery
index abb5483..49ccde0 100755
--- a/var/lib/sorcery/modules/libsorcery
+++ b/var/lib/sorcery/modules/libsorcery
@@ -618,15 +618,14 @@ function dirnames()  {
 ## option passed.  Options may be on or more of:  i386, i486, i586,
 ## pentium, pentium-mmx, i686, pentiumpro, pentium2, pentium3,
 ## pentium4, k6, k6-2, k6-3, athlon, athlon-tbird, athlon-4,
-## athlon-xp, athlon-mp, powerpc, speedy, tiny, risky, strip,
-## combreloc
+## athlon-xp, athlon-mp, powerpc, speedy, tiny, risky, strip
 ##
 #---------------------------------------------------------------------
 function optimize()  {
   debug "libsorcery" "In optimize()"
 
   unset  CFLAGS CXXFLAGS LDFLAGS CPPFLAGS
-  unset  COMBRELOC FAST PRELINK RISKY SMALL SPEEDY STRIP TINY
+  unset  FAST PRELINK RISKY SMALL SPEEDY STRIP TINY
 
   # if user specified --no-opts then use only the args from the command line
   # otherwise do the normal stuff
@@ -647,11 +646,6 @@ function optimize()  {
     CFLAGS="$CFLAGS -pipe"
     for  PARAM  in  $OPTIMIZATIONS;  do
       case  $PARAM  in
-        combreloc)
-          LDFLAGS="$LDFLAGS -z combreloc"
-          COMBRELOC="on"
-          ;;
-
         prelink)
           CFLAGS="$CFLAGS -DPIC -fPIC"
           PRELINK="on"



More information about the SM-Commit mailing list