Bug 1028557 - Part 2: Flatten xpcom/reflect/xptcall/{public,src}/ directories. r=bsmedberg
authorBirunthan Mohanathas <birunthan@mohanathas.com>
Mon, 30 Jun 2014 08:39:46 -0700
changeset 191473 f9d26a6bc910537ba436ca7f3a4572492a3f82f6
parent 191472 bb55ed386d477af1e15a1c8b816d490d94bb7d1a
child 191474 7d8ba4eebaa19037a93573a1de73a50db5b19832
push id27051
push userkwierso@gmail.com
push dateTue, 01 Jul 2014 01:00:57 +0000
treeherdermozilla-central@5f998c527a67 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs1028557
milestone33.0a1
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
Bug 1028557 - Part 2: Flatten xpcom/reflect/xptcall/{public,src}/ directories. r=bsmedberg
layout/xul/tree/crashtests/730441-1.xul
layout/xul/tree/crashtests/730441-2.xul
layout/xul/tree/crashtests/730441-3.xul
xpcom/idl-parser/xpidl.py
xpcom/reflect/xptcall/genstubs.pl
xpcom/reflect/xptcall/md/moz.build
xpcom/reflect/xptcall/md/test/README
xpcom/reflect/xptcall/md/test/clean.bat
xpcom/reflect/xptcall/md/test/invoke_test.cpp
xpcom/reflect/xptcall/md/test/mk_invoke.bat
xpcom/reflect/xptcall/md/test/mk_stub.bat
xpcom/reflect/xptcall/md/test/moz.build
xpcom/reflect/xptcall/md/test/stub_test.cpp
xpcom/reflect/xptcall/md/unix/Makefile.in
xpcom/reflect/xptcall/md/unix/moz.build
xpcom/reflect/xptcall/md/unix/vtable_layout_x86.cpp
xpcom/reflect/xptcall/md/unix/xptc_gcc_x86_unix.h
xpcom/reflect/xptcall/md/unix/xptcinvoke_aarch64.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_alpha_openbsd.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_amd64_openbsd.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_arm_netbsd.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_arm_openbsd.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_aarch64.s
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ipf32.s
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ipf64.s
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_mips.S
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_mips64.S
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_pa32.s
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_parisc_linux.s
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc64_linux.S
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc_aix.s
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc_aix64.s
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc_ibmobj_aix.s
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc_linux.S
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc_netbsd.s
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc_openbsd.S
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc_rhapsody.s
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparc64_openbsd.s
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparc_linux_GCC3.s
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparc_netbsd.s
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparc_openbsd.s
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparc_solaris_GCC3.s
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparc_solaris_SUNW.s
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparcv9_solaris_SUNW.s
xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_x86_solaris_SUNW.s
xpcom/reflect/xptcall/md/unix/xptcinvoke_darwin.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_gcc_x86_unix.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_ipf32.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_ipf64.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_linux_alpha.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_linux_m68k.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_linux_s390.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_linux_s390x.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_mips.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_mips64.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_netbsd_m68k.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_pa32.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_aix.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_aix64.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_linux.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_netbsd.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_openbsd.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_rhapsody.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc64_openbsd.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc_netbsd.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc_openbsd.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc_solaris.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_sparcv9_solaris.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_x86_64_solaris.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_x86_64_unix.cpp
xpcom/reflect/xptcall/md/unix/xptcinvoke_x86_solaris.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_aarch64.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_alpha_openbsd.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_amd64_openbsd.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_arm.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_arm_netbsd.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_arm_openbsd.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_aarch64.s
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ipf32.s
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ipf64.s
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips.S
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips.s.m4
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips64.S
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_pa32.s
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_parisc_linux.s
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ppc64_linux.S
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ppc_aix.s.m4
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ppc_aix64.s.m4
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ppc_darwin.s.m4
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ppc_linux.S
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ppc_netbsd.s
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ppc_openbsd.S
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_sparc64_openbsd.s
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_sparc_netbsd.s
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_sparc_openbsd.s
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_sparc_solaris.s
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_sparcv9_solaris.s
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_x86_64_solaris_SUNW.s
xpcom/reflect/xptcall/md/unix/xptcstubs_asm_x86_solaris_SUNW.s
xpcom/reflect/xptcall/md/unix/xptcstubs_darwin.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_gcc_x86_unix.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_ipf32.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_ipf64.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_linux_alpha.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_linux_m68k.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_linux_s390.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_linux_s390x.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_mips.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_mips64.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_netbsd_m68k.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_pa32.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_ppc_aix.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_ppc_aix64.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_ppc_linux.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_ppc_netbsd.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_ppc_openbsd.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_ppc_rhapsody.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_sparc64_openbsd.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_sparc_netbsd.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_sparc_openbsd.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_sparc_solaris.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_sparcv9_solaris.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_x86_64_darwin.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_x86_64_linux.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_x86_64_solaris.cpp
xpcom/reflect/xptcall/md/unix/xptcstubs_x86_solaris.cpp
xpcom/reflect/xptcall/md/win32/moz.build
xpcom/reflect/xptcall/md/win32/xptcinvoke.cpp
xpcom/reflect/xptcall/md/win32/xptcinvoke_asm_x86_64.asm
xpcom/reflect/xptcall/md/win32/xptcinvoke_asm_x86_64_gnu.s
xpcom/reflect/xptcall/md/win32/xptcinvoke_x86_64.cpp
xpcom/reflect/xptcall/md/win32/xptcinvoke_x86_gnu.cpp
xpcom/reflect/xptcall/md/win32/xptcstubs.cpp
xpcom/reflect/xptcall/md/win32/xptcstubs_asm_x86_64.asm
xpcom/reflect/xptcall/md/win32/xptcstubs_x86_64.cpp
xpcom/reflect/xptcall/md/win32/xptcstubs_x86_64_gnu.cpp
xpcom/reflect/xptcall/moz.build
xpcom/reflect/xptcall/porting.html
xpcom/reflect/xptcall/public/genstubs.pl
xpcom/reflect/xptcall/public/moz.build
xpcom/reflect/xptcall/public/xptcall.h
xpcom/reflect/xptcall/public/xptcstubsdecl.inc
xpcom/reflect/xptcall/public/xptcstubsdef.inc
xpcom/reflect/xptcall/src/md/moz.build
xpcom/reflect/xptcall/src/md/test/README
xpcom/reflect/xptcall/src/md/test/clean.bat
xpcom/reflect/xptcall/src/md/test/invoke_test.cpp
xpcom/reflect/xptcall/src/md/test/mk_invoke.bat
xpcom/reflect/xptcall/src/md/test/mk_stub.bat
xpcom/reflect/xptcall/src/md/test/moz.build
xpcom/reflect/xptcall/src/md/test/stub_test.cpp
xpcom/reflect/xptcall/src/md/unix/Makefile.in
xpcom/reflect/xptcall/src/md/unix/moz.build
xpcom/reflect/xptcall/src/md/unix/vtable_layout_x86.cpp
xpcom/reflect/xptcall/src/md/unix/xptc_gcc_x86_unix.h
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_aarch64.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_alpha_openbsd.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_openbsd.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm_netbsd.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm_openbsd.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_aarch64.s
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf32.s
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.S
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips64.S
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_pa32.s
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.S
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_aix.s
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_aix64.s
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_ibmobj_aix.s
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_linux.S
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_openbsd.S
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_rhapsody.s
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_openbsd.s
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_linux_GCC3.s
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_netbsd.s
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_openbsd.s
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_solaris_GCC3.s
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_solaris_SUNW.s
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparcv9_solaris_SUNW.s
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_x86_solaris_SUNW.s
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_darwin.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ipf32.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ipf64.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_m68k.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips64.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_pa32.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_aix.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_aix64.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_linux.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_openbsd.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_rhapsody.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_openbsd.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc_netbsd.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc_openbsd.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc_solaris.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparcv9_solaris.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_solaris.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_unix.cpp
xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_solaris.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_aarch64.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_alpha_openbsd.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_openbsd.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_openbsd.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_aarch64.s
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf32.s
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.S
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips64.S
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_pa32.s
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.S
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_aix.s.m4
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_aix64.s.m4
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_darwin.s.m4
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_linux.S
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_openbsd.S
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc64_openbsd.s
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc_netbsd.s
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc_openbsd.s
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc_solaris.s
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparcv9_solaris.s
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_x86_64_solaris_SUNW.s
xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_x86_solaris_SUNW.s
xpcom/reflect/xptcall/src/md/unix/xptcstubs_darwin.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf32.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf64.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_s390.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_s390x.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_mips.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_mips64.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_pa32.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_aix.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_aix64.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_linux.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_openbsd.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_rhapsody.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_openbsd.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc_netbsd.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc_openbsd.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc_solaris.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparcv9_solaris.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_darwin.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_solaris.cpp
xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_solaris.cpp
xpcom/reflect/xptcall/src/md/win32/moz.build
xpcom/reflect/xptcall/src/md/win32/xptcinvoke.cpp
xpcom/reflect/xptcall/src/md/win32/xptcinvoke_asm_x86_64.asm
xpcom/reflect/xptcall/src/md/win32/xptcinvoke_asm_x86_64_gnu.s
xpcom/reflect/xptcall/src/md/win32/xptcinvoke_x86_64.cpp
xpcom/reflect/xptcall/src/md/win32/xptcinvoke_x86_gnu.cpp
xpcom/reflect/xptcall/src/md/win32/xptcstubs.cpp
xpcom/reflect/xptcall/src/md/win32/xptcstubs_asm_x86_64.asm
xpcom/reflect/xptcall/src/md/win32/xptcstubs_x86_64.cpp
xpcom/reflect/xptcall/src/md/win32/xptcstubs_x86_64_gnu.cpp
xpcom/reflect/xptcall/src/moz.build
xpcom/reflect/xptcall/src/xptcall.cpp
xpcom/reflect/xptcall/src/xptcprivate.h
xpcom/reflect/xptcall/status.html
xpcom/reflect/xptcall/xptcall.cpp
xpcom/reflect/xptcall/xptcall.h
xpcom/reflect/xptcall/xptcprivate.h
xpcom/reflect/xptcall/xptcstubsdecl.inc
xpcom/reflect/xptcall/xptcstubsdef.inc
xpcom/reflect/xptinfo/xptiInterfaceInfoManager.cpp
--- a/layout/xul/tree/crashtests/730441-1.xul
+++ b/layout/xul/tree/crashtests/730441-1.xul
@@ -3,17 +3,17 @@
 Program received signal SIGSEGV, Segmentation fault.
 0xb6457185 in nsIContent::SetAttr (this=0x0, aNameSpaceID=0, aName=0xb0cb064c, aValue=..., aNotify=1) at ../../dist/include/nsIContent.h:285
 285	    return SetAttr(aNameSpaceID, aName, nsnull, aValue, aNotify);
 (gdb) p this
 $6 = (nsIContent * const) 0x0
 (gdb) bt 3
 #0  0xb6457185 in nsIContent::SetAttr (this=0x0, aNameSpaceID=0, aName=0xb0cb064c, aValue=..., aNotify=1) at ../../dist/include/nsIContent.h:285
 #1  0xb6b72072 in nsTreeColumns::RestoreNaturalOrder (this=0xaaf83cc0) at layout/xul/base/src/tree/src/nsTreeColumns.cpp:605
