Hi -

This patch set cleans up how user library include paths work.  The main thing
is that user/LIBRARY/include/*.h is now at user/LIBRARY/include/LIBRARY/*.h.
For details, check out the message of the first patch.

After these are merged, you will all need to do something like this:

    $ rm user/parlib/include/arch
    $ make mrproper
    $ mv .config.old .config
    $ make ARCH=x86 oldconfig
    $ make userclean

------------
You can also find this patch set at:

[email protected]:brho/akaros.git
From: 2598c7e54f51 master
To: 4dec3510e947 ulibs

And view them at:

https://github.com/brho/akaros/compare/2598c7e54f51...4dec3510e947

------------


Barret Rhoden (2):
  Clean up user library include paths (XCC)
  Remove user include hacks

 .gitignore                                                | 2 +-
 Makefile                                                  | 4 ++--
 tools/compilers/gcc-glibc/Makefile                        | 3 +--
 user/Makefrag-user-lib                                    | 9 ++-------
 user/benchutil/include/benchutil                          | 1 -
 user/benchutil/include/{ => benchutil}/alarm.h            | 0
 user/benchutil/include/{ => benchutil}/measure.h          | 0
 user/benchutil/include/{ => benchutil}/pvcalarm.h         | 0
 user/iplib/include/iplib                                  | 1 -
 user/iplib/include/{ => iplib}/icmp.h                     | 0
 user/iplib/include/{ => iplib}/iplib.h                    | 0
 user/ndblib/include/ndblib                                | 1 -
 user/ndblib/include/{ => ndblib}/fcallfmt.h               | 0
 user/ndblib/include/{ => ndblib}/ndb.h                    | 0
 user/ndblib/include/{ => ndblib}/ndbhf.h                  | 0
 user/ndblib/ndbopen.c                                     | 2 +-
 user/parlib/Makefile                                      | 1 -
 user/parlib/include/parlib                                | 1 -
 user/parlib/include/{ => parlib}/arc.h                    | 0
 user/parlib/include/{ => parlib}/assert.h                 | 6 +-----
 user/parlib/include/{ => parlib}/bitmask.h                | 0
 user/parlib/include/{ => parlib}/ceq.h                    | 0
 user/parlib/include/{ => parlib}/common.h                 | 0
 user/parlib/include/{ => parlib}/dtls.h                   | 0
 user/parlib/include/{ => parlib}/evbitmap.h               | 0
 user/parlib/include/{ => parlib}/event.h                  | 0
 user/parlib/include/{ => parlib}/mcs.h                    | 0
 user/parlib/include/{ => parlib}/net.h                    | 0
 user/parlib/include/{ => parlib}/parlib.h                 | 0
 user/parlib/include/{ => parlib}/poke.h                   | 0
 user/parlib/include/{ => parlib}/pool.h                   | 0
 user/parlib/include/{ => parlib}/printf-ext.h             | 0
 user/parlib/include/{ => parlib}/riscv/arch.h             | 0
 user/parlib/include/{ => parlib}/riscv/atomic.h           | 0
 user/parlib/include/{ => parlib}/riscv/bitmask.h          | 0
 user/parlib/include/{ => parlib}/riscv/trap.h             | 0
 user/parlib/include/{ => parlib}/riscv/vcore.h            | 0
 user/parlib/include/{ => parlib}/ros_debug.h              | 0
 user/parlib/include/{ => parlib}/serialize.h              | 0
 user/parlib/include/{ => parlib}/signal.h                 | 6 +-----
 user/parlib/include/{ => parlib}/slab.h                   | 0
 user/parlib/include/{ => parlib}/spinlock.h               | 0
 user/parlib/include/{ => parlib}/stdio.h                  | 6 +-----
 user/parlib/include/{ => parlib}/timing.h                 | 0
 user/parlib/include/{ => parlib}/tsc-compat.h             | 0
 user/parlib/include/{ => parlib}/ucq.h                    | 0
 user/parlib/include/{ => parlib}/uthread.h                | 0
 user/parlib/include/{ => parlib}/vcore.h                  | 0
 user/parlib/include/{ => parlib}/waitfreelist.h           | 0
 user/parlib/include/{ => parlib}/x86/arch.h               | 0
 user/parlib/include/{ => parlib}/x86/atomic.h             | 0
 user/parlib/include/{ => parlib}/x86/bitmask.h            | 0
 user/parlib/include/{ => parlib}/x86/trap.h               | 0
 user/parlib/include/{ => parlib}/x86/vcore.h              | 0
 user/parlib/include/{ => parlib}/x86/vcore32.h            | 0
 user/parlib/include/{ => parlib}/x86/vcore64.h            | 0
 user/perfmon/Makefile                                     | 3 +--
 user/vmm/include/vmm                                      | 1 -
 user/vmm/include/{ => vmm}/acpi/acakaros.h                | 0
 user/vmm/include/{acpi/platform => vmm/acpi}/acakarosex.h | 0
 user/vmm/include/{ => vmm}/acpi/acbuffer.h                | 0
 user/vmm/include/{ => vmm}/acpi/acconfig.h                | 0
 user/vmm/include/{ => vmm}/acpi/acenv.h                   | 0
 user/vmm/include/{ => vmm}/acpi/acenvex.h                 | 0
 user/vmm/include/{ => vmm}/acpi/acexcep.h                 | 0
 user/vmm/include/{acpi/platform => vmm/acpi}/acgcc.h      | 0
 user/vmm/include/{ => vmm}/acpi/acnames.h                 | 0
 user/vmm/include/{ => vmm}/acpi/acoutput.h                | 0
 user/vmm/include/{ => vmm}/acpi/acpi.h                    | 0
 user/vmm/include/{ => vmm}/acpi/acpi_bus.h                | 0
 user/vmm/include/{ => vmm}/acpi/acpi_drivers.h            | 0
 user/vmm/include/{ => vmm}/acpi/acpi_io.h                 | 0
 user/vmm/include/{ => vmm}/acpi/acpi_lpat.h               | 0
 user/vmm/include/{ => vmm}/acpi/acpi_numa.h               | 0
 user/vmm/include/{ => vmm}/acpi/acpiosxf.h                | 0
 user/vmm/include/{ => vmm}/acpi/acpixf.h                  | 0
 user/vmm/include/{ => vmm}/acpi/acrestyp.h                | 0
 user/vmm/include/{ => vmm}/acpi/actbl.h                   | 0
 user/vmm/include/{ => vmm}/acpi/actbl1.h                  | 0
 user/vmm/include/{ => vmm}/acpi/actbl2.h                  | 0
 user/vmm/include/{ => vmm}/acpi/actbl3.h                  | 0
 user/vmm/include/{ => vmm}/acpi/actypes.h                 | 0
 user/vmm/include/{ => vmm}/acpi/acuuid.h                  | 0
 user/vmm/include/{ => vmm}/acpi/apei.h                    | 0
 user/vmm/include/{ => vmm}/acpi/button.h                  | 0
 user/vmm/include/{ => vmm}/acpi/ghes.h                    | 0
 user/vmm/include/{ => vmm}/acpi/hed.h                     | 0
 user/vmm/include/{ => vmm}/acpi/pdc_intel.h               | 0
 user/vmm/include/{ => vmm}/acpi/platform/acakaros.h       | 0
 user/vmm/include/{acpi => vmm/acpi/platform}/acakarosex.h | 0
 user/vmm/include/{ => vmm}/acpi/platform/acenv.h          | 0
 user/vmm/include/{ => vmm}/acpi/platform/acenvex.h        | 0
 user/vmm/include/{acpi => vmm/acpi/platform}/acgcc.h      | 0
 user/vmm/include/{ => vmm}/acpi/processor.h               | 0
 user/vmm/include/{ => vmm}/acpi/reboot.h                  | 0
 user/vmm/include/{ => vmm}/acpi/video.h                   | 0
 user/vmm/include/{ => vmm}/coreboot_tables.h              | 0
 user/vmm/include/{ => vmm}/linux_bootparam.h              | 0
 user/vmm/include/{ => vmm}/virtio.h                       | 0
 user/vmm/include/{ => vmm}/virtio_9p.h                    | 0
 user/vmm/include/{ => vmm}/virtio_balloon.h               | 0
 user/vmm/include/{ => vmm}/virtio_blk.h                   | 0
 user/vmm/include/{ => vmm}/virtio_config.h                | 0
 user/vmm/include/{ => vmm}/virtio_console.h               | 0
 user/vmm/include/{ => vmm}/virtio_ids.h                   | 0
 user/vmm/include/{ => vmm}/virtio_input.h                 | 0
 user/vmm/include/{ => vmm}/virtio_mmio.h                  | 0
 user/vmm/include/{ => vmm}/virtio_net.h                   | 0
 user/vmm/include/{ => vmm}/virtio_pci.h                   | 0
 user/vmm/include/{ => vmm}/virtio_ring.h                  | 0
 user/vmm/include/{ => vmm}/virtio_rng.h                   | 0
 user/vmm/include/{ => vmm}/virtio_scsi.h                  | 0
 user/vmm/include/{ => vmm}/virtio_types.h                 | 0
 user/vmm/include/{ => vmm}/vmm.h                          | 0
 114 files changed, 11 insertions(+), 36 deletions(-)
 delete mode 120000 user/benchutil/include/benchutil
 rename user/benchutil/include/{ => benchutil}/alarm.h (100%)
 rename user/benchutil/include/{ => benchutil}/measure.h (100%)
 rename user/benchutil/include/{ => benchutil}/pvcalarm.h (100%)
 delete mode 120000 user/iplib/include/iplib
 rename user/iplib/include/{ => iplib}/icmp.h (100%)
 rename user/iplib/include/{ => iplib}/iplib.h (100%)
 delete mode 120000 user/ndblib/include/ndblib
 rename user/ndblib/include/{ => ndblib}/fcallfmt.h (100%)
 rename user/ndblib/include/{ => ndblib}/ndb.h (100%)
 rename user/ndblib/include/{ => ndblib}/ndbhf.h (100%)
 delete mode 120000 user/parlib/include/parlib
 rename user/parlib/include/{ => parlib}/arc.h (100%)
 rename user/parlib/include/{ => parlib}/assert.h (92%)
 rename user/parlib/include/{ => parlib}/bitmask.h (100%)
 rename user/parlib/include/{ => parlib}/ceq.h (100%)
 rename user/parlib/include/{ => parlib}/common.h (100%)
 rename user/parlib/include/{ => parlib}/dtls.h (100%)
 rename user/parlib/include/{ => parlib}/evbitmap.h (100%)
 rename user/parlib/include/{ => parlib}/event.h (100%)
 rename user/parlib/include/{ => parlib}/mcs.h (100%)
 rename user/parlib/include/{ => parlib}/net.h (100%)
 rename user/parlib/include/{ => parlib}/parlib.h (100%)
 rename user/parlib/include/{ => parlib}/poke.h (100%)
 rename user/parlib/include/{ => parlib}/pool.h (100%)
 rename user/parlib/include/{ => parlib}/printf-ext.h (100%)
 rename user/parlib/include/{ => parlib}/riscv/arch.h (100%)
 rename user/parlib/include/{ => parlib}/riscv/atomic.h (100%)
 rename user/parlib/include/{ => parlib}/riscv/bitmask.h (100%)
 rename user/parlib/include/{ => parlib}/riscv/trap.h (100%)
 rename user/parlib/include/{ => parlib}/riscv/vcore.h (100%)
 rename user/parlib/include/{ => parlib}/ros_debug.h (100%)
 rename user/parlib/include/{ => parlib}/serialize.h (100%)
 rename user/parlib/include/{ => parlib}/signal.h (97%)
 rename user/parlib/include/{ => parlib}/slab.h (100%)
 rename user/parlib/include/{ => parlib}/spinlock.h (100%)
 rename user/parlib/include/{ => parlib}/stdio.h (89%)
 rename user/parlib/include/{ => parlib}/timing.h (100%)
 rename user/parlib/include/{ => parlib}/tsc-compat.h (100%)
 rename user/parlib/include/{ => parlib}/ucq.h (100%)
 rename user/parlib/include/{ => parlib}/uthread.h (100%)
 rename user/parlib/include/{ => parlib}/vcore.h (100%)
 rename user/parlib/include/{ => parlib}/waitfreelist.h (100%)
 rename user/parlib/include/{ => parlib}/x86/arch.h (100%)
 rename user/parlib/include/{ => parlib}/x86/atomic.h (100%)
 rename user/parlib/include/{ => parlib}/x86/bitmask.h (100%)
 rename user/parlib/include/{ => parlib}/x86/trap.h (100%)
 rename user/parlib/include/{ => parlib}/x86/vcore.h (100%)
 rename user/parlib/include/{ => parlib}/x86/vcore32.h (100%)
 rename user/parlib/include/{ => parlib}/x86/vcore64.h (100%)
 delete mode 120000 user/vmm/include/vmm
 rename user/vmm/include/{ => vmm}/acpi/acakaros.h (100%)
 rename user/vmm/include/{acpi/platform => vmm/acpi}/acakarosex.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/acbuffer.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/acconfig.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/acenv.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/acenvex.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/acexcep.h (100%)
 rename user/vmm/include/{acpi/platform => vmm/acpi}/acgcc.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/acnames.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/acoutput.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/acpi.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/acpi_bus.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/acpi_drivers.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/acpi_io.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/acpi_lpat.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/acpi_numa.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/acpiosxf.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/acpixf.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/acrestyp.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/actbl.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/actbl1.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/actbl2.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/actbl3.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/actypes.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/acuuid.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/apei.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/button.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/ghes.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/hed.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/pdc_intel.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/platform/acakaros.h (100%)
 rename user/vmm/include/{acpi => vmm/acpi/platform}/acakarosex.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/platform/acenv.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/platform/acenvex.h (100%)
 rename user/vmm/include/{acpi => vmm/acpi/platform}/acgcc.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/processor.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/reboot.h (100%)
 rename user/vmm/include/{ => vmm}/acpi/video.h (100%)
 rename user/vmm/include/{ => vmm}/coreboot_tables.h (100%)
 rename user/vmm/include/{ => vmm}/linux_bootparam.h (100%)
 rename user/vmm/include/{ => vmm}/virtio.h (100%)
 rename user/vmm/include/{ => vmm}/virtio_9p.h (100%)
 rename user/vmm/include/{ => vmm}/virtio_balloon.h (100%)
 rename user/vmm/include/{ => vmm}/virtio_blk.h (100%)
 rename user/vmm/include/{ => vmm}/virtio_config.h (100%)
 rename user/vmm/include/{ => vmm}/virtio_console.h (100%)
 rename user/vmm/include/{ => vmm}/virtio_ids.h (100%)
 rename user/vmm/include/{ => vmm}/virtio_input.h (100%)
 rename user/vmm/include/{ => vmm}/virtio_mmio.h (100%)
 rename user/vmm/include/{ => vmm}/virtio_net.h (100%)
 rename user/vmm/include/{ => vmm}/virtio_pci.h (100%)
 rename user/vmm/include/{ => vmm}/virtio_ring.h (100%)
 rename user/vmm/include/{ => vmm}/virtio_rng.h (100%)
 rename user/vmm/include/{ => vmm}/virtio_scsi.h (100%)
 rename user/vmm/include/{ => vmm}/virtio_types.h (100%)
 rename user/vmm/include/{ => vmm}/vmm.h (100%)

-- 
2.7.0.rc3.207.g0ac5344

-- 
You received this message because you are subscribed to the Google Groups 
"Akaros" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
To post to this group, send email to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to