applied_patches/0261-speed-hash-style.diff

   1 --- configure.in.old    2008-10-01 12:42:32.000000000 +0200
   2 +++ configure.in        2008-10-01 12:55:52.000000000 +0200
   3 @@ -540,6 +540,9 @@
   4                            libxul (default), xulrunner, firefox, seamonkey,
   5                            mozilla
   6  ], WITH_SYSTEM_MOZILLA=$withval, WITH_SYSTEM_MOZILLA=no)
   7 +AC_ARG_WITH(linker-hash-style,
   8 +[  --with-linker-hash-style
   9 +], WITH_LINKER_HASH_STYLE=$withval, WITH_LINKER_HASH_STYLE=gnu)
  10  AC_ARG_WITH(stlport,
  11  [  --with-stlport         The location that STLport is installed in. The STL
  12                            header files are assumed to be in
  13 @@ -1563,9 +1566,9 @@
  14  fi
  15
  16  if test "$GCC" = "yes"; then
  17 -   AC_MSG_CHECKING( for --hash-style=both linker support )
  18 +   AC_MSG_CHECKING( for --hash-style=$WITH_LINKER_HASH_STYLE linker support )
  19     hash_style_ldflags_save=$LDFLAGS
  20 -   LDFLAGS="$LDFLAGS -Wl,--hash-style=both"
  21 +   LDFLAGS="$LDFLAGS -Wl,--hash-style=$WITH_LINKER_HASH_STYLE"
  22     AC_LINK_IFELSE([AC_LANG_PROGRAM([
  23     #include <stdio.h>
  24     ],[
  25 @@ -1579,6 +1582,7 @@
  26     LDFLAGS=$hash_style_ldflags_save
  27  fi
  28  AC_SUBST(HAVE_LD_HASH_STYLE)
  29 +AC_SUBST(WITH_LINKER_HASH_STYLE)
  30
  31  dnl ===================================================================
  32  dnl  Test the IRIX SGI Mips pro compiler
  33 --- set_soenv.in
  34 +++ set_soenv.in
  35 @@ -1966,6 +1966,7 @@
  36  ToFile( "HAVE_GCC_VISIBILITY_BROKEN",
  37                 "@HAVE_GCC_VISIBILITY_BROKEN@", "e" );
  38  ToFile( "HAVE_LD_HASH_STYLE","@HAVE_LD_HASH_STYLE@","e" );
  39 +ToFile( "WITH_LINKER_HASH_STYLE","@WITH_LINKER_HASH_STYLE@","e" );
  40  ToFile( "HAVE_LD_BSYMBOLIC_FUNCTIONS",
  41                 "@HAVE_LD_BSYMBOLIC_FUNCTIONS@","e" );
  42  ToFile( "CXX",               $CXX,               "e" );
  43 --- solenv/inc/unxlngi6.mk      2008-10-01 12:42:32.000000000 +0200
  44 +++ solenv/inc/unxlngi6.mk      2008-10-01 13:00:26.000000000 +0200
  45 @@ -199,7 +199,7 @@
  46  STDSHLCUIMT+=-ltcmalloc
  47  .ENDIF
  48  .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
  49 -LINKFLAGS += -Wl,--hash-style=both
  50 +LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
  51  .ELSE
  52  LINKFLAGS += -Wl,-zdynsort
  53  .ENDIF
  54 --- solenv/inc/unxlngppc.mk     2008-10-01 12:42:32.000000000 +0200
  55 +++ solenv/inc/unxlngppc.mk     2008-10-01 13:01:09.000000000 +0200
  56 @@ -74,7 +74,7 @@
  57  CFLAGSENABLESYMBOLS=-g
  58  .ENDIF
  59  .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
  60 -LINKFLAGS += -Wl,--hash-style=both
  61 +LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
  62  .ELSE
  63  LINKFLAGS += -Wl,-zdynsort
  64  .ENDIF
  65 --- solenv/inc/unxlngs.mk       2008-10-01 12:42:32.000000000 +0200
  66 +++ solenv/inc/unxlngs.mk       2008-10-01 13:01:17.000000000 +0200
  67 @@ -76,7 +76,7 @@
  68  CFLAGSENABLESYMBOLS=-g
  69  .ENDIF
  70  .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
  71 -LINKFLAGS += -Wl,--hash-style=both
  72 +LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
  73  .ELSE
  74  LINKFLAGS += -Wl,-zdynsort
  75  .ENDIF
  76 --- solenv/inc/unxlngx6.mk
  77 +++ solenv/inc/unxlngx6.mk
  78 @@ -80,7 +80,7 @@
  79  .ENDIF
  80
  81  .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
  82 -LINKFLAGS += -Wl,--hash-style=both
  83 +LINKFLAGS += -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
  84  .ELSE
  85  LINKFLAGS += -Wl,-zdynsort
  86  .ENDIF
  87 --- stlport/makefile.mk
  88 +++ stlport/makefile.mk
  89 @@ -164,7 +164,7 @@
  90         BUILD_FLAGS+= -j$(MAXPROCESS)
  91  .ENDIF
  92  .IF "$(HAVE_LD_HASH_STYLE)"  == "TRUE"
  93 -CXX+= -Wl,--hash-style=both
  94 +CXX+= -Wl,--hash-style=$(WITH_LINKER_HASH_STYLE)
  95  .ENDIF
  96
  97  .IF "$(HAVE_LD_BSYMBOLIC_FUNCTIONS)"  == "TRUE"