-#2  0xb736c76f in NS_InvokeByIndex_P () at xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp:69
+#2  0xb736c76f in NS_InvokeByIndex_P () at xpcom/reflect/xptcall/md/unix/xptcinvoke_gcc_x86_unix.cpp:69
 (More stack frames follow...)
 (gdb) frame 1
 #1  0xb6b72072 in nsTreeColumns::RestoreNaturalOrder (this=0xaaf83cc0) at layout/xul/base/src/tree/src/nsTreeColumns.cpp:605
 605	    child->SetAttr(kNameSpaceID_None, nsGkAtoms::ordinal, ordinal, PR_TRUE);
 (gdb) list
 600	  PRUint32 numChildren = colsContent->GetChildCount();
 601	  for (PRUint32 i = 0; i < numChildren; ++i) {
 602	    nsIContent *child = colsContent->GetChildAt(i);
--- a/layout/xul/tree/crashtests/730441-2.xul
+++ b/layout/xul/tree/crashtests/730441-2.xul
@@ -1,16 +1,16 @@
 <?xml version="1.0"?>
 <!--
 Program received signal SIGSEGV, Segmentation fault.
 0xb6b720a6 in nsTreeColumns::RestoreNaturalOrder (this=0xa947a580) at layout/xul/base/src/tree/src/nsTreeColumns.cpp:610
 610	  mTree->Invalidate();
 (gdb) bt 3
 #0  0xb6b720a6 in nsTreeColumns::RestoreNaturalOrder (this=0xa947a580) at layout/xul/base/src/tree/src/nsTreeColumns.cpp:610
-#1  0xb736c76f in NS_InvokeByIndex_P () at xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp:69
+#1  0xb736c76f in NS_InvokeByIndex_P () at xpcom/reflect/xptcall/md/unix/xptcinvoke_gcc_x86_unix.cpp:69
 #2  0xb6171901 in XPCWrappedNative::CallMethod (ccx=..., mode=XPCWrappedNative::CALL_METHOD)
     at js/src/xpconnect/src/xpcwrappednative.cpp:2722
 (More stack frames follow...)
 (gdb) list
 605	    child->SetAttr(kNameSpaceID_None, nsGkAtoms::ordinal, ordinal, PR_TRUE);
 606	  }
 607	
 608	  nsTreeColumns::InvalidateColumns();
