diff options
author | Treeve Jelbert | 2012-02-09 20:18:15 +0100 |
---|---|---|
committer | Treeve Jelbert | 2012-02-09 20:18:15 +0100 |
commit | bbd472703311cee7f49680dafe55df8b0e9d002b (patch) | |
tree | f4af13b0f01397281f0f5a2a4d9a14a4828ab5b5 | |
parent | dcfee508e1d4f87b09d00866042387a7e23cb6c5 (diff) |
glibc - remove sparc/ppc support
-rwxr-xr-x | libs/glibc/BUILD | 43 | ||||
-rw-r--r-- | libs/glibc/HISTORY | 1 | ||||
-rwxr-xr-x | libs/glibc/PRE_INSTALL | 5 |
3 files changed, 2 insertions, 47 deletions
diff --git a/libs/glibc/BUILD b/libs/glibc/BUILD index 20d1d0f320..7e6882801d 100755 --- a/libs/glibc/BUILD +++ b/libs/glibc/BUILD @@ -43,9 +43,6 @@ unset LD_LIBRARY_PATH && cd ${GLIBC_HEADERS_DIR} && GL_ARCH=${SMGL_COMPAT_ARCHS[1]} && if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 ]];then - if [[ ${SMGL_COMPAT_ARCHS[1]} == sparc ]]; then - GL_ARCH=sparc64 - fi else if [[ ${SMGL_COMPAT_ARCHS[1]} == ia32 ]]; then GL_ARCH=i386 @@ -53,46 +50,6 @@ unset LD_LIBRARY_PATH && fi && make ARCH=$GL_ARCH INSTALL_HDR_PATH=usr headers_install -if [[ ${SMGL_COMPAT_ARCHS[0]} == 64 && ${SMGL_COMPAT_ARCHS[1]} == sparc ]]; then - # - # If we're not compiling for 64-bit SPARC then we need to use the sparc - # headers, not sparc64 - # - if echo "$CFLAGS" | grep -q -- "-m64"; then - export CC=gcc64 - fi && - - # - # Fixes from Gentoo's 2.3.3.20040420-r2 ebuild - # - sedit "s:CPPFLAGS += -DHAVE_INITFINI:CPPFLAGS += -DHAVE_INITFINI -fno-pie -fno-PIE:" csu/Makefile - export CFLAGS="${CFLAGS/-fcall-used-g7/}" - export CFLAGS="$CFLAGS -fcall-used-g6" - export CFLAGS="${CFLAGS/-mcpu=v9/}" - export CFLAGS="${CFLAGS/-mtune=ultrasparc/}" - export CFLAGS="${CFLAGS/-mvis/}" - - # Setup the HOST properly to insure "sparcv9" - # This passes -mcpu=ultrasparc -Wa,-Av9a to the compiler - [ "$HOST" = "sparc-unknown-linux-gnu" ] && - export HOST="sparcv9-unknown-linux-gnu" && - [ "$BUILD" = "sparc-unknown-linux-gnu" ] && - export BUILD="sparcv9-unknown-linux-gnu" -elif [[ ${SMGL_COMPAT_ARCHS[0]} == 32 && ${SMGL_COMPAT_ARCHS[1]} == sparc ]]; then - # - # Fixes from Gentoo's 2.3.3.20040420-r2 ebuild - # - sedit "s:CPPFLAGS += -DHAVE_INITFINI:CPPFLAGS += -DHAVE_INITFINI -fno-pie -fno-PIE:" csu/Makefile - export CFLAGS="${CFLAGS/-fcall-used-g7/}" - export CFLAGS="$CFLAGS -fcall-used-g6" -elif [[ ${SMGL_COMPAT_ARCHS[1]} == alpha ]]; then - # This is a first attempt to get alpha going, being paranoid about any CFLAGS, - # not without reason: -Os/-O breaks compile in strange ways: - # either an elf/ld.so that segfaults (build failing at sunrpc) or - # internal compiler error(s) in intl/ - # glibc knows itself what flags to choose - export CFLAGS="" -fi && # CPPFLAGS setting is needed so the check for cpp works on boxes that don't # have any kernel headers in /usr/include yet diff --git a/libs/glibc/HISTORY b/libs/glibc/HISTORY index 23a9b431db..9a238ab644 100644 --- a/libs/glibc/HISTORY +++ b/libs/glibc/HISTORY @@ -1,6 +1,7 @@ 2012-02-09 Treeve Jelbert <treeve@sourcemage.org> * *: remove support for linux-2.4 * remove obsolete fixups + * remove sparc/alpha support 2011-09-20 Ismael Luceno <ismael@sourcemage.org> * DEPENDS, DETAILS, PREPARE: Use prepare_select_branch diff --git a/libs/glibc/PRE_INSTALL b/libs/glibc/PRE_INSTALL index 4cda51574d..8f07459037 100755 --- a/libs/glibc/PRE_INSTALL +++ b/libs/glibc/PRE_INSTALL @@ -9,10 +9,7 @@ if [ -z $INSTALL_ROOT ]; then done && ldconfig $SOURCE_DIRECTORY.bld/old.libs && local LD && - if [[ ${SMGL_COMPAT_ARCHS[1]} == ppc ]]; then - LD=$(readlink /lib/ld.so.1) && - ln -sf $SOURCE_DIRECTORY.bld/old.libs/$LD /lib/ld.so.1 - elif [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]] && test -f /lib/ld-linux-x86-64.so.2; then + if [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]] && test -f /lib/ld-linux-x86-64.so.2; then LD=$(readlink /lib/ld-linux-x86-64.so.2) && ln -sf $SOURCE_DIRECTORY.bld/old.libs/$LD /lib/ld-linux-x86-64.so.2 elif [[ ${SMGL_COMPAT_ARCHS[1]} == x86_64 ]] && test -f /lib64/ld-linux-x86-64.so.2; then |