x86/pv: Fix Clang build with !CONFIG_PV32

Clang 3.5 doesn't do enough dead-code-elimination to drop the compat_gdt
reference, resulting in a linker failure:

  hidden symbol `per_cpu__compat_gdt' isn't defined

Drop the local variable, and move the evaluation of this_cpu(compat_gdt) to
within the guarded region.

Reported-by: Roger Pau Monné <roger.pau@citrix.com>
Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Tested-by: Roger Pau Monné <roger.pau@citrix.com>
Reviewed-by: Roger Pau Monné <roger.pau@citrix.com>

diff --git a/xen/arch/x86/cpu/common.c b/xen/arch/x86/cpu/common.c
index 131ff03fcfdd063c1d02debc878ddd15ee639637..63f3893c7a6d437d41765d8bb9fcc51e17653202 100644 (file)
--- a/xen/arch/x86/cpu/common.c
+++ b/xen/arch/x86/cpu/common.c
@@ -711,8 +711,6 @@ void load_system_tables(void)
        struct tss64 *tss = &this_cpu(tss_page).tss;
        seg_desc_t *gdt =
                this_cpu(gdt) - FIRST_RESERVED_GDT_ENTRY;
-       seg_desc_t *compat_gdt =
-               this_cpu(compat_gdt) - FIRST_RESERVED_GDT_ENTRY;
 
        const struct desc_ptr gdtr = {
                .base = (unsigned long)gdt,
@@ -753,8 +751,9 @@ void load_system_tables(void)
        _set_tssldt_desc(gdt + TSS_ENTRY, (unsigned long)tss,
                         sizeof(*tss) - 1, SYS_DESC_tss_avail);
        if ( IS_ENABLED(CONFIG_PV32) )
-               _set_tssldt_desc(compat_gdt + TSS_ENTRY, (unsigned long)tss,
-                                sizeof(*tss) - 1, SYS_DESC_tss_busy);
+               _set_tssldt_desc(
+                       this_cpu(compat_gdt) - FIRST_RESERVED_GDT_ENTRY + TSS_ENTRY,
+                       (unsigned long)tss, sizeof(*tss) - 1, SYS_DESC_tss_busy);
 
        per_cpu(full_gdt_loaded, cpu) = false;
        lgdt(&gdtr);