--- a/layout/xul/tree/crashtests/730441-3.xul
+++ b/layout/xul/tree/crashtests/730441-3.xul
@@ -2,17 +2,17 @@
 <!--
 ###!!! ASSERTION: You can't dereference a NULL nsCOMPtr with operator->().: 'mRawPtr != 0', file ../../../../dist/include/nsCOMPtr.h, line 796
 
 Program received signal SIGSEGV, Segmentation fault.
 0xb6b7463a in nsTreeContentView::SetTree (this=0xb0ba2510, aTree=0xaaecece0) at layout/xul/base/src/tree/src/nsTreeContentView.cpp:571
 571        boxObject->GetElement(getter_AddRefs(element));
 (gdb) bt 3
 #0  0xb6b7463a in nsTreeContentView::SetTree (this=0xb0ba2510, aTree=0xaaecece0) at layout/xul/base/src/tree/src/nsTreeContentView.cpp:571
-#1  0xb736c76f in NS_InvokeByIndex_P () at xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp:69
+#1  0xb736c76f in NS_InvokeByIndex_P () at xpcom/reflect/xptcall/md/unix/xptcinvoke_gcc_x86_unix.cpp:69
 #2  0xb6171901 in XPCWrappedNative::CallMethod (ccx=..., mode=XPCWrappedNative::CALL_METHOD)
     at js/src/xpconnect/src/xpcwrappednative.cpp:2722
 (More stack frames follow...)
 (gdb) list 566
 561    nsTreeContentView::SetTree(nsITreeBoxObject* aTree)
 562    {
 563      ClearRows();
 564
--- a/xpcom/idl-parser/xpidl.py
+++ b/xpcom/idl-parser/xpidl.py
@@ -511,17 +511,17 @@ class Interface(object):
 
             if self.attributes.scriptable and realbase.attributes.builtinclass and not self.attributes.builtinclass:
                 raise IDLError("interface '%s' is not builtinclass but derives from builtinclass '%s'" % (self.name, self.base), self.location)
 
         for member in self.members:
             member.resolve(self)
 
         # The number 250 is NOT arbitrary; this number is the maximum number of
-        # stub entries defined in xpcom/reflect/xptcall/public/genstubs.pl
+        # stub entries defined in xpcom/reflect/xptcall/genstubs.pl
         # Do not increase this value without increasing the number in that
         # location, or you WILL cause otherwise unknown problems!
         if self.countEntries() > 250 and not self.attributes.builtinclass:
             raise IDLError("interface '%s' has too many entries" % self.name,
                 self.location)
 
     def isScriptable(self):
         # NOTE: this is not whether *this* interface is scriptable... it's
rename from xpcom/reflect/xptcall/public/genstubs.pl
rename to xpcom/reflect/xptcall/genstubs.pl
rename from xpcom/reflect/xptcall/src/md/moz.build
rename to xpcom/reflect/xptcall/md/moz.build
rename from xpcom/reflect/xptcall/src/md/test/README
rename to xpcom/reflect/xptcall/md/test/README
rename from xpcom/reflect/xptcall/src/md/test/clean.bat
rename to xpcom/reflect/xptcall/md/test/clean.bat
rename from xpcom/reflect/xptcall/src/md/test/invoke_test.cpp
rename to xpcom/reflect/xptcall/md/test/invoke_test.cpp
rename from xpcom/reflect/xptcall/src/md/test/mk_invoke.bat
rename to xpcom/reflect/xptcall/md/test/mk_invoke.bat
rename from xpcom/reflect/xptcall/src/md/test/mk_stub.bat
rename to xpcom/reflect/xptcall/md/test/mk_stub.bat
rename from xpcom/reflect/xptcall/src/md/test/moz.build
rename to xpcom/reflect/xptcall/md/test/moz.build
rename from xpcom/reflect/xptcall/src/md/test/stub_test.cpp
rename to xpcom/reflect/xptcall/md/test/stub_test.cpp
rename from xpcom/reflect/xptcall/src/md/unix/Makefile.in
rename to xpcom/reflect/xptcall/md/unix/Makefile.in
rename from xpcom/reflect/xptcall/src/md/unix/moz.build
rename to xpcom/reflect/xptcall/md/unix/moz.build
--- a/xpcom/reflect/xptcall/src/md/unix/moz.build
+++ b/xpcom/reflect/xptcall/md/unix/moz.build
@@ -326,12 +326,12 @@ if CONFIG['OS_ARCH'] == 'Linux':
             '-fomit-frame-pointer',
             '-mbackchain',
         ]
 
 FINAL_LIBRARY = 'xpcom_core'
 
 LOCAL_INCLUDES += [
     '../..',
-    '../../../../xptinfo',
+    '/xpcom/reflect/xptinfo',
 ]
 
 NO_PGO = True
