diff options
author | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-07 16:01:34 +0100 |
---|---|---|
committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-03-07 16:01:34 +0100 |
commit | 50127562c0f873f196be3ed8afd692c3764ae214 (patch) | |
tree | 41bf45e0e5bec1fceccc8900c02b6717c86d625c | |
parent | 0e8808034d072fcac7039f34b72654bbca53a988 (diff) | |
parent | a45af5640d77c4059d2e47087bfd4dcc29173613 (diff) |
Merge branch 'master' of git+ssh://openadk.org:/git/openadk
-rw-r--r-- | package/cdrtools/Makefile | 2 | ||||
-rw-r--r-- | toolchain/gcc/Makefile | 4 | ||||
-rw-r--r-- | toolchain/musl/patches/xxx-hotfix-sh.patch | 80 |
3 files changed, 86 insertions, 0 deletions
diff --git a/package/cdrtools/Makefile b/package/cdrtools/Makefile index 1b195fc3f..6bf16ab17 100644 --- a/package/cdrtools/Makefile +++ b/package/cdrtools/Makefile @@ -12,6 +12,8 @@ PKG_SECTION:= misc PKG_URL:= http://cdrecord.berlios.de/private/cdrecord.html PKG_SITES:= http://openadk.org/ +PKG_CFLINE_CDRTOOLS:= depends on ADK_BROKEN + include $(TOPDIR)/mk/package.mk $(eval $(call PKG_template,CDRTOOLS,cdrtools,$(PKG_VERSION)-${PKG_RELEASE},${PKG_DEPENDS},${PKG_DESCR},${PKG_SECTION})) diff --git a/toolchain/gcc/Makefile b/toolchain/gcc/Makefile index f32b1836d..d7527442f 100644 --- a/toolchain/gcc/Makefile +++ b/toolchain/gcc/Makefile @@ -136,6 +136,8 @@ ifeq ($(ADK_LINUX_SH),y) endif sed -i '/k prot/agcc_cv_libc_provides_ssp=yes' $(WRKBUILD)/gcc/configure cd $(GCC_BUILD_DIR_MINIMAL); PATH='$(TARGET_PATH)' \ + CFLAGS="-O0 -g0" \ + CXXFLAGS="-O0 -g0" \ $(WRKBUILD)/configure \ ${GCC_CONFOPTS} \ --enable-languages=c \ @@ -154,6 +156,8 @@ $(WRKBUILD)/.headers: $(GCC_BUILD_DIR_MINIMAL)/.compiled $(GCC_BUILD_DIR_INITIAL)/.configured: mkdir -p $(GCC_BUILD_DIR_INITIAL) cd $(GCC_BUILD_DIR_INITIAL); PATH='$(TARGET_PATH)' \ + CFLAGS="-O0 -g0" \ + CXXFLAGS="-O0 -g0" \ $(WRKBUILD)/configure \ ${GCC_CONFOPTS} \ --enable-languages=c \ diff --git a/toolchain/musl/patches/xxx-hotfix-sh.patch b/toolchain/musl/patches/xxx-hotfix-sh.patch new file mode 100644 index 000000000..0c60604d0 --- /dev/null +++ b/toolchain/musl/patches/xxx-hotfix-sh.patch @@ -0,0 +1,80 @@ +* thx to nsz from #musl +diff -Nur musl-git/arch/sh/bits/user.h musl-sh/arch/sh/bits/user.h +--- musl-git/arch/sh/bits/user.h 1970-01-01 01:00:00.000000000 +0100 ++++ musl-sh/arch/sh/bits/user.h 2014-03-07 15:08:42.000000000 +0100 +@@ -0,0 +1,75 @@ ++#undef __WORDSIZE ++#define __WORDSIZE 32 ++ ++#define REG_REG0 0 ++#define REG_REG15 15 ++#define REG_PC 16 ++#define REG_PR 17 ++#define REG_SR 18 ++#define REG_GBR 19 ++#define REG_MACH 20 ++#define REG_MACL 21 ++#define REG_SYSCALL 22 ++#define REG_FPREG0 23 ++#define REG_FPREG15 38 ++#define REG_XFREG0 39 ++#define REG_XFREG15 54 ++#define REG_FPSCR 55 ++#define REG_FPUL 56 ++ ++struct pt_regs { ++ unsigned long regs[16]; ++ unsigned long pc; ++ unsigned long pr; ++ unsigned long sr; ++ unsigned long gbr; ++ unsigned long mach; ++ unsigned long macl; ++ long tra; ++}; ++ ++struct pt_dspregs { ++ unsigned long a1; ++ unsigned long a0g; ++ unsigned long a1g; ++ unsigned long m0; ++ unsigned long m1; ++ unsigned long a0; ++ unsigned long x0; ++ unsigned long x1; ++ unsigned long y0; ++ unsigned long y1; ++ unsigned long dsr; ++ unsigned long rs; ++ unsigned long re; ++ unsigned long mod; ++}; ++ ++struct user_fpu_struct { ++ unsigned long fp_regs[16]; ++ unsigned long xfp_regs[16]; ++ unsigned long fpscr; ++ unsigned long fpul; ++}; ++ ++#define ELF_NGREG 23 ++typedef unsigned long elf_greg_t; ++typedef elf_greg_t elf_gregset_t[ELF_NGREG]; ++typedef struct user_fpu_struct elf_fpregset_t; ++ ++struct user { ++ struct pt_regs regs; ++ struct user_fpu_struct fpu; ++ int u_fpvalid; ++ unsigned long u_tsize; ++ unsigned long u_dsize; ++ unsigned long u_ssize; ++ unsigned long start_code; ++ unsigned long start_data; ++ unsigned long start_stack; ++ long int signal; ++ unsigned long u_ar0; ++ struct user_fpu_struct *u_fpstate; ++ unsigned long magic; ++ char u_comm[32]; ++}; |