upgrade to latest git, refresh patches

SVN-Revision: 25698

diff --git a/toolchain/uClibc/Makefile b/toolchain/uClibc/Makefile
index 32747a53a2d226771808a29f31c4d75dce845e57..0ce9554e78d568e8df6cfe002bfeb2f2126b8976 100644 (file)
--- a/toolchain/uClibc/Makefile
+++ b/toolchain/uClibc/Makefile
@@ -12,7 +12,7 @@ PKG_VERSION:=$(call qstrip,$(CONFIG_UCLIBC_VERSION))
 ifeq ($(PKG_VERSION),0.9.32)
   PKG_SOURCE_URL:=git://git.busybox.net/uClibc
   PKG_SOURCE_PROTO:=git
-  PKG_SOURCE_VERSION:=bb8551685e2efc42c65a01479b9f9bb8b860da01
+  PKG_SOURCE_VERSION:=9112a2398ec58b32cd1a1c6feae195bd8f9a46a2
   PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
   PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION)-$(PKG_SOURCE_VERSION).tar.gz
   LIBC_SO_VERSION:=$(PKG_VERSION)-rc2-git

diff --git a/toolchain/uClibc/patches-0.9.32/110-compat_macros.patch b/toolchain/uClibc/patches-0.9.32/110-compat_macros.patch
index a07c603c31b00a1c9835906a34f5192b0c957e6d..61dfe55eb697229d3434e0ff7ba71923cd8b8590 100644 (file)
--- a/toolchain/uClibc/patches-0.9.32/110-compat_macros.patch
+++ b/toolchain/uClibc/patches-0.9.32/110-compat_macros.patch
@@ -1,6 +1,6 @@
 --- a/include/string.h
 +++ b/include/string.h