rename from xpcom/reflect/xptcall/src/md/unix/vtable_layout_x86.cpp
rename to xpcom/reflect/xptcall/md/unix/vtable_layout_x86.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptc_gcc_x86_unix.h
rename to xpcom/reflect/xptcall/md/unix/xptc_gcc_x86_unix.h
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_aarch64.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_aarch64.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_alpha_openbsd.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_alpha_openbsd.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_amd64_openbsd.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_amd64_openbsd.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_arm.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm_netbsd.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_arm_netbsd.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_arm_openbsd.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_arm_openbsd.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_aarch64.s
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_aarch64.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf32.s
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ipf32.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ipf64.s
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ipf64.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips.S
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_mips.S
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_mips64.S
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_mips64.S
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_pa32.s
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_pa32.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_parisc_linux.s
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_parisc_linux.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc64_linux.S
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc64_linux.S
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_aix.s
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc_aix.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_aix64.s
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc_aix64.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_ibmobj_aix.s
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc_ibmobj_aix.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_linux.S
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc_linux.S
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_netbsd.s
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc_netbsd.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_openbsd.S
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc_openbsd.S
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_ppc_rhapsody.s
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_ppc_rhapsody.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc64_openbsd.s
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparc64_openbsd.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_linux_GCC3.s
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparc_linux_GCC3.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_netbsd.s
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparc_netbsd.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_openbsd.s
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparc_openbsd.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_solaris_GCC3.s
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparc_solaris_GCC3.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparc_solaris_SUNW.s
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparc_solaris_SUNW.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_sparcv9_solaris_SUNW.s
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_sparcv9_solaris_SUNW.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_asm_x86_solaris_SUNW.s
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_asm_x86_solaris_SUNW.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_darwin.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_darwin.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_gcc_x86_unix.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_gcc_x86_unix.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ipf32.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_ipf32.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ipf64.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_ipf64.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_alpha.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_linux_alpha.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_m68k.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_linux_m68k.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_linux_s390.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_linux_s390x.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_linux_s390x.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_mips.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_mips64.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_mips64.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_netbsd_m68k.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_netbsd_m68k.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_pa32.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_pa32.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc64_linux.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc64_linux.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_aix.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_aix.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_aix64.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_aix64.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_linux.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_linux.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_netbsd.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_netbsd.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_openbsd.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_openbsd.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_ppc_rhapsody.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_ppc_rhapsody.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc64_openbsd.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc64_openbsd.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc_netbsd.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc_netbsd.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc_openbsd.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc_openbsd.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparc_solaris.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_sparc_solaris.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_sparcv9_solaris.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_sparcv9_solaris.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_solaris.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_x86_64_solaris.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_64_unix.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_x86_64_unix.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcinvoke_x86_solaris.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcinvoke_x86_solaris.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_aarch64.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_aarch64.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_alpha_openbsd.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_alpha_openbsd.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_amd64_openbsd.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_amd64_openbsd.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_arm.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_netbsd.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_arm_netbsd.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_arm_openbsd.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_arm_openbsd.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_aarch64.s
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_aarch64.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf32.s
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ipf32.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ipf64.s
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ipf64.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.S
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips.S
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips.s.m4
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips.s.m4
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_mips64.S
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_mips64.S
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_pa32.s
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_pa32.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_parisc_linux.s
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_parisc_linux.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc64_linux.S
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ppc64_linux.S
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_aix.s.m4
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ppc_aix.s.m4
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_aix64.s.m4
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ppc_aix64.s.m4
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_darwin.s.m4
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ppc_darwin.s.m4
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_linux.S
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ppc_linux.S
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_netbsd.s
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ppc_netbsd.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_ppc_openbsd.S
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_ppc_openbsd.S
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc64_openbsd.s
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_sparc64_openbsd.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc_netbsd.s
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_sparc_netbsd.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc_openbsd.s
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_sparc_openbsd.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparc_solaris.s
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_sparc_solaris.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_sparcv9_solaris.s
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_sparcv9_solaris.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_x86_64_solaris_SUNW.s
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_x86_64_solaris_SUNW.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_asm_x86_solaris_SUNW.s
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_asm_x86_solaris_SUNW.s
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_darwin.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_darwin.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_gcc_x86_unix.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_gcc_x86_unix.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf32.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_ipf32.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_ipf64.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_ipf64.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_alpha.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_linux_alpha.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_m68k.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_linux_m68k.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_s390.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_linux_s390.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_linux_s390x.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_linux_s390x.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_mips.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_mips.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_mips64.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_mips64.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_netbsd_m68k.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_netbsd_m68k.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_pa32.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_pa32.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc64_linux.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_ppc64_linux.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_aix.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_ppc_aix.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_aix64.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_ppc_aix64.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_linux.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_ppc_linux.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_netbsd.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_ppc_netbsd.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_openbsd.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_ppc_openbsd.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_ppc_rhapsody.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_ppc_rhapsody.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc64_openbsd.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_sparc64_openbsd.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc_netbsd.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_sparc_netbsd.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc_openbsd.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_sparc_openbsd.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparc_solaris.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_sparc_solaris.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_sparcv9_solaris.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_sparcv9_solaris.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_darwin.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_x86_64_darwin.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_linux.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_x86_64_linux.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_64_solaris.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_x86_64_solaris.cpp
rename from xpcom/reflect/xptcall/src/md/unix/xptcstubs_x86_solaris.cpp
rename to xpcom/reflect/xptcall/md/unix/xptcstubs_x86_solaris.cpp
rename from xpcom/reflect/xptcall/src/md/win32/moz.build
rename to xpcom/reflect/xptcall/md/win32/moz.build
--- a/xpcom/reflect/xptcall/src/md/win32/moz.build
+++ b/xpcom/reflect/xptcall/md/win32/moz.build
@@ -33,15 +33,15 @@ else:
             'xptcinvoke.cpp',
             'xptcstubs.cpp',
         ]
 
 FINAL_LIBRARY = 'xpcom_core'
 
 LOCAL_INCLUDES += [
     '../..',
-    '../../../../xptinfo',
+    '/xpcom/reflect/xptinfo',
 ]
 
 if CONFIG['TARGET_CPU'] != 'x86_64':
     if not CONFIG['GNU_CXX']:
         # FIXME: bug 413019
         NO_PGO = True
