Compare commits

...

30 Commits
master ... 1.11

Author SHA1 Message Date
Yann E. MORIN" 56db0be25b 1.11: close branch 12 years ago
Yann E. MORIN" 289698ff3e 1.11: update version to 1.11.4+hg 12 years ago
Yann E. MORIN" 12aaae6873 Tagging release 1.11.4 12 years ago
Yann E. MORIN" f71aa6456c 1.11: update version to 1.11.4 12 years ago
Yann E. MORIN" c90eb9eb9a configure: add yet a bit more of autostuff compatibility 12 years ago
Yann E. MORIN" 151ec4a0df scripts, cc/gcc: do not fail on existing symlinks or build.log 12 years ago
Yann E. MORIN" 7ddae7f671 scripts/internals: do not remove lib{32,64}/ symlinks after build 12 years ago
Yann E. MORIN" 624514508b scripts: on startup, also remove the buildtools dir 12 years ago
Yann E. MORIN" 0d319daf2d cc/gcc: fix passing args with spaces when calling core gcc 12 years ago
Yann E. MORIN" 7839c6af5c cc/gcc: remove --enable-symver option 12 years ago
Nicolás Reynolds" 80fc848670 libc/glibc: fix {e,}glibc add-ons with short or long names 12 years ago
Benoît THÉBAUDEAU" 5840c84775 debug/gdb: fix runtime sysroot 12 years ago
Yann E. MORIN" 17f504fc30 1.11: update version to 1.11.3+hg 12 years ago
Yann E. MORIN" f77afe143a Tagging release 1.11.3 12 years ago
Yann E. MORIN" e1ceba1600 1.11: update version to 1.11.3 12 years ago
Anthony Foiani 48c5423871 complibs/ppl: fix 0.11-0.11.2 to compile with --disable-shared 12 years ago
Anthony Foiani 5c2c335873 complibs/ppl: build only C and C++ interfaces for PPL 12 years ago
Anthony Foiani 02f7cf42de complibs/ppl: update GMP location configuration argument for PPL v0.11 and later 12 years ago
Yann E. MORIN" b1a712364d 1.11: update version to 1.11.2+hg 12 years ago
Yann E. MORIN" efc63eba5e Tagging release 1.11.2 12 years ago
Yann E. MORIN" d202dc25fe 1.11: update version to 1.11.2 12 years ago
Yann E. MORIN" bf2f0d57d2 scripts/addToolVersion: fix gcc complibs dependency 12 years ago
Yann E. MORIN" 1ac7419d2e cc/gcc: fix complibs dependency 12 years ago
Yann E. MORIN" 5b237f8511 1.11: update version to 1.11.1+hg 12 years ago
Yann E. MORIN" 80d46479f3 Tagging release 1.11.1 12 years ago
Yann E. MORIN" 46e10cd3a1 1.11: update version to 1.11.1 12 years ago
Yann E. MORIN" 2517bb881a internals: fix stripping yet once again 12 years ago
Yann E. MORIN" ad4e6da655 1.11: update version to 1.11.0+hg 12 years ago
Yann E. MORIN" e079fb231e Tagging release 1.11.0 12 years ago
Yann E. MORIN" a96b1dbb31 1.11: create maintenance branch, update version to 1.11.0 12 years ago
  1. 5
      .hgtags
  2. 2
      .version
  3. 2
      config/cc/gcc.in
  4. 1
      configure
  5. 28
      patches/ppl/0.11.1/100-fix-java-test-vs-enabled-shared.patch
  6. 28
      patches/ppl/0.11.2/100-fix-java-test-vs-enabled-shared.patch
  7. 28
      patches/ppl/0.11/100-fix-java-test-vs-enabled-shared.patch
  8. 19
      scripts/addToolVersion.sh
  9. 10
      scripts/build/cc/gcc.sh
  10. 3
      scripts/build/companion_libs/ppl.sh
  11. 1
      scripts/build/debug/300-gdb.sh
  12. 32
      scripts/build/internals.sh
  13. 21
      scripts/build/libc/eglibc.sh
  14. 19
      scripts/build/libc/glibc.sh
  15. 7
      scripts/crosstool-NG.sh.in

5
.hgtags

