author | Ginn Chen <ginn.chen@sun.com> |
Tue, 28 Sep 2010 18:03:51 +0800 | |
changeset 54747 | 4109d15945e5d3c618721a8bf643f8aeeee16e27 |
parent 54746 | 20ebb001f3a9ffe830589fcc1e7986f91d982ce1 |
child 54748 | d132b53dbdbceed6b09f9cf0d257228474436928 |
push id | 16011 |
push user | rsayre@mozilla.com |
push date | Wed, 29 Sep 2010 06:01:57 +0000 |
treeherder | mozilla-central@d7e659b4f80c [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | ted.mielczarek |
bugs | 594718 |
milestone | 2.0b7pre |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
--- a/js/src/Makefile.in +++ b/js/src/Makefile.in @@ -684,25 +684,27 @@ endif ifdef MOZ_MEMORY ifeq ($(OS_ARCH),Darwin) LDFLAGS += -ljemalloc endif endif ifdef SOLARIS_SUNPRO_CXX +ifeq ($(TARGET_CPU),sparc # Sun Studio SPARC doesn't work well with gcc inline asm, use lock_SunOS_sparc*.il jslock.o: jslock.cpp Makefile.in lock_sparcv8plus.il lock_sparcv9.il $(REPORT_BUILD) @$(MAKE_DEPS_AUTO_CXX) ifeq (sparcv9,$(findstring sparcv9,$(OS_TEST))) $(CXX) -o $@ -c $(COMPILE_CFLAGS) $(srcdir)/lock_sparcv9.il $< else $(CXX) -o $@ -c $(COMPILE_CFLAGS) $(srcdir)/lock_sparcv8plus.il $< endif # sparcv9 +endif # sparc endif # SOLARIS_SUNPRO_CXX ifeq ($(OS_ARCH),IRIX) ifndef GNU_CC _COMPILE_CFLAGS = $(patsubst -O%,-O1,$(COMPILE_CFLAGS)) jsapi.o jsxdrapi.o jsarena.o jsarray.o jsatom.o jsemit.o jsfun.o jsinterp.o jsreflect.o jsregexp.o jsparse.o jsopcode.o jsscript.o: %.o: %.cpp Makefile.in $(REPORT_BUILD) @$(MAKE_DEPS_AUTO_CXX)