rename from xpcom/reflect/xptcall/src/md/win32/xptcinvoke.cpp
rename to xpcom/reflect/xptcall/md/win32/xptcinvoke.cpp
rename from xpcom/reflect/xptcall/src/md/win32/xptcinvoke_asm_x86_64.asm
rename to xpcom/reflect/xptcall/md/win32/xptcinvoke_asm_x86_64.asm
rename from xpcom/reflect/xptcall/src/md/win32/xptcinvoke_asm_x86_64_gnu.s
rename to xpcom/reflect/xptcall/md/win32/xptcinvoke_asm_x86_64_gnu.s
rename from xpcom/reflect/xptcall/src/md/win32/xptcinvoke_x86_64.cpp
rename to xpcom/reflect/xptcall/md/win32/xptcinvoke_x86_64.cpp
rename from xpcom/reflect/xptcall/src/md/win32/xptcinvoke_x86_gnu.cpp
rename to xpcom/reflect/xptcall/md/win32/xptcinvoke_x86_gnu.cpp
rename from xpcom/reflect/xptcall/src/md/win32/xptcstubs.cpp
rename to xpcom/reflect/xptcall/md/win32/xptcstubs.cpp
rename from xpcom/reflect/xptcall/src/md/win32/xptcstubs_asm_x86_64.asm
rename to xpcom/reflect/xptcall/md/win32/xptcstubs_asm_x86_64.asm
rename from xpcom/reflect/xptcall/src/md/win32/xptcstubs_x86_64.cpp
rename to xpcom/reflect/xptcall/md/win32/xptcstubs_x86_64.cpp
rename from xpcom/reflect/xptcall/src/md/win32/xptcstubs_x86_64_gnu.cpp
rename to xpcom/reflect/xptcall/md/win32/xptcstubs_x86_64_gnu.cpp
--- a/xpcom/reflect/xptcall/moz.build
+++ b/xpcom/reflect/xptcall/moz.build
@@ -1,8 +1,25 @@
 # -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
 # vim: set filetype=python:
 # This Source Code Form is subject to the terms of the Mozilla Public
 # License, v. 2.0. If a copy of the MPL was not distributed with this
 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
-DIRS += ['public', 'src']
+DIRS += ['md']
+
+SOURCES += [
+    'xptcall.cpp',
+]
 
+EXPORTS += [
+    'xptcall.h',
+    'xptcstubsdecl.inc',
+    'xptcstubsdef.inc',
+]
+
+MSVC_ENABLE_PGO = True
+
+LOCAL_INCLUDES += [
+    '/xpcom/reflect/xptinfo',
+]
+
+FINAL_LIBRARY = 'xpcom_core'
--- a/xpcom/reflect/xptcall/porting.html
+++ b/xpcom/reflect/xptcall/porting.html
@@ -23,21 +23,21 @@ ported to all platforms that want to sup
 
 <h3>The tree</h3>
 
 <blockquote>
 <pre>
 <a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall">mozilla/xpcom/reflect/xptcall</a>
   +--<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/public">public</a>  // exported headers
   +--<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/src">src</a>  // core source
-  |  \--<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/src/md">md</a>  // platform specific parts
-  |     +--<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/src/md/mac">mac</a>  // mac ppc
-  |     +--<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/src/md/unix">unix</a>  // all unix
-  |     \--<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/src/md/win32">win32</a>  // win32
-  |     +--<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/src/md/test">test</a>  // simple tests to get started
+  |  \--<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/md">md</a>  // platform specific parts
+  |     +--<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/md/mac">mac</a>  // mac ppc
+  |     +--<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/md/unix">unix</a>  // all unix
+  |     \--<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/md/win32">win32</a>  // win32
+  |     +--<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/md/test">test</a>  // simple tests to get started
   \--<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/tests">tests</a>  // full tests via api
 </pre>
 
 Porters are free to create subdirectories under the base <code>md</code>
 directory for their given platforms and to integrate into the build system as
 appropriate for their platform.
 
 </blockquote>
