From 47d1ca4838fac9a1efd23dfba58a17492ae2f174 Mon Sep 17 00:00:00 2001 From: Ben Langmuir Date: Thu, 17 Apr 2014 00:52:48 +0000 Subject: Rename lib/Headers/module.map to module.modulemap Don't install a file using the legacy spelling. llvm-svn: 206431 --- clang/docs/Modules.rst | 2 +- clang/lib/Headers/CMakeLists.txt | 2 +- clang/lib/Headers/Makefile | 8 +- clang/lib/Headers/module.map | 156 ------------------------------------- clang/lib/Headers/module.modulemap | 156 +++++++++++++++++++++++++++++++++++++ 5 files changed, 162 insertions(+), 162 deletions(-) delete mode 100644 clang/lib/Headers/module.map create mode 100644 clang/lib/Headers/module.modulemap (limited to 'clang') diff --git a/clang/docs/Modules.rst b/clang/docs/Modules.rst index eec0b774cf6..183a8f208f6 100644 --- a/clang/docs/Modules.rst +++ b/clang/docs/Modules.rst @@ -839,7 +839,7 @@ Where To Learn More About Modules ================================= The Clang source code provides additional information about modules: -``clang/lib/Headers/module.map`` +``clang/lib/Headers/module.modulemap`` Module map for Clang's compiler-specific header files. ``clang/test/Modules/`` diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt index d0c26848a3a..23b2446cffe 100644 --- a/clang/lib/Headers/CMakeLists.txt +++ b/clang/lib/Headers/CMakeLists.txt @@ -45,7 +45,7 @@ set(files xopintrin.h cpuid.h unwind.h - module.map + module.modulemap ) set(output_dir ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}/include) diff --git a/clang/lib/Headers/Makefile b/clang/lib/Headers/Makefile index 42219c4082b..903acacc8ac 100644 --- a/clang/lib/Headers/Makefile +++ b/clang/lib/Headers/Makefile @@ -32,13 +32,13 @@ $(HeaderDir)/arm_neon.h: $(BUILT_SOURCES) $(HeaderDir)/.dir $(Verb) cp $< $@ $(Echo) Copying $(notdir $<) to build dir -$(HeaderDir)/module.map: $(PROJ_SRC_DIR)/module.map $(HeaderDir)/.dir +$(HeaderDir)/module.modulemap: $(PROJ_SRC_DIR)/module.modulemap $(HeaderDir)/.dir $(Verb) cp $< $@ $(Echo) Copying $(notdir $<) to build dir # Hook into the standard Makefile rules. -all-local:: $(OBJHEADERS) $(HeaderDir)/module.map +all-local:: $(OBJHEADERS) $(HeaderDir)/module.modulemap PROJ_headers := $(DESTDIR)$(PROJ_prefix)/lib/clang/$(CLANG_VERSION)/include @@ -52,12 +52,12 @@ $(INSTHEADERS): $(PROJ_headers)/%.h: $(HeaderDir)/%.h | $(PROJ_headers) $(Verb) $(DataInstall) $< $(PROJ_headers) $(Echo) Installing compiler include file: $(notdir $<) -$(PROJ_headers)/module.map: $(HeaderDir)/module.map | $(PROJ_headers) +$(PROJ_headers)/module.modulemap: $(HeaderDir)/module.modulemap | $(PROJ_headers) $(Verb) $(DataInstall) $< $(PROJ_headers) $(Echo) Installing compiler module map file: $(notdir $<) -install-local:: $(INSTHEADERS) $(PROJ_headers)/module.map +install-local:: $(INSTHEADERS) $(PROJ_headers)/module.modulemap $(ObjDir)/arm_neon.h.inc.tmp : $(CLANG_LEVEL)/include/clang/Basic/arm_neon.td $(CLANG_TBLGEN) $(ObjDir)/.dir $(Echo) "Building Clang arm_neon.h.inc with tblgen" diff --git a/clang/lib/Headers/module.map b/clang/lib/Headers/module.map deleted file mode 100644 index 9f7944dedbb..00000000000 --- a/clang/lib/Headers/module.map +++ /dev/null @@ -1,156 +0,0 @@ -module _Builtin_intrinsics [system] { - explicit module altivec { - requires altivec - header "altivec.h" - } - - explicit module arm { - requires arm - - explicit module neon { - requires neon - header "arm_neon.h" - export * - } - } - - explicit module intel { - requires x86 - export * - - header "immintrin.h" - header "x86intrin.h" - - explicit module mm_malloc { - header "mm_malloc.h" - export * // note: for dependency - } - - explicit module cpuid { - requires x86 - header "cpuid.h" - } - - explicit module mmx { - requires mmx - header "mmintrin.h" - } - - explicit module f16c { - requires f16c - header "f16cintrin.h" - } - - explicit module sse { - requires sse - export mmx - export * // note: for hackish dependency - header "xmmintrin.h" - } - - explicit module sse2 { - requires sse2 - export sse - header "emmintrin.h" - } - - explicit module sse3 { - requires sse3 - export sse2 - header "pmmintrin.h" - } - - explicit module ssse3 { - requires ssse3 - export sse3 - header "tmmintrin.h" - } - - explicit module sse4_1 { - requires sse41 - export ssse3 - header "smmintrin.h" - } - - explicit module sse4_2 { - requires sse42 - export sse4_1 - header "nmmintrin.h" - } - - explicit module sse4a { - requires sse4a - export sse3 - header "ammintrin.h" - } - - explicit module avx { - requires avx - export sse4_2 - header "avxintrin.h" - } - - explicit module avx2 { - requires avx2 - export avx - header "avx2intrin.h" - } - - explicit module bmi { - requires bmi - header "bmiintrin.h" - } - - explicit module bmi2 { - requires bmi2 - header "bmi2intrin.h" - } - - explicit module fma { - requires fma - header "fmaintrin.h" - } - - explicit module fma4 { - requires fma4 - export sse3 - header "fma4intrin.h" - } - - explicit module lzcnt { - requires lzcnt - header "lzcntintrin.h" - } - - explicit module popcnt { - requires popcnt - header "popcntintrin.h" - } - - explicit module mm3dnow { - requires mm3dnow - header "mm3dnow.h" - } - - explicit module xop { - requires xop - export fma4 - header "xopintrin.h" - } - - explicit module aes_pclmul { - requires aes, pclmul - header "wmmintrin.h" - } - - explicit module aes { - requires aes - header "__wmmintrin_aes.h" - } - - explicit module pclmul { - requires pclmul - header "__wmmintrin_pclmul.h" - } - } -} diff --git a/clang/lib/Headers/module.modulemap b/clang/lib/Headers/module.modulemap new file mode 100644 index 00000000000..9f7944dedbb --- /dev/null +++ b/clang/lib/Headers/module.modulemap @@ -0,0 +1,156 @@ +module _Builtin_intrinsics [system] { + explicit module altivec { + requires altivec + header "altivec.h" + } + + explicit module arm { + requires arm + + explicit module neon { + requires neon + header "arm_neon.h" + export * + } + } + + explicit module intel { + requires x86 + export * + + header "immintrin.h" + header "x86intrin.h" + + explicit module mm_malloc { + header "mm_malloc.h" + export * // note: for dependency + } + + explicit module cpuid { + requires x86 + header "cpuid.h" + } + + explicit module mmx { + requires mmx + header "mmintrin.h" + } + + explicit module f16c { + requires f16c + header "f16cintrin.h" + } + + explicit module sse { + requires sse + export mmx + export * // note: for hackish dependency + header "xmmintrin.h" + } + + explicit module sse2 { + requires sse2 + export sse + header "emmintrin.h" + } + + explicit module sse3 { + requires sse3 + export sse2 + header "pmmintrin.h" + } + + explicit module ssse3 { + requires ssse3 + export sse3 + header "tmmintrin.h" + } + + explicit module sse4_1 { + requires sse41 + export ssse3 + header "smmintrin.h" + } + + explicit module sse4_2 { + requires sse42 + export sse4_1 + header "nmmintrin.h" + } + + explicit module sse4a { + requires sse4a + export sse3 + header "ammintrin.h" + } + + explicit module avx { + requires avx + export sse4_2 + header "avxintrin.h" + } + + explicit module avx2 { + requires avx2 + export avx + header "avx2intrin.h" + } + + explicit module bmi { + requires bmi + header "bmiintrin.h" + } + + explicit module bmi2 { + requires bmi2 + header "bmi2intrin.h" + } + + explicit module fma { + requires fma + header "fmaintrin.h" + } + + explicit module fma4 { + requires fma4 + export sse3 + header "fma4intrin.h" + } + + explicit module lzcnt { + requires lzcnt + header "lzcntintrin.h" + } + + explicit module popcnt { + requires popcnt + header "popcntintrin.h" + } + + explicit module mm3dnow { + requires mm3dnow + header "mm3dnow.h" + } + + explicit module xop { + requires xop + export fma4 + header "xopintrin.h" + } + + explicit module aes_pclmul { + requires aes, pclmul + header "wmmintrin.h" + } + + explicit module aes { + requires aes + header "__wmmintrin_aes.h" + } + + explicit module pclmul { + requires pclmul + header "__wmmintrin_pclmul.h" + } + } +} -- cgit v1.2.3