diff options
| author | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-03-28 18:34:16 +0100 |
|---|---|---|
| committer | Samuel Thibault <samuel.thibault@ens-lyon.org> | 2020-03-28 18:34:16 +0100 |
| commit | 7b820145fcd05552ab3496affaa94d0330959d19 (patch) | |
| tree | 0e248f7228b148baa8058d23a66b510af7990ceb | |
| parent | 32d025a4f73ad5b9ceeefa86b2f285cd0bdb1e89 (diff) | |
| parent | 2a64b83ebcd604d4ccad8a95480be418c8ccb451 (diff) | |
Merge branch 'master' into master-x86_64
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | x86_64/Makefrag.am | 18 |
2 files changed, 9 insertions, 14 deletions
diff --git a/configure.ac b/configure.ac index fe49a830..42dfcd40 100644 --- a/configure.ac +++ b/configure.ac @@ -55,8 +55,9 @@ AC_ARG_ENABLE([platform], case $host_platform:$host_cpu in default:i?86) host_platform=at;; - default:x86_64) - host_platform=xen;; + default:x86_64)] + AC_MSG_WARN([Platform set to Xen by default, this can not boot on non-Xen systems, you currently need a 32bit build for that.]) + [host_platform=xen;; at:i?86 | xen:i?86 | xen:x86_64) :;; *)] diff --git a/x86_64/Makefrag.am b/x86_64/Makefrag.am index fe9f559a..d260cebc 100644 --- a/x86_64/Makefrag.am +++ b/x86_64/Makefrag.am @@ -60,13 +60,6 @@ libkernel_a_SOURCES += \ i386/i386at/rtc.h endif -if PLATFORM_xen -libkernel_a_SOURCES += \ - x86_64/xen_locore.S \ - x86_64/xen_boothdr.S -endif - - # # `lpr' device support. # @@ -149,7 +142,6 @@ libkernel_a_SOURCES += \ i386/i386/user_ldt.c \ i386/i386/user_ldt.h \ i386/i386/vm_param.h \ - i386/i386/vm_tuning.h \ i386/i386/xpr.h \ i386/intel/pmap.c \ i386/intel/pmap.h \ @@ -222,10 +214,10 @@ AM_CPPFLAGS += \ AM_CFLAGS += \ -mno-red-zone \ -mcmodel=kernel \ - -mno-sse \ + -mno-3dnow \ -mno-mmx \ - -mno-sse2 \ - -mno-3dnow + -mno-sse \ + -mno-sse2 # # Installation. @@ -267,7 +259,9 @@ EXTRA_DIST += \ if PLATFORM_xen libkernel_a_SOURCES += \ - i386/i386/xen.c \ + x86_64/xen_locore.S \ + x86_64/xen_boothdr.S \ + i386/xen/xen.c \ i386/i386/xen.h gnumach_LINKFLAGS += \ |