Skip to content

Commit d17ed69

Browse files
committed
Backed out changeset cec7b12eb5e3
1 parent f4b0fe9 commit d17ed69

File tree

15 files changed

+2
-500
lines changed

15 files changed

+2
-500
lines changed

config/Makefile.in

Lines changed: 0 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -137,26 +137,6 @@ export::
137137
GARBAGE_DIRS += system_wrappers
138138
endif
139139

140-
ifdef WRAP_STL_INCLUDES
141-
ifdef GCC_VERSION
142-
stl_compiler = gcc
143-
else
144-
stl_compiler = msvc
145-
endif
146-
endif
147-
148-
ifdef stl_compiler
149-
stl-wrappers-sentinel: $(srcdir)/make-stl-wrappers.py $(srcdir)/$(stl_compiler)-stl-wrapper.template.h $(srcdir)/stl-headers $(GLOBAL_DEPS)
150-
$(PYTHON) $(srcdir)/make-stl-wrappers.py stl_wrappers $(stl_compiler) $(srcdir)/$(stl_compiler)-stl-wrapper.template.h $(srcdir)/stl-headers
151-
$(PYTHON) $(srcdir)/nsinstall.py stl_wrappers $(DIST)
152-
touch stl-wrappers-sentinel
153-
154-
export:: stl-wrappers-sentinel
155-
156-
GARBAGE += stl-wrappers-sentinel
157-
GARBAGE_DIRS += stl_wrappers
158-
endif
159-
160140
install::
161141
$(SYSINSTALL) $(IFLAGS1) $(DEPTH)/mozilla-config.h $(DESTDIR)$(includedir)
162142

config/autoconf.mk.in

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -359,9 +359,6 @@ HAVE_GCC3_ABI = @HAVE_GCC3_ABI@
359359
INTEL_CC = @INTEL_CC@
360360
INTEL_CXX = @INTEL_CXX@
361361

362-
STL_FLAGS = @STL_FLAGS@
363-
WRAP_STL_INCLUDES = @WRAP_STL_INCLUDES@
364-
365362
HOST_CC = @HOST_CC@
366363
HOST_CXX = @HOST_CXX@
367364
HOST_CFLAGS = @HOST_CFLAGS@

config/config.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ OS_COMPILE_CMMFLAGS += -fobjc-exceptions
526526
endif
527527

528528
COMPILE_CFLAGS = $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(CFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CFLAGS)
529-
COMPILE_CXXFLAGS = $(VISIBILITY_FLAGS) $(STL_FLAGS) $(DEFINES) $(INCLUDES) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(CXXFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CXXFLAGS)
529+
COMPILE_CXXFLAGS = $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(CXXFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CXXFLAGS)
530530
COMPILE_CMFLAGS = $(OS_COMPILE_CMFLAGS)
531531
COMPILE_CMMFLAGS = $(OS_COMPILE_CMMFLAGS)
532532

config/gcc-stl-wrapper.template.h

Lines changed: 0 additions & 85 deletions
This file was deleted.

config/make-stl-wrappers.py

Lines changed: 0 additions & 87 deletions
This file was deleted.

config/msvc-stl-wrapper.template.h

Lines changed: 0 additions & 96 deletions
This file was deleted.

config/stl-headers

Lines changed: 0 additions & 19 deletions
This file was deleted.

configure.in

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -759,9 +759,6 @@ EOF
759759
AC_DEFINE_UNQUOTED(MOZ_NTDDI_WS03, 0x05020000)
760760
AC_DEFINE_UNQUOTED(MOZ_NTDDI_LONGHORN, 0x06000000)
761761
AC_DEFINE_UNQUOTED(MOZ_NTDDI_WIN7, 0x06010000)
762-
763-
STL_FLAGS='-D_HAS_EXCEPTIONS=0 -I$(DIST)/stl_wrappers'
764-
WRAP_STL_INCLUDES=1
765762
;;
766763
esac
767764

@@ -810,9 +807,6 @@ AC_SUBST(GNU_CXX)
810807
AC_SUBST(INTEL_CC)
811808
AC_SUBST(INTEL_CXX)
812809

813-
AC_SUBST(STL_FLAGS)
814-
AC_SUBST(WRAP_STL_INCLUDES)
815-
816810
dnl ========================================================
817811
dnl Checks for programs.
818812
dnl ========================================================
@@ -3132,8 +3126,6 @@ EOF
31323126
"$ac_cv_have_visibility_class_bug" = "no"; then
31333127
VISIBILITY_FLAGS='-I$(DIST)/system_wrappers -include $(topsrcdir)/config/gcc_hidden.h'
31343128
WRAP_SYSTEM_INCLUDES=1
3135-
STL_FLAGS='-I$(DIST)/stl_wrappers'
3136-
WRAP_STL_INCLUDES=1
31373129
else
31383130
VISIBILITY_FLAGS='-fvisibility=hidden'
31393131
fi # have visibility pragma bug

js/src/config/config.mk

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -526,7 +526,7 @@ OS_COMPILE_CMMFLAGS += -fobjc-exceptions
526526
endif
527527

528528
COMPILE_CFLAGS = $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(CFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CFLAGS)
529-
COMPILE_CXXFLAGS = $(VISIBILITY_FLAGS) $(STL_FLAGS) $(DEFINES) $(INCLUDES) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(CXXFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CXXFLAGS)
529+
COMPILE_CXXFLAGS = $(VISIBILITY_FLAGS) $(DEFINES) $(INCLUDES) $(DSO_CFLAGS) $(DSO_PIC_CFLAGS) $(CXXFLAGS) $(RTL_FLAGS) $(OS_COMPILE_CXXFLAGS)
530530
COMPILE_CMFLAGS = $(OS_COMPILE_CMFLAGS)
531531
COMPILE_CMMFLAGS = $(OS_COMPILE_CMMFLAGS)
532532

testing/mochitest/ssltunnel/Makefile.in

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -43,10 +43,6 @@ VPATH = @srcdir@
4343

4444
include $(DEPTH)/config/autoconf.mk
4545

46-
# This isn't XPCOM code, but it wants to use STL, so disable the STL
47-
# wrappers
48-
STL_FLAGS =
49-
5046
PROGRAM = ssltunnel$(BIN_SUFFIX)
5147

5248
CPPSRCS = ssltunnel.cpp

0 commit comments

Comments
 (0)