From a643fbbecc17657cc4c7484e092342f5ed36c2d0 Mon Sep 17 00:00:00 2001 From: "reed%reedloden.com" Date: Wed, 12 Mar 2008 10:59:03 +0000 Subject: [PATCH] Bug 356011 - "kfreebsd support" (main configure.in and xpcom parts) [p=mh+mozilla@glandium.org (Mike Hommey) r=bsmedberg a1.9=damons] git-svn-id: svn://10.0.0.236/trunk@247620 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/configure.in | 7 ++++--- mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in | 2 +- .../xptcall/src/md/unix/xptc_platforms_unixish_x86.h | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/mozilla/configure.in b/mozilla/configure.in index a5b76ab2da3..22b7745270b 100644 --- a/mozilla/configure.in +++ b/mozilla/configure.in @@ -948,6 +948,7 @@ if test -n "$CROSS_COMPILE"; then OS_RELEASE= case "${target_os}" in linux*) OS_ARCH=Linux OS_TARGET=Linux ;; + kfreebsd*-gnu) OS_ARCH=GNU_kFreeBSD OS_TARGET=GNU_kFreeBSD ;; solaris*) OS_ARCH=SunOS OS_RELEASE=5 ;; mingw*) OS_ARCH=WINNT ;; wince*) OS_ARCH=WINCE ;; @@ -1478,7 +1479,7 @@ case "$host" in LIBXUL_LIBS='$(XPCOM_FROZEN_LDOPTS) $(LIBXUL_DIST)/bin/XUL -lobjc' ;; -*-linux*) +*-linux*|*-kfreebsd*-gnu) HOST_CFLAGS="$HOST_CFLAGS -DXP_UNIX" HOST_NSPR_MDCPUCFG='\"md/_linux.cfg\"' HOST_OPTIMIZE_FLAGS="${HOST_OPTIMIZE_FLAGS=-O3}" @@ -2470,7 +2471,7 @@ dnl ======================================================== dnl = Flags to strip unused symbols from .so components dnl ======================================================== case "$target" in - *-linux*) + *-linux*|*-kfreebsd*-gnu) MOZ_COMPONENTS_VERSION_SCRIPT_LDFLAGS='-Wl,--version-script -Wl,$(BUILD_TOOLS)/gnu-ld-scripts/components-version-script' ;; *-solaris*) @@ -3144,7 +3145,7 @@ then fi ;; - *-*-linux*) + *-*-linux*|*-*-kfreebsd*-gnu) AC_DEFINE(_REENTRANT) ;; diff --git a/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in b/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in index f13e6809d72..abe5007df7c 100644 --- a/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in +++ b/mozilla/xpcom/reflect/xptcall/src/md/unix/Makefile.in @@ -76,7 +76,7 @@ endif # New code for Linux, et. al., with gcc # Migrate other platforms here after testing # -ifneq (,$(filter Linux,$(OS_ARCH))) +ifneq (,$(filter Linux GNU_%,$(OS_ARCH))) # Linux/x86-64 ifeq (x86_64,$(OS_TEST)) CPPSRCS := xptcinvoke_x86_64_linux.cpp xptcstubs_x86_64_linux.cpp diff --git a/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h b/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h index c61141554ee..dd6cb947154 100644 --- a/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h +++ b/mozilla/xpcom/reflect/xptcall/src/md/unix/xptc_platforms_unixish_x86.h @@ -67,7 +67,7 @@ * */ -#if defined(LINUX) +#if defined(LINUX) || (defined(__GLIBC__) && defined(__FreeBSD_kernel__)) #if (__GNUC__ == 2) && (__GNUC_MINOR__ <= 7) /* Old gcc 2.7.x.x. What does gcc 2.8.x do?? */