-@@ -357,18 +357,40 @@
+@@ -357,18 +357,40 @@ extern char *index (__const char *__s, i
  /* Find the last occurrence of C in S (same as strrchr).  */
  extern char *rindex (__const char *__s, int __c)
       __THROW __attribute_pure__ __nonnull ((1));

diff --git a/toolchain/uClibc/patches-0.9.32/120-adjtimex.patch b/toolchain/uClibc/patches-0.9.32/120-adjtimex.patch
index 84b0173c95484059df463715a366614115d2b2aa..dcf9c9b5aa264acd5b9c4f56a1f1494069970fd5 100644 (file)
--- a/toolchain/uClibc/patches-0.9.32/120-adjtimex.patch
+++ b/toolchain/uClibc/patches-0.9.32/120-adjtimex.patch
@@ -1,6 +1,6 @@
 --- a/include/sys/timex.h
 +++ b/include/sys/timex.h
-@@ -116,9 +116,8 @@
+@@ -116,9 +116,8 @@ struct timex
  
  __BEGIN_DECLS
  

diff --git a/toolchain/uClibc/patches-0.9.32/130-ldso-fix-__dl_parse_dynamic_info-segfault.patch b/toolchain/uClibc/patches-0.9.32/130-ldso-fix-__dl_parse_dynamic_info-segfault.patch
index d523d1b0c459171af28bb7f71f12b194bb46139a..4d898f5271387ce9c7ef8e0d04076894b913f717 100644 (file)
--- a/toolchain/uClibc/patches-0.9.32/130-ldso-fix-__dl_parse_dynamic_info-segfault.patch
+++ b/toolchain/uClibc/patches-0.9.32/130-ldso-fix-__dl_parse_dynamic_info-segfault.patch
@@ -20,7 +20,7 @@ Signed-off-by: Mark Mentovai <mark at moxienet.com>
 ldso/ldso/ldso.c |   12 +++++++++---
 --- a/ldso/ldso/ldso.c
 +++ b/ldso/ldso/ldso.c
-@@ -920,9 +920,15 @@
+@@ -918,9 +918,15 @@ void _dl_get_ready_to_run(struct elf_res
  #ifdef __LDSO_LDD_SUPPORT__
        /* End of the line for ldd.... */
        if (trace_loaded_objects) {

diff --git a/toolchain/uClibc/patches-0.9.32/140-avr32_atomic_fix.patch b/toolchain/uClibc/patches-0.9.32/140-avr32_atomic_fix.patch
index daaba31fdbe7ed7801773fdfee05771ddebd8b73..5e5460a3dc7c820f90ad24b711b3caa0fb146ffd 100644 (file)
--- a/toolchain/uClibc/patches-0.9.32/140-avr32_atomic_fix.patch
+++ b/toolchain/uClibc/patches-0.9.32/140-avr32_atomic_fix.patch
@@ -1,6 +1,6 @@
 --- a/libc/sysdeps/linux/avr32/bits/atomic.h
 +++ b/libc/sysdeps/linux/avr32/bits/atomic.h
-@@ -28,6 +28,7 @@
+@@ -28,6 +28,7 @@ typedef uintmax_t uatomic_max_t;
  
  #define __arch_compare_and_exchange_val_32_acq(mem, newval, oldval)   \
        ({                                                              \

diff --git a/toolchain/uClibc/patches-0.9.32/170-math_finite.patch b/toolchain/uClibc/patches-0.9.32/170-math_finite.patch
index ad1cc8ea5370375f22d6b58fb81a7b42dd92ca4c..b0ae3337b9864b7a06693ed892fc342312a851d4 100644 (file)
--- a/toolchain/uClibc/patches-0.9.32/170-math_finite.patch
+++ b/toolchain/uClibc/patches-0.9.32/170-math_finite.patch
@@ -1,6 +1,6 @@
 --- a/include/math.h
 +++ b/include/math.h
-@@ -195,7 +195,7 @@
+@@ -195,7 +195,7 @@ extern int signgam;
  
  
  /* ISO C99 defines some generic macros which work on any data type.  */
@@ -9,7 +9,7 @@
  
  /* Get the architecture specific values describing the floating-point
     evaluation.  The following symbols will get defined:
-@@ -315,6 +315,11 @@
+@@ -315,6 +315,11 @@ enum
  
  #endif /* Use ISO C99.  */
  

diff --git a/toolchain/uClibc/patches-0.9.32/410-llvm_workaround.patch b/toolchain/uClibc/patches-0.9.32/410-llvm_workaround.patch
index c4976a9423f9267220dc701b05135dac667e8cc7..7ae394325bc86367b34bdc4db3d2c94bfefe1688 100644 (file)
--- a/toolchain/uClibc/patches-0.9.32/410-llvm_workaround.patch
+++ b/toolchain/uClibc/patches-0.9.32/410-llvm_workaround.patch
@@ -1,6 +1,6 @@
 --- a/libc/stdio/_stdio.c
 +++ b/libc/stdio/_stdio.c
-@@ -124,7 +124,7 @@
+@@ -124,7 +124,7 @@ static FILE _stdio_streams[] = {
                                                         __FLAG_NBF|__FLAG_WRITEONLY, \
                                                         2, \
                                                         NULL, \

diff --git a/toolchain/uClibc/patches-0.9.32/600-ubicom32-uClibc.patch b/toolchain/uClibc/patches-0.9.32/600-ubicom32-uClibc.patch
index 234e1672d774bd97c5e18d2c8da362a397399f53..82019617700e7844a714880050b93b709057050c 100644 (file)
--- a/toolchain/uClibc/patches-0.9.32/600-ubicom32-uClibc.patch
+++ b/toolchain/uClibc/patches-0.9.32/600-ubicom32-uClibc.patch
@@ -1,6 +1,6 @@
 --- a/Rules.mak
 +++ b/Rules.mak
-@@ -481,6 +481,17 @@
+@@ -481,6 +481,17 @@ ifeq ($(TARGET_ARCH),i960)
        SYMBOL_PREFIX=_
  endif
  
@@ -20,7 +20,7 @@
  endif
 --- a/extra/Configs/Config.in
 +++ b/extra/Configs/Config.in
-@@ -102,6 +102,9 @@
+@@ -102,6 +102,9 @@ config TARGET_sh64
  config TARGET_sparc
        bool "sparc"
  
@@ -30,7 +30,7 @@
  config TARGET_v850
        bool "v850 (BROKEN)"
  
-@@ -203,6 +206,10 @@
+@@ -203,6 +206,10 @@ if TARGET_sparc
  source "extra/Configs/Config.sparc"
  endif
  
@@ -43,7 +43,7 @@
  endif
 --- a/extra/Configs/Config.in.arch
 +++ b/extra/Configs/Config.in.arch
-@@ -149,7 +149,7 @@
+@@ -149,7 +149,7 @@ config UCLIBC_HAS_SOFT_FLOAT
  config DO_C99_MATH
        bool "Enable full C99 math library support"
        depends on UCLIBC_HAS_FLOATS
@@ -101,7 +101,7 @@
 +      string
 --- a/include/elf.h
 +++ b/include/elf.h
-@@ -337,6 +337,8 @@
+@@ -337,6 +337,8 @@ typedef struct
  
  #define EM_XSTORMY16          0xad45
  
@@ -110,7 +110,7 @@
  /* FRV magic number - no EABI available??.  */
  #define EM_CYGNUS_FRV 0x5441
  
-@@ -3063,6 +3065,55 @@
+@@ -3063,6 +3065,55 @@ typedef Elf32_Addr Elf32_Conflict;
  /* Keep this the last entry.  */
  #define R_XTENSA_NUM          50
  
@@ -168,7 +168,7 @@
  #endif
 --- a/include/features.h
 +++ b/include/features.h
-@@ -445,4 +445,10 @@
+@@ -445,4 +445,10 @@ uClibc was built without large file supp
  # include <libc-internal.h>
  #endif
  
@@ -181,7 +181,7 @@
  #endif        /* features.h  */
 --- a/ldso/ldso/dl-startup.c
 +++ b/ldso/ldso/dl-startup.c
-@@ -164,10 +164,13 @@
+@@ -164,10 +164,13 @@ DL_START(unsigned long args)
                aux_dat += 2;
        }
  
@@ -197,7 +197,7 @@
  
 --- a/ldso/ldso/ldso.c
 +++ b/ldso/ldso/ldso.c
-@@ -327,10 +327,12 @@
+@@ -327,10 +327,12 @@ void _dl_get_ready_to_run(struct elf_res
                _dl_progname = argv[0];
        }
  
@@ -2095,7 +2095,7 @@
 +      .size   _dl_ubicom32_resolve_pending, . - _dl_ubicom32_resolve_pending
 --- a/libc/misc/Makefile.in
 +++ b/libc/misc/Makefile.in
-@@ -12,7 +12,9 @@
+@@ -12,7 +12,9 @@ include $(top_srcdir)libc/misc/assert/Ma
  include $(top_srcdir)libc/misc/ctype/Makefile.in
  include $(top_srcdir)libc/misc/dirent/Makefile.in
  include $(top_srcdir)libc/misc/error/Makefile.in
@@ -4170,7 +4170,7 @@
 +      .set __GI_vfork,vfork
 --- a/libpthread/linuxthreads.old/pthread.c
 +++ b/libpthread/linuxthreads.old/pthread.c
-@@ -393,6 +393,10 @@
+@@ -393,6 +393,10 @@ void __pthread_initialize_minimal(void)
  #endif
  
      __libc_multiple_threads_ptr = __libc_pthread_init (ptr_pthread_functions);
@@ -4181,7 +4181,7 @@
  }
  
  
-@@ -461,8 +465,11 @@
+@@ -461,8 +465,11 @@ static void pthread_initialize(void)
     * __pthread_initial_thread_bos at address 0. These bounds are refined as we
     * malloc other stack frames such that they don't overlap. -StS
     */

diff --git a/toolchain/uClibc/patches-0.9.32/601-ubicom32_uClibc_fixes.patch b/toolchain/uClibc/patches-0.9.32/601-ubicom32_uClibc_fixes.patch
index 0333046c27a7c1fd2f803be5a4eea0b0d6ce7c9b..b4f9ce681c24ba67d7c9efd234eedf0541e70771 100644 (file)
--- a/toolchain/uClibc/patches-0.9.32/601-ubicom32_uClibc_fixes.patch
+++ b/toolchain/uClibc/patches-0.9.32/601-ubicom32_uClibc_fixes.patch
@@ -1,6 +1,6 @@
 --- a/ldso/include/dl-elf.h
 +++ b/ldso/include/dl-elf.h
-@@ -42,6 +42,10 @@
+@@ -42,6 +42,10 @@ extern int _dl_linux_resolve(void);
  extern int _dl_fixup(struct dyn_elf *rpnt, int flag);
  extern void _dl_protect_relro (struct elf_resolve *l);
  
@@ -11,18 +11,18 @@
  /*
   * Bitsize related settings for things ElfW()
   * does not handle already
-@@ -163,7 +167,7 @@
-                       dynamic_info[tag] = (unsigned long) DL_RELOC_ADDR(load_off, dynamic_info[tag]); \
-       } while (0)
-       /* Don't adjust .dynamic unnecessarily.  */
--      if (load_off != 0) {
-+      if (DL_LOADADDR_ISSET(load_off)) {
+@@ -166,7 +170,7 @@ unsigned int __dl_parse_dynamic_info(Elf
+          we'd have to walk all the loadsegs to find out if it was
+          actually unnecessary, so skip this optimization.  */
+ #ifndef __FDPIC__
+-      if (load_off != 0)
++      if (DL_LOADADDR_ISSET(load_off))
+ #endif
+       {
                ADJUST_DYN_INFO(DT_HASH, load_off);
-               ADJUST_DYN_INFO(DT_PLTGOT, load_off);
-               ADJUST_DYN_INFO(DT_STRTAB, load_off);
 --- a/ldso/ldso/ubicom32/dl-sysdep.h
 +++ b/ldso/ldso/ubicom32/dl-sysdep.h
-@@ -101,6 +101,7 @@
+@@ -101,6 +101,7 @@ do {                                                                       \
  } while (0)
  
  #define DL_LOADADDR_TYPE struct elf32_fdpic_loadaddr

diff --git a/toolchain/uClibc/patches-0.9.32/900-reorder_use_bx.patch b/toolchain/uClibc/patches-0.9.32/900-reorder_use_bx.patch
index dddd0a0e4f5b11a4887cd8e068109cb87fd461e9..ffe9e69f838812282450ab5f14b8b12db5bbde3e 100644 (file)
--- a/toolchain/uClibc/patches-0.9.32/900-reorder_use_bx.patch
+++ b/toolchain/uClibc/patches-0.9.32/900-reorder_use_bx.patch
@@ -12,8 +12,6 @@ Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
  extra/Configs/Config.arm |   14 +++++++-------
  1 files changed, 7 insertions(+), 7 deletions(-)
 
-diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
-index b060ace..3b90e67 100644
 --- a/extra/Configs/Config.arm
 +++ b/extra/Configs/Config.arm
 @@ -30,13 +30,6 @@ config CONFIG_ARM_EABI
@@ -41,6 +39,3 @@ index b060ace..3b90e67 100644
 +      depends on !CONFIG_GENERIC_ARM && !CONFIG_ARM610 && !CONFIG_ARM710
 +      help
 +        Use BX instruction for THUMB aware architectures.
--- 
-1.7.1
-

diff --git a/toolchain/uClibc/patches-0.9.32/910-thumb_blind_options.patch b/toolchain/uClibc/patches-0.9.32/910-thumb_blind_options.patch
index 7585533ff25a4591cd6f54344f5ec6e794576e2b..149668375bd2d385343eafbefd6fb7c37c54357b 100644 (file)
--- a/toolchain/uClibc/patches-0.9.32/910-thumb_blind_options.patch
+++ b/toolchain/uClibc/patches-0.9.32/910-thumb_blind_options.patch
@@ -20,8 +20,6 @@ Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
  extra/Configs/Config.arm |   31 ++++++++++++++++++++++++++++---
  2 files changed, 32 insertions(+), 6 deletions(-)
 
-diff --git a/Rules.mak b/Rules.mak
-index eecdc64..2a16908 100644
 --- a/Rules.mak
 +++ b/Rules.mak
 @@ -348,9 +348,10 @@ ifeq ($(TARGET_ARCH),arm)
@@ -38,8 +36,6 @@ index eecdc64..2a16908 100644
  endif
  
  ifeq ($(TARGET_ARCH),mips)
-diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
-index 3b90e67..c9c40d4 100644
 --- a/extra/Configs/Config.arm
 +++ b/extra/Configs/Config.arm
 @@ -64,70 +64,95 @@ config CONFIG_ARM710
@@ -141,6 +137,3 @@ index 3b90e67..c9c40d4 100644
 +      depends on HAS_THUMB
        help
          Use BX instruction for THUMB aware architectures.
--- 
-1.7.1
-

diff --git a/toolchain/uClibc/patches-0.9.32/920-remove_sub-arch_variants.patch b/toolchain/uClibc/patches-0.9.32/920-remove_sub-arch_variants.patch
index 4051ef39fc44eaed3c883c6ae1a1fd1a7e49b435..4f71186514529940b500684213a5f36e156fc60d 100644 (file)
--- a/toolchain/uClibc/patches-0.9.32/920-remove_sub-arch_variants.patch
+++ b/toolchain/uClibc/patches-0.9.32/920-remove_sub-arch_variants.patch
@@ -15,8 +15,6 @@ Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
  extra/Configs/Config.arm |  125 ++--------------------------------------------
  2 files changed, 5 insertions(+), 139 deletions(-)
 
-diff --git a/Rules.mak b/Rules.mak
-index 2a16908..09741a6 100644
 --- a/Rules.mak
 +++ b/Rules.mak
 @@ -332,25 +332,6 @@ ifeq ($(TARGET_ARCH),arm)
@@ -45,8 +43,6 @@ index 2a16908..09741a6 100644
        CPU_CFLAGS-$(COMPILE_IN_THUMB_MODE)+=-mthumb
  endif
  
-diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
-index c9c40d4..6c75a00 100644
 --- a/extra/Configs/Config.arm
 +++ b/extra/Configs/Config.arm
 @@ -30,129 +30,14 @@ config CONFIG_ARM_EABI
@@ -184,6 +180,3 @@ index c9c40d4..6c75a00 100644
 -      depends on HAS_THUMB
        help
          Use BX instruction for THUMB aware architectures.
--- 
-1.7.1
-

diff --git a/toolchain/uClibc/patches-0.9.32/930-transform_eabi_oabi_choice.patch b/toolchain/uClibc/patches-0.9.32/930-transform_eabi_oabi_choice.patch
index 7a91f6786c9cece893540459e7fc6d4833cdd8c4..fb13cde13c45bd4792f246f9c2c8103a1f853134 100644 (file)
--- a/toolchain/uClibc/patches-0.9.32/930-transform_eabi_oabi_choice.patch
+++ b/toolchain/uClibc/patches-0.9.32/930-transform_eabi_oabi_choice.patch
@@ -8,8 +8,6 @@ Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
  extra/Configs/Config.arm |   23 ++++++++---------------
  1 files changed, 8 insertions(+), 15 deletions(-)
 
-diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
-index 6c75a00..227b90c 100644
 --- a/extra/Configs/Config.arm
 +++ b/extra/Configs/Config.arm
 @@ -12,23 +12,16 @@ config FORCE_OPTIONS_FOR_ARCH
@@ -18,7 +16,7 @@ index 6c75a00..227b90c 100644
  
 -choice
 -      prompt "Target ABI"
--      default CONFIG_ARM_OABI
+-      default CONFIG_ARM_EABI
 +config CONFIG_ARM_EABI
 +      bool "Build for EABI"
        help
@@ -44,6 +42,3 @@ index 6c75a00..227b90c 100644
  
  config COMPILE_IN_THUMB_MODE
        bool "Build using Thumb mode"
--- 
-1.7.1
-

diff --git a/toolchain/uClibc/patches-0.9.32/940-include_arm-asm.h.patch b/toolchain/uClibc/patches-0.9.32/940-include_arm-asm.h.patch
index 955b372ad8454ae216b7e62a87b25f9b13ae9bd1..7ae385456b66f708c2adeda62866f7422b196edd 100644 (file)
--- a/toolchain/uClibc/patches-0.9.32/940-include_arm-asm.h.patch
+++ b/toolchain/uClibc/patches-0.9.32/940-include_arm-asm.h.patch
@@ -10,8 +10,6 @@ Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
  libc/sysdeps/linux/arm/sysdep.h |    1 +
  2 files changed, 2 insertions(+), 0 deletions(-)
 
-diff --git a/ldso/ldso/arm/dl-startup.h b/ldso/ldso/arm/dl-startup.h
-index a95389d..2dfdaff 100644
 --- a/ldso/ldso/arm/dl-startup.h
 +++ b/ldso/ldso/arm/dl-startup.h
 @@ -7,6 +7,7 @@
@@ -22,8 +20,6 @@ index a95389d..2dfdaff 100644
  
  #if !defined(__thumb__)
  __asm__(
-diff --git a/libc/sysdeps/linux/arm/sysdep.h b/libc/sysdeps/linux/arm/sysdep.h
-index 013f88c..e498695 100644
 --- a/libc/sysdeps/linux/arm/sysdep.h
 +++ b/libc/sysdeps/linux/arm/sysdep.h
 @@ -21,6 +21,7 @@
@@ -34,6 +30,3 @@ index 013f88c..e498695 100644
  
  #include <sys/syscall.h>
  /* For Linux we can use the system call table in the header file
--- 
-1.7.1
-

diff --git a/toolchain/uClibc/patches-0.9.32/950-detect_bx_availibility.patch b/toolchain/uClibc/patches-0.9.32/950-detect_bx_availibility.patch
index 24d5bcca66b4abb7ecf4cb4edd3f2687265fb0c4..a0277cb086b84d8a430976ca433e0b13e809999e 100644 (file)
--- a/toolchain/uClibc/patches-0.9.32/950-detect_bx_availibility.patch
+++ b/toolchain/uClibc/patches-0.9.32/950-detect_bx_availibility.patch
@@ -14,8 +14,6 @@ Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
  libc/sysdeps/linux/arm/bits/arm_asm.h |    9 ++++++++-
  2 files changed, 11 insertions(+), 2 deletions(-)
 
-diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
-index 227b90c..9aa9e56 100644
 --- a/extra/Configs/Config.arm
 +++ b/extra/Configs/Config.arm
 @@ -33,4 +33,6 @@ config COMPILE_IN_THUMB_MODE
@@ -26,8 +24,6 @@ index 227b90c..9aa9e56 100644
 +        Say 'y' to use BX to return from functions on your thumb-aware
 +        processor. Say 'y' if you need to use interworking. Say 'n' if not.
 +        It is safe to say 'y' even if you're not doing interworking.
-diff --git a/libc/sysdeps/linux/arm/bits/arm_asm.h b/libc/sysdeps/linux/arm/bits/arm_asm.h
-index 1d87df6..921c9a3 100644
 --- a/libc/sysdeps/linux/arm/bits/arm_asm.h
 +++ b/libc/sysdeps/linux/arm/bits/arm_asm.h
 @@ -24,5 +24,12 @@
@@ -44,6 +40,3 @@ index 1d87df6..921c9a3 100644
 +#endif /* __USE_BX__ */
  
 +#endif /* _ARM_ASM_H */
--- 
-1.7.1
-

diff --git a/toolchain/uClibc/patches-0.9.32/960-remove_eabi_oabi_selection.patch b/toolchain/uClibc/patches-0.9.32/960-remove_eabi_oabi_selection.patch
index a87d8c99f1f66631cc16fd472dc995f470f46c91..8f96e10e2524ae950502ba12b59345e384d0e0cb 100644 (file)
--- a/toolchain/uClibc/patches-0.9.32/960-remove_eabi_oabi_selection.patch
+++ b/toolchain/uClibc/patches-0.9.32/960-remove_eabi_oabi_selection.patch
@@ -14,8 +14,6 @@ Cc: Carmelo AMOROSO <carmelo.amoroso@st.com>
  libc/sysdeps/linux/arm/bits/huge_val.h |    4 ++--
  3 files changed, 9 insertions(+), 15 deletions(-)
 
-diff --git a/extra/Configs/Config.arm b/extra/Configs/Config.arm
-index 9aa9e56..85f2515 100644
 --- a/extra/Configs/Config.arm
 +++ b/extra/Configs/Config.arm
 @@ -12,17 +12,6 @@ config FORCE_OPTIONS_FOR_ARCH
@@ -36,8 +34,6 @@ index 9aa9e56..85f2515 100644
  config COMPILE_IN_THUMB_MODE
        bool "Build using Thumb mode"
        select USE_BX
-diff --git a/libc/sysdeps/linux/arm/Makefile.arch b/libc/sysdeps/linux/arm/Makefile.arch
-index b53c539..14279e0 100644
 --- a/libc/sysdeps/linux/arm/Makefile.arch
 +++ b/libc/sysdeps/linux/arm/Makefile.arch
 @@ -24,7 +24,12 @@ ifeq ($(UCLIBC_HAS_ADVANCED_REALTIME),y)
@@ -63,8 +59,6 @@ index b53c539..14279e0 100644
  libc-static-y += $(ARCH_OUT)/aeabi_lcsts.o $(ARCH_OUT)/aeabi_math.o \
        $(ARCH_OUT)/aeabi_sighandlers.o
  libc-nonshared-y += $(ARCH_OUT)/aeabi_lcsts.os $(ARCH_OUT)/aeabi_math.os \
-diff --git a/libc/sysdeps/linux/arm/bits/huge_val.h b/libc/sysdeps/linux/arm/bits/huge_val.h
-index a215f3c..745e0bb 100644
 --- a/libc/sysdeps/linux/arm/bits/huge_val.h
 +++ b/libc/sysdeps/linux/arm/bits/huge_val.h
 @@ -32,7 +32,7 @@
@@ -85,6 +79,3 @@ index a215f3c..745e0bb 100644
  # if __BYTE_ORDER == __BIG_ENDIAN
  #  define __HUGE_VAL_bytes    { 0, 0, 0, 0, 0x7f, 0xf0, 0, 0 }
  # endif
--- 
-1.7.1
-