Skip to content

Commit 4975e6a

Browse files
stskeepsstskeeps
committed
Add MIPS o32 ABI support
Fixup -accel dependencies Signed-off-by: Carsten Munk <[email protected]> Change-Id: I6eb0ab3e15b14a0e13fb17bfdcbcc6b474058699
1 parent 7d0fbc6 commit 4975e6a

19 files changed

+3604
-101
lines changed

‎baselibs.conf

+76-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
arch i586 targets armv5tel:armv5tel armv6l:armv6l armv7l:armv7l armv7hl:armv7hl armv7nhl:armv7nhl
1+
arch i586 targets armv5tel:armv5tel armv6l:armv6l armv7l:armv7l armv7hl:armv7hl armv7nhl:armv7nhl mipsel:mipsel
22

33
cross-armv5tel-gcc-accel
44
targettype x86 block!
@@ -7,6 +7,7 @@ cross-armv5tel-gcc-accel
77
targettype armv7l block!
88
targettype armv7hl block!
99
targettype armv7nhl block!
10+
targettype mipsel block!
1011

1112
targettype armv5tel autoreqprov off
1213
targettype armv5tel provides "cross-arm-gcc-accel"
@@ -76,6 +77,7 @@ cross-armv6l-gcc-accel
7677
targettype armv7l block!
7778
targettype armv7hl block!
7879
targettype armv7nhl block!
80+
targettype mipsel block!
7981

8082
targettype armv6l autoreqprov off
8183
targettype armv6l provides "cross-arm-gcc-accel"
@@ -145,6 +147,7 @@ cross-armv7l-gcc-accel
145147
targettype armv6l block!
146148
targettype armv7hl block!
147149
targettype armv7nhl block!
150+
targettype mipsel block!
148151

149152
targettype armv7l autoreqprov off
150153
targettype armv7l provides "cross-arm-gcc-accel"
@@ -214,6 +217,7 @@ cross-armv7hl-gcc-accel
214217
targettype armv6l block!
215218
targettype armv7l block!
216219
targettype armv7nhl block!
220+
targettype mipsel block!
217221

218222
targettype armv7hl autoreqprov off
219223
targettype armv7hl provides "cross-arm-gcc-accel"
@@ -283,6 +287,7 @@ cross-armv7nhl-gcc-accel
283287
targettype armv6l block!
284288
targettype armv7l block!
285289
targettype armv7hl block!
290+
targettype mipsel block!
286291

287292
targettype armv7nhl autoreqprov off
288293
targettype armv7nhl provides "cross-arm-gcc-accel"
@@ -344,3 +349,73 @@ cross-armv7nhl-gcc-accel
344349
targettype armv7nhl preun " for i in cc1 cc1plus ; do cd /usr/libexec/gcc/armv7nhl-meego-linux-gnueabi/$GCCVER ; if test -e ${i}.orig-arm ; then rm ${i} ; mv ${i}.orig-arm ${i} ; fi ; done "
345350

346351

