Package: mozilla
Version: 1.7.12-1.2
Sererity: important
Tags: patch

Fixing bug #274738 for binutils will allow to build mozilla without the
xgot hack on mips/mipsel. Since this may also break the existing xgot
support, a rebuild with the modified patch file is needed then.

The attached version replaces debian/patches/mips-xgot-inline.


Thiemo
#!/bin/sh -e
## mips-xgot-inline by Thiemo Seufer <[EMAIL PROTECTED]>
##
## All lines beginning with `## DP:' are a description of the patch.
## DP: Performance improvement and compile stability

if [ $# -ne 1 ]; then
    echo >&2 "`basename $0`: script expects -patch|-unpatch as argument"
    exit 1
fi

[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
patch_opts="${patch_opts:--f --no-backup-if-mismatch}"

case "$1" in
       -patch) patch $patch_opts -p1 < $0;;
       -unpatch) patch $patch_opts -p1 -R < $0;;
        *)
                echo >&2 "`basename $0`: script expects -patch|-unpatch as 
argument"
                exit 1;;
esac

exit 0

@DPATCH@
--- mozilla/configure.in.old    2004-09-09 04:17:48.000000000 +0200
+++ mozilla/configure.in        2004-09-10 11:51:35.000000000 +0200
@@ -1107,8 +1107,7 @@ case "$target" in
         MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1
     ;;
     mips*)
-        CFLAGS="$CFLAGS -Wa,-xgot"
-        CXXFLAGS="$CXXFLAGS -Wa,-xgot"
+        MOZ_DEBUG_FLAGS="-g"   # We want inlining
     ;;
     esac
     ;;
--- mozilla/configure.old       2004-09-16 22:04:43.000000000 +0200
+++ mozilla/configure   2004-09-11 11:13:01.000000000 +0200
@@ -5337,8 +5337,7 @@ EOF
         MOZ_ENABLE_OLD_ABI_COMPAT_WRAPPERS=1
     ;;
     mips*)
-        CFLAGS="$CFLAGS -Wa,-xgot"
-        CXXFLAGS="$CXXFLAGS -Wa,-xgot"
+        MOZ_DEBUG_FLAGS="-g"   # We want inlining
     ;;
     esac
     ;;
--- mozilla/config/rules.mk.old 2006-06-20 11:06:33.000000000 +0100
+++ mozilla/config/rules.mk     2006-06-20 11:06:54.000000000 +0100
@@ -452,15 +452,6 @@ endif
 endif
 endif
 
-ifeq ($(OS_ARCH),Linux)
-ifneq (,$(filter mips mipsel,$(OS_TEST)))
-ifeq ($(MODULE),layout)
-OS_CFLAGS += -Wa,-xgot
-OS_CXXFLAGS += -Wa,-xgot
-endif
-endif
-endif
-
 #
 # HP-UXBeOS specific section: for COMPONENTS only, add -Bsymbolic flag
 # which uses internal symbols first

Reply via email to