ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move libc headers to conform to x86_32, x86_64, and arm SPECS 

Move the libc-i386, libc-amd64, and libc-arm include directories into
the standard "include/spec" directory. This allows the platform specific
headers in the libc API package to be detected in a generic manner.

Ref #3051
This commit is contained in:
Emery Hemingway 2018-09-03 11:53:05 +02:00 committed by Christian Helmuth
parent 7a11384177
commit 8ad56a6c0e
3 changed files with 20 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
repos/libports/lib/import/import-libc.mk
View File

@ -1,18 +1,16 @@
#
# Add platform-specific libc headers to standard include search paths
#
ifeq ($(filter-out $(SPECS),x86),)
ifeq ($(filter-out $(SPECS),32bit),)
LIBC_ARCH_INC_DIR := include/libc-i386
endif # 32bit
ifeq ($(filter-out $(SPECS),x86_32),)
LIBC_ARCH_INC_DIR := include/spec/x86_32/libc
endif # x86_32
ifeq ($(filter-out $(SPECS),64bit),)
LIBC_ARCH_INC_DIR := include/libc-amd64
endif # 64bit
endif # x86
ifeq ($(filter-out $(SPECS),x86_64),)
LIBC_ARCH_INC_DIR := include/spec/x86_64/libc
endif # x86_64
ifeq ($(filter-out $(SPECS),arm),)
LIBC_ARCH_INC_DIR := include/libc-arm
LIBC_ARCH_INC_DIR := include/spec/arm/libc
endif # ARM
#

2
repos/libports/ports/libc.hash
View File

@ -1 +1 @@
c9cbd0d0fe35cc19c71295a02d67ecbe09a14573
c3de28a9a17be0e2273ed1a053fa4faf4f7ee463

24
repos/libports/ports/libc.port
View File

@ -154,13 +154,13 @@ common_include_libc_arch_machine_content = \
#
# i386-specific headers
#
DIRS += include/libc-i386
DIR_CONTENT(include/libc-i386) := \
DIRS += include/spec/x86_32/libc
DIR_CONTENT(include/spec/x86_32/libc) := \
$(call common_include_libc_arch_content,i386) \
src/lib/libc/lib/msun/i387/fenv.h
DIRS += include/libc-i386/machine
DIR_CONTENT(include/libc-i386/machine) := \
DIRS += include/spec/x86_32/libc/machine
DIR_CONTENT(include/spec/x86_32/libc/machine) := \
$(call common_include_libc_arch_machine_content,i386) \
$(addprefix src/lib/libc/sys/i386/include/, specialreg.h npx.h)
@ -168,13 +168,13 @@ DIR_CONTENT(include/libc-i386/machine) := \
#
# AMD64-specific headers
#
DIRS += include/libc-amd64
DIR_CONTENT(include/libc-amd64) := \
DIRS += include/spec/x86_64/libc
DIR_CONTENT(include/spec/x86_64/libc) := \
$(call common_include_libc_arch_content,amd64) \
src/lib/libc/lib/msun/amd64/fenv.h
DIRS += include/libc-amd64/machine
DIR_CONTENT(include/libc-amd64/machine) := \
DIRS += include/spec/x86_64/libc/machine
DIR_CONTENT(include/spec/x86_64/libc/machine) := \
$(call common_include_libc_arch_machine_content,amd64) \
$(addprefix src/lib/libc/sys/amd64/include/, specialreg.h fpu.h)
@ -182,13 +182,13 @@ DIR_CONTENT(include/libc-amd64/machine) := \
#
# ARM-specific headers
#
DIRS += include/libc-arm
DIR_CONTENT(include/libc-arm) := \
DIRS += include/spec/arm/libc
DIR_CONTENT(include/spec/arm/libc) := \
$(call common_include_libc_arch_content,arm) \
src/lib/libc/lib/msun/arm/fenv.h
DIRS += include/libc-arm/machine
DIR_CONTENT(include/libc-arm/machine) := \
DIRS += include/spec/arm/libc/machine
DIR_CONTENT(include/spec/arm/libc/machine) := \
$(call common_include_libc_arch_machine_content,arm) \
$(addprefix src/lib/libc/sys/arm/include/, pte.h cpuconf.h armreg.h ieee.h)