[981dbbc] | 1 | diff -up openjdk/jdk/make/common/shared/Sanity.gmk.sav openjdk/jdk/make/common/shared/Sanity.gmk |
---|
| 2 | --- openjdk/jdk/make/common/shared/Sanity.gmk.sav 2012-02-14 16:12:48.000000000 -0500 |
---|
| 3 | +++ openjdk/jdk/make/common/shared/Sanity.gmk 2012-03-07 17:31:26.153840755 -0500 |
---|
| 4 | @@ -814,12 +814,12 @@ ifdef OPENJDK |
---|
| 5 | @(($(CD) $(BUILDDIR)/tools/freetypecheck && $(MAKE)) || \ |
---|
| 6 | $(ECHO) "Failed to build freetypecheck." ) > $@ |
---|
| 7 | |
---|
| 8 | - sane-freetype: $(TEMPDIR)/freetypeinfo |
---|
| 9 | - @if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \ |
---|
| 10 | - $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \ |
---|
| 11 | - " or higher is required. \n" \ |
---|
| 12 | - "`$(CAT) $<` \n" >> $(ERROR_FILE) ; \ |
---|
| 13 | - fi |
---|
| 14 | +# sane-freetype: $(TEMPDIR)/freetypeinfo |
---|
| 15 | +# @if [ "`$(CAT) $< | $(GREP) Fail`" != "" ]; then \ |
---|
| 16 | +# $(ECHO) "ERROR: FreeType version " $(REQUIRED_FREETYPE_VERSION) \ |
---|
| 17 | +# " or higher is required. \n" \ |
---|
| 18 | +# "`$(CAT) $<` \n" >> $(ERROR_FILE) ; \ |
---|
| 19 | +# fi |
---|
| 20 | else |
---|
| 21 | #do nothing (cross-compiling) |
---|
| 22 | sane-freetype: |
---|
| 23 | diff -up openjdk/jdk/make/jdk_generic_profile.sh.sav openjdk/jdk/make/jdk_generic_profile.sh |
---|
| 24 | --- openjdk/jdk/make/jdk_generic_profile.sh.sav 2012-02-14 16:12:48.000000000 -0500 |
---|
| 25 | +++ openjdk/jdk/make/jdk_generic_profile.sh 2012-03-07 17:31:26.154840740 -0500 |
---|
| 26 | @@ -280,7 +280,7 @@ if [ "${ZERO_BUILD}" = true ] ; then |
---|
| 27 | |
---|
| 28 | # ZERO_ENDIANNESS is the endianness of the processor |
---|
| 29 | case "${ZERO_LIBARCH}" in |
---|
| 30 | - i386|amd64|ia64) |
---|
| 31 | + i386|amd64|ia64|arm) |
---|
| 32 | ZERO_ENDIANNESS=little |
---|
| 33 | ;; |
---|
| 34 | ppc*|s390*|sparc*|alpha) |
---|
| 35 | @@ -307,6 +307,9 @@ if [ "${ZERO_BUILD}" = true ] ; then |
---|
| 36 | s390) |
---|
| 37 | ZERO_ARCHFLAG="-m31" |
---|
| 38 | ;; |
---|
| 39 | + arm) |
---|
| 40 | + ZERO_ARCHFLAG="-D_LITTLE_ENDIAN" |
---|
| 41 | + ;; |
---|
| 42 | *) |
---|
| 43 | ZERO_ARCHFLAG="-m${ARCH_DATA_MODEL}" |
---|
| 44 | esac |
---|