Setup -fno-pic or -fpic in Architecture Rules.

EFI boot needs -fpic but all boot code was built with -fno-pic. This is now set accordingly in HAIKU_BOOT_CCFLAGS and HAIKU_BOOT_C++FLAGS. Also setup compile flags for EFI platform.
2016-09-02 19:02:32 +12:00
parent 211483cb51
commit bd0604764e
21 changed files with 16 additions and 29 deletions
@@ -420,6 +420,9 @@ rule KernelArchitectureSetup architecture
 		HAIKU_BOOT_C++FLAGS += -fpic -fno-stack-protector -fPIC -fshort-wchar -mno-red-zone
 			-maccumulate-outgoing-args -Wno-error=unused-variable ;
 		HAIKU_BOOT_LDFLAGS = -Bstatic -Bsymbolic -shared -nostdlib -znocombreloc -nostartfiles ;
+	} else {
+		HAIKU_BOOT_CCFLAGS += -fno-pic ;
+		HAIKU_BOOT_C++FLAGS += -fno-pic ;
 	}

 	# warning flags
@@ -47,7 +47,6 @@ BootMergeObject boot_libroot.o :
 	strrchr.c
 	strtol.c
 	$(extraSources)
-	: -fno-pic
 ;

 AddResources haiku_loader : boot_loader.rdef ;
@@ -49,7 +49,7 @@ BootMergeObject boot_arch_$(TARGET_KERNEL_ARCH).o :
 	$(kernelDebugSources)

 	$(librootArchObjects)
-	: -fno-pic
+	:
 	:
 	$(kernelLibArchObjects)
 ;
@@ -16,24 +16,24 @@ local kernelLibArchObjects =
 BootMergeObject boot_arch_$(TARGET_KERNEL_ARCH).o :
 	arch_elf.cpp
 	$(librootArchObjects)
-	: -fno-pic
+	:
 	:
 	$(kernelLibArchObjects)
 ;

 BootMergeObject boot_arch_m68k_030.o :
 	mmu_030.cpp
-	: -fno-pic -Wno-unused -mcpu=68030
+	: -Wno-unused -mcpu=68030
 ;

 BootMergeObject boot_arch_m68k_040.o :
 	mmu_040.cpp
-	: -fno-pic -Wno-unused -mcpu=68040 -Wa,-m68040
+	: -Wno-unused -mcpu=68040 -Wa,-m68040
 ;

 BootMergeObject boot_arch_m68k_060.o :
 	mmu_060.cpp
-	: -fno-pic -Wno-unused -mcpu=68060
+	: -Wno-unused -mcpu=68060
 ;

 SEARCH on [ FGristFiles arch_elf.cpp ]
@@ -90,8 +90,6 @@ BootStaticLibrary boot_loader :

 	DataIO.cpp
 	Referenceable.cpp
-
-	: -fno-pic
 	;

 # The partition support is built in an extra static library
@@ -110,7 +108,6 @@ BootStaticLibrary boot_partitions :
 	intel.cpp
 	PartitionMap.cpp
 	PartitionMapParser.cpp
-	: -fno-pic
 	;

 # Tell Jam where to find the utility sources
@@ -13,5 +13,4 @@ BootStaticLibrary boot_amiga_ffs :
 	Volume.cpp
 	Directory.cpp
 	File.cpp
-	: -fno-pic
 	;
@@ -18,7 +18,6 @@ BootStaticLibrary boot_bfs :
 	Stream.cpp
 	BPlusTree.cpp
 	QueryParserUtils.cpp
-	: -fno-pic
 	;

 SEARCH on [ FGristFiles BPlusTree.cpp ]
@@ -20,5 +20,4 @@ BootStaticLibrary boot_fatfs :
 	Directory.cpp
 	File.cpp
 	Stream.cpp
-	: -fno-pic
 	;