@@ -46,50 +46,50 @@ appropriate for their platform.
 
 <blockquote>
 
 There are really two pieces of functionality: <i>invoke</i> and <i>stubs</i>...
 
 <p>
 
 The <b><i>invoke</i></b> functionality requires the implementation of the
-following on each platform (from <a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/public/xptcall.h">xptcall/public/xptcall.h</a>):
+following on each platform (from <a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/xptcall.h">xptcall/xptcall.h</a>):
 
 <pre>
 XPTC_PUBLIC_API(nsresult)
 NS_InvokeByIndex(nsISupports* that, uint32_t methodIndex,
                    uint32_t paramCount, nsXPTCVariant* params);
 </pre>
 
 Calling code is expected to supply an array of <code>nsXPTCVariant</code>
 structs. These are discriminated unions describing the type and value of each
 parameter of the target function. The platform specific code then builds a call
 frame and invokes the method indicated by the index <code>methodIndex</code> on
 the xpcom interface <code>that</code>.
 
 <p>
 
 Here are examples of this implementation for 
-<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/src/md/win32/xptcinvoke.cpp">Win32</a>
+<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/md/win32/xptcinvoke.cpp">Win32</a>
 and 
-<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/src/md/unix/xptcinvoke_unixish_x86.cpp">Linux x86, NetBSD x86, and FreeBSD</a>.
+<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/md/unix/xptcinvoke_unixish_x86.cpp">Linux x86, NetBSD x86, and FreeBSD</a>.
 
 Both of these implementations use the basic strategy of: figure out how much
 stack space is needed for the params, make the space in a new frame, copy the
 params to that space, invoke the method, cleanup and return. C++ is used where
 appropriate, Assembly language is used where necessary. Inline assembly language is used here,
 but it is equally valid to use separate assembly language source files. Porters
 can decide how best to do this for their platforms.
 
 <p>
 
 The <b><i>stubs</i></b> functionality is more complex. The goal here is a class
 whose vtbl can look like the vtbl of any arbitrary xpcom interface. Objects of
 this class can then be built to impersonate any xpcom object. The base interface
-for this is (from <a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/public/xptcall.h">xptcall/public/xptcall.h</a>):
+for this is (from <a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/xptcall.h">xptcall/xptcall.h</a>):
 
 <pre>
 class nsXPTCStubBase : public nsISupports
 {
 public:
     // Include generated vtbl stub declarations.
     // These are virtual and *also* implemented by this class..
 #include "xptcstubsdecl.inc"
@@ -125,32 +125,32 @@ specific method that uses the interface 
 the overridden <code>GetInterfaceInfo</code> to extract the parameters and build
 an array of platform independent <code>nsXPTCMiniVariant</code> structs which
 are in turn passed on to the overridden <code>CallMethod</code>. The
 platform dependent code is responsible for doing any cleanup and returning.
 
 <p>
 
 The stub methods are declared in <a
-href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/public/xptcstubsdecl.inc">xptcall/public/xptcstubsdecl.inc</a>.
+href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/xptcstubsdecl.inc">xptcall/xptcstubsdecl.inc</a>.
 These are '#included' into the declaration of <code>nsXPTCStubBase</code>. A
 similar include file (<a
-href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/public/xptcstubsdef.inc">xptcall/public/xptcstubsdef.inc</a>)
+href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/xptcstubsdef.inc">xptcall/xptcstubsdef.inc</a>)
 is expanded using platform specific macros to define the stub functions. These
 '.inc' files are checked into cvs. However, they can be regenerated as necessary
 (i.e. to change the number of stubs or to change their specific declaration)
 using the Perl script  <a
-href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/public/genstubs.pl">xptcall/public/genstubs.pl</a>.
+href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/genstubs.pl">xptcall/genstubs.pl</a>.
 
 <p>
 
 Here are examples of this implementation for  <a
-href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/src/md/win32/xptcstubs.cpp">Win32</a>
+href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/md/win32/xptcstubs.cpp">Win32</a>
 and  <a
-href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/src/md/unix/xptcstubs_unixish_x86.cpp">Linux x86, NetBSD x86, and FreeBSD</a>.
+href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/md/unix/xptcstubs_unixish_x86.cpp">Linux x86, NetBSD x86, and FreeBSD</a>.
 Both of these examples use inline assembly language. That is just how I
 decided to do it. You can do it as you choose.
 
 <p>
 
 The Win32 version is somewhat tighter because the __declspec(naked) feature
 allows for very small stubs. However, the __stdcall requires the callee to clean
 up the stack, so it is imperative that the interface information scheme allow
@@ -171,17 +171,17 @@ paste as necessary. Please remember that
 important than speed optimizations. This code is primarily used to connect XPCOM
 components with JavaScript; function call overhead is a <b>tiny</b> part of the
 time involved.
 
 <p>
 
 I put together 
 <a
-href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/src/md/test">xptcall/src/md/test
+href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/md/test">xptcall/md/test
 </a> as a place to evolve the basic functionality as a port is coming together.
 Not all of the functionality is exercised, but it is a place to get started. 
 <a
 href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/tests">xptcall/tests
 </a> has an api level test for <code>NS_InvokeByIndex</code>, but no tests for
 the <i>stubs</i> functionality. Such a test ought to be written, but this has not
 yet been done.
 
deleted file mode 100644
--- a/xpcom/reflect/xptcall/public/moz.build
+++ /dev/null
@@ -1,12 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-EXPORTS += [
-    'xptcall.h',
-    'xptcstubsdecl.inc',
-    'xptcstubsdef.inc',
-]
-
deleted file mode 100644
--- a/xpcom/reflect/xptcall/src/moz.build
+++ /dev/null
@@ -1,19 +0,0 @@
-# -*- Mode: python; c-basic-offset: 4; indent-tabs-mode: nil; tab-width: 40 -*-
-# vim: set filetype=python:
-# This Source Code Form is subject to the terms of the Mozilla Public
-# License, v. 2.0. If a copy of the MPL was not distributed with this
-# file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
-DIRS += ['md']
-
-SOURCES += [
-    'xptcall.cpp',
-]
-
-MSVC_ENABLE_PGO = True
-
-LOCAL_INCLUDES += [
-    '/xpcom/reflect/xptinfo',
-]
-
-FINAL_LIBRARY = 'xpcom_core'
--- a/xpcom/reflect/xptcall/status.html
+++ b/xpcom/reflect/xptcall/status.html
@@ -39,86 +39,86 @@ is the best contact regarding 'nix (Unix
 
 <TR>
 <TD bgcolor="green"><font color="white"><b>Done</b></font></TD>
 <TD>Win32 x86</TD>
 <TD><img alt="Contributed code!" title="Contributed code!" src="http://tinderbox.mozilla.org/star.gif">
 <a href="mailto:jband@netscape.com">John Bandhauer &lt;jband@netscape.com&gt;</a>
 </TD>
 <TD>
-<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/src/md/win32">win32</a></TD>
+<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/md/win32">win32</a></TD>
 </TR>
 
 <TR>
 <TD bgcolor="green"><font color="white"><b>Done</b></font></TD>
 <TD>Linux x86</TD>
 <TD><img alt="Contributed code!" title="Contributed code!" src="http://tinderbox.mozilla.org/star.gif">
 <a href="mailto:jband@netscape.com">John Bandhauer &lt;jband@netscape.com&gt;</a><br>
 <img alt="Contributed code!" title="Contributed code!" src="http://tinderbox.mozilla.org/star.gif">
 <a href="mailto:drepper@cygnus.com">Ulrich Drepper &lt;drepper@cygnus.com&gt;</a>
 </TD>
-<TD><a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/src/md/unix">unix</a>
+<TD><a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/md/unix">unix</a>
 </TD>
 </TR>
 
 <TR>
 <TD bgcolor="green"><font color="white"><b>Done</b></font></TD>
 <TD>FreeBSD and NetBSD x86</TD>
 <TD><img alt="Contributed code!" title="Contributed code!" src="http://tinderbox.mozilla.org/star.gif">
 <a href="mailto:toshok@hungry.com">Christoph Toshok &lt;toshok@hungry.com&gt;</a>,<BR>
 <img alt="Contributed code!" title="Contributed code!" src="http://tinderbox.mozilla.org/star.gif">
 <a href="mailto:jband@netscape.com">John Bandhauer &lt;jband@netscape.com&gt;</a></TD>
-<TD><a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/src/md/unix">unix</a> (same as Linux 86 code)</TD>
+<TD><a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/md/unix">unix</a> (same as Linux 86 code)</TD>
 </TR>
 
 <TR>
 <TD bgcolor="green"><font color="white"><b>Done</b></font></TD>
 <TD>BSD/OS x86</TD>
 <TD><img alt="Contributed code!" title="Contributed code!" src="http://tinderbox.mozilla.org/star.gif">
 <a href="mailto:bert_driehuis@nl.compuware.com">Bert Driehuis &lt;bert_driehuis@nl.compuware.com&gt;</a></TD>
-<TD><a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/src/md/unix">unix</a> (same as Linux 86 code)
+<TD><a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/md/unix">unix</a> (same as Linux 86 code)
 Bert contributed patches that *should* do the right thing for all the unixish-x86
 versions of this code for GCC 2.7 or 2.8 vs. EGCS 1.1. He notes that the vtbl 
 scheme is different. He is hoping that others will help test the changes using 
 these two compilers on the various platforms where this same code is used. 
 <a href="news://news.mozilla.org/372DD257.4248C821%40nl.compuware.com">Bert's details</a>
 </TD>
 </TR>
 
 <TR>
 <TD bgcolor="green"><font color="white"><b>Done</b></font></TD>
 <TD>Mac PPC</TD>
 <TD><img alt="Contributed code!" title="Contributed code!" src="http://tinderbox.mozilla.org/star.gif">
  <a href="mailto:rogerl@netscape.com">Roger Lawrence &lt;rogerl@netscape.com&gt;</a>,<BR>
 <img alt="Contributed code!" title="Contributed code!" src="http://tinderbox.mozilla.org/star.gif">
 <a href="mailto:beard@netscape.com">Patrick Beard &lt;beard@netscape.com&gt;</a>
 </TD>
-<TD><a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/src/md/mac">mac</a> (passing tests and checked in)</TD>
+<TD><a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/md/mac">mac</a> (passing tests and checked in)</TD>
 </TR>
 
 <TR>
 <TD bgcolor="green"><font color="white"><b>Done</b></font></TD>
 <TD>Solaris Sparc</TD>
 <TD><img alt="Contributed code!" title="Contributed code!" src="http://tinderbox.mozilla.org/star.gif">
 <a href="mailto:rogerl@netscape.com">Roger Lawrence &lt;rogerl@netscape.com&gt;</a>,<BR>
 <img alt="Contributed code!" title="Contributed code!" src="http://tinderbox.mozilla.org/star.gif">
 <a href="mailto:mcafee@netscape.com">Chris McAfee &lt;mcafee@netscape.com&gt;</a>
 </TD>
-<TD><a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/src/md/unix">unix</a> This is checked in and working.</TD>
+<TD><a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/md/unix">unix</a> This is checked in and working.</TD>
 </TR>
 
 <TR>
 <TD bgcolor="green"><font color="white"><b>Done</b></font></TD>
 <TD>Solaris Sparc v9 (64bit)</TD>
 <TD><img alt="Contributed code!" title="Contributed code!" src="http://tinderbox.mozilla.org/star.gif">
 <a href="mailto:pavlov@netscape.com">Stuart Parmenter &lt;pavlov@netscape.com&gt;</a>,<BR>
 <img alt="Contributed code!" title="Contributed code!" src="http://tinderbox.mozilla.org/star.gif">
 <a href="mailto:cls@seawood.org">Chris Seawood &lt;cls@seawood.org&gt;</a>
 </TD>
-<TD><a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/src/md/unix">unix</a> This is checked in and (pavlov claims!) working.</TD>
+<TD><a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/md/unix">unix</a> This is checked in and (pavlov claims!) working.</TD>
 </TR>
 
 <TR>
 <TD bgcolor="green"><font color="white"><b>Done</b></font></TD>
 <TD>OS/2</TD>
 <TD><img alt="Contributed code!" title="Contributed code!" src="http://tinderbox.mozilla.org/star.gif">
 <a href="mailto:mjf35@cam.ac.uk">John Fairhurst &lt;mjf35@cam.ac.uk&gt;</a></TD>
 <TD>I never heard exactly who did what. But mozilla has been working on OS/2 
@@ -150,17 +150,17 @@ It is a variation of the IRIS port (only
 Notice the last 2 files (the change to mozilla\xpcom\build\makefile.win and
 mozilla\xpcom\build) are needed because I was unable to figure how to do a
 "declspecexport" from the assembler ASAXP ... if some knows how to do that then
 those last 2 files won't be needed.
 <p>
 I have had someone look over this code at bridge.com (the entry point to
 compaq/gem compiler team) and this code was given the OK. I consider it "done".
 <p>
-This code lives in the files where the name includes 'alpha' in the <a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/src/md/win32">win32</a> directory.<BR>
+This code lives in the files where the name includes 'alpha' in the <a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/md/win32">win32</a> directory.<BR>
 </TD>
 </TR>
 
 <TR>
 <TD bgcolor="green"><font color="white"><b>Done</b></font></TD>
 <TD>Linux ARM</TD>
 <TD><img alt="Started" title="Started" src="http://tinderbox.mozilla.org/star.gif">
 <a href="mailto:sh990154@mail.uni-greifswald.de">Stefan Hanske&lt;sh990154@mail.uni-greifswald.de&gt;</a><BR>
@@ -296,17 +296,17 @@ is the interim maintainer until someone 
 
 <TR>
 <TD bgcolor="green"><font color="white"><b>Done</b></font></TD>
 <TD>BeOS x86</TD>
 <TD><img alt="Contributed code!" title="Contributed code!" src="http://tinderbox.mozilla.org/star.gif">
 <a href="mailto:duncan@be.com">Duncan Wilcox &lt;duncan@be.com&gt;</a><BR>
 </TD>
 <TD>
-<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/src/md/unix">unix</a> (yet another reuse of the Linux 86 code!)<BR>
+<a href="http://lxr.mozilla.org/mozilla/source/xpcom/reflect/xptcall/md/unix">unix</a> (yet another reuse of the Linux 86 code!)<BR>
 Duncan says this is all working. He did the code for old cfront style 'this' adjustment for others to use too!
 </TD>
 </TR>
 
 <TR>
 <TD bgcolor="red"><font color="white"><b>HELP!</b></font></TD>
 <TD>BeOS PPC</TD>
 <TD align="center">-</TD>
rename from xpcom/reflect/xptcall/src/xptcall.cpp
rename to xpcom/reflect/xptcall/xptcall.cpp
rename from xpcom/reflect/xptcall/public/xptcall.h
rename to xpcom/reflect/xptcall/xptcall.h
rename from xpcom/reflect/xptcall/src/xptcprivate.h
rename to xpcom/reflect/xptcall/xptcprivate.h
rename from xpcom/reflect/xptcall/public/xptcstubsdecl.inc
rename to xpcom/reflect/xptcall/xptcstubsdecl.inc
rename from xpcom/reflect/xptcall/public/xptcstubsdef.inc
rename to xpcom/reflect/xptcall/xptcstubsdef.inc
--- a/xpcom/reflect/xptinfo/xptiInterfaceInfoManager.cpp
+++ b/xpcom/reflect/xptinfo/xptiInterfaceInfoManager.cpp
@@ -136,17 +136,17 @@ void
 XPTInterfaceInfoManager::VerifyAndAddEntryIfNew(XPTInterfaceDirectoryEntry* iface,
                                                 uint16_t idx,
                                                 xptiTypelibGuts* typelib)
 {
     if (!iface->interface_descriptor)
         return;
 
     // The number of maximum methods is not arbitrary. It is the same value as
-    // in xpcom/reflect/xptcall/public/genstubs.pl; do not change this value
+    // in xpcom/reflect/xptcall/genstubs.pl; do not change this value
     // without changing that one or you WILL see problems.
     if (iface->interface_descriptor->num_methods > 250 &&
             !(XPT_ID_IS_BUILTINCLASS(iface->interface_descriptor->flags))) {
         NS_ASSERTION(0, "Too many methods to handle for the stub, cannot load");
         fprintf(stderr, "ignoring too large interface: %s\n", iface->name);
         return;
     }