This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "IPFire 2.x development tree".
The branch, master has been updated via 89066697c4c257896feaf017ecc72814d01f3682 (commit) via 94abd48b1c666f7ec1009515ffb651f522f9f89b (commit) via da3dbb2a428127f345c4881a757cce8f60df767f (commit) from b8cee3bb81787328e3bb2c6d9edb31ac0015a717 (commit)
Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below.
- Log ----------------------------------------------------------------- commit 89066697c4c257896feaf017ecc72814d01f3682 Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jul 18 15:20:13 2014 +0200
gmp: Ship MMX/SSE/SSE2 enabled version.
commit 94abd48b1c666f7ec1009515ffb651f522f9f89b Merge: da3dbb2 b8cee3b Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jul 18 14:55:47 2014 +0200
Merge branch 'master' of ssh://git.ipfire.org/pub/git/ipfire-2.x
commit da3dbb2a428127f345c4881a757cce8f60df767f Author: Michael Tremer michael.tremer@ipfire.org Date: Fri Jul 18 10:20:41 2014 +0200
buildsystem: Explicitely compile with -mtune=generic
-----------------------------------------------------------------------
Summary of changes: config/rootfiles/common/{ => armv5tel}/gmp | 0 config/rootfiles/common/{ => i586}/gmp | 4 ++++ config/rootfiles/common/stage2 | 1 + config/rootfiles/core/80/filelists/i586/gmp | 1 + lfs/gmp | 33 ++++++++++++++++++++++++++--- lfs/stage2 | 2 +- tools/make-functions | 2 +- 7 files changed, 38 insertions(+), 5 deletions(-) copy config/rootfiles/common/{ => armv5tel}/gmp (100%) rename config/rootfiles/common/{ => i586}/gmp (80%) create mode 120000 config/rootfiles/core/80/filelists/i586/gmp
Difference in files: diff --git a/config/rootfiles/common/armv5tel/gmp b/config/rootfiles/common/armv5tel/gmp new file mode 100644 index 0000000..67f557f --- /dev/null +++ b/config/rootfiles/common/armv5tel/gmp @@ -0,0 +1,21 @@ +#usr/include/gmp.h +#usr/include/gmpxx.h +#usr/include/mp.h +#usr/lib/libgmp.a +#usr/lib/libgmp.la +#usr/lib/libgmp.so +usr/lib/libgmp.so.10 +usr/lib/libgmp.so.10.0.5 +#usr/lib/libgmpxx.a +#usr/lib/libgmpxx.la +#usr/lib/libgmpxx.so +usr/lib/libgmpxx.so.4 +usr/lib/libgmpxx.so.4.2.5 +#usr/lib/libmp.a +#usr/lib/libmp.la +#usr/lib/libmp.so +usr/lib/libmp.so.3 +usr/lib/libmp.so.3.1.25 +#usr/share/info/gmp.info +#usr/share/info/gmp.info-1 +#usr/share/info/gmp.info-2 diff --git a/config/rootfiles/common/gmp b/config/rootfiles/common/gmp deleted file mode 100644 index 67f557f..0000000 --- a/config/rootfiles/common/gmp +++ /dev/null @@ -1,21 +0,0 @@ -#usr/include/gmp.h -#usr/include/gmpxx.h -#usr/include/mp.h -#usr/lib/libgmp.a -#usr/lib/libgmp.la -#usr/lib/libgmp.so -usr/lib/libgmp.so.10 -usr/lib/libgmp.so.10.0.5 -#usr/lib/libgmpxx.a -#usr/lib/libgmpxx.la -#usr/lib/libgmpxx.so -usr/lib/libgmpxx.so.4 -usr/lib/libgmpxx.so.4.2.5 -#usr/lib/libmp.a -#usr/lib/libmp.la -#usr/lib/libmp.so -usr/lib/libmp.so.3 -usr/lib/libmp.so.3.1.25 -#usr/share/info/gmp.info -#usr/share/info/gmp.info-1 -#usr/share/info/gmp.info-2 diff --git a/config/rootfiles/common/i586/gmp b/config/rootfiles/common/i586/gmp new file mode 100644 index 0000000..db6a000 --- /dev/null +++ b/config/rootfiles/common/i586/gmp @@ -0,0 +1,25 @@ +#usr/include/gmp.h +#usr/include/gmpxx.h +#usr/include/mp.h +#usr/lib/libgmp.a +#usr/lib/libgmp.la +#usr/lib/libgmp.so +usr/lib/libgmp.so.10 +usr/lib/libgmp.so.10.0.5 +#usr/lib/libgmpxx.a +#usr/lib/libgmpxx.la +#usr/lib/libgmpxx.so +usr/lib/libgmpxx.so.4 +usr/lib/libgmpxx.so.4.2.5 +#usr/lib/libmp.a +#usr/lib/libmp.la +#usr/lib/libmp.so +usr/lib/libmp.so.3 +usr/lib/libmp.so.3.1.25 +usr/lib/sse2/libgmp.so.10 +usr/lib/sse2/libgmp.so.10.0.5 +usr/lib/sse2/libmp.so.3 +usr/lib/sse2/libmp.so.3.1.25 +#usr/share/info/gmp.info +#usr/share/info/gmp.info-1 +#usr/share/info/gmp.info-2 diff --git a/config/rootfiles/common/stage2 b/config/rootfiles/common/stage2 index 085092d..39bf555 100644 --- a/config/rootfiles/common/stage2 +++ b/config/rootfiles/common/stage2 @@ -74,6 +74,7 @@ usr/lib/libgcc_s.so.1 #usr/lib/libstdc++.la #usr/lib/libstdc++.so usr/lib/libstdc++.so.6 +#usr/lib/sse2 #usr/local #usr/local/bin #usr/local/bin/archive.files diff --git a/config/rootfiles/core/80/filelists/i586/gmp b/config/rootfiles/core/80/filelists/i586/gmp new file mode 120000 index 0000000..52a09cd --- /dev/null +++ b/config/rootfiles/core/80/filelists/i586/gmp @@ -0,0 +1 @@ +../../../../common/i586/gmp \ No newline at end of file diff --git a/lfs/gmp b/lfs/gmp index 55603a5..1e518a2 100644 --- a/lfs/gmp +++ b/lfs/gmp @@ -34,8 +34,15 @@ TARGET = $(DIR_INFO)/$(THISAPP)
ifeq "$(MACHINE)" "i586" CONFIGURE_ARGS = ABI=32 + BUILDTARGET_PENTIUM4 = $(patsubst $(MACHINE)-%,pentium4-%,$(BUILDTARGET)) endif
+CONFIGURE_OPTIONS = \ + --prefix=/usr \ + --enable-cxx \ + --enable-mpbsd \ + --disable-nls + ############################################################################### # Top-level Rules ############################################################################### @@ -74,10 +81,30 @@ $(subst %,%_MD5,$(objects)) : $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects)) @$(PREBUILD) @rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar jxf $(DIR_DL)/$(DL_FILE) - cd $(DIR_APP) && $(CONFIGURE_ARGS) ./configure --prefix=/usr \ - --build=$(BUILDTARGET) \ - --enable-cxx --enable-mpbsd --disable-nls + cd $(DIR_APP) && \ + $(CONFIGURE_ARGS) \ + ./configure \ + --build=$(BUILDTARGET) \ + $(CONFIGURE_OPTIONS) cd $(DIR_APP) && make $(MAKETUNING) cd $(DIR_APP) && make install + +ifeq "$(MACHINE)" "i586" + # Build SSE/SSE2 optimised version for x86 + cd $(DIR_APP) && make clean + cd $(DIR_APP) && \ + $(CONFIGURE_ARGS) \ + ./configure \ + --build=$(BUILDTARGET_PENTIUM4) \ + $(CONFIGURE_OPTIONS) \ + CFLAGS="$(CFLAGS) -march=pentium4" \ + CXXFLAGS="$(CXXFLAGS) -march=pentium4" + cd $(DIR_APP) && make $(MAKETUNING) + + -mkdir -pv /usr/lib/sse2 + cd $(DIR_APP) && install -v -m 755 .libs/libgmp.so.10.0.5 /usr/lib/sse2 + cd $(DIR_APP) && install -v -m 755 .libs/libmp.so.3.1.25 /usr/lib/sse2 +endif + @rm -rf $(DIR_APP) @$(POSTBUILD) diff --git a/lfs/stage2 b/lfs/stage2 index 956f589..a084816 100644 --- a/lfs/stage2 +++ b/lfs/stage2 @@ -53,7 +53,7 @@ $(TARGET) : -mkdir -pv /{media/{floppy,cdrom,usbkey},sbin,srv,var} -install -dv -m 0750 /root -install -dv -m 1777 /tmp /var/tmp - -mkdir -pv /usr/{,local/}{bin,include,lib,sbin,src} + -mkdir -pv /usr/{,local/}{bin,include,lib{,/sse2},sbin,src} -mkdir -pv /usr/{,local/}share/{doc,info,locale,man} -mkdir -v /usr/{,local/}share/{misc,terminfo,zoneinfo} -mkdir -pv /usr/{,local/}share/man/man{1..8} diff --git a/tools/make-functions b/tools/make-functions index ba66547..5a557a6 100644 --- a/tools/make-functions +++ b/tools/make-functions @@ -71,7 +71,7 @@ configure_target() { i586) BUILDTARGET="${target_arch}-pc-linux-gnu" CROSSTARGET="${BUILD_ARCH}-cross-linux-gnu" - CFLAGS_ARCH="-march=i586 -fomit-frame-pointer" + CFLAGS_ARCH="-march=i586 -mtune=generic -fomit-frame-pointer" ;;
armv5tel)
hooks/post-receive -- IPFire 2.x development tree