@ -30,3 +30,8 @@ c71b4f4da4b46aa83e6c013208731edfffd249a1 crosstool-ng-0.0.4
ce34b7cd6509906de6885c084dbef7ddecd603c6 crosstool-ng-1.1.3a
e016efb7036c14f86e1592114e621cfadeaf714c crosstool-ng-0.0.2
fec15dd785b1ab52e15a350665362c3f58852931 crosstool-ng-0.1.0
5a725fbda9e024d1509e36191ac0f59226a8d59c crosstool-ng-1.11.0
c8f6b7d1e424b8178bf9325e7a503701703b8191 crosstool-ng-1.11.1
07b540a921ce3242cb8c72785eedc0f4e9c68171 crosstool-ng-1.11.2
d767e91f4418ca2eba38b3885278888039cdc05b crosstool-ng-1.11.3
1f1930e245c645df92a27accc07e5543f8d055ca crosstool-ng-1.11.4

2
.version

@ -1 +1 @@
hg
1.11.4+hg

2
config/cc/gcc.in

@ -83,7 +83,7 @@ config CC_V_linaro_4_4_2011_02_0
config CC_V_4_4_6
bool
prompt "4.4.6"
select CC_GCC_4_4_or_later
select CC_GCC_4_4
config CC_V_4_4_5
bool

1
configure vendored

@ -260,6 +260,7 @@ while [ $# -ne 0 ]; do
# Skip, auto-stuff compatibility
--build=*|--host=*|--infodir=*|--datadir=*|--sysconfdir=*|--localstatedir=*) shift;;
--build|--host|--infodir|--datadir|--sysconfdir|--localstatedir) shift 2;;
--enable-shared|--disable-shared|--enable-static|--disable-static) shift;;
*) printf "Unrecognised option: '${1}'\n"; do_help; exit 1;;
esac
done

28
patches/ppl/0.11.1/100-fix-java-test-vs-enabled-shared.patch

@ -0,0 +1,28 @@
commit 25bb77587944768581225d1c0048facab32cf019
Author: Roberto Bagnara <bagnara@cs.unipr.it>
Date: Wed May 18 09:35:36 2011 +0200
Moved misplaced conditional.
diff --git a/interfaces/Java/tests/Makefile.am b/interfaces/Java/tests/Makefile.am
index 64ba864..607bbc6 100644
--- a/interfaces/Java/tests/Makefile.am
+++ b/interfaces/Java/tests/Makefile.am
@@ -51,6 +51,8 @@ Parma_Polyhedra_Library_test2.java \
PPL_Test.java \
ppl_java_tests_common
+if ENABLE_SHARED
+
check_JAVA = \
ppl_java_generated_tests.java \
Test_Executor.java \
@@ -62,8 +64,6 @@ Parma_Polyhedra_Library_test1.java \
Parma_Polyhedra_Library_test2.java \
PPL_Test.java
-if ENABLE_SHARED
-
CLASSPATH = ../ppl_java.jar:.
JAVACFLAGS = -classpath $(CLASSPATH)

28
patches/ppl/0.11.2/100-fix-java-test-vs-enabled-shared.patch

@ -0,0 +1,28 @@
commit 25bb77587944768581225d1c0048facab32cf019
Author: Roberto Bagnara <bagnara@cs.unipr.it>
Date: Wed May 18 09:35:36 2011 +0200
Moved misplaced conditional.
diff --git a/interfaces/Java/tests/Makefile.am b/interfaces/Java/tests/Makefile.am
index 64ba864..607bbc6 100644
--- a/interfaces/Java/tests/Makefile.am
+++ b/interfaces/Java/tests/Makefile.am
@@ -51,6 +51,8 @@ Parma_Polyhedra_Library_test2.java \
PPL_Test.java \
ppl_java_tests_common
+if ENABLE_SHARED
+
check_JAVA = \
ppl_java_generated_tests.java \
Test_Executor.java \
@@ -62,8 +64,6 @@ Parma_Polyhedra_Library_test1.java \
Parma_Polyhedra_Library_test2.java \
PPL_Test.java
-if ENABLE_SHARED
-
CLASSPATH = ../ppl_java.jar:.
JAVACFLAGS = -classpath $(CLASSPATH)

28
patches/ppl/0.11/100-fix-java-test-vs-enabled-shared.patch

@ -0,0 +1,28 @@
commit 25bb77587944768581225d1c0048facab32cf019
Author: Roberto Bagnara <bagnara@cs.unipr.it>
Date: Wed May 18 09:35:36 2011 +0200
Moved misplaced conditional.
diff --git a/interfaces/Java/tests/Makefile.am b/interfaces/Java/tests/Makefile.am
index 64ba864..607bbc6 100644
--- a/interfaces/Java/tests/Makefile.am
+++ b/interfaces/Java/tests/Makefile.am
@@ -51,6 +51,8 @@ Parma_Polyhedra_Library_test2.java \
PPL_Test.java \
ppl_java_tests_common
+if ENABLE_SHARED
+
check_JAVA = \
ppl_java_generated_tests.java \
Test_Executor.java \
@@ -62,8 +64,6 @@ Parma_Polyhedra_Library_test1.java \
Parma_Polyhedra_Library_test2.java \
PPL_Test.java
-if ENABLE_SHARED
-
CLASSPATH = ../ppl_java.jar:.
JAVACFLAGS = -classpath $(CLASSPATH)

19
scripts/addToolVersion.sh

@ -102,15 +102,16 @@ addToolVersion() {
# Extract 'M'ajor and 'm'inor from version string
ver_M=$(echo "${version}...." |cut -d . -f 1)
ver_m=$(echo "${version}...." |cut -d . -f 2)
if [ ${ver_M} -gt 4 \
-o \( ${ver_M} -eq 4 -a ${ver_m} -ge 5 \) ]; then
SedExpr1="${SedExpr1}\n select CC_GCC_4_5_or_later"
elif [ ${ver_M} -gt 4 \
-o \( ${ver_M} -eq 4 -a ${ver_m} -ge 4 \) ]; then
SedExpr1="${SedExpr1}\n select CC_GCC_4_4_or_later"
elif [ ${ver_M} -gt 4 \
-o \( ${ver_M} -eq 4 -a ${ver_m} -ge 3 \) ]; then
SedExpr1="${SedExpr1}\n select CC_GCC_4_3_or_later"
if [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 6 \) ]; then
SedExpr1="${SedExpr1}\n select CC_GCC_4_6"
elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 5 \) ]; then
SedExpr1="${SedExpr1}\n select CC_GCC_4_5"
elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 4 \) ]; then
SedExpr1="${SedExpr1}\n select CC_GCC_4_4"
elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 3 \) ]; then
SedExpr1="${SedExpr1}\n select CC_GCC_4_3"
elif [ \( ${ver_M} -eq 4 -a ${ver_m} -eq 2 \) ]; then
SedExpr1="${SedExpr1}\n select CC_GCC_4_2"
fi
;;
uClibc)

10
scripts/build/cc/gcc.sh

@ -123,7 +123,7 @@ do_cc_core() {
local -a core_targets
while [ $# -ne 0 ]; do
eval "${1}"
eval "${1// /\\ }"
shift
done
@ -274,7 +274,6 @@ do_cc_core() {
${CC_CORE_SYSROOT_ARG} \
"${extra_config[@]}" \
--disable-nls \
--enable-symvers=gnu \
--enable-languages="${lang_opt}" \
${CT_CC_CORE_EXTRA_CONFIG}
@ -355,7 +354,7 @@ do_cc_core() {
# check whether compiler has an extension
file="$( ls -1 "${core_prefix_dir}/bin/${CT_TARGET}-gcc."* 2>/dev/null || true )"
[ -z "${file}" ] || ext=".${file##*.}"
CT_DoExecLog ALL ln -sv "${CT_TARGET}-gcc${ext}" "${core_prefix_dir}/bin/${CT_TARGET}-cc${ext}"
CT_DoExecLog ALL ln -sfv "${CT_TARGET}-gcc${ext}" "${core_prefix_dir}/bin/${CT_TARGET}-cc${ext}"
CT_EndStep
}
@ -532,8 +531,6 @@ do_cc() {
CT_DoLog DEBUG "Extra config passed: '${extra_config[*]}'"
# --enable-symvers=gnu really only needed for sh4 to work around a
# detection problem only matters for gcc-3.2.x and later, I think.
# --disable-nls to work around crash bug on ppc405, but also because
# embedded systems don't really need message catalogs...
CT_DoExecLog CFG \
@ -552,7 +549,6 @@ do_cc() {
"${extra_config[@]}" \
--with-local-prefix="${CT_SYSROOT_DIR}" \
--disable-nls \
--enable-symvers=gnu \
--enable-c99 \
--enable-long-long \
${CT_CC_EXTRA_CONFIG}
@ -573,7 +569,7 @@ do_cc() {
# check whether compiler has an extension
file="$( ls -1 "${CT_PREFIX_DIR}/bin/${CT_TARGET}-gcc."* 2>/dev/null || true )"
[ -z "${file}" ] || ext=".${file##*.}"
CT_DoExecLog ALL ln -sv "${CT_TARGET}-gcc${ext}" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-cc${ext}"
CT_DoExecLog ALL ln -sfv "${CT_TARGET}-gcc${ext}" "${CT_PREFIX_DIR}/bin/${CT_TARGET}-cc${ext}"
CT_EndStep
}

3
scripts/build/companion_libs/ppl.sh

@ -41,6 +41,7 @@ do_ppl() {
--prefix="${CT_COMPLIBS_DIR}" \
--with-libgmp-prefix="${CT_COMPLIBS_DIR}" \
--with-libgmpxx-prefix="${CT_COMPLIBS_DIR}" \
--with-gmp-prefix="${CT_COMPLIBS_DIR}" \
--enable-cxx \
--enable-watchdog \
--disable-debugging \
@ -48,10 +49,10 @@ do_ppl() {
--disable-ppl_lcdd \
--disable-ppl_lpsol \
--disable-shared \
--enable-interfaces='c c++' \
--enable-static
# Maybe-options:
# --enable-interfaces=...
# --enable-optimization=speed or sspeed (yes, with 2 's')
CT_DoLog EXTRA "Building PPL"

1
scripts/build/debug/300-gdb.sh

@ -133,6 +133,7 @@ do_debug_gdb_build() {
--target=${CT_TARGET} \
--prefix="${CT_PREFIX_DIR}" \
--with-build-sysroot="${CT_SYSROOT_DIR}" \
--with-sysroot="${CT_SYSROOT_DIR}" \
--disable-werror \
"${cross_extra_config[@]}"

32
scripts/build/internals.sh

@ -22,7 +22,19 @@ do_finish() {
esac
CT_DoLog INFO "Stripping all toolchain executables"
CT_Pushd "${CT_PREFIX_DIR}"
gcc_version=$( cat "${CT_SRC_DIR}/gcc-${CT_GCC_VERSION}/gcc/BASE-VER" )
# We can not use the version in CT_CC_VERSION because
# of the Linaro stuff. So, harvest the version string
# directly from the gcc sources...
# All gcc 4.x seem to have the version in gcc/BASE-VER
# while version prior to 4.x have the version in gcc/version.c
# Of course, here is not the better place to do that...
if [ -f "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/BASE-VER" ]; then
gcc_version=$( cat "${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/BASE-VER" )
else
gcc_version=$( sed -r -e '/version_string/!d; s/^.+= "([^"]+)".*$/\1/;' \
"${CT_SRC_DIR}/gcc-${CT_CC_VERSION}/gcc/version.c" \
)
fi
for _t in "bin/${CT_TARGET}-"* \
"${CT_TARGET}/bin/"* \
"libexec/gcc/${CT_TARGET}/${gcc_version}/"* \
@ -74,14 +86,14 @@ do_finish() {
for t in "${CT_TARGET}-"*; do
if [ -n "${CT_TARGET_ALIAS}" ]; then
_t=$(echo "$t" |sed -r -e 's/^'"${CT_TARGET}"'-/'"${CT_TARGET_ALIAS}"'-/;')
CT_DoExecLog ALL ln -sv "${t}" "${_t}"
CT_DoExecLog ALL ln -sfv "${t}" "${_t}"
fi
if [ -n "${CT_TARGET_ALIAS_SED_EXPR}" ]; then
_t=$(echo "$t" |sed -r -e "${CT_TARGET_ALIAS_SED_EXPR}")
if [ "${_t}" = "${t}" ]; then
CT_DoLog WARN "The sed expression '${CT_TARGET_ALIAS_SED_EXPR}' has no effect on '${t}'"
else
CT_DoExecLog ALL ln -sv "${t}" "${_t}"
CT_DoExecLog ALL ln -sfv "${t}" "${_t}"
fi
fi
done
@ -102,18 +114,8 @@ do_finish() {
# The symlinks are needed only during the build process.
# The final gcc will still search those dirs, but will also search
# the standard lib/ dirs, so we can get rid of the symlinks
for d in \
"${CT_PREFIX_DIR}" \
"${CT_PREFIX_DIR}/${CT_TARGET}" \
; do
CT_DoExecLog ALL rm -f "${d}/lib32"
CT_DoExecLog ALL rm -f "${d}/lib64"
done
# Also remove the lib/ symlink out-side of sysroot
if [ "${CT_USE_SYSROOT}" = "y" ]; then
CT_DoExecLog ALL rm -f "${CT_PREFIX_DIR}/${CT_TARGET}/lib"
fi
CT_DoExecLog ALL rm -f "${CT_PREFIX_DIR}/lib32"
CT_DoExecLog ALL rm -f "${CT_PREFIX_DIR}/lib64"
CT_EndStep
}

21
scripts/build/libc/eglibc.sh

@ -109,15 +109,26 @@ do_libc_extract() {
[ "${addon}" = "nptl" ] && continue || true
CT_Pushd "${CT_SRC_DIR}/eglibc-${CT_LIBC_VERSION}"
CT_Extract nochdir "eglibc-${addon}-${CT_LIBC_VERSION}"
CT_TestAndAbort "Error in add-on '${addon}': both short and long names in tarball" \
-d "${addon}" -a -d "eglibc-${addon}-${CT_LIBC_VERSION}"
# Some addons have the 'long' name, while others have the
# 'short' name, but patches are non-uniformly built with
# either the 'long' or 'short' name, whatever the addons name
# so we have to make symlinks from the existing to the missing
# Fortunately for us, [ -d foo ], when foo is a symlink to a
# directory, returns true!
[ -d "${addon}" ] || ln -s "eglibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
[ -d "eglibc-${addon}-${CT_LIBC_VERSION}" ] || ln -s "${addon}" "eglibc-${addon}-${CT_LIBC_VERSION}"
# but we prefer the 'short' name and avoid duplicates.
if [ -d "eglibc-${addon}-${CT_LIBC_VERSION}" ]; then
mv "eglibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
fi
ln -s "${addon}" "eglibc-${addon}-${CT_LIBC_VERSION}"
CT_Patch nochdir "eglibc" "${addon}-${CT_LIBC_VERSION}"
# Remove the long name since it can confuse configure scripts to run
# the same source twice.
rm "eglibc-${addon}-${CT_LIBC_VERSION}"
CT_Popd
done

19
scripts/build/libc/glibc.sh

@ -54,15 +54,24 @@ do_libc_extract() {
[ "${addon}" = "nptl" ] && continue || true
CT_Extract nochdir "glibc-${addon}-${CT_LIBC_VERSION}"
CT_TestAndAbort "Error in add-on '${addon}': both short and long names in tarball" \
-d "${addon}" -a -d "glibc-${addon}-${CT_LIBC_VERSION}"
# Some addons have the 'long' name, while others have the
# 'short' name, but patches are non-uniformly built with
# either the 'long' or 'short' name, whatever the addons name
# so we have to make symlinks from the existing to the missing
# Fortunately for us, [ -d foo ], when foo is a symlink to a
# directory, returns true!
[ -d "${addon}" ] || CT_DoExecLog ALL ln -s "glibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
[ -d "glibc-${addon}-${CT_LIBC_VERSION}" ] || CT_DoExecLog ALL ln -s "${addon}" "glibc-${addon}-${CT_LIBC_VERSION}"
# but we prefer the 'short' name and avoid duplicates.
if [ -d "glibc-${addon}-${CT_LIBC_VERSION}" ]; then
mv "glibc-${addon}-${CT_LIBC_VERSION}" "${addon}"
fi
ln -s "${addon}" "glibc-${addon}-${CT_LIBC_VERSION}"
CT_Patch nochdir "glibc" "${addon}-${CT_LIBC_VERSION}"
# Remove the long name since it can confuse configure scripts to run
# the same source twice.
rm "glibc-${addon}-${CT_LIBC_VERSION}"
done
# The configure files may be older than the configure.in files

7
scripts/crosstool-NG.sh.in

@ -208,9 +208,8 @@ CT_TOOLCHAIN_ID="crosstool-${CT_VERSION} build ${CT_STAR_DATE_HUMAN} by ${CT_SYS
CT_DoLog EXTRA "Preparing working directories"
# Ah! The build directory shall be eradicated, even if we restart!
if [ -d "${CT_BUILD_DIR}" ]; then
CT_DoForceRmdir "${CT_BUILD_DIR}"
fi
# Ditto for the build tools install dir
CT_DoForceRmdir "${CT_BUILD_DIR}" "${CT_BUILDTOOLS_PREFIX_DIR}"
# Don't eradicate directories if we need to restart
if [ -z "${CT_RESTART}" ]; then
@ -598,7 +597,7 @@ CT_DoEnd INFO
# moment... Consign all ouptut to oblivion...
CT_DoLog INFO "Finishing installation (may take a few seconds)..."
exec >/dev/null 2>&1
rm -f ${CT_PREFIX_DIR}/build.log.bz2
if [ "${CT_LOG_TO_FILE}" = "y" ]; then
cp "${tmp_log_file}" "${CT_PREFIX_DIR}/build.log"
if [ "${CT_LOG_FILE_COMPRESS}" = y ]; then

Loading…
Cancel
Save