diff --git a/icu4c/source/common/digitlst.cpp b/icu4c/source/common/digitlst.cpp index eee7948dadb..578428d1930 100644 --- a/icu4c/source/common/digitlst.cpp +++ b/icu4c/source/common/digitlst.cpp @@ -518,7 +518,7 @@ DigitList::initializeLONG_MIN_REP() { // THIS ASSUMES A 32-BIT LONG_MIN VALUE char buf[LONG_DIGITS]; - sprintf(buf, "%d", LONG_MIN); + sprintf(buf, "%d", T_INT32_MIN); LONG_MIN_REP_LENGTH = strlen(buf) - 1; // assert(LONG_MIN_REP_LENGTH == LONG_DIGITS); for (int32_t i=1; i<=LONG_MIN_REP_LENGTH; ++i) LONG_MIN_REP[i-1] = buf[i]; diff --git a/icu4c/source/common/scsu.c b/icu4c/source/common/scsu.c index 87b6f98076c..f5c4fc24769 100644 --- a/icu4c/source/common/scsu.c +++ b/icu4c/source/common/scsu.c @@ -1385,7 +1385,7 @@ scsu_findStaticWindow(int32_t c) static int32_t scsu_getLRDefinedWindow(const UnicodeCompressor *comp) { - int32_t leastRU = LONG_MAX; + int32_t leastRU = T_INT32_MAX; int32_t whichWindow = INVALIDWINDOW; int32_t i; diff --git a/icu4c/source/common/ucnv2022.c b/icu4c/source/common/ucnv2022.c index 92b4a59f9ba..46c877d669d 100644 --- a/icu4c/source/common/ucnv2022.c +++ b/icu4c/source/common/ucnv2022.c @@ -688,7 +688,7 @@ static const UConverterImpl _ISO2022Impl={ }; extern const UConverterSharedData _ISO2022Data={ - sizeof(UConverterSharedData), ~0, + sizeof(UConverterSharedData), ~((uint32_t) 0), NULL, NULL, &_ISO2022Impl, "ISO_2022", 2022, UCNV_IBM, UCNV_ISO_2022, 1, 4, { 0, 1, 0x1a, 0, 0, 0 } diff --git a/icu4c/source/common/ucnv_utf.c b/icu4c/source/common/ucnv_utf.c index 1c2ecb5e164..8a858e1a99c 100644 --- a/icu4c/source/common/ucnv_utf.c +++ b/icu4c/source/common/ucnv_utf.c @@ -713,7 +713,7 @@ static const UConverterImpl _UTF8Impl={ }; extern const UConverterSharedData _UTF8Data={ - sizeof(UConverterSharedData), ~0, + sizeof(UConverterSharedData), ~((uint32_t) 0), NULL, NULL, &_UTF8Impl, "UTF8", 1208, UCNV_IBM, UCNV_UTF8, 1, 4, { 0, 3, 0xef, 0xbf, 0xbd, 0 } @@ -887,7 +887,7 @@ static const UConverterImpl _UTF16BEImpl={ }; extern const UConverterSharedData _UTF16BEData={ - sizeof(UConverterSharedData), ~0, + sizeof(UConverterSharedData), ~((uint32_t) 0), NULL, NULL, &_UTF16BEImpl, "UTF16_BigEndian", 1200, UCNV_IBM, UCNV_UTF16_BigEndian, 2, 2, { 0, 2, 0xff, 0xfd, 0, 0 } @@ -1065,7 +1065,7 @@ static const UConverterImpl _UTF16LEImpl={ }; extern const UConverterSharedData _UTF16LEData={ - sizeof(UConverterSharedData), ~0, + sizeof(UConverterSharedData), ~((uint32_t) 0), NULL, NULL, &_UTF16LEImpl, "UTF16_LittleEndian", 1200, UCNV_IBM, UCNV_UTF16_LittleEndian, 2, 2, { 0, 2, 0xfd, 0xff, 0, 0 } diff --git a/icu4c/source/common/ucnvlat1.c b/icu4c/source/common/ucnvlat1.c index 9ae84a127b4..5b6f513c16d 100644 --- a/icu4c/source/common/ucnvlat1.c +++ b/icu4c/source/common/ucnvlat1.c @@ -161,7 +161,7 @@ static const UConverterImpl _Latin1Impl={ }; extern const UConverterSharedData _Latin1Data={ - sizeof(UConverterSharedData), ~0, + sizeof(UConverterSharedData), ~((uint32_t) 0), NULL, NULL, &_Latin1Impl, "LATIN_1", 819, UCNV_IBM, UCNV_LATIN_1, 1, 1, { 0, 1, 0x1a, 0, 0, 0 } diff --git a/icu4c/source/common/unicode/platform.h.in b/icu4c/source/common/unicode/platform.h.in index f9f35959f6c..126e6a98264 100644 --- a/icu4c/source/common/unicode/platform.h.in +++ b/icu4c/source/common/unicode/platform.h.in @@ -80,17 +80,32 @@ typedef unsigned short uint16_t; #endif #if ! HAVE_INT32_T -typedef signed long int32_t; +# if defined(_LP64) + typedef signed int int32_t; +# else + typedef signed long int32_t; +# endif #endif #if ! HAVE_UINT32_T -typedef unsigned long uint32_t; +# if defined(_LP64) + typedef unsigned int uint32_t; +# else + typedef unsigned long uint32_t; +# endif #endif #endif #include -#define T_INT32_MAX (LONG_MAX) + +#if defined(_LP64) +# define T_INT32_MAX (INT_MAX) +# define T_INT32_MIN (INT_MIN) +#else +# define T_INT32_MAX (LONG_MAX) +# define T_INT32_MIN (LONG_MIN) +#endif /*===========================================================================*/ /* Character data types */ diff --git a/icu4c/source/common/unicode/pos2.h b/icu4c/source/common/unicode/pos2.h index 0e3378e3542..3c522aaae0e 100644 --- a/icu4c/source/common/unicode/pos2.h +++ b/icu4c/source/common/unicode/pos2.h @@ -74,6 +74,7 @@ typedef unsigned long uint32_t; #include #define T_INT32_MAX (LONG_MAX) +#define T_INT32_MIN (LONG_MIN) /*===========================================================================*/ /* Character data types */ diff --git a/icu4c/source/common/unicode/pos400.h b/icu4c/source/common/unicode/pos400.h index 7a5dc92af2a..ea97dea2fd0 100644 --- a/icu4c/source/common/unicode/pos400.h +++ b/icu4c/source/common/unicode/pos400.h @@ -75,6 +75,7 @@ typedef unsigned long uint32_t; #include #define T_INT32_MAX (LONG_MAX) +#define T_INT32_MIN (LONG_MIN) /*===========================================================================*/ /* Character data types */ diff --git a/icu4c/source/common/unicode/pwin32.h b/icu4c/source/common/unicode/pwin32.h index 3d9931f6a68..de535cb0124 100644 --- a/icu4c/source/common/unicode/pwin32.h +++ b/icu4c/source/common/unicode/pwin32.h @@ -63,17 +63,32 @@ typedef unsigned short uint16_t; #endif #if ! HAVE_INT32_T -typedef signed long int32_t; +# if defined(_LP64) + typedef signed int int32_t; +# else + typedef signed long int32_t; +# endif #endif #if ! HAVE_UINT32_T -typedef unsigned long uint32_t; +# if defined(_LP64) + typedef unsigned int uint32_t; +# else + typedef unsigned long uint32_t; +# endif #endif #endif #include -#define T_INT32_MAX (LONG_MAX) +#if defined(_LP64) +# define T_INT32_MAX (INT_MAX) +# define T_INT32_MIN (INT_MIN) +#else +# define T_INT32_MAX (LONG_MAX) +# define T_INT32_MIN (LONG_MIN) +#endif + /*===========================================================================*/ /* Character data types */ diff --git a/icu4c/source/common/unicode/unistr.h b/icu4c/source/common/unicode/unistr.h index 977976ebebd..7ae55340789 100644 --- a/icu4c/source/common/unicode/unistr.h +++ b/icu4c/source/common/unicode/unistr.h @@ -1334,7 +1334,7 @@ public: * @stable */ inline UnicodeString& remove(UTextOffset start, - int32_t length = LONG_MAX); + int32_t length = T_INT32_MAX); /** * Remove the characters in the range @@ -1345,7 +1345,7 @@ public: * @stable */ inline UnicodeString& removeBetween(UTextOffset start, - UTextOffset limit = LONG_MAX); + UTextOffset limit = T_INT32_MAX); /* Length operations */ @@ -1603,7 +1603,7 @@ public: * @stable */ int32_t numDisplayCells(UTextOffset start = 0, - int32_t length = LONG_MAX, + int32_t length = T_INT32_MAX, bool_t asian = TRUE) const; diff --git a/icu4c/source/common/unicode/utypes.h b/icu4c/source/common/unicode/utypes.h index 2800452366f..4687a260134 100644 --- a/icu4c/source/common/unicode/utypes.h +++ b/icu4c/source/common/unicode/utypes.h @@ -115,7 +115,9 @@ updates come out. */ /* Maximum value of a (void*) - use to indicate the limit of an 'infinite' buffer. */ +#ifndef U_MAX_PTR #define U_MAX_PTR ((void*)-1) +#endif /*===========================================================================*/ /* Calendar/TimeZone data types */ diff --git a/icu4c/source/common/utf_impl.c b/icu4c/source/common/utf_impl.c index 01dd5baaff9..a9ef94fbeed 100644 --- a/icu4c/source/common/utf_impl.c +++ b/icu4c/source/common/utf_impl.c @@ -70,7 +70,7 @@ utf8_minRegular[4]={ 0, 0x80, 0x800, 0x10000 }; static UChar32 utf8_errorValue[7]={ UTF8_ERROR_VALUE_1, UTF8_ERROR_VALUE_2, UTF_ERROR_VALUE, 0x10ffff, - 0x3ffffff, 0x7fffffff, 0xffffffff + 0x3ffffff, 0x7fffffff, -1 /* 0xffffffff in a signed value! */ }; U_CAPI UChar32 U_EXPORT2 diff --git a/icu4c/source/config.guess b/icu4c/source/config.guess index 67e04be3694..5d97ad160d7 100644 --- a/icu4c/source/config.guess +++ b/icu4c/source/config.guess @@ -182,6 +182,9 @@ EOF sun4H:SunOS:5.*:*) echo sparc-hal-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; + sun4u:SunOS:5.*:*) + echo sparcv9-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` + exit 0 ;; sun4*:SunOS:5.*:* | tadpole*:SunOS:5.*:*) echo sparc-sun-solaris2`echo ${UNAME_RELEASE}|sed -e 's/[^.]*//'` exit 0 ;; diff --git a/icu4c/source/config/mh-solaris-sparcv9 b/icu4c/source/config/mh-solaris-sparcv9 new file mode 100644 index 00000000000..66a9bb79f50 --- /dev/null +++ b/icu4c/source/config/mh-solaris-sparcv9 @@ -0,0 +1,55 @@ +## -*-makefile-*- +## Solaris-specific setup using Sun's workshop compilers +## Copyright (c) 1999-2000, International Business Machines Corporation and +## others. All Rights Reserved. + +## Commands to generate dependency files +GEN_DEPS.c= $(CC) -xtarget=ultra -xarch=v9 -xM $(DEFS) $(CPPFLAGS) +GEN_DEPS.cc= $(CXX) -xtarget=ultra -xarch=v9 -xM $(DEFS) $(CPPFLAGS) + +## Commands to compile +COMPILE.c= $(CC) -xtarget=ultra -xarch=v9 -mt $(DEFS) $(CPPFLAGS) $(CFLAGS) -c +COMPILE.cc= $(CXX) -xtarget=ultra -xarch=v9 -mt $(DEFS) $(CPPFLAGS) $(CXXFLAGS) -c + +## Commands to link +## For Sun Workshop, use CC to link to bring in C++ runtime +LINK.c= $(CXX) -xtarget=ultra -xarch=v9 -mt $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) +LINK.cc= $(CXX) -xtarget=ultra -xarch=v9 -mt $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) + +## Commands to make a shared library +SHLIB.c= $(CC) -xtarget=ultra -xarch=v9 $(DEFS) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) -G +SHLIB.cc= $(CXX) -xtarget=ultra -xarch=v9 $(DEFS) $(CPPFLAGS) $(CXXFLAGS) $(LDFLAGS) -G + +## Compiler switch to embed a runtime search path +LD_RPATH= -R +LD_RPATH_PRE= + +## Shared object suffix +SO= so + +## Link commands to link to ICU libs +LIBICU-UC= -L$(top_builddir)/common -licu-uc +LIBICU-I18N= -L$(top_builddir)/i18n -licu-i18n +LIBCTESTFW= -L$(top_builddir)/tools/ctestfw -lctestfw +LIBICU-TOOLUTIL=-L$(top_builddir)/tools/toolutil -licu-toolutil + +## Compilation rules +%.o : $(srcdir)/%.c + $(COMPILE.c) -o $@ $< + +%.o : $(srcdir)/%.cpp + $(COMPILE.cc) -o $@ $< + +../data/%.o : ../data/%.c + $(COMPILE.c) -o $@ $< + +## Dependency rules +%.d : $(srcdir)/%.c + @echo "Generating dependency information for $<" + @$(GEN_DEPS.c) $< > $@ + +%.d : $(srcdir)/%.cpp + @echo "Generating dependency information for $<" + @$(GEN_DEPS.cc) $< > $@ + +## End Solaris-specific setup diff --git a/icu4c/source/configure b/icu4c/source/configure index b51d2fb6a25..73992c84168 100755 --- a/icu4c/source/configure +++ b/icu4c/source/configure @@ -1093,6 +1093,8 @@ case "${host}" in *-*-solaris*) if test "$ac_cv_prog_gcc" = yes; then icu_cv_host_frag=$srcdir/config/mh-solaris-gcc + elif test "$host_cpu" = sparcv9; then + icu_cv_host_frag=$srcdir/config/mh-solaris-sparcv9 else icu_cv_host_frag=$srcdir/config/mh-solaris fi ;; diff --git a/icu4c/source/i18n/dbbi.cpp b/icu4c/source/i18n/dbbi.cpp index 3273a137144..f11f450a000 100644 --- a/icu4c/source/i18n/dbbi.cpp +++ b/icu4c/source/i18n/dbbi.cpp @@ -380,7 +380,7 @@ DictionaryBasedBreakIterator::divideUpDictionaryRange(int32_t startPos, int32_t } else { if ((currentBreakPositions.isEmpty() - || (int32_t)currentBreakPositions.peek() != text->getIndex()) + || (int32_t)(unsigned long)currentBreakPositions.peek() != text->getIndex()) && text->getIndex() != startPos) { currentBreakPositions.push((void*)text->getIndex()); } @@ -395,15 +395,15 @@ DictionaryBasedBreakIterator::divideUpDictionaryRange(int32_t startPos, int32_t // it. Then back up to that position and start over from there (i.e., // treat that position as the beginning of a new word) else { - int32_t temp = (int32_t)possibleBreakPositions.pop(); + int32_t temp = (int32_t)(unsigned long)possibleBreakPositions.pop(); void* temp2 = NULL; while (!currentBreakPositions.isEmpty() && temp < - (int32_t)currentBreakPositions.peek()) { + (int32_t)(unsigned long)currentBreakPositions.peek()) { temp2 = currentBreakPositions.pop(); wrongBreakPositions.addElement(temp2); } currentBreakPositions.push((void*)temp); - text->setIndex((int32_t)currentBreakPositions.peek()); + text->setIndex((int32_t)(unsigned long)currentBreakPositions.peek()); } // re-sync "c" for the next go-round, and drop out of the loop if @@ -440,7 +440,8 @@ DictionaryBasedBreakIterator::divideUpDictionaryRange(int32_t startPos, int32_t cachedBreakPositions[0] = startPos; for (int32_t i = 0; i < currentBreakPositions.size(); i++) { - cachedBreakPositions[i + 1] = (int32_t)currentBreakPositions.elementAt(i); + cachedBreakPositions[i + 1] = (int32_t)(unsigned long)currentBreakPositions.elementAt(i); } positionInCache = 0; } + diff --git a/icu4c/source/i18n/dbbi_tbl.cpp b/icu4c/source/i18n/dbbi_tbl.cpp index c622c745145..3fb812caef6 100644 --- a/icu4c/source/i18n/dbbi_tbl.cpp +++ b/icu4c/source/i18n/dbbi_tbl.cpp @@ -24,13 +24,13 @@ DictionaryBasedBreakIteratorTables::DictionaryBasedBreakIteratorTables( dictionary(dictionaryFilename, status) { if (U_FAILURE(status)) return; - const void** tablesIdx = (const void**)tablesImage; - const void* dbbiImage = (const void*)((const int8_t*)tablesImage + (int32_t)tablesIdx[8]); + const int32_t* tablesIdx = (int32_t*) tablesImage; + const int8_t* dbbiImage = ((const int8_t*)tablesImage + tablesIdx[8]); // we know the offset into the memory image where the DBBI stuff // starts is stored in element 8 of the array. There should be // a way for the RBBI constructor to give us this, but there's // isn't a good one. - const void** dbbiIdx = (const void**)dbbiImage; + const int32_t* dbbiIdx = (const int32_t*)dbbiImage; categoryFlags = (int8_t*)((const int8_t*)dbbiImage + (int32_t)dbbiIdx[0]); } diff --git a/icu4c/source/i18n/decimfmt.cpp b/icu4c/source/i18n/decimfmt.cpp index 421ed8869a0..417c6d23764 100644 --- a/icu4c/source/i18n/decimfmt.cpp +++ b/icu4c/source/i18n/decimfmt.cpp @@ -481,7 +481,7 @@ DecimalFormat::format(int32_t number, if (number < 0) // This can only happen if number == Long.MIN_VALUE { - int32_t cutoff = LONG_MIN / fMultiplier; + int32_t cutoff = T_INT32_MIN / fMultiplier; useDouble = (number < cutoff); } else diff --git a/icu4c/source/i18n/digitlst.cpp b/icu4c/source/i18n/digitlst.cpp index eee7948dadb..578428d1930 100644 --- a/icu4c/source/i18n/digitlst.cpp +++ b/icu4c/source/i18n/digitlst.cpp @@ -518,7 +518,7 @@ DigitList::initializeLONG_MIN_REP() { // THIS ASSUMES A 32-BIT LONG_MIN VALUE char buf[LONG_DIGITS]; - sprintf(buf, "%d", LONG_MIN); + sprintf(buf, "%d", T_INT32_MIN); LONG_MIN_REP_LENGTH = strlen(buf) - 1; // assert(LONG_MIN_REP_LENGTH == LONG_DIGITS); for (int32_t i=1; i<=LONG_MIN_REP_LENGTH; ++i) LONG_MIN_REP[i-1] = buf[i]; diff --git a/icu4c/source/i18n/rbbi_tbl.cpp b/icu4c/source/i18n/rbbi_tbl.cpp index 73d29b90d66..293a638eb7f 100644 --- a/icu4c/source/i18n/rbbi_tbl.cpp +++ b/icu4c/source/i18n/rbbi_tbl.cpp @@ -19,8 +19,8 @@ RuleBasedBreakIteratorTables::RuleBasedBreakIteratorTables(const void* image) : refCount(0), ownTables(FALSE) { - const void** im = (const void**)(image); - const int8_t* base = (const int8_t*)(image); + const int32_t* im = (const int32_t*)(image); + const int8_t* base = (const int8_t*)(image); // the memory image begins with an index that gives the offsets into the // image for each of the fields in the BreakIteratorTables object-- diff --git a/icu4c/source/i18n/rbt_data.cpp b/icu4c/source/i18n/rbt_data.cpp index c4fa9279c91..cb1aff3067c 100644 --- a/icu4c/source/i18n/rbt_data.cpp +++ b/icu4c/source/i18n/rbt_data.cpp @@ -47,7 +47,7 @@ TransliterationRuleData::lookupVariable(const UnicodeString& name, if (value == 0) { status = U_ILLEGAL_ARGUMENT_ERROR; } - return (UChar) (int32_t) value; + return (UChar) (int32_t) (unsigned long) value; } const UnicodeSet* diff --git a/icu4c/source/i18n/uniset.cpp b/icu4c/source/i18n/uniset.cpp index f880f59156a..befe229fdd7 100644 --- a/icu4c/source/i18n/uniset.cpp +++ b/icu4c/source/i18n/uniset.cpp @@ -976,9 +976,9 @@ void UnicodeSet::doUnion(UnicodeString& c1, const UnicodeString& c2) { // one of the operands. We can append all of the remaining characters // in the other operand without doing any extra work. if (i < c1.length()) - result.append(c1, i, LONG_MAX); + result.append(c1, i, T_INT32_MAX); if (j < c2.length()) - result.append(c2, j, LONG_MAX); + result.append(c2, j, T_INT32_MAX); c1 = result; } diff --git a/icu4c/source/test/intltest/callimts.cpp b/icu4c/source/test/intltest/callimts.cpp index af3764bcffd..32c5f3a0764 100644 --- a/icu4c/source/test/intltest/callimts.cpp +++ b/icu4c/source/test/intltest/callimts.cpp @@ -335,7 +335,7 @@ CalendarLimitTest::timeToFields(UDate theTime, int32_t* fields) // Compute the Julian calendar day number for January 1, rawYear //double january1 = 365 * (rawYear - 1) + floorDivide(rawYear - 1, 4); double january1 = 365 * (rawYear - 1) + floorDivide(rawYear - 1, 4L); - dayOfYear = (int32_t)(julianEpochDay - january1); // 0-based + dayOfYear = (int32_t)uprv_fmod(julianEpochDay - january1, 365.0); // Julian leap years occurred historically every 4 years starting // with 8 AD. Before 8 AD the spacing is irregular; every 3 years diff --git a/icu4c/source/test/intltest/calregts.cpp b/icu4c/source/test/intltest/calregts.cpp index 8a49cddd224..ddab9649817 100644 --- a/icu4c/source/test/intltest/calregts.cpp +++ b/icu4c/source/test/intltest/calregts.cpp @@ -1248,11 +1248,11 @@ CalendarRegressionTest::test4031502() calendar->adoptTimeZone(TimeZone::createTimeZone("GMT")); - calendar->setTime(makeDate(LONG_MIN),status); + calendar->setTime(makeDate(T_INT32_MIN),status); int32_t year1 = calendar->get(Calendar::YEAR,status); int32_t era1 = calendar->get(Calendar::ERA,status); - calendar->setTime(makeDate(LONG_MAX),status); + calendar->setTime(makeDate(T_INT32_MAX),status); int32_t year2 = calendar->get(Calendar::YEAR,status); int32_t era2 = calendar->get(Calendar::ERA,status); diff --git a/icu4c/source/test/intltest/numrgts.cpp b/icu4c/source/test/intltest/numrgts.cpp index a58de09d787..301c5d3f126 100644 --- a/icu4c/source/test/intltest/numrgts.cpp +++ b/icu4c/source/test/intltest/numrgts.cpp @@ -1793,15 +1793,15 @@ void NumberFormatRegressionTest::Test4162198(void) { // for some reason, DBL_MAX will not round trip. (bug in sprintf/atof) - double dbl = LONG_MAX * 1000.0; + double dbl = T_INT32_MAX * 1000.0; UErrorCode status = U_ZERO_ERROR; NumberFormat *f = NumberFormat::createInstance(status); if(U_FAILURE(status)) { errln("Couldn't create number format"); return; } - f->setMaximumFractionDigits(LONG_MAX); - f->setMaximumIntegerDigits(LONG_MAX); + f->setMaximumFractionDigits(T_INT32_MAX); + f->setMaximumIntegerDigits(T_INT32_MAX); UnicodeString s; f->format(dbl,s); logln(UnicodeString("The number ") + dbl + " formatted to " + s); @@ -2167,7 +2167,7 @@ void NumberFormatRegressionTest::Test4216742(void) { UErrorCode status = U_ZERO_ERROR; DecimalFormat *fmt = (DecimalFormat*) NumberFormat::createInstance(Locale::US, status); failure(status, "createInstance"); - int32_t DATA[] = { LONG_MIN, LONG_MAX, -100000000, 100000000 }; + int32_t DATA[] = { T_INT32_MIN, T_INT32_MAX, -100000000, 100000000 }; int DATA_length = sizeof(DATA) / sizeof(DATA[0]); for (int i=0; i