352+
353+
cross-mipsel-gcc-accel
354+
targettype x86 block!
355+
targettype 32bit block!
356+
targettype armv5tel block!
357+
targettype armv6l block!
358+
targettype armv7l block!
359+
targettype armv7hl block!
360+
targettype armv7nhl block!
361+
362+
targettype mipsel autoreqprov off
363+
targettype mipsel provides "cross-arm-gcc-accel"
364+
targettype mipsel requires "glibc-x86-arm"
365+
targettype mipsel requires "gmp-x86-arm"
366+
targettype mipsel requires "libgcc-x86-arm"
367+
targettype mipsel requires "mpfr-x86-arm"
368+
targettype mipsel requires "mpc-x86-arm"
369+
targettype mipsel requires "gcc"
370+
targettype mipsel requires "gcc-c++"
371+
372+
373+
targettype mipsel prefix /emul/ia32-linux
374+
targettype mipsel extension -arm
375+
targettype mipsel +/
376+
targettype mipsel -/usr/lib/debug
377+
targettype mipsel -/usr/src/debug
378+
targettype mipsel -/usr/share/man
379+
targettype mipsel -/usr/share/doc
380+
targettype mipsel -/usr/share/locale
381+
targettype mipsel requires "meego-accelerator"
382+
targettype mipsel post "#set -x"
383+
targettype mipsel post " export GCCVER=$(LANG=C gcc --version | head -1 | sed 's/\([a-z+]*\) \((.*)\) \([1-9\.]*\)\(.*\)/\3/') "
384+
targettype mipsel post " export GCCVER_NEW=$(LANG=C <prefix>/usr/bin/gcc --version | head -1 | sed 's/\([a-z+]*\) \((.*)\) \([1-9\.]*\)\(.*\)/\3/') "
385+
targettype mipsel post " echo \"GCCVER: $GCCVER GCCVER_NEW: $GCCVER_NEW \" "
386+
targettype mipsel post " if test "${GCCVER}" == "${GCCVER_NEW}"; then"
387+
targettype mipsel post " echo "GCC and GCC-accel versions match. Enabling cross-compiler." "
388+
targettype mipsel post " for bin in gcc g++ ; do "
389+
targettype mipsel post " binary="/usr/bin/${bin}" "
390+
targettype mipsel post " if test -e ${binary} -a ! -e ${binary}.orig-arm ; then"
391+
targettype mipsel post " mv ${binary} ${binary}.orig-arm && cp <prefix>${binary} ${binary}"
392+
targettype mipsel post " else "
393+
targettype mipsel post " echo "${binary} not installed or ${binary}.orig-arm already present !" "
394+
targettype mipsel post " fi "
395+
targettype mipsel post " done "
396+
397+
targettype mipsel post " for bin in cc1 cc1plus ; do "
398+
targettype mipsel post " binary="/usr/libexec/gcc/mipsel-meego-linux-gnueabi/$GCCVER/$bin" "
399+
targettype mipsel post " if test -e ${binary} -a ! -e ${binary}.orig-arm ; then"
400+
targettype mipsel post " mv ${binary} ${binary}.orig-arm && cp <prefix>/usr/libexec/gcc/mipsel-meego-linux-gnueabi/$GCCVER_NEW/${bin} ${binary}"
401+
targettype mipsel post " else "
402+
targettype mipsel post " echo "${binary} not installed or ${binary}.orig-arm already present !" "
403+
targettype mipsel post " fi "
404+
targettype mipsel post " done "
405+
targettype mipsel post " else"
406+
targettype mipsel post " echo "GCC and GCC-accel versions don't match. Rollback also binutils..." "
407+
targettype mipsel post " for bin in addr2line ar as c++filt gprov ld nm objcopy objdump ranlib readelf size strings strip ; do"
408+
targettype mipsel post " binary="/usr/bin/${bin}" "
409+
targettype mipsel post " if test -e ${binary}.orig-arm ; then"
410+
targettype mipsel post " rm ${binary} && mv ${binary}.orig-arm ${binary}"
411+
targettype mipsel post " else "
412+
targettype mipsel post " echo "${binary}.orig-arm not present !" "
413+
targettype mipsel post " fi "
414+
targettype mipsel post " done "
415+
targettype mipsel post " fi"
416+
417+
targettype mipsel preun " export GCCVER=$(LANG=C gcc --version | head -1 | sed 's/\([a-z+]*\) \((.*)\) \([1-9\.]*\)\(.*\)/\3/') "
418+
targettype mipsel preun " for i in gcc g++ ; do if test -e /usr/bin/${i}.orig-arm ; then rm /usr/bin/${i} ; mv /usr/bin/${i}.orig-arm /usr/bin/${i}; fi ; done "
419+
targettype mipsel preun " for i in cc1 cc1plus ; do cd /usr/libexec/gcc/mipsel-meego-linux-gnueabi/$GCCVER ; if test -e ${i}.orig-arm ; then rm ${i} ; mv ${i}.orig-arm ${i} ; fi ; done "
420+
421+

‎cross-armv5tel-gcc-accel.spec

