1 diff --git a/profile/dirserviceprovider/src/nsProfileLock.cpp b/profile/dirserviceprovider/src/nsProfileLock.cpp

     2 --- a/profile/dirserviceprovider/src/nsProfileLock.cpp

     3 +++ b/profile/dirserviceprovider/src/nsProfileLock.cpp

     4 @@ -154,17 +154,18 @@ void nsProfileLock::RemovePidLockFiles()

     5  static struct sigaction SIGHUP_oldact;

     6  static struct sigaction SIGINT_oldact;

     7  static struct sigaction SIGQUIT_oldact;

     8  static struct sigaction SIGILL_oldact;

     9  static struct sigaction SIGABRT_oldact;

    10  static struct sigaction SIGSEGV_oldact;

    11  static struct sigaction SIGTERM_oldact;

    12  

    13 -void nsProfileLock::FatalSignalHandler(int signo)

    14 +void nsProfileLock::FatalSignalHandler(int signo, siginfo_t *info,

    15 +                                       void *context)

    16  {

    17      // Remove any locks still held.

    18      RemovePidLockFiles();

    19  

    20      // Chain to the old handler, which may exit.

    21      struct sigaction *oldact = nsnull;

    22  

    23      switch (signo) {

    24 @@ -206,16 +207,20 @@ void nsProfileLock::FatalSignalHandler(i

    25              sigset_t unblock_sigs;

    26              sigemptyset(&unblock_sigs);

    27              sigaddset(&unblock_sigs, signo);

    28  

    29              sigprocmask(SIG_UNBLOCK, &unblock_sigs, NULL);

    30  

    31              raise(signo);

    32          }

    33 +        else if (oldact->sa_sigaction &&

    34 +                 (oldact->sa_flags & SA_SIGINFO) == SA_SIGINFO) {

    35 +            oldact->sa_sigaction(signo, info, context);

    36 +        }

    37          else if (oldact->sa_handler && oldact->sa_handler != SIG_IGN)

    38          {

    39              oldact->sa_handler(signo);

    40          }

    41      }

    42  

    43      // Backstop exit call, just in case.

    44      _exit(signo);

    45 @@ -382,18 +387,18 @@ nsresult nsProfileLock::LockWithSymlink(

    46                  // Clean up on normal termination.

    47                  atexit(RemovePidLockFiles);

    48  

    49                  // Clean up on abnormal termination, using POSIX sigaction.

    50                  // Don't arm a handler if the signal is being ignored, e.g.,

    51                  // because mozilla is run via nohup.

    52                  if (!sDisableSignalHandling) {

    53                      struct sigaction act, oldact;

    54 -                    act.sa_handler = FatalSignalHandler;

    55 -                    act.sa_flags = 0;

    56 +                    act.sa_sigaction = FatalSignalHandler;

    57 +                    act.sa_flags = SA_SIGINFO;

    58                      sigfillset(&act.sa_mask);

    59  

    60  #define CATCH_SIGNAL(signame)                                           \

    61  PR_BEGIN_MACRO                                                          \

    62    if (sigaction(signame, NULL, &oldact) == 0 &&                         \

    63        oldact.sa_handler != SIG_IGN)                                     \

    64    {                                                                     \

    65        sigaction(signame, &act, &signame##_oldact);                      \

    66 diff --git a/profile/dirserviceprovider/src/nsProfileLock.h b/profile/dirserviceprovider/src/nsProfileLock.h

    67 --- a/profile/dirserviceprovider/src/nsProfileLock.h

    68 +++ b/profile/dirserviceprovider/src/nsProfileLock.h

    69 @@ -50,16 +50,17 @@ class nsIProfileUnlocker;

    70  

    71  #if defined (XP_OS2)

    72  #define INCL_DOSERRORS

    73  #define INCL_DOSFILEMGR

    74  #include <os2.h>

    75  #endif

    76  

    77  #if defined (XP_UNIX)

    78 +#include <signal.h>

    79  #include "prclist.h"

    80  #endif

    81  

    82  class nsProfileLock

    83  #if defined (XP_UNIX)

    84    : public PRCList

    85  #endif

    86  {

    87 @@ -87,17 +88,18 @@ private:

    88      PRPackedBool            mHaveLock;

    89  

    90  #if defined (XP_WIN)

    91      HANDLE                  mLockFileHandle;

    92  #elif defined (XP_OS2)

    93      LHANDLE                 mLockFileHandle;

    94  #elif defined (XP_UNIX)

    95      static void             RemovePidLockFiles();

    96 -    static void             FatalSignalHandler(int signo);

    97 +    static void             FatalSignalHandler(int signo, siginfo_t *info,

    98 +                                               void *context);

    99      static PRCList          mPidLockList;

   100  

   101      nsresult                LockWithFcntl(const nsACString& lockFilePath);

   102  

   103      /**

   104       * @param aHaveFcntlLock if true, we've already acquired an fcntl lock so this

   105       * lock is merely an "obsolete" lock to keep out old Firefoxes

   106       */

   107 diff --git a/toolkit/crashreporter/Makefile.in b/toolkit/crashreporter/Makefile.in

   108 --- a/toolkit/crashreporter/Makefile.in

   109 +++ b/toolkit/crashreporter/Makefile.in

   110 @@ -77,16 +77,17 @@ endif

   111  ifeq ($(OS_ARCH),Linux)

   112  # there's no define for this normally

   113  DEFINES += -DXP_LINUX

   114  DIRS += \

   115    google-breakpad/src/common \

   116    google-breakpad/src/common/linux \

   117    google-breakpad/src/client \

   118    google-breakpad/src/client/linux/handler \

   119 +  google-breakpad/src/client/linux/minidump_writer \

   120    google-breakpad/src/tools/linux/dump_syms \

   121    $(NULL)

   122  endif

   123  

   124  ifeq ($(OS_ARCH),SunOS)

   125  # there's no define for this normally

   126  DEFINES += -DXP_SOLARIS

   127  DIRS += \

   128 diff --git a/toolkit/crashreporter/client/Makefile.in b/toolkit/crashreporter/client/Makefile.in

   129 --- a/toolkit/crashreporter/client/Makefile.in

   130 +++ b/toolkit/crashreporter/client/Makefile.in

   131 @@ -80,29 +80,27 @@ endif

   132  ifeq ($(OS_ARCH),Linux)

   133  CPPSRCS += crashreporter_linux.cpp

   134  LIBS += \

   135    $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/linux/$(LIB_PREFIX)breakpad_linux_common_s.$(LIB_SUFFIX) \

   136    $(NULL)

   137  LOCAL_INCLUDES += -I$(srcdir)

   138  OS_CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_GTHREAD_CFLAGS)

   139  OS_LIBS += $(MOZ_GTK2_LIBS) $(MOZ_GTHREAD_LIBS)

   140 -CPPSRCS += http_upload.cc

   141  FORCE_USE_PIC=1

   142  endif

   143  

   144  ifeq ($(OS_ARCH),SunOS)

   145  CPPSRCS += crashreporter_linux.cpp

   146  LIBS += \

   147    $(DEPTH)/toolkit/crashreporter/google-breakpad/src/common/solaris/$(LIB_PREFIX)breakpad_solaris_common_s.$(LIB_SUFFIX) \

   148    $(NULL)

   149  LOCAL_INCLUDES += -I$(srcdir)

   150  OS_CXXFLAGS += $(MOZ_GTK2_CFLAGS) $(MOZ_GTHREAD_CFLAGS)

   151  OS_LIBS += $(MOZ_GTK2_LIBS) $(MOZ_GTHREAD_LIBS)

   152 -CPPSRCS += http_upload.cc

   153  FORCE_USE_PIC=1

   154  endif

   155  

   156  include $(topsrcdir)/config/rules.mk

   157  

   158  ifeq ($(OS_ARCH),Darwin)

   159  libs::

   160  	$(NSINSTALL) -D $(DIST)/bin/crashreporter.app

   161 @@ -110,14 +108,11 @@ libs::

   162  	sed -e "s/%APP_NAME%/$(MOZ_APP_DISPLAYNAME)/" $(srcdir)/macbuild/Contents/Resources/English.lproj/InfoPlist.strings.in | \

   163  	  iconv -f UTF-8 -t UTF-16 > $(DIST)/bin/crashreporter.app/Contents/Resources/English.lproj/InfoPlist.strings

   164  	$(NSINSTALL) -D $(DIST)/bin/crashreporter.app/Contents/MacOS

   165  	$(NSINSTALL) $(DIST)/bin/crashreporter $(DIST)/bin/crashreporter.app/Contents/MacOS

   166  	rm -f $(DIST)/bin/crashreporter

   167  endif

   168  

   169  ifeq (,$(filter-out Linux SunOS,$(OS_ARCH)))

   170 -export:: $(srcdir)/../google-breakpad/src/common/linux/http_upload.cc

   171 -	$(INSTALL) $^ .

   172 -

   173  libs:: $(topsrcdir)/toolkit/themes/winstripe/global/throbber/Throbber-small.gif

   174  	$(INSTALL) $^ $(DIST)/bin

   175  endif

   176 diff --git a/toolkit/crashreporter/google-breakpad/Makefile.am b/toolkit/crashreporter/google-breakpad/Makefile.am

   177 --- a/toolkit/crashreporter/google-breakpad/Makefile.am

   178 +++ b/toolkit/crashreporter/google-breakpad/Makefile.am

   179 @@ -90,16 +90,18 @@ src_libbreakpad_la_SOURCES = \

   180  	src/processor/range_map.h \

   181  	src/processor/scoped_ptr.h \

   182  	src/processor/simple_symbol_supplier.cc \

   183  	src/processor/simple_symbol_supplier.h \

   184  	src/processor/stack_frame_info.h \

   185  	src/processor/stackwalker.cc \

   186  	src/processor/stackwalker_amd64.cc \

   187  	src/processor/stackwalker_amd64.h \

   188 +	src/processor/stackwalker_arm.cc \

   189 +	src/processor/stackwalker_arm.h \

   190  	src/processor/stackwalker_ppc.cc \

   191  	src/processor/stackwalker_ppc.h \

   192  	src/processor/stackwalker_sparc.cc \

   193  	src/processor/stackwalker_sparc.h \

   194  	src/processor/stackwalker_x86.cc \

   195  	src/processor/stackwalker_x86.h

   196  

   197  

   198 @@ -110,16 +112,17 @@ bin_PROGRAMS = \

   199  

   200  

   201  ## Tests

   202  check_PROGRAMS = \

   203  	src/processor/address_map_unittest \

   204  	src/processor/basic_source_line_resolver_unittest \

   205  	src/processor/contained_range_map_unittest \

   206  	src/processor/minidump_processor_unittest \

   207 +	src/processor/minidump_unittest \

   208  	src/processor/pathname_stripper_unittest \

   209  	src/processor/postfix_evaluator_unittest \

   210  	src/processor/range_map_unittest

   211  

   212  if SELFTEST

   213  check_PROGRAMS += \

   214  	src/processor/stackwalker_selftest

   215  endif SELFTEST

   216 @@ -147,32 +150,55 @@ src_processor_basic_source_line_resolver

   217  

   218  src_processor_contained_range_map_unittest_SOURCES = \

   219  	src/processor/contained_range_map_unittest.cc

   220  src_processor_contained_range_map_unittest_LDADD = \

   221  	src/processor/logging.lo \

   222  	src/processor/pathname_stripper.lo

   223  

   224  src_processor_minidump_processor_unittest_SOURCES = \

   225 -	src/processor/minidump_processor_unittest.cc

   226 +	src/processor/minidump_processor_unittest.cc \

   227 +	src/testing/gtest/src/gtest-all.cc \

   228 +	src/testing/src/gmock-all.cc

   229 +src_processor_minidump_processor_unittest_CPPFLAGS = \

   230 +	-I$(top_srcdir)/src/testing/include \

   231 +        -I$(top_srcdir)/src/testing/gtest/include \

   232 +	-I$(top_srcdir)/src/testing/gtest \

   233 +	-I$(top_srcdir)/src/testing

   234  src_processor_minidump_processor_unittest_LDADD = \

   235  	src/processor/basic_code_modules.lo \

   236  	src/processor/basic_source_line_resolver.lo \

   237  	src/processor/call_stack.lo \

   238  	src/processor/logging.lo \

   239  	src/processor/minidump_processor.lo \

   240  	src/processor/minidump.lo \

   241  	src/processor/pathname_stripper.lo \

   242  	src/processor/process_state.lo \

   243  	src/processor/stackwalker.lo \

   244  	src/processor/stackwalker_amd64.lo \

   245 +	src/processor/stackwalker_arm.lo \

   246  	src/processor/stackwalker_ppc.lo \

   247  	src/processor/stackwalker_sparc.lo \

   248  	src/processor/stackwalker_x86.lo

   249  

   250 +src_processor_minidump_unittest_SOURCES = \

   251 +	src/processor/minidump_unittest.cc \

   252 +	src/testing/gtest/src/gtest-all.cc \

   253 +	src/testing/src/gmock-all.cc

   254 +src_processor_minidump_unittest_CPPFLAGS = \

   255 +	-I$(top_srcdir)/src/testing/include \

   256 +        -I$(top_srcdir)/src/testing/gtest/include \

   257 +	-I$(top_srcdir)/src/testing/gtest \

   258 +	-I$(top_srcdir)/src/testing

   259 +src_processor_minidump_unittest_LDADD = \

   260 +	src/processor/basic_code_modules.lo \

   261 +	src/processor/logging.lo \

   262 +	src/processor/minidump.lo \

   263 +	src/processor/pathname_stripper.lo

   264 +

   265  src_processor_pathname_stripper_unittest_SOURCES = \

   266  	src/processor/pathname_stripper_unittest.cc

   267  src_processor_pathname_stripper_unittest_LDADD = \

   268  	src/processor/pathname_stripper.lo

   269  

   270  src_processor_postfix_evaluator_unittest_SOURCES = \

   271  	src/processor/postfix_evaluator_unittest.cc

   272  src_processor_postfix_evaluator_unittest_LDADD = \

   273 @@ -191,16 +217,17 @@ src_processor_stackwalker_selftest_LDADD

   274  	src/processor/basic_code_modules.lo \

   275  	src/processor/basic_source_line_resolver.lo \

   276  	src/processor/call_stack.lo \

   277  	src/processor/logging.lo \

   278  	src/processor/minidump.lo \

   279  	src/processor/pathname_stripper.lo \

   280  	src/processor/stackwalker.lo \

   281  	src/processor/stackwalker_amd64.lo \

   282 +	src/processor/stackwalker_arm.lo \

   283  	src/processor/stackwalker_ppc.lo \

   284  	src/processor/stackwalker_sparc.lo \

   285  	src/processor/stackwalker_x86.lo

   286  

   287  ## Non-installables

   288  noinst_PROGRAMS =

   289  noinst_SCRIPTS = $(check_SCRIPTS)

   290  

   291 @@ -221,16 +248,17 @@ src_processor_minidump_stackwalk_LDADD =

   292  	src/processor/logging.lo \

   293  	src/processor/minidump.lo \

   294  	src/processor/minidump_processor.lo \

   295  	src/processor/pathname_stripper.lo \

   296  	src/processor/process_state.lo \

   297  	src/processor/simple_symbol_supplier.lo \

   298  	src/processor/stackwalker.lo \

   299  	src/processor/stackwalker_amd64.lo \

   300 +	src/processor/stackwalker_arm.lo \

   301  	src/processor/stackwalker_ppc.lo \

   302  	src/processor/stackwalker_sparc.lo \

   303  	src/processor/stackwalker_x86.lo

   304  

   305  

   306  ## Additional files to be included in a source distribution

   307  ##

   308  ## find src/client src/common src/processor/testdata src/tools \

   309 diff --git a/toolkit/crashreporter/google-breakpad/Makefile.in b/toolkit/crashreporter/google-breakpad/Makefile.in

   310 --- a/toolkit/crashreporter/google-breakpad/Makefile.in

   311 +++ b/toolkit/crashreporter/google-breakpad/Makefile.in

   312 @@ -142,18 +142,19 @@ src_processor_contained_range_map_unitte

   313  	src/processor/logging.lo src/processor/pathname_stripper.lo

   314  am_src_processor_minidump_dump_OBJECTS =  \

   315  	src/processor/minidump_dump.$(OBJEXT)

   316  src_processor_minidump_dump_OBJECTS =  \

   317  	$(am_src_processor_minidump_dump_OBJECTS)

   318  src_processor_minidump_dump_DEPENDENCIES =  \

   319  	src/processor/basic_code_modules.lo src/processor/logging.lo \

   320  	src/processor/minidump.lo src/processor/pathname_stripper.lo

   321 -am_src_processor_minidump_processor_unittest_OBJECTS =  \

   322 -	src/processor/minidump_processor_unittest.$(OBJEXT)

   323 +am_src_processor_minidump_processor_unittest_OBJECTS = src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.$(OBJEXT) \

   324 +	src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.$(OBJEXT) \

   325 +	src/testing/src/src_processor_minidump_processor_unittest-gmock-all.$(OBJEXT)

   326  src_processor_minidump_processor_unittest_OBJECTS =  \

   327  	$(am_src_processor_minidump_processor_unittest_OBJECTS)

   328  src_processor_minidump_processor_unittest_DEPENDENCIES =  \

   329  	src/processor/basic_code_modules.lo \

   330  	src/processor/basic_source_line_resolver.lo \

   331  	src/processor/call_stack.lo src/processor/logging.lo \

   332  	src/processor/minidump_processor.lo src/processor/minidump.lo \

   333  	src/processor/pathname_stripper.lo \

   334 @@ -284,16 +285,17 @@ CPP = @CPP@

   335  CPPFLAGS = @CPPFLAGS@

   336  CXX = @CXX@

   337  CXXCPP = @CXXCPP@

   338  CXXDEPMODE = @CXXDEPMODE@

   339  CXXFLAGS = @CXXFLAGS@

   340  CYGPATH_W = @CYGPATH_W@

   341  DEFS = @DEFS@

   342  DEPDIR = @DEPDIR@

   343 +DSYMUTIL = @DSYMUTIL@

   344  ECHO = @ECHO@

   345  ECHO_C = @ECHO_C@

   346  ECHO_N = @ECHO_N@

   347  ECHO_T = @ECHO_T@

   348  EGREP = @EGREP@

   349  EXEEXT = @EXEEXT@

   350  F77 = @F77@

   351  FFLAGS = @FFLAGS@

   352 @@ -307,25 +309,27 @@ LDFLAGS = @LDFLAGS@

   353  LIBOBJS = @LIBOBJS@

   354  LIBS = @LIBS@

   355  LIBTOOL = @LIBTOOL@

   356  LIBTOOL_DEPS = @LIBTOOL_DEPS@

   357  LN_S = @LN_S@

   358  LTLIBOBJS = @LTLIBOBJS@

   359  MAKEINFO = @MAKEINFO@

   360  MKDIR_P = @MKDIR_P@

   361 +NMEDIT = @NMEDIT@

   362  OBJEXT = @OBJEXT@

   363  PACKAGE = @PACKAGE@

   364  PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@

   365  PACKAGE_NAME = @PACKAGE_NAME@

   366  PACKAGE_STRING = @PACKAGE_STRING@

   367  PACKAGE_TARNAME = @PACKAGE_TARNAME@

   368  PACKAGE_VERSION = @PACKAGE_VERSION@

   369  PATH_SEPARATOR = @PATH_SEPARATOR@

   370  RANLIB = @RANLIB@

   371 +SED = @SED@

   372  SET_MAKE = @SET_MAKE@

   373  SHELL = @SHELL@

   374  STRIP = @STRIP@

   375  VERSION = @VERSION@

   376  abs_builddir = @abs_builddir@

   377  abs_srcdir = @abs_srcdir@

   378  abs_top_builddir = @abs_top_builddir@

   379  abs_top_srcdir = @abs_top_srcdir@

   380 @@ -466,17 +470,25 @@ src_processor_basic_source_line_resolver

   381  src_processor_contained_range_map_unittest_SOURCES = \

   382  	src/processor/contained_range_map_unittest.cc

   383  

   384  src_processor_contained_range_map_unittest_LDADD = \

   385  	src/processor/logging.lo \

   386  	src/processor/pathname_stripper.lo

   387  

   388  src_processor_minidump_processor_unittest_SOURCES = \

   389 -	src/processor/minidump_processor_unittest.cc

   390 +	src/processor/minidump_processor_unittest.cc \

   391 +	src/testing/gtest/src/gtest-all.cc \

   392 +	src/testing/src/gmock-all.cc

   393 +

   394 +src_processor_minidump_processor_unittest_CPPFLAGS = \

   395 +	-I$(top_srcdir)/src/testing/include \

   396 +        -I$(top_srcdir)/src/testing/gtest/include \

   397 +	-I$(top_srcdir)/src/testing/gtest \

   398 +	-I$(top_srcdir)/src/testing

   399  

   400  src_processor_minidump_processor_unittest_LDADD = \

   401  	src/processor/basic_code_modules.lo \

   402  	src/processor/basic_source_line_resolver.lo \

   403  	src/processor/call_stack.lo \

   404  	src/processor/logging.lo \

   405  	src/processor/minidump_processor.lo \

   406  	src/processor/minidump.lo \

   407 @@ -866,19 +878,37 @@ src/processor/contained_range_map_unitte

   408  src/processor/contained_range_map_unittest$(EXEEXT): $(src_processor_contained_range_map_unittest_OBJECTS) $(src_processor_contained_range_map_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)

   409  	@rm -f src/processor/contained_range_map_unittest$(EXEEXT)

   410  	$(CXXLINK) $(src_processor_contained_range_map_unittest_OBJECTS) $(src_processor_contained_range_map_unittest_LDADD) $(LIBS)

   411  src/processor/minidump_dump.$(OBJEXT): src/processor/$(am__dirstamp) \

   412  	src/processor/$(DEPDIR)/$(am__dirstamp)

   413  src/processor/minidump_dump$(EXEEXT): $(src_processor_minidump_dump_OBJECTS) $(src_processor_minidump_dump_DEPENDENCIES) src/processor/$(am__dirstamp)

   414  	@rm -f src/processor/minidump_dump$(EXEEXT)

   415  	$(CXXLINK) $(src_processor_minidump_dump_OBJECTS) $(src_processor_minidump_dump_LDADD) $(LIBS)

   416 -src/processor/minidump_processor_unittest.$(OBJEXT):  \

   417 +src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.$(OBJEXT):  \

   418  	src/processor/$(am__dirstamp) \

   419  	src/processor/$(DEPDIR)/$(am__dirstamp)

   420 +src/testing/gtest/src/$(am__dirstamp):

   421 +	@$(MKDIR_P) src/testing/gtest/src

   422 +	@: > src/testing/gtest/src/$(am__dirstamp)

   423 +src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp):

   424 +	@$(MKDIR_P) src/testing/gtest/src/$(DEPDIR)

   425 +	@: > src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)

   426 +src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.$(OBJEXT):  \

   427 +	src/testing/gtest/src/$(am__dirstamp) \

   428 +	src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)

   429 +src/testing/src/$(am__dirstamp):

   430 +	@$(MKDIR_P) src/testing/src

   431 +	@: > src/testing/src/$(am__dirstamp)

   432 +src/testing/src/$(DEPDIR)/$(am__dirstamp):

   433 +	@$(MKDIR_P) src/testing/src/$(DEPDIR)

   434 +	@: > src/testing/src/$(DEPDIR)/$(am__dirstamp)

   435 +src/testing/src/src_processor_minidump_processor_unittest-gmock-all.$(OBJEXT):  \

   436 +	src/testing/src/$(am__dirstamp) \

   437 +	src/testing/src/$(DEPDIR)/$(am__dirstamp)

   438  src/processor/minidump_processor_unittest$(EXEEXT): $(src_processor_minidump_processor_unittest_OBJECTS) $(src_processor_minidump_processor_unittest_DEPENDENCIES) src/processor/$(am__dirstamp)

   439  	@rm -f src/processor/minidump_processor_unittest$(EXEEXT)

   440  	$(CXXLINK) $(src_processor_minidump_processor_unittest_OBJECTS) $(src_processor_minidump_processor_unittest_LDADD) $(LIBS)

   441  src/processor/minidump_stackwalk.$(OBJEXT):  \

   442  	src/processor/$(am__dirstamp) \

   443  	src/processor/$(DEPDIR)/$(am__dirstamp)

   444  src/processor/minidump_stackwalk$(EXEEXT): $(src_processor_minidump_stackwalk_OBJECTS) $(src_processor_minidump_stackwalk_DEPENDENCIES) src/processor/$(am__dirstamp)

   445  	@rm -f src/processor/minidump_stackwalk$(EXEEXT)

   446 @@ -921,66 +951,70 @@ mostlyclean-compile:

   447  	-rm -f src/processor/contained_range_map_unittest.$(OBJEXT)

   448  	-rm -f src/processor/logging.$(OBJEXT)

   449  	-rm -f src/processor/logging.lo

   450  	-rm -f src/processor/minidump.$(OBJEXT)

   451  	-rm -f src/processor/minidump.lo

   452  	-rm -f src/processor/minidump_dump.$(OBJEXT)

   453  	-rm -f src/processor/minidump_processor.$(OBJEXT)

   454  	-rm -f src/processor/minidump_processor.lo

   455 -	-rm -f src/processor/minidump_processor_unittest.$(OBJEXT)

   456  	-rm -f src/processor/minidump_stackwalk.$(OBJEXT)

   457  	-rm -f src/processor/pathname_stripper.$(OBJEXT)

   458  	-rm -f src/processor/pathname_stripper.lo

   459  	-rm -f src/processor/pathname_stripper_unittest.$(OBJEXT)

   460  	-rm -f src/processor/postfix_evaluator_unittest.$(OBJEXT)

   461  	-rm -f src/processor/process_state.$(OBJEXT)

   462  	-rm -f src/processor/process_state.lo

   463  	-rm -f src/processor/range_map_unittest.$(OBJEXT)

   464  	-rm -f src/processor/simple_symbol_supplier.$(OBJEXT)

   465  	-rm -f src/processor/simple_symbol_supplier.lo

   466 +	-rm -f src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.$(OBJEXT)

   467  	-rm -f src/processor/stackwalker.$(OBJEXT)

   468  	-rm -f src/processor/stackwalker.lo

   469  	-rm -f src/processor/stackwalker_amd64.$(OBJEXT)

   470  	-rm -f src/processor/stackwalker_amd64.lo

   471  	-rm -f src/processor/stackwalker_ppc.$(OBJEXT)

   472  	-rm -f src/processor/stackwalker_ppc.lo

   473  	-rm -f src/processor/stackwalker_selftest.$(OBJEXT)

   474  	-rm -f src/processor/stackwalker_sparc.$(OBJEXT)

   475  	-rm -f src/processor/stackwalker_sparc.lo

   476  	-rm -f src/processor/stackwalker_x86.$(OBJEXT)

   477  	-rm -f src/processor/stackwalker_x86.lo

   478 +	-rm -f src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.$(OBJEXT)

   479 +	-rm -f src/testing/src/src_processor_minidump_processor_unittest-gmock-all.$(OBJEXT)

   480  

   481  distclean-compile:

   482  	-rm -f *.tab.c

   483  

   484  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/address_map_unittest.Po@am__quote@

   485  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/basic_code_modules.Plo@am__quote@

   486  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/basic_source_line_resolver.Plo@am__quote@

   487  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/basic_source_line_resolver_unittest.Po@am__quote@

   488  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/call_stack.Plo@am__quote@

   489  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/contained_range_map_unittest.Po@am__quote@

   490  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/logging.Plo@am__quote@

   491  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/minidump.Plo@am__quote@

   492  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/minidump_dump.Po@am__quote@

   493  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/minidump_processor.Plo@am__quote@

   494 -@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/minidump_processor_unittest.Po@am__quote@

   495  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/minidump_stackwalk.Po@am__quote@

   496  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/pathname_stripper.Plo@am__quote@

   497  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/pathname_stripper_unittest.Po@am__quote@

   498  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/postfix_evaluator_unittest.Po@am__quote@

   499  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/process_state.Plo@am__quote@

   500  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/range_map_unittest.Po@am__quote@

   501  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/simple_symbol_supplier.Plo@am__quote@

   502 +@AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/src_processor_minidump_processor_unittest-minidump_processor_unittest.Po@am__quote@

   503  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stackwalker.Plo@am__quote@

   504  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stackwalker_amd64.Plo@am__quote@

   505  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stackwalker_ppc.Plo@am__quote@

   506  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stackwalker_selftest.Po@am__quote@

   507  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stackwalker_sparc.Plo@am__quote@

   508  @AMDEP_TRUE@@am__include@ @am__quote@src/processor/$(DEPDIR)/stackwalker_x86.Plo@am__quote@

   509 +@AMDEP_TRUE@@am__include@ @am__quote@src/testing/gtest/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gtest-all.Po@am__quote@

   510 +@AMDEP_TRUE@@am__include@ @am__quote@src/testing/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gmock-all.Po@am__quote@

   511  

   512  .cc.o:

   513  @am__fastdepCXX_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.o$$||'`;\

   514  @am__fastdepCXX_TRUE@	$(CXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\

   515  @am__fastdepCXX_TRUE@	mv -f $$depbase.Tpo $$depbase.Po

   516  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=no @AMDEPBACKSLASH@

   517  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

   518  @am__fastdepCXX_FALSE@	$(CXXCOMPILE) -c -o $@ $<

   519 @@ -996,16 +1030,58 @@ distclean-compile:

   520  .cc.lo:

   521  @am__fastdepCXX_TRUE@	depbase=`echo $@ | sed 's|[^/]*$$|$(DEPDIR)/&|;s|\.lo$$||'`;\

   522  @am__fastdepCXX_TRUE@	$(LTCXXCOMPILE) -MT $@ -MD -MP -MF $$depbase.Tpo -c -o $@ $< &&\

   523  @am__fastdepCXX_TRUE@	mv -f $$depbase.Tpo $$depbase.Plo

   524  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='$<' object='$@' libtool=yes @AMDEPBACKSLASH@

   525  @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

   526  @am__fastdepCXX_FALSE@	$(LTCXXCOMPILE) -c -o $@ $<

   527  

   528 +src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.o: src/processor/minidump_processor_unittest.cc

   529 +@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.o -MD -MP -MF src/processor/$(DEPDIR)/src_processor_minidump_processor_unittest-minidump_processor_unittest.Tpo -c -o src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.o `test -f 'src/processor/minidump_processor_unittest.cc' || echo '$(srcdir)/'`src/processor/minidump_processor_unittest.cc

   530 +@am__fastdepCXX_TRUE@	mv -f src/processor/$(DEPDIR)/src_processor_minidump_processor_unittest-minidump_processor_unittest.Tpo src/processor/$(DEPDIR)/src_processor_minidump_processor_unittest-minidump_processor_unittest.Po

   531 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/processor/minidump_processor_unittest.cc' object='src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.o' libtool=no @AMDEPBACKSLASH@

   532 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

   533 +@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.o `test -f 'src/processor/minidump_processor_unittest.cc' || echo '$(srcdir)/'`src/processor/minidump_processor_unittest.cc

   534 +

   535 +src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.obj: src/processor/minidump_processor_unittest.cc

   536 +@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.obj -MD -MP -MF src/processor/$(DEPDIR)/src_processor_minidump_processor_unittest-minidump_processor_unittest.Tpo -c -o src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.obj `if test -f 'src/processor/minidump_processor_unittest.cc'; then $(CYGPATH_W) 'src/processor/minidump_processor_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/src/processor/minidump_processor_unittest.cc'; fi`

   537 +@am__fastdepCXX_TRUE@	mv -f src/processor/$(DEPDIR)/src_processor_minidump_processor_unittest-minidump_processor_unittest.Tpo src/processor/$(DEPDIR)/src_processor_minidump_processor_unittest-minidump_processor_unittest.Po

   538 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/processor/minidump_processor_unittest.cc' object='src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.obj' libtool=no @AMDEPBACKSLASH@

   539 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

   540 +@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/processor/src_processor_minidump_processor_unittest-minidump_processor_unittest.obj `if test -f 'src/processor/minidump_processor_unittest.cc'; then $(CYGPATH_W) 'src/processor/minidump_processor_unittest.cc'; else $(CYGPATH_W) '$(srcdir)/src/processor/minidump_processor_unittest.cc'; fi`

   541 +

   542 +src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.o: src/testing/gtest/src/gtest-all.cc

   543 +@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.o -MD -MP -MF src/testing/gtest/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gtest-all.Tpo -c -o src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.o `test -f 'src/testing/gtest/src/gtest-all.cc' || echo '$(srcdir)/'`src/testing/gtest/src/gtest-all.cc

   544 +@am__fastdepCXX_TRUE@	mv -f src/testing/gtest/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gtest-all.Tpo src/testing/gtest/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gtest-all.Po

   545 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/testing/gtest/src/gtest-all.cc' object='src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.o' libtool=no @AMDEPBACKSLASH@

   546 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

   547 +@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.o `test -f 'src/testing/gtest/src/gtest-all.cc' || echo '$(srcdir)/'`src/testing/gtest/src/gtest-all.cc

   548 +

   549 +src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.obj: src/testing/gtest/src/gtest-all.cc

   550 +@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.obj -MD -MP -MF src/testing/gtest/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gtest-all.Tpo -c -o src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.obj `if test -f 'src/testing/gtest/src/gtest-all.cc'; then $(CYGPATH_W) 'src/testing/gtest/src/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)/src/testing/gtest/src/gtest-all.cc'; fi`

   551 +@am__fastdepCXX_TRUE@	mv -f src/testing/gtest/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gtest-all.Tpo src/testing/gtest/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gtest-all.Po

   552 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/testing/gtest/src/gtest-all.cc' object='src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.obj' libtool=no @AMDEPBACKSLASH@

   553 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

   554 +@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/testing/gtest/src/src_processor_minidump_processor_unittest-gtest-all.obj `if test -f 'src/testing/gtest/src/gtest-all.cc'; then $(CYGPATH_W) 'src/testing/gtest/src/gtest-all.cc'; else $(CYGPATH_W) '$(srcdir)/src/testing/gtest/src/gtest-all.cc'; fi`

   555 +

   556 +src/testing/src/src_processor_minidump_processor_unittest-gmock-all.o: src/testing/src/gmock-all.cc

   557 +@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/testing/src/src_processor_minidump_processor_unittest-gmock-all.o -MD -MP -MF src/testing/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gmock-all.Tpo -c -o src/testing/src/src_processor_minidump_processor_unittest-gmock-all.o `test -f 'src/testing/src/gmock-all.cc' || echo '$(srcdir)/'`src/testing/src/gmock-all.cc

   558 +@am__fastdepCXX_TRUE@	mv -f src/testing/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gmock-all.Tpo src/testing/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gmock-all.Po

   559 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/testing/src/gmock-all.cc' object='src/testing/src/src_processor_minidump_processor_unittest-gmock-all.o' libtool=no @AMDEPBACKSLASH@

   560 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

   561 +@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/testing/src/src_processor_minidump_processor_unittest-gmock-all.o `test -f 'src/testing/src/gmock-all.cc' || echo '$(srcdir)/'`src/testing/src/gmock-all.cc

   562 +

   563 +src/testing/src/src_processor_minidump_processor_unittest-gmock-all.obj: src/testing/src/gmock-all.cc

   564 +@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -MT src/testing/src/src_processor_minidump_processor_unittest-gmock-all.obj -MD -MP -MF src/testing/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gmock-all.Tpo -c -o src/testing/src/src_processor_minidump_processor_unittest-gmock-all.obj `if test -f 'src/testing/src/gmock-all.cc'; then $(CYGPATH_W) 'src/testing/src/gmock-all.cc'; else $(CYGPATH_W) '$(srcdir)/src/testing/src/gmock-all.cc'; fi`

   565 +@am__fastdepCXX_TRUE@	mv -f src/testing/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gmock-all.Tpo src/testing/src/$(DEPDIR)/src_processor_minidump_processor_unittest-gmock-all.Po

   566 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='src/testing/src/gmock-all.cc' object='src/testing/src/src_processor_minidump_processor_unittest-gmock-all.obj' libtool=no @AMDEPBACKSLASH@

   567 +@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@

   568 +@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(src_processor_minidump_processor_unittest_CPPFLAGS) $(CPPFLAGS) $(AM_CXXFLAGS) $(CXXFLAGS) -c -o src/testing/src/src_processor_minidump_processor_unittest-gmock-all.obj `if test -f 'src/testing/src/gmock-all.cc'; then $(CYGPATH_W) 'src/testing/src/gmock-all.cc'; else $(CYGPATH_W) '$(srcdir)/src/testing/src/gmock-all.cc'; fi`

   569 +

   570  mostlyclean-libtool:

   571  	-rm -f *.lo

   572  

   573  clean-libtool:

   574  	-rm -rf .libs _libs

   575  	-rm -rf src/.libs src/_libs

   576  	-rm -rf src/processor/.libs src/processor/_libs

   577  

   578 @@ -1304,29 +1380,33 @@ mostlyclean-generic:

   579  

   580  clean-generic:

   581  

   582  distclean-generic:

   583  	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)

   584  	-rm -f src/$(am__dirstamp)

   585  	-rm -f src/processor/$(DEPDIR)/$(am__dirstamp)

   586  	-rm -f src/processor/$(am__dirstamp)

   587 +	-rm -f src/testing/gtest/src/$(DEPDIR)/$(am__dirstamp)

   588 +	-rm -f src/testing/gtest/src/$(am__dirstamp)

   589 +	-rm -f src/testing/src/$(DEPDIR)/$(am__dirstamp)

   590 +	-rm -f src/testing/src/$(am__dirstamp)

   591  

   592  maintainer-clean-generic:

   593  	@echo "This command is intended for maintainers to use"

   594  	@echo "it deletes files that may require special tools to rebuild."

   595  clean: clean-am

   596  

   597  clean-am: clean-binPROGRAMS clean-checkPROGRAMS clean-generic \

   598  	clean-libLTLIBRARIES clean-libtool clean-noinstPROGRAMS \

   599  	mostlyclean-am

   600  

   601  distclean: distclean-am

   602  	-rm -f $(am__CONFIG_DISTCLEAN_FILES)

   603 -	-rm -rf src/processor/$(DEPDIR)

   604 +	-rm -rf src/processor/$(DEPDIR) src/testing/gtest/src/$(DEPDIR) src/testing/src/$(DEPDIR)

   605  	-rm -f Makefile

   606  distclean-am: clean-am distclean-compile distclean-generic \

   607  	distclean-hdr distclean-libtool distclean-tags

   608  

   609  dvi: dvi-am

   610  

   611  dvi-am:

   612  

   613 @@ -1352,17 +1432,17 @@ install-pdf: install-pdf-am

   614  

   615  install-ps: install-ps-am

   616  

   617  installcheck-am:

   618  

   619  maintainer-clean: maintainer-clean-am

   620  	-rm -f $(am__CONFIG_DISTCLEAN_FILES)

   621  	-rm -rf $(top_srcdir)/autom4te.cache

   622 -	-rm -rf src/processor/$(DEPDIR)

   623 +	-rm -rf src/processor/$(DEPDIR) src/testing/gtest/src/$(DEPDIR) src/testing/src/$(DEPDIR)

   624  	-rm -f Makefile

   625  maintainer-clean-am: distclean-am maintainer-clean-generic

   626  

   627  mostlyclean: mostlyclean-am

   628  

   629  mostlyclean-am: mostlyclean-compile mostlyclean-generic \

   630  	mostlyclean-libtool

   631  

   632 diff --git a/toolkit/crashreporter/google-breakpad/aclocal.m4 b/toolkit/crashreporter/google-breakpad/aclocal.m4

   633 --- a/toolkit/crashreporter/google-breakpad/aclocal.m4

   634 +++ b/toolkit/crashreporter/google-breakpad/aclocal.m4

   635 @@ -13,17 +13,17 @@

   636  

   637  m4_if(m4_PACKAGE_VERSION, [2.61],,

   638  [m4_fatal([this file was generated for autoconf 2.61.

   639  You have another version of autoconf.  If you want to use that,

   640  you should regenerate the build system entirely.], [63])])

   641  

   642  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-

   643  

   644 -# serial 48 AC_PROG_LIBTOOL

   645 +# serial 52 AC_PROG_LIBTOOL

   646  

   647  

   648  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)

   649  # -----------------------------------------------------------

   650  # If this macro is not defined by Autoconf, define it here.

   651  m4_ifdef([AC_PROVIDE_IFELSE],

   652           [],

   653           [m4_define([AC_PROVIDE_IFELSE],

   654 @@ -101,17 +101,16 @@ AC_REQUIRE([AC_PROG_LD_RELOAD_FLAG])dnl

   655  AC_REQUIRE([AC_PROG_NM])dnl

   656  

   657  AC_REQUIRE([AC_PROG_LN_S])dnl

   658  AC_REQUIRE([AC_DEPLIBS_CHECK_METHOD])dnl

   659  # Autoconf 2.13's AC_OBJEXT and AC_EXEEXT macros only works for C compilers!

   660  AC_REQUIRE([AC_OBJEXT])dnl

   661  AC_REQUIRE([AC_EXEEXT])dnl

   662  dnl

   663 -

   664  AC_LIBTOOL_SYS_MAX_CMD_LEN

   665  AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE

   666  AC_LIBTOOL_OBJDIR

   667  

   668  AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl

   669  _LT_AC_PROG_ECHO_BACKSLASH

   670  

   671  case $host_os in

   672 @@ -176,17 +175,17 @@ test -z "$MAGIC_CMD" && MAGIC_CMD=file

   673  test -z "$NM" && NM=nm

   674  test -z "$SED" && SED=sed

   675  test -z "$OBJDUMP" && OBJDUMP=objdump

   676  test -z "$RANLIB" && RANLIB=:

   677  test -z "$STRIP" && STRIP=:

   678  test -z "$ac_objext" && ac_objext=o

   679  

   680  # Determine commands to create old-style static archives.

   681 -old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'

   682 +old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'

   683  old_postinstall_cmds='chmod 644 $oldlib'

   684  old_postuninstall_cmds=

   685  

   686  if test -n "$RANLIB"; then

   687    case $host_os in

   688    openbsd*)

   689      old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"

   690      ;;

   691 @@ -203,16 +202,18 @@ _LT_CC_BASENAME([$compiler])

   692  case $deplibs_check_method in

   693  file_magic*)

   694    if test "$file_magic_cmd" = '$MAGIC_CMD'; then

   695      AC_PATH_MAGIC

   696    fi

   697    ;;

   698  esac

   699  

   700 +_LT_REQUIRED_DARWIN_CHECKS

   701 +

   702  AC_PROVIDE_IFELSE([AC_LIBTOOL_DLOPEN], enable_dlopen=yes, enable_dlopen=no)

   703  AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],

   704  enable_win32_dll=yes, enable_win32_dll=no)

   705  

   706  AC_ARG_ENABLE([libtool-lock],

   707      [AC_HELP_STRING([--disable-libtool-lock],

   708  	[avoid locking (might break parallel builds)])])

   709  test "x$enable_libtool_lock" != xno && enable_libtool_lock=yes

   710 @@ -263,52 +264,133 @@ cc_basename=`$echo "X$cc_temp" | $Xsed -

   711  ])

   712  

   713  

   714  # _LT_COMPILER_BOILERPLATE

   715  # ------------------------

   716  # Check for compiler boilerplate output or warnings with

   717  # the simple compiler test code.

   718  AC_DEFUN([_LT_COMPILER_BOILERPLATE],

   719 -[ac_outfile=conftest.$ac_objext

   720 -printf "$lt_simple_compile_test_code" >conftest.$ac_ext

   721 +[AC_REQUIRE([LT_AC_PROG_SED])dnl

   722 +ac_outfile=conftest.$ac_objext

   723 +echo "$lt_simple_compile_test_code" >conftest.$ac_ext

   724  eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

   725  _lt_compiler_boilerplate=`cat conftest.err`

   726  $rm conftest*

   727  ])# _LT_COMPILER_BOILERPLATE

   728  

   729  

   730  # _LT_LINKER_BOILERPLATE

   731  # ----------------------

   732  # Check for linker boilerplate output or warnings with

   733  # the simple link test code.

   734  AC_DEFUN([_LT_LINKER_BOILERPLATE],

   735 -[ac_outfile=conftest.$ac_objext

   736 -printf "$lt_simple_link_test_code" >conftest.$ac_ext

   737 +[AC_REQUIRE([LT_AC_PROG_SED])dnl

   738 +ac_outfile=conftest.$ac_objext

   739 +echo "$lt_simple_link_test_code" >conftest.$ac_ext

   740  eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err

   741  _lt_linker_boilerplate=`cat conftest.err`

   742 -$rm conftest*

   743 +$rm -r conftest*

   744  ])# _LT_LINKER_BOILERPLATE

   745  

   746 +# _LT_REQUIRED_DARWIN_CHECKS

   747 +# --------------------------

   748 +# Check for some things on darwin

   749 +AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS],[

   750 +  case $host_os in

   751 +    rhapsody* | darwin*)

   752 +    AC_CHECK_TOOL([DSYMUTIL], [dsymutil], [:])

   753 +    AC_CHECK_TOOL([NMEDIT], [nmedit], [:])

   754 +

   755 +    AC_CACHE_CHECK([for -single_module linker flag],[lt_cv_apple_cc_single_mod],

   756 +      [lt_cv_apple_cc_single_mod=no

   757 +      if test -z "${LT_MULTI_MODULE}"; then

   758 +   # By default we will add the -single_module flag. You can override

   759 +   # by either setting the environment variable LT_MULTI_MODULE

   760 +   # non-empty at configure time, or by adding -multi_module to the

   761 +   # link flags.

   762 +   echo "int foo(void){return 1;}" > conftest.c

   763 +   $LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \

   764 +     -dynamiclib ${wl}-single_module conftest.c

   765 +   if test -f libconftest.dylib; then

   766 +     lt_cv_apple_cc_single_mod=yes

   767 +     rm -rf libconftest.dylib*

   768 +   fi

   769 +   rm conftest.c

   770 +      fi])

   771 +    AC_CACHE_CHECK([for -exported_symbols_list linker flag],

   772 +      [lt_cv_ld_exported_symbols_list],

   773 +      [lt_cv_ld_exported_symbols_list=no

   774 +      save_LDFLAGS=$LDFLAGS

   775 +      echo "_main" > conftest.sym

   776 +      LDFLAGS="$LDFLAGS -Wl,-exported_symbols_list,conftest.sym"

   777 +      AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],

   778 +   [lt_cv_ld_exported_symbols_list=yes],

   779 +   [lt_cv_ld_exported_symbols_list=no])

   780 +   LDFLAGS="$save_LDFLAGS"

   781 +    ])

   782 +    case $host_os in

   783 +    rhapsody* | darwin1.[[0123]])

   784 +      _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;

   785 +    darwin1.*)

   786 +     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;

   787 +    darwin*)

   788 +      # if running on 10.5 or later, the deployment target defaults

   789 +      # to the OS version, if on x86, and 10.4, the deployment

   790 +      # target defaults to 10.4. Don't you love it?

   791 +      case ${MACOSX_DEPLOYMENT_TARGET-10.0},$host in

   792 +   10.0,*86*-darwin8*|10.0,*-darwin[[91]]*)

   793 +     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;

   794 +   10.[[012]]*)

   795 +     _lt_dar_allow_undefined='${wl}-flat_namespace ${wl}-undefined ${wl}suppress' ;;

   796 +   10.*)

   797 +     _lt_dar_allow_undefined='${wl}-undefined ${wl}dynamic_lookup' ;;

   798 +      esac

   799 +    ;;

   800 +  esac

   801 +    if test "$lt_cv_apple_cc_single_mod" = "yes"; then

   802 +      _lt_dar_single_mod='$single_module'

   803 +    fi

   804 +    if test "$lt_cv_ld_exported_symbols_list" = "yes"; then

   805 +      _lt_dar_export_syms=' ${wl}-exported_symbols_list,$output_objdir/${libname}-symbols.expsym'

   806 +    else

   807 +      _lt_dar_export_syms="~$NMEDIT -s \$output_objdir/\${libname}-symbols.expsym \${lib}"

   808 +    fi

   809 +    if test "$DSYMUTIL" != ":"; then

   810 +      _lt_dsymutil="~$DSYMUTIL \$lib || :"

   811 +    else

   812 +      _lt_dsymutil=

   813 +    fi

   814 +    ;;

   815 +  esac

   816 +])

   817  

   818  # _LT_AC_SYS_LIBPATH_AIX

   819  # ----------------------

   820  # Links a minimal program and checks the executable

   821  # for the system default hardcoded library path. In most cases,

   822  # this is /usr/lib:/lib, but when the MPI compilers are used

   823  # the location of the communication and MPI libs are included too.

   824  # If we don't find anything, use the default library path according

   825  # to the aix ld manual.

   826  AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],

   827 -[AC_LINK_IFELSE(AC_LANG_PROGRAM,[

   828 -aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }

   829 -}'`

   830 +[AC_REQUIRE([LT_AC_PROG_SED])dnl

   831 +AC_LINK_IFELSE(AC_LANG_PROGRAM,[

   832 +lt_aix_libpath_sed='

   833 +    /Import File Strings/,/^$/ {

   834 +	/^0/ {

   835 +	    s/^0  *\(.*\)$/\1/

   836 +	    p

   837 +	}

   838 +    }'

   839 +aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

   840  # Check for a 64-bit object if we didn't find anything.

   841 -if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0  *\(.*\)$/\1/; p; }

   842 -}'`; fi],[])

   843 +if test -z "$aix_libpath"; then

   844 +  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`

   845 +fi],[])

   846  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi

   847  ])# _LT_AC_SYS_LIBPATH_AIX

   848  

   849  

   850  # _LT_AC_SHELL_INIT(ARG)

   851  # ----------------------

   852  AC_DEFUN([_LT_AC_SHELL_INIT],

   853  [ifdef([AC_DIVERSION_NOTICE],

   854 @@ -529,39 +611,46 @@ ia64-*-hpux*)

   855        LD="${LD-ld} -64"

   856        ;;

   857      esac

   858     fi

   859    fi

   860    rm -rf conftest*

   861    ;;

   862  

   863 -x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)

   864 +x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \

   865 +s390*-*linux*|sparc*-*linux*)

   866    # Find out which ABI we are using.

   867    echo 'int i;' > conftest.$ac_ext

   868    if AC_TRY_EVAL(ac_compile); then

   869      case `/usr/bin/file conftest.o` in

   870      *32-bit*)

   871        case $host in

   872 +        x86_64-*kfreebsd*-gnu)

   873 +          LD="${LD-ld} -m elf_i386_fbsd"

   874 +          ;;

   875          x86_64-*linux*)

   876            LD="${LD-ld} -m elf_i386"

   877            ;;

   878          ppc64-*linux*|powerpc64-*linux*)

   879            LD="${LD-ld} -m elf32ppclinux"

   880            ;;

   881          s390x-*linux*)

   882            LD="${LD-ld} -m elf_s390"

   883            ;;

   884          sparc64-*linux*)

   885            LD="${LD-ld} -m elf32_sparc"

   886            ;;

   887        esac

   888        ;;

   889      *64-bit*)

   890        case $host in

   891 +        x86_64-*kfreebsd*-gnu)

   892 +          LD="${LD-ld} -m elf_x86_64_fbsd"

   893 +          ;;

   894          x86_64-*linux*)

   895            LD="${LD-ld} -m elf_x86_64"

   896            ;;

   897          ppc*-*linux*|powerpc*-*linux*)

   898            LD="${LD-ld} -m elf64ppc"

   899            ;;

   900          s390*-*linux*)

   901            LD="${LD-ld} -m elf64_s390"

   902 @@ -592,17 +681,21 @@ x86_64-*linux*|ppc*-*linux*|powerpc*-*li

   903  sparc*-*solaris*)

   904    # Find out which ABI we are using.

   905    echo 'int i;' > conftest.$ac_ext

   906    if AC_TRY_EVAL(ac_compile); then

   907      case `/usr/bin/file conftest.o` in

   908      *64-bit*)

   909        case $lt_cv_prog_gnu_ld in

   910        yes*) LD="${LD-ld} -m elf64_sparc" ;;

   911 -      *)    LD="${LD-ld} -64" ;;

   912 +      *)

   913 +        if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then

   914 +	  LD="${LD-ld} -64"

   915 +	fi

   916 +	;;

   917        esac

   918        ;;

   919      esac

   920    fi

   921    rm -rf conftest*

   922    ;;

   923  

   924  AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],

   925 @@ -623,17 +716,17 @@ need_locks="$enable_libtool_lock"

   926  #		[OUTPUT-FILE], [ACTION-SUCCESS], [ACTION-FAILURE])

   927  # ----------------------------------------------------------------

   928  # Check whether the given compiler option works

   929  AC_DEFUN([AC_LIBTOOL_COMPILER_OPTION],

   930  [AC_REQUIRE([LT_AC_PROG_SED])

   931  AC_CACHE_CHECK([$1], [$2],

   932    [$2=no

   933    ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])

   934 -   printf "$lt_simple_compile_test_code" > conftest.$ac_ext

   935 +   echo "$lt_simple_compile_test_code" > conftest.$ac_ext

   936     lt_compiler_flag="$3"

   937     # Insert the option either (1) after the last *FLAGS variable, or

   938     # (2) before a word containing "conftest.", or (3) at the end.

   939     # Note that $ac_compile itself does not contain backslashes and begins

   940     # with a dollar sign (not a hyphen), so the echo should work correctly.

   941     # The option is referenced via a variable to avoid confusing sed.

   942     lt_compile=`echo "$ac_compile" | $SED \

   943     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

   944 @@ -664,37 +757,38 @@ fi

   945  ])# AC_LIBTOOL_COMPILER_OPTION

   946  

   947  

   948  # AC_LIBTOOL_LINKER_OPTION(MESSAGE, VARIABLE-NAME, FLAGS,

   949  #                          [ACTION-SUCCESS], [ACTION-FAILURE])

   950  # ------------------------------------------------------------

   951  # Check whether the given compiler option works

   952  AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],

   953 -[AC_CACHE_CHECK([$1], [$2],

   954 +[AC_REQUIRE([LT_AC_PROG_SED])dnl

   955 +AC_CACHE_CHECK([$1], [$2],

   956    [$2=no

   957     save_LDFLAGS="$LDFLAGS"

   958     LDFLAGS="$LDFLAGS $3"

   959 -   printf "$lt_simple_link_test_code" > conftest.$ac_ext

   960 +   echo "$lt_simple_link_test_code" > conftest.$ac_ext

   961     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then

   962       # The linker can only warn and ignore the option if not recognized

   963       # So say no if there are warnings

   964       if test -s conftest.err; then

   965         # Append any errors to the config.log.

   966         cat conftest.err 1>&AS_MESSAGE_LOG_FD

   967         $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp

   968         $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2

   969         if diff conftest.exp conftest.er2 >/dev/null; then

   970           $2=yes

   971         fi

   972       else

   973         $2=yes

   974       fi

   975     fi

   976 -   $rm conftest*

   977 +   $rm -r conftest*

   978     LDFLAGS="$save_LDFLAGS"

   979  ])

   980  

   981  if test x"[$]$2" = xyes; then

   982      ifelse([$4], , :, [$4])

   983  else

   984      ifelse([$5], , :, [$5])

   985  fi

   986 @@ -782,34 +876,37 @@ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [d

   987      kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`

   988      if test -n "$kargmax"; then

   989        lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ 	]]//'`

   990      else

   991        lt_cv_sys_max_cmd_len=32768

   992      fi

   993      ;;

   994    *)

   995 -    # If test is not a shell built-in, we'll probably end up computing a

   996 -    # maximum length that is only half of the actual maximum length, but

   997 -    # we can't tell.

   998 -    SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}

   999 -    while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \

  1000 +    lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`

  1001 +    if test -n "$lt_cv_sys_max_cmd_len"; then

  1002 +      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`

  1003 +      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`

  1004 +    else

  1005 +      SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}

  1006 +      while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \

  1007  	       = "XX$teststring") >/dev/null 2>&1 &&

  1008 -	    new_result=`expr "X$teststring" : ".*" 2>&1` &&

  1009 -	    lt_cv_sys_max_cmd_len=$new_result &&

  1010 -	    test $i != 17 # 1/2 MB should be enough

  1011 -    do

  1012 -      i=`expr $i + 1`

  1013 -      teststring=$teststring$teststring

  1014 -    done

  1015 -    teststring=

  1016 -    # Add a significant safety factor because C++ compilers can tack on massive

  1017 -    # amounts of additional arguments before passing them to the linker.

  1018 -    # It appears as though 1/2 is a usable value.

  1019 -    lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`

  1020 +	      new_result=`expr "X$teststring" : ".*" 2>&1` &&

  1021 +	      lt_cv_sys_max_cmd_len=$new_result &&

  1022 +	      test $i != 17 # 1/2 MB should be enough

  1023 +      do

  1024 +        i=`expr $i + 1`

  1025 +        teststring=$teststring$teststring

  1026 +      done

  1027 +      teststring=

  1028 +      # Add a significant safety factor because C++ compilers can tack on massive

  1029 +      # amounts of additional arguments before passing them to the linker.

  1030 +      # It appears as though 1/2 is a usable value.

  1031 +      lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`

  1032 +    fi

  1033      ;;

  1034    esac

  1035  ])

  1036  if test -n $lt_cv_sys_max_cmd_len ; then

  1037    AC_MSG_RESULT($lt_cv_sys_max_cmd_len)

  1038  else

  1039    AC_MSG_RESULT(none)

  1040  fi

  1041 @@ -952,25 +1049,25 @@ else

  1042      lt_cv_dlopen_self=yes

  1043      ])

  1044     ;;

  1045  

  1046    *)

  1047      AC_CHECK_FUNC([shl_load],

  1048  	  [lt_cv_dlopen="shl_load"],

  1049        [AC_CHECK_LIB([dld], [shl_load],

  1050 -	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-dld"],

  1051 +	    [lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"],

  1052  	[AC_CHECK_FUNC([dlopen],

  1053  	      [lt_cv_dlopen="dlopen"],

  1054  	  [AC_CHECK_LIB([dl], [dlopen],

  1055  		[lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"],

  1056  	    [AC_CHECK_LIB([svld], [dlopen],

  1057  		  [lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"],

  1058  	      [AC_CHECK_LIB([dld], [dld_link],

  1059 -		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-dld"])

  1060 +		    [lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"])

  1061  	      ])

  1062  	    ])

  1063  	  ])

  1064  	])

  1065        ])

  1066      ;;

  1067    esac

  1068  

  1069 @@ -1026,25 +1123,26 @@ else

  1070  fi

  1071  ])# AC_LIBTOOL_DLOPEN_SELF

  1072  

  1073  

  1074  # AC_LIBTOOL_PROG_CC_C_O([TAGNAME])

  1075  # ---------------------------------

  1076  # Check to see if options -c and -o are simultaneously supported by compiler

  1077  AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],

  1078 -[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl

  1079 +[AC_REQUIRE([LT_AC_PROG_SED])dnl

  1080 +AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl

  1081  AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],

  1082    [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],

  1083    [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no

  1084     $rm -r conftest 2>/dev/null

  1085     mkdir conftest

  1086     cd conftest

  1087     mkdir out

  1088 -   printf "$lt_simple_compile_test_code" > conftest.$ac_ext

  1089 +   echo "$lt_simple_compile_test_code" > conftest.$ac_ext

  1090  

  1091     lt_compiler_flag="-o out/conftest2.$ac_objext"

  1092     # Insert the option either (1) after the last *FLAGS variable, or

  1093     # (2) before a word containing "conftest.", or (3) at the end.

  1094     # Note that $ac_compile itself does not contain backslashes and begins

  1095     # with a dollar sign (not a hyphen), so the echo should work correctly.

  1096     lt_compile=`echo "$ac_compile" | $SED \

  1097     -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \

  1098 @@ -1174,16 +1272,17 @@ if test -n "$STRIP" && $STRIP -V 2>&1 | 

  1099    test -z "$striplib" && striplib="$STRIP --strip-unneeded"

  1100    AC_MSG_RESULT([yes])

  1101  else

  1102  # FIXME - insert some real tests, host_os isn't really good enough

  1103    case $host_os in

  1104     darwin*)

  1105         if test -n "$STRIP" ; then

  1106           striplib="$STRIP -x"

  1107 +         old_striplib="$STRIP -S"

  1108           AC_MSG_RESULT([yes])

  1109         else

  1110    AC_MSG_RESULT([no])

  1111  fi

  1112         ;;

  1113     *)

  1114    AC_MSG_RESULT([no])

  1115      ;;

  1116 @@ -1191,44 +1290,83 @@ fi

  1117  fi

  1118  ])# AC_LIBTOOL_SYS_LIB_STRIP

  1119  

  1120  

  1121  # AC_LIBTOOL_SYS_DYNAMIC_LINKER

  1122  # -----------------------------

  1123  # PORTME Fill in your ld.so characteristics

  1124  AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],

  1125 -[AC_MSG_CHECKING([dynamic linker characteristics])

  1126 +[AC_REQUIRE([LT_AC_PROG_SED])dnl

  1127 +AC_MSG_CHECKING([dynamic linker characteristics])

  1128  library_names_spec=

  1129  libname_spec='lib$name'

  1130  soname_spec=

  1131  shrext_cmds=".so"

  1132  postinstall_cmds=

  1133  postuninstall_cmds=

  1134  finish_cmds=

  1135  finish_eval=