@@ -8,5 +8,4 @@ SubDirC++Flags -fno-rtti ;

 BootStaticLibrary boot_hfs_plus :
 	hfs_plus.cpp
-	: -fno-pic
 	;
@@ -46,8 +46,6 @@ BootStaticLibrary boot_packagefs :
 	# support kit
 	CompressionAlgorithm.cpp
 	ZlibCompressionAlgorithm.cpp
-
-	: -fno-pic
 ;

 Includes [ FGristFiles ZlibCompressionAlgorithm.cpp ]
@@ -29,7 +29,6 @@ Depends [ FGristFiles $(zlibSources) ]

 BootStaticLibrary boot_zlib :
 	$(zlibSources)
-	: -fno-pic
 	;


@@ -41,5 +40,4 @@ Includes [ FGristFiles tarfs.cpp ] : [ BuildFeatureAttribute zlib : sources ] ;

 BootStaticLibrary boot_tarfs :
 	tarfs.cpp
-	: -fno-pic
 	;
@@ -23,6 +23,4 @@ BootStaticLibrary boot_net :
 	UDP.cpp
 	$(tcp)
 	$(iscsi)
-
-	: -fno-pic
 ;
@@ -49,7 +49,7 @@ BootMergeObject boot_platform_amiga_m68k_other.o :
 	#decode_edid.c
 	#dump_edid.c

-	: -fno-pic #-Wa,--pcrel
+	: #-Wa,--pcrel
 	: boot_platform_generic.a
 ;

@@ -54,7 +54,7 @@ BootMergeObject boot_platform_atari_m68k_other.o :
 	#decode_edid.c
 	#dump_edid.c

-	: -fno-pic #-Wa,--pcrel
+	: #-Wa,--pcrel
 	: boot_platform_generic.a
 ;

@@ -47,7 +47,7 @@ BootMergeObject boot_platform_bios_ia32.o :
 	decode_edid.c
 	dump_edid.c

-	: -fno-pic
+	:
 	: boot_platform_generic.a
 ;

@@ -9,7 +9,6 @@ BootStaticLibrary boot_platform_generic :
 	text_menu.cpp
 	video_blit.cpp
 	video_splash.cpp
-	: -fno-pic
 ;

 Includes [ FGristFiles video_splash.cpp ] 
@@ -57,7 +57,7 @@ BootMergeObject boot_platform_pxe_ia32.o :
 	$(bios_ia32_src)
 	$(bios_ia32_edid_src)

-	: -fno-pic
+	:
 	: boot_platform_generic.a
 ;

@@ -40,7 +40,7 @@ BootMergeObject boot_platform_raspberrypi_arm.o :
 	arch_framebuffer_bcm2835.cpp

 	$(genericPlatformSources)
-	: -fno-pic
+	:
 	: boot_platform_generic.a
 ;

@@ -59,7 +59,7 @@ BootMergeObject boot_platform_u-boot_common.o :
 	$(libFDTSources)


-	: -fno-pic
+	:
 	: boot_platform_generic.a
 ;

@@ -16,7 +16,6 @@ BootMergeObject boot_platform_u-boot_arm.o :
 	shell.S

 	arch_mailbox.cpp
-	: -fno-pic
 ;

 #SEARCH on [ FGristFiles arch_cpu_asm.S ]
@@ -12,7 +12,7 @@ SubDirC++Flags -fno-rtti ;

 BootMergeObject boot_platform_u-boot_ppc_amcc440.o :
 	arch_mmu_amcc440.cpp
-	: -fno-pic -mcpu=440
+	: -mcpu=440
 ;

 BootMergeObject boot_platform_u-boot_ppc.o :
@@ -24,7 +24,7 @@ BootMergeObject boot_platform_u-boot_ppc.o :
 	arch_start_kernel.S
 	arch_cpu.cpp
 	#mmu.cpp
-	: -fno-pic
+	:
 	: boot_platform_u-boot_ppc_amcc440.o
 ;