+51-9
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,11 @@ AutoReqProv: 0
1818
AutoReq: false
1919
BuildRequires: -rpmlint-Moblin -rpmlint-mini -post-build-checks
2020
# cross platform
21+
%if "%{name}" != "cross-mipsel-gcc"
2122
%define cross_gcc_target_platform %{crossarch}-%{_vendor}-linux-gnueabi
23+
%else
24+
%define cross_gcc_target_platform %{crossarch}-%{_vendor}-linux-gnu
25+
%endif
2226
# gcc_target_platform holds the host (executing the compiler)
2327
# cross_gcc_target_platform holds the target (for which the compiler is producing binaries)
2428
# prefix for cross compiler
@@ -58,6 +62,11 @@ BuildRequires: cross-armv7nhl-glibc cross-armv7nhl-glibc-devel cross-armv7nhl-gl
5862
BuildRequires: cross-armv7nhl-kernel-headers cross-armv7nhl-binutils
5963
%define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a
6064
%endif
65+
%if "%{name}" == "cross-mipsel-gcc"
66+
BuildRequires: cross-mipsel-glibc cross-mipsel-glibc-devel cross-mipsel-glibc-headers
67+
BuildRequires: cross-mipsel-kernel-headers cross-mipsel-binutils
68+
%define crossextraconfig --disable-fixed-point --disable-ssp --disable-libstdcxx-pch --with-arch=mips32
69+
%endif
6170
# Fixme: see above
6271
%if "%{name}" == "cross-armv5tel-gcc-accel"
6372
BuildRequires: cross-armv5tel-glibc cross-armv5tel-glibc-devel cross-armv5tel-glibc-headers
@@ -84,6 +93,11 @@ BuildRequires: cross-armv7nhl-glibc cross-armv7nhl-glibc-devel cross-armv7nhl-gl
8493
BuildRequires: cross-armv7nhl-kernel-headers cross-armv7nhl-binutils
8594
%define crossextraconfig --with-float=hard --with-fpu=neon --with-arch=armv7-a
8695
%endif
96+
%if "%{name}" == "cross-mipsel-gcc-accel"
97+
BuildRequires: cross-mipsel-glibc cross-mipsel-glibc-devel cross-mipsel-glibc-headers
98+
BuildRequires: cross-mipsel-kernel-headers cross-mipsel-binutils
99+
%define crossextraconfig --disable-fixed-point --disable-ssp --disable-libstdcxx-pch --with-arch=mips32
100+
%endif
87101
# single target atm.
88102
ExclusiveArch: %ix86
89103
#
@@ -117,10 +131,14 @@ ExclusiveArch: %ix86
117131
%global _unpackaged_files_terminate_build 0
118132
%global include_gappletviewer 0
119133
%if !%{crossbuild}
134+
%ifnarch mips mipsel
120135
%global build_cloog 1
121136
%else
122137
%global build_cloog 0
123138
%endif
139+
%else
140+
%global build_cloog 0
141+
%endif
124142
%global build_libstdcxx_docs 0
125143
%global multilib_64_archs x86_64
126144
%ifarch x86_64
@@ -208,6 +226,8 @@ Patch41: libgcc_post_upgrade.c.arm.patch
208226
Patch42: gcc46-libiberty-conftest.patch
209227
Patch43: gcc463-sync-upto-r182741.patch
210228
Patch44: gcc-hash-style-gnu.diff
229+
Patch45: gcc46-MIPS-boehm-gc-stack-qemu.patch
230+
Patch46: gcc-4.6.0-mips_fix-1.patch
211231

212232
Patch9999: gcc44-ARM-boehm-gc-stack-qemu.patch
213233

@@ -454,6 +474,8 @@ This is one set of libraries which support 64bit multilib on top of
454474
%endif
455475
%patch43 -p1
456476
%patch44 -p1
477+
%patch45 -p1
478+
%patch46 -p1
457479

458480
# This testcase doesn't compile.
459481
rm libjava/testsuite/libjava.lang/PR35020*
@@ -500,6 +522,10 @@ case "$OPT_FLAGS" in
500522
;;
501523
esac
502524

525+
%ifarch mipsel
526+
export OPT_FLAGS="$OPT_FLAGS --param ggc-min-expand=0 --param ggc-min-heapsize=65536"
527+
%endif
528+
503529
%ifarch %arm
504530
# gcc 45 fails to bootstrap itself otherwise on insn-attrtab.o
505531
# issue is bad interaction between ggc and qemu
@@ -522,6 +548,9 @@ export OPT_FLAGS="$OPT_FLAGS --param ggc-min-expand=0 --param ggc-min-heapsize=6
522548
%endif
523549
%endif
524550

551+
#export OPT_FLAGS=`echo "$OPT_FLAGS" | sed -e "s/-O2/-O2 -fkeep-inline-functions/g"`
552+
export OPT_FLAGS=`echo "$OPT_FLAGS" | sed -e "s/-fstack-protector//g"`
553+
525554
%if %{crossbuild}
526555
# cross build
527556
export PATH=/opt/cross/bin:$PATH
@@ -537,17 +566,25 @@ export OPT_FLAGS="$OPT_FLAGS -Wl,-rpath,/emul/ia32-linux/usr/lib:/emul/ia32-linu
537566
CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`" XCFLAGS="$OPT_FLAGS" TCFLAGS="$OPT_FLAGS" \
538567
GCJFLAGS="$OPT_FLAGS" \
539568
../configure --prefix=%{_prefix} --mandir=%{_mandir} --infodir=%{_infodir} \
540-
%ifarch %{arm}
569+
%ifarch %{arm} mipsel
541570
--with-bugurl=http://bugzilla.meego.com/ --disable-bootstrap \
542-
--enable-shared --enable-threads=posix --disable-checking \
571+
--enable-shared --enable-threads=posix --enable-checking=release \
572+
%ifarch mipsel
573+
--disable-fixed-point \
574+
--disable-ssp \
575+
--disable-libstdcxx-pch \
576+
--with-arch=mips32 \
577+
%endif
578+
%ifarch %{arm}
543579
%ARM_EXTRA_CONFIGURE \
580+
%endif
544581
%else
545582
%if %{crossbuild}
546583
--build=%{gcc_target_platform} \
547584
--host=%{gcc_target_platform} \
548585
--target=%{cross_gcc_target_platform} \
549586
--with-bugurl=http://bugzilla.meego.com/ --disable-bootstrap \
550-
--enable-shared --enable-threads=posix --disable-checking \
587+
--enable-shared --enable-threads=posix --enable-checking=release \
551588
%else
552589
--with-bugurl=http://bugzilla.meego.com/ --enable-bootstrap \
553590
--enable-shared --enable-threads=posix --enable-checking=release \
@@ -594,8 +631,8 @@ CC="$CC" CFLAGS="$OPT_FLAGS" CXXFLAGS="`echo $OPT_FLAGS | sed 's/ -Wall / /g'`"
594631

595632

596633
#GCJFLAGS="$OPT_FLAGS" make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS" bootstrap
597-
%ifarch %{arm}
598-
GCJFLAGS="$OPT_FLAGS" make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS"
634+
%ifarch %{arm} mipsel
635+
GCJFLAGS="$OPT_FLAGS" make %{?_smp_mflags} BOOT_CFLAGS="$OPT_FLAGS"
599636
# native ARM
600637
%else
601638
%if !%{crossbuild}
@@ -899,8 +936,10 @@ mkdir -p %{buildroot}%{_prefix}/sbin
899936
%ifarch %{arm}
900937
patch %{SOURCE1} < %{PATCH41}
901938
%endif
939+
%ifnarch mipsel
902940
gcc -static -Os %{SOURCE1} -o %{buildroot}%{_prefix}/sbin/libgcc_post_upgrade
903941
strip %{buildroot}%{_prefix}/sbin/libgcc_post_upgrade
942+
%endif
904943

905944
cd ..
906945
%find_lang %{name}
@@ -965,7 +1004,6 @@ done
9651004
tar cf - testlogs-%{_target_platform}-%{version}-%{release} | bzip2 -9c \
9661005
| uuencode testlogs-%{_target_platform}.tar.bz2 || :
9671006
rm -rf testlogs-%{_target_platform}-%{version}-%{release}
968-
9691007
%endif
9701008

9711009
%clean
@@ -993,7 +1031,9 @@ if [ $1 = 0 ]; then
9931031
--info-dir=%{_infodir} %{_infodir}/cpp.info.gz || :
9941032
fi
9951033

1034+
%ifnarch mipsel
9961035
%post -n libgcc -p %{_prefix}/sbin/libgcc_post_upgrade
1036+
%endif
9971037

9981038
%postun -n libgcc -p /sbin/ldconfig
9991039

@@ -1044,7 +1084,7 @@ fi
10441084
%{_prefix}/bin/c99
10451085
%{_prefix}/bin/gcc
10461086
%{_prefix}/bin/gcov
1047-
%ifnarch %{arm}
1087+
%ifnarch %{arm} mipsel
10481088
%{_prefix}/bin/%{gcc_target_platform}-gcc
10491089
%endif
10501090
%{_mandir}/man1/gcc.1*
@@ -1174,17 +1214,19 @@ fi
11741214
/%{_lib}/libgcc_s-%{gcc_version}.so.1
11751215
/%{_lib}/libgcc_s.*
11761216
/%{_libdir}/libgcc_s.*
1217+
%ifnarch mipsel
11771218
%{_prefix}/sbin/libgcc_post_upgrade
1219+
%endif
11781220
%doc gcc/COPYING.LIB
11791221

11801222
# For ARM port
1181-
%ifarch %{arm}
1223+
%ifarch %{arm} mipsel
11821224
%{_prefix}/%{_lib}/libssp*
11831225
%endif
11841226

11851227
%files c++
11861228
%defattr(-,root,root,-)
1187-
%ifnarch %{arm}
1229+
%ifnarch %{arm} mipsel
11881230
%{_prefix}/bin/%{gcc_target_platform}-*++
11891231
%endif
11901232
%{_prefix}/bin/g++

0 commit comments

Comments
 (0)