Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-12-04 11:26:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

#59855

Browse Source 
r=mccabe, sr=brendan
Fix Javascript to get Endianness from jstypes.h - start with a Makefile change and let it cycle once
This commit is contained in:
mkaply%us.ibm.com 2001-01-31 21:07:16 +00:00
parent 9d8468af0e
commit ab94da8892
1 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
js/src/Makefile.in
View File

@ -134,33 +134,17 @@ DASH_R = -r
include $(topsrcdir)/config/config.mk include $(topsrcdir)/config/config.mk
ifeq ($(OS_ARCH),OS2)
ifneq ($(MOZ_WIDGET_TOOLKIT),os2)
ifndef XCFLAGS
OS2_IMPLIB = 1
LIBRARY = js$(MOZ_BITS)$(VERSION_NUMBER).$(LIB_SUFFIX)
DEF_FILE = jsos2$(VERSION_NUMBER).def
EXTRA_LIBS = $(NSPR_LIBS) $(LIBNSJAVA)
else
EXTRA_LIBS = $(NSPR_LIBS) $(LIBNSJAVA) libjs.lib
endif
OS_CFLAGS += -tm-
endif
endif
EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_NSPR_LIBS) EXTRA_DSO_LDOPTS += $(MOZ_COMPONENT_NSPR_LIBS)
ifeq ($(OS_ARCH),OS2)
EXTRA_DSO_LDOPTS += $(FDLIBM_LIBRARY)
endif
# When using gcc the assembly is inlined in the C-file (see jslock.c) # When using gcc the assembly is inlined in the C-file (see jslock.c)
ifdef NS_USE_NATIVE ifdef NS_USE_NATIVE
ASFILES = $(notdir $(wildcard $(srcdir)/*_$(OS_ARCH).s)) ASFILES = $(notdir $(wildcard $(srcdir)/*_$(OS_ARCH).s))
endif endif
ifeq ($(MOZ_WIDGET_TOOLKIT),os2)
DEF_OBJS = jsapi.o jsarena.o jsdbgapi.o jsdhash.o jsdtoa.o jsgc.o jshash.o \
jsinterp.o jslog2.o jslong.o jsprf.o jsutil.o jsxdrapi.o prmjtime.o
#ADD_TO_DEF_FILE = cat < $(srcdir)/extradefs.os2 >>$(DEF_FILE)
endif
ifndef BUILD_OPT ifndef BUILD_OPT
MOCHAFILE = 1 MOCHAFILE = 1
endif endif
@ -264,9 +248,9 @@ OBJS += fdlibm/*.o
endif endif
endif endif
# OS/2 linkers expect to create executables or dlls, not object files # On OS/2 we are already linking against fdlibm, so don't bother
# so we pull in what's needed from fdlibm when creating the js dll # creating jsmathtemp
ifneq ($(MOZ_WIDGET_TOOLKIT),os2) ifneq ($(OS_ARCH),OS2)
# special rule for jsmath.o since we want to incrementally link # special rule for jsmath.o since we want to incrementally link
# against fdlibm to pull in only what is needed # against fdlibm to pull in only what is needed
jsmath.o: $(FDLIBM_LIBRARY) $(JSMATH_PRELINK) jsmath.o: $(FDLIBM_LIBRARY) $(JSMATH_PRELINK)
@ -286,6 +270,9 @@ ifeq ($(OS_ARCH),WINNT)
else else
$(CC) -o $@ -c $(COMPILE_CFLAGS) $< $(CC) -o $@ -c $(COMPILE_CFLAGS) $<
endif endif
else
# Create dependency so we build fdlibm
jsmath.o: $(FDLIBM_LIBRARY)
endif endif
# An AIX Optimization bug causes PR_dtoa() & JS_dtoa to produce wrong result. # An AIX Optimization bug causes PR_dtoa() & JS_dtoa to produce wrong result.
@ -296,9 +283,7 @@ jsdtoa.o: jsdtoa.c
endif endif
$(FDLIBM_LIBRARY): $(FDLIBM_LIBRARY):
@$(CONTINUE_ON_ERROR) \ $(MAKE) -C $(@D) $(@F)
$(MAKE) -C $(@D) $(@F); \
$(EXIT_ON_ERROR)
jsopcode.h jsopcode.c: jsopcode.tbl jsopcode.h jsopcode.c: jsopcode.tbl