diff options
| -rw-r--r-- | unified/emulator_build.conf | 12 | ||||
| -rw-r--r-- | unified/standard_build.conf | 12 |
2 files changed, 22 insertions, 2 deletions
diff --git a/unified/emulator_build.conf b/unified/emulator_build.conf index 2f637b3..cb68eec 100644 --- a/unified/emulator_build.conf +++ b/unified/emulator_build.conf @@ -102,7 +102,7 @@ Macros: %build_hostarch x86_64 :Macros -%ifarch %arm armv7l aarch64 +%ifarch %arm armv7l armv7hl aarch64 Hostarch: x86_64 # cross build support for the build hosts Preinstall: qemu-linux-user-%{build_hostarch}-cross @@ -119,6 +119,12 @@ Runscripts: qemu-accel-%{build_hostarch}-armv7l Preinstall: libmount libblkid libuuid %endif +%ifarch armv7hl +Preinstall: qemu-accel-%{build_hostarch}-armv7hl +Runscripts: qemu-accel-%{build_hostarch}-armv7hl +Preinstall: libmount libblkid libuuid +%endif + %ifarch aarch64 Preinstall: qemu-accel-%{build_hostarch}-aarch64 Runscripts: qemu-accel-%{build_hostarch}-aarch64 @@ -126,14 +132,17 @@ Preinstall: libmount libblkid libuuid %endif # aarch64 Substitute: python-accel-armv7l-cross-arm python-accel-%{build_hostarch}-armv7l +Substitute: python-accel-armv7hl-cross-arm python-accel-%{build_hostarch}-armv7hl Substitute: python-accel-aarch64-cross-aarch64 python-accel-%{build_hostarch}-aarch64 Substitute: clang-accel-armv7l-cross-arm clang-accel-%{build_hostarch}-armv7l +Substitute: clang-accel-armv7hl-cross-arm clang-accel-%{build_hostarch}-armv7hl Substitute: clang-accel-aarch64-cross-aarch64 clang-accel-%{build_hostarch}-aarch64 ########## exports for different architectures ########## ExportFilter: \.armv7l\.rpm$ armv7l +ExportFilter: \.armv7hl\.rpm$ armv7hl ExportFilter: \.aarch64\.rpm$ aarch64 ExportFilter: \.i586\.rpm$ i586 ExportFilter: \.x86_64\.rpm$ x86_64 @@ -216,6 +225,7 @@ Substitute: glibc-devel-32bit %define __global_cflags -O2 -g2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong -Wformat-security -fmessage-length=0 -frecord-gcc-switches -Wl,-z,relro,--as-needed Optflags: armv7l %{__global_cflags} --param=ssp-buffer-size=4 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -mthumb -Wp,-D__SOFTFP__ -Wl,-O1 -Wl,--hash-style=gnu -Wa,-mimplicit-it=thumb +Optflags: armv7hl %{__global_cflags} --param=ssp-buffer-size=4 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=hard -mthumb -Wl,-O1 -Wl,--hash-style=gnu -Wa,-mimplicit-it=thumb Optflags: aarch64 %{__global_cflags} -feliminate-unused-debug-types -Wformat -march=armv8-a+fp+simd+crc+crypto -mtune=cortex-a57.cortex-a53 Optflags: i686 %{__global_cflags} -feliminate-unused-debug-types --param=ssp-buffer-size=4 -fdiagnostics-color=never -m32 -march=i686 -mtune=i686 -msse4.2 -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer -mstackrealign -Wl,-z,noseparate-code Optflags: x86_64 %{__global_cflags} -feliminate-unused-debug-types --param=ssp-buffer-size=4 -fdiagnostics-color=never -m64 -march=nehalem -msse4.2 -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer diff --git a/unified/standard_build.conf b/unified/standard_build.conf index b160add..948cb5d 100644 --- a/unified/standard_build.conf +++ b/unified/standard_build.conf @@ -102,7 +102,7 @@ Macros: %build_hostarch x86_64 :Macros -%ifarch %arm armv7l aarch64 +%ifarch %arm armv7l armv7hl aarch64 Hostarch: x86_64 # cross build support for the build hosts Preinstall: qemu-linux-user-%{build_hostarch}-cross @@ -119,6 +119,12 @@ Runscripts: qemu-accel-%{build_hostarch}-armv7l Preinstall: libmount libblkid libuuid %endif +%ifarch armv7hl +Preinstall: qemu-accel-%{build_hostarch}-armv7hl +Runscripts: qemu-accel-%{build_hostarch}-armv7hl +Preinstall: libmount libblkid libuuid +%endif + %ifarch aarch64 Preinstall: qemu-accel-%{build_hostarch}-aarch64 Runscripts: qemu-accel-%{build_hostarch}-aarch64 @@ -126,14 +132,17 @@ Preinstall: libmount libblkid libuuid %endif # aarch64 Substitute: python-accel-armv7l-cross-arm python-accel-%{build_hostarch}-armv7l +Substitute: python-accel-armv7hl-cross-arm python-accel-%{build_hostarch}-armv7hl Substitute: python-accel-aarch64-cross-aarch64 python-accel-%{build_hostarch}-aarch64 Substitute: clang-accel-armv7l-cross-arm clang-accel-%{build_hostarch}-armv7l +Substitute: clang-accel-armv7hl-cross-arm clang-accel-%{build_hostarch}-armv7hl Substitute: clang-accel-aarch64-cross-aarch64 clang-accel-%{build_hostarch}-aarch64 ########## exports for different architectures ########## ExportFilter: \.armv7l\.rpm$ armv7l +ExportFilter: \.armv7hl\.rpm$ armv7hl ExportFilter: \.aarch64\.rpm$ aarch64 ExportFilter: \.i586\.rpm$ i586 ExportFilter: \.x86_64\.rpm$ x86_64 @@ -216,6 +225,7 @@ Substitute: glibc-devel-32bit %define __global_cflags -O2 -g2 -pipe -Wall -Wp,-D_FORTIFY_SOURCE=2 -fexceptions -fstack-protector-strong -Wformat-security -fmessage-length=0 -frecord-gcc-switches -Wl,-z,relro,--as-needed Optflags: armv7l %{__global_cflags} --param=ssp-buffer-size=4 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=softfp -mthumb -Wp,-D__SOFTFP__ -Wl,-O1 -Wl,--hash-style=gnu -Wa,-mimplicit-it=thumb +Optflags: armv7hl %{__global_cflags} --param=ssp-buffer-size=4 -march=armv7-a -mtune=cortex-a8 -mlittle-endian -mfpu=neon -mfloat-abi=hard -mthumb -Wl,-O1 -Wl,--hash-style=gnu -Wa,-mimplicit-it=thumb Optflags: aarch64 %{__global_cflags} -feliminate-unused-debug-types -Wformat -march=armv8-a+fp+simd+crc+crypto -mtune=cortex-a57.cortex-a53 Optflags: i686 %{__global_cflags} -feliminate-unused-debug-types --param=ssp-buffer-size=4 -fdiagnostics-color=never -m32 -march=i686 -mtune=i686 -msse4.2 -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer -mstackrealign -Wl,-z,noseparate-code Optflags: x86_64 %{__global_cflags} -feliminate-unused-debug-types --param=ssp-buffer-size=4 -fdiagnostics-color=never -m64 -march=nehalem -msse4.2 -mfpmath=sse -fasynchronous-unwind-tables -fno-omit-frame-pointer |