AMD64 - Sync additional modifications so amd64 kernel & world builds on i386.
authorMatthew Dillon <dillon@apollo.backplane.com>
Wed, 12 Aug 2009 04:45:26 +0000 (21:45 -0700)
committerMatthew Dillon <dillon@apollo.backplane.com>
Wed, 12 Aug 2009 04:45:26 +0000 (21:45 -0700)
sys/platform/pc64/acpica5/OsdEnvironment.c
test/amd64/Makefile

index 0e68087..a4a8159 100644 (file)
@@ -57,7 +57,7 @@ AcpiOsTerminate(void)
 ACPI_PHYSICAL_ADDRESS
 AcpiOsGetRootPointer(void)
 {
-       ACPI_NATIVE_UINT ptr;
+       ACPI_SIZE ptr;
        ACPI_STATUS status;
 
        if (i386_acpi_root == 0) {
index 19e0dfe..c73c696 100644 (file)
@@ -181,7 +181,7 @@ umount: check
 install64: mount
        cd ${SRCDIR} && \
            make -j 4 TARGET_ARCH=amd64 TARGET_PLATFORM=pc64 \
-                DESTDIR=${QEMUDIR}/root installworld
+                DESTDIR=${QEMUDIR}/root NO_GCC44=1 installworld
        cd ${SRCDIR}/etc && \
            make -j 4 TARGET_ARCH=amd64 TARGET_PLATFORM=pc64 \
                 DESTDIR=${QEMUDIR}/root distribution