diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2010-02-21 17:19:22 +0000 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2010-02-21 17:19:22 +0000 |
| commit | a6b82d7c0897a540db13a31c9fd55e6cbfb979ed (patch) | |
| tree | 2e3fe27969b1e3935e7e269dae16a7e3e4a5ca07 | |
| parent | Add patch for bug 302357. (diff) | |
| download | emacs-patches-emacs-23.1-patches-5.tar.gz emacs-patches-emacs-23.1-patches-5.tar.bz2 emacs-patches-emacs-23.1-patches-5.zip | |
Updated patch for arm, bug 302357, thanks to armin76.emacs-23.1-patches-5
| -rw-r--r-- | emacs/23.1/04_all_arm-libgcc_s.patch | 17 | ||||
| -rw-r--r-- | emacs/23.1/04_arm_nostdlib-unwind.patch | 16 |
2 files changed, 17 insertions, 16 deletions
diff --git a/emacs/23.1/04_all_arm-libgcc_s.patch b/emacs/23.1/04_all_arm-libgcc_s.patch new file mode 100644 index 0000000..a46ad3e --- /dev/null +++ b/emacs/23.1/04_all_arm-libgcc_s.patch @@ -0,0 +1,17 @@ +http://bugs.gentoo.org/302357 +http://debbugs.gnu.org/cgi/bugreport.cgi?bug=5518 + +--- emacs-orig/src/m/arm.h 2010-01-13 08:35:10 +0000 ++++ emacs/src/m/arm.h 2010-02-21 13:44:07 +0000 +@@ -36,5 +36,11 @@ + + #define NO_REMAP + ++/* armin76@gentoo.org reported that the lgcc_s flag is necessary to ++ build on ARM EABI under GNU/Linux (Bug#5518). */ ++#ifdef GNU_LINUX ++#define LIB_GCC -lgcc_s ++#endif ++ + /* arch-tag: 07856f0c-f0c8-4bd8-99af-0b7fa1e5ee42 + (do not change this comment) */ diff --git a/emacs/23.1/04_arm_nostdlib-unwind.patch b/emacs/23.1/04_arm_nostdlib-unwind.patch deleted file mode 100644 index a90c450..0000000 --- a/emacs/23.1/04_arm_nostdlib-unwind.patch +++ /dev/null @@ -1,16 +0,0 @@ -http://bugs.gentoo.org/302357 -http://gnutoo.homelinux.org/open_embedded/recipes/emacs/files/nostdlib-unwind.patch -Fix linking problem: -undefined reference to `__aeabi_unwind_cpp_pr0' - ---- emacs-23.1-orig/src/Makefile.in -+++ emacs-23.1/src/Makefile.in -@@ -443,7 +443,7 @@ - ask GCC explicitly where to find libgcc.a. */ - - #ifndef LINKER --#define LINKER $(CC) -nostdlib -+#define LINKER $(CC) -nostdlib -lgcc_s - #endif - - #ifndef LIB_GCC |