Bug 682751 - Remove build/hcc and build/hcpp r=ted
authorMatheus Kerschbaum <matjk7@gmail.com>
Mon, 29 Aug 2011 20:17:17 +0100
changeset 76282 080f856c88a753ced9c117d57b97f6b5d634dac2
parent 76281 ccc8a52f68b02783255fe61c611d98c64084c237
child 76283 b26059bb002e3e4672f95cc84111b32dce732f87
push id3
push userfelipc@gmail.com
push dateFri, 30 Sep 2011 20:09:13 +0000
reviewersted
bugs682751
milestone9.0a1
Bug 682751 - Remove build/hcc and build/hcpp r=ted
build/hcc
build/hcpp
configure.in
js/src/configure.in
deleted file mode 100755
--- a/build/hcc
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/bin/sh
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#
-# Fix brain-damaged compilers that don't understand -o and -c together
-#
-CC=`echo $1 | sed -e "s|'||g" -e 's|"||g'`
-shift
-DASH_C=0
-DASH_O=0
-DUMMY="XxxXxxX"
-GET_OBJECT=0
-OBJ="${DUMMY}"
-OBJECT="${DUMMY}"
-
-for i in $*
-do
-	[ "${CHECK_O}" = yes ]  && {
-	case $i in
-		./*/*.o)	OBJECT="$i"
-			OPTS="${OPTS} -o"
-   			DASH_O=1
-			;;
-		./*.o)	OBJECT="`basename $i`"
-			i=""
-   			DASH_O=1
-			;;
-		*.o)	if [ $i = `basename $i` ]
-			then
-				OBJECT="$i"
-				i=""
-			else
-				OPTS="${OPTS} -o"
-			fi
-   			DASH_O=1
-			;;
-		*)	OPTS="${OPTS} -o $i"
-   			DASH_O=1
-			i=""
-			;;
-	esac
-	CHECK_O=no
-	}
-   case $i in
-   -c)     DASH_C=1
-	OPTS="${OPTS} -c"
-		;;
-   -o)     CHECK_O=yes
-		;;
-   *.c)    C_SRC=$i
-	OPTS="${OPTS} $i"
-# cc always creates the .o from the .c name
-	OBJ=`basename $C_SRC .c`.o
-		;;
-   *.s)    S_SRC=$i
-	OPTS="${OPTS} $i"
-# or the .o from the .s name
-	OBJ=`basename $S_SRC .s`.o
-		;;
-   *.o)    OBJECT=$i
-	OPTS="${OPTS} $i"
-		;;
-   *) 	OPTS="${OPTS} $i"
-		;;
-   esac
-done
-
-${CC} ${OPTS} || exit $?
-
-# if there was no -c and -o we're done
-[ $DASH_C = 1 -a $DASH_O = 1 ] || exit 0
-
-# if $OBJ and $OBJECT are the same we're done
-[ $OBJ = $OBJECT ] && exit 0
-
-[ -f $OBJ ] && mv -f $OBJ $OBJECT
deleted file mode 100755
--- a/build/hcpp
+++ /dev/null
@@ -1,145 +0,0 @@
-#!/bin/sh
-#
-# ***** BEGIN LICENSE BLOCK *****
-# Version: MPL 1.1/GPL 2.0/LGPL 2.1
-#
-# The contents of this file are subject to the Mozilla Public License Version
-# 1.1 (the "License"); you may not use this file except in compliance with
-# the License. You may obtain a copy of the License at
-# http://www.mozilla.org/MPL/
-#
-# Software distributed under the License is distributed on an "AS IS" basis,
-# WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
-# for the specific language governing rights and limitations under the
-# License.
-#
-# The Original Code is mozilla.org code.
-#
-# The Initial Developer of the Original Code is
-# Netscape Communications Corporation.
-# Portions created by the Initial Developer are Copyright (C) 1998
-# the Initial Developer. All Rights Reserved.
-#
-# Contributor(s):
-#
-# Alternatively, the contents of this file may be used under the terms of
-# either of the GNU General Public License Version 2 or later (the "GPL"),
-# or the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
-# in which case the provisions of the GPL or the LGPL are applicable instead
-# of those above. If you wish to allow use of your version of this file only
-# under the terms of either the GPL or the LGPL, and not to allow others to
-# use your version of this file under the terms of the MPL, indicate your
-# decision by deleting the provisions above and replace them with the notice
-# and other provisions required by the GPL or the LGPL. If you do not delete
-# the provisions above, a recipient may use your version of this file under
-# the terms of any one of the MPL, the GPL or the LGPL.
-#
-# ***** END LICENSE BLOCK *****
-
-#
-# Wrapper for brain-damaged compilers that don't understand -o and -c together.
-#
-CXX=`echo $1 | sed -e "s|'||g" -e 's|"||g'`
-shift
-DUMMY="XxxXxxX"
-DASH_C=0
-DASH_O=0
-GET_OBJECT=0
-C_SRC="${DUMMY}"
-CC_SRC="${DUMMY}"
-CPP_SRC="${DUMMY}"
-S_SRC="${DUMMY}"
-OBJECT="${DUMMY}"
-NEW_i="${DUMMY}"
-PLATFORM=`uname -s`
-
-for i in $*
-do
-	[ ${GET_OBJECT} -eq 1 ]  && {
-	case $i in
-		./*/*.o)	OBJECT="$i"
-			OPTS="${OPTS} -o"
-   			DASH_O=1
-			;;
-		./*.o)	OBJECT="`basename $i`"
-			i=""
-   			DASH_O=1
-			;;
-		*.o)	if [ $i = `basename $i` ]
-			then
-				i=""
-			else
-				OPTS="${OPTS} -o"
-   				DASH_O=1
-			fi
-			;;
-		*)	OPTS="${OPTS} -o $i"
-   			DASH_O=1
-			i=""
-			;;
-	esac
-	GET_OBJECT=0
-	}
-	case $i in
-		-c)
-			DASH_C=1
-			OPTS="${OPTS} -c"
-			;;
-		-o)
-			GET_OBJECT=1
-			;;
-		*.c)
-			C_SRC="$i"
-			OPTS="${OPTS} $i"
-# cc always creates the .o from the .c name
-			OBJ=`basename ${C_SRC} .c`.o
-			;;
-		+.*)
-			OPTS="${OPTS} $i"
-			;;
-		*.cpp)
-			CPP_SRC="$i"
-			if [ "${PLATFORM}" = "SCO_SV" ]; then
-				OPTS="${OPTS} +.cpp $i"
-			else
-				OPTS="${OPTS} $i"
-			fi
-# cc always creates the .o from the .cpp name
-			OBJ=`basename ${CPP_SRC} .cpp`.o
-			;;
-		*.cc)
-			CC_SRC="$i"
-			OPTS="${OPTS} $i"
-# cc always creates the .o from the .cc name
-			OBJ=`basename ${CC_SRC} .cc`.o
-			;;
-		*.s)
-			S_SRC="$i"
-			OPTS="${OPTS} $i"
-# cc always creates the .o from the .s name
-			OBJ=`basename ${S_SRC} .s`.o
-			;;
-   		*.o)    OBJECT=$i
-			OPTS="${OPTS} $i"
-			;;
-   		*) 	OPTS="${OPTS} $i"
-			;;
-	esac
-done
-
-${CXX} ${OPTS} || exit $?
-rm -f ${NEW_i}
-
-# LAME!!!
-if [ -f -O ]; then
-	mv -f -- -O ${OBJECT}
-fi
-
-# if there was no -c and -o we're done
-[ ${DASH_C} -eq 1 -a ${DASH_O} -eq 1 ] || exit 0
-
-# if $OBJ and $OBJECT are the same we're done
-[ $OBJ = $OBJECT ] && exit 0
-
-[ -f $OBJ ] && mv -f $OBJ $OBJECT
-
--- a/configure.in
+++ b/configure.in
@@ -940,28 +940,16 @@ EOF
     AC_DEFINE_UNQUOTED(MOZ_WINSDK_TARGETVER,0x$MOZ_WINSDK_TARGETVER)
     # Definitions matching sdkddkver.h
     AC_DEFINE_UNQUOTED(MOZ_NTDDI_WS03, 0x05020000)
     AC_DEFINE_UNQUOTED(MOZ_NTDDI_LONGHORN, 0x06000000)
     AC_DEFINE_UNQUOTED(MOZ_NTDDI_WIN7, 0x06010000)
     ;;
 esac
 
-dnl Test breaks icc on OS/2 && MSVC
-if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then
-    AC_PROG_CC_C_O
-    if grep "NO_MINUS_C_MINUS_O 1" ./confdefs.h >/dev/null; then
-        USING_HCC=1
-        _OLDCC=$CC
-        _OLDCXX=$CXX
-        CC="${srcdir}/build/hcc '$CC'"
-        CXX="${srcdir}/build/hcpp '$CXX'"
-    fi
-fi
-
 AC_PROG_CPP
 AC_PROG_CXXCPP
 
 if test -n "$_WIN32_MSVC"; then
     SKIP_PATH_CHECKS=1
     SKIP_COMPILER_CHECKS=1
     SKIP_LIBRARY_CHECKS=1
 
@@ -8821,25 +8809,16 @@ AC_SUBST(VPX_ASM_SUFFIX)
 AC_SUBST(VPX_X86_ASM)
 AC_SUBST(VPX_ARM_ASM)
 AC_SUBST(MOZ_INSTRUMENT_EVENT_LOOP)
 AC_SUBST(LIBJPEG_TURBO_AS)
 AC_SUBST(LIBJPEG_TURBO_ASFLAGS)
 AC_SUBST(LIBJPEG_TURBO_X86_ASM)
 AC_SUBST(LIBJPEG_TURBO_X64_ASM)
 
-if test "$USING_HCC"; then
-   CC='${topsrcdir}/build/hcc'
-   CC="$CC '$_OLDCC'"
-   CXX='${topsrcdir}/build/hcpp'
-   CXX="$CXX '$_OLDCXX'"
-   AC_SUBST(CC)
-   AC_SUBST(CXX)
-fi
-
 AC_MSG_CHECKING([for posix_fallocate])
 AC_TRY_LINK([#define _XOPEN_SOURCE 600
   #include <fcntl.h>],
                  [posix_fallocate(0, 0, 0);],
                  [ac_cv___posix_fallocate=true],
                  [ac_cv___posix_fallocate=false])
 
 if test "$ac_cv___posix_fallocate" = true ; then
--- a/js/src/configure.in
+++ b/js/src/configure.in
@@ -941,28 +941,16 @@ EOF
     AC_DEFINE_UNQUOTED(MOZ_WINSDK_TARGETVER,0x$MOZ_WINSDK_TARGETVER)
     # Definitions matching sdkddkver.h
     AC_DEFINE_UNQUOTED(MOZ_NTDDI_WS03, 0x05020000)
     AC_DEFINE_UNQUOTED(MOZ_NTDDI_LONGHORN, 0x06000000)
     AC_DEFINE_UNQUOTED(MOZ_NTDDI_WIN7, 0x06010000)
     ;;
 esac
 
-dnl Test breaks icc on OS/2 && MSVC
-if test "$CC" != "icc" -a -z "$_WIN32_MSVC"; then
-    AC_PROG_CC_C_O
-    if grep "NO_MINUS_C_MINUS_O 1" ./confdefs.h >/dev/null; then
-        USING_HCC=1
-        _OLDCC=$CC
-        _OLDCXX=$CXX
-        CC="${srcdir}/build/hcc '$CC'"
-        CXX="${srcdir}/build/hcpp '$CXX'"
-    fi
-fi
-
 AC_PROG_CPP
 AC_PROG_CXXCPP
 
 if test -n "$_WIN32_MSVC"; then
     SKIP_PATH_CHECKS=1
     SKIP_COMPILER_CHECKS=1
     SKIP_LIBRARY_CHECKS=1
 
@@ -5436,25 +5424,16 @@ AC_SUBST(OBJ_SUFFIX)
 AC_SUBST(BIN_SUFFIX)
 AC_SUBST(ASM_SUFFIX)
 AC_SUBST(IMPORT_LIB_SUFFIX)
 AC_SUBST(USE_N32)
 AC_SUBST(CC_VERSION)
 AC_SUBST(CXX_VERSION)
 AC_SUBST(MSMANIFEST_TOOL)
 
-if test "$USING_HCC"; then
-   CC='${topsrcdir}/build/hcc'
-   CC="$CC '$_OLDCC'"
-   CXX='${topsrcdir}/build/hcpp'
-   CXX="$CXX '$_OLDCXX'"
-   AC_SUBST(CC)
-   AC_SUBST(CXX)
-fi
-
 AC_MSG_CHECKING([for posix_fallocate])
 AC_TRY_LINK([#define _XOPEN_SOURCE 600
   #include <fcntl.h>],
                  [posix_fallocate(0, 0, 0);],
                  [ac_cv___posix_fallocate=true],
                  [ac_cv___posix_fallocate=false])
 
 if test "$ac_cv___posix_fallocate" = true ; then