diff options
| author | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-23 08:13:59 +0100 |
|---|---|---|
| committer | Waldemar Brodkorb <wbx@openadk.org> | 2014-01-23 08:13:59 +0100 |
| commit | 17a6468b3f0fae577b1aaad51b56bdefe15a25c1 (patch) | |
| tree | 2e0ccfed1a6a8afb24c2547ca97ae5d8c450b717 /package/gcc | |
| parent | 2548d641ca7adfe3dcf31d09bb2f9b047b186a0f (diff) | |
| parent | c66e4117d3ac4d561718a8b17066dc8b04a02027 (diff) | |
Merge branch 'master' of git+ssh://openadk.org/git/openadk
Diffstat (limited to 'package/gcc')
| -rw-r--r-- | package/gcc/Makefile | 9 | ||||
| -rw-r--r-- | package/gcc/patches/4.7.3/musl-cris.patch | 11 |
2 files changed, 7 insertions, 13 deletions
diff --git a/package/gcc/Makefile b/package/gcc/Makefile index f0e17503a..4b8480342 100644 --- a/package/gcc/Makefile +++ b/package/gcc/Makefile @@ -11,8 +11,6 @@ PKG_OPTS:= noremove PKG_DEPENDS:= libmpc libgmp mpfr libgcc PKG_BUILDDEP:= libmpc gmp mpfr -PKG_ARCH_DEPENDS:= !avr32 - PKG_SUBPKGS:= GCC GXX PKGSD_GXX:= GNU C++ compiler @@ -48,6 +46,13 @@ CONFIGURE_ARGS+= --enable-languages=c,c++ else CONFIGURE_ARGS+= --enable-languages=c endif +ifeq ($(CPU_ARCH),ppc) +CONFIGURE_ARGS+= --disable-target-optspace --with-long-double-64 --enable-secureplt +TARGET_CFLAGS+= '-Wl,--secure-plt' +else +CONFIGURE_ARGS+= --enable-target-optspace +endif + CONFIGURE_ENV+= have_sys_sdt_h=no CONFIGURE_ARGS+= --host=$(REAL_GNU_TARGET_NAME) \ diff --git a/package/gcc/patches/4.7.3/musl-cris.patch b/package/gcc/patches/4.7.3/musl-cris.patch deleted file mode 100644 index 4889263a1..000000000 --- a/package/gcc/patches/4.7.3/musl-cris.patch +++ /dev/null @@ -1,11 +0,0 @@ -diff -Nur gcc-4.7.3.orig/gcc/config/cris/linux.h gcc-4.7.3/gcc/config/cris/linux.h ---- gcc-4.7.3.orig/gcc/config/cris/linux.h 2011-04-11 20:46:05.000000000 +0200 -+++ gcc-4.7.3/gcc/config/cris/linux.h 2013-10-11 10:01:51.000000000 +0200 -@@ -104,6 +104,7 @@ - #define CRIS_DEFAULT_CPU_VERSION CRIS_CPU_NG - - #define GLIBC_DYNAMIC_LINKER "/lib/ld.so.1" -+#define MUSL_DYNAMIC_LINKER "/lib/ld-musl-cris.1" - - #undef CRIS_LINK_SUBTARGET_SPEC - #define CRIS_LINK_SUBTARGET_SPEC \ |