diff options
| author | Thomas Preud'homme <robotux@celest.fr> | 2018-02-24 16:46:30 +0000 |
|---|---|---|
| committer | Thomas Preud'homme <robotux@celest.fr> | 2018-02-24 16:46:30 +0000 |
| commit | 029da9f4da76f54288ccb03b78dab43f16cd8aa5 (patch) | |
| tree | 7252e1587179235c55e0649645b3148072f9f152 | |
| parent | 1dfe85f722f02cdd36a012546f3b7d32a4ed8d0f (diff) | |
| parent | 952b0441cf8da8363402bc3d7063cc6fbaab9b4b (diff) | |
merge patched into master
| -rw-r--r-- | debian/.git-dpm | 4 | ||||
| -rw-r--r-- | debian/patches/0002-Disable-stack-protector-in-runtime-library.patch | 6 | ||||
| -rw-r--r-- | debian/patches/0003-Prevent-dead-code-on-x86-in-prepare_dynamic_rel.patch | 2 | ||||
| -rw-r--r-- | lib/Makefile | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/debian/.git-dpm b/debian/.git-dpm index fd7e773..9ad42be 100644 --- a/debian/.git-dpm +++ b/debian/.git-dpm @@ -1,6 +1,6 @@ # see git-dpm(1) from git-dpm package -71cce632fb6ba4af4640ffc41d39e940298665e2 -71cce632fb6ba4af4640ffc41d39e940298665e2 +952b0441cf8da8363402bc3d7063cc6fbaab9b4b +952b0441cf8da8363402bc3d7063cc6fbaab9b4b e2ccf3981d78dfeb390d22c74625b60310100abb e2ccf3981d78dfeb390d22c74625b60310100abb tcc_0.9.27.orig.tar.bz2 diff --git a/debian/patches/0002-Disable-stack-protector-in-runtime-library.patch b/debian/patches/0002-Disable-stack-protector-in-runtime-library.patch index 35732fc..8a8ba6c 100644 --- a/debian/patches/0002-Disable-stack-protector-in-runtime-library.patch +++ b/debian/patches/0002-Disable-stack-protector-in-runtime-library.patch @@ -1,4 +1,4 @@ -From 09f0871781d6462279d3ea97db05b0cc4d77d4d2 Mon Sep 17 00:00:00 2001 +From dc6b796293da8f4f411e369f241b41ce1c49ee77 Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme <robotux@celest.fr> Date: Sun, 17 Feb 2013 23:39:08 +0100 Subject: Disable stack protector in runtime library @@ -15,14 +15,14 @@ Last-Update: 2018-02-24 1 file changed, 1 insertion(+) diff --git a/lib/Makefile b/lib/Makefile -index 0c1ec54d..be0e6485 100644 +index 0c1ec54d..be25e884 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -20,6 +20,7 @@ XCFG = $(or $(findstring -win,$T),-unx) # in order to use gcc, tyoe: make <target>-libtcc1-usegcc=yes arm-libtcc1-usegcc ?= no -+CFLAGS:=$(CFLAGS) -fstack-protector ++CFLAGS:=$(CFLAGS) -fno-stack-protector ifeq "$($(T)-libtcc1-usegcc)" "yes" XCC = $(CC) XAR = $(AR) diff --git a/debian/patches/0003-Prevent-dead-code-on-x86-in-prepare_dynamic_rel.patch b/debian/patches/0003-Prevent-dead-code-on-x86-in-prepare_dynamic_rel.patch index ca2a4ad..6fab2a8 100644 --- a/debian/patches/0003-Prevent-dead-code-on-x86-in-prepare_dynamic_rel.patch +++ b/debian/patches/0003-Prevent-dead-code-on-x86-in-prepare_dynamic_rel.patch @@ -1,4 +1,4 @@ -From 71cce632fb6ba4af4640ffc41d39e940298665e2 Mon Sep 17 00:00:00 2001 +From 952b0441cf8da8363402bc3d7063cc6fbaab9b4b Mon Sep 17 00:00:00 2001 From: Thomas Preud'homme <robotux@celest.fr> Date: Sat, 24 Feb 2018 15:50:14 +0000 Subject: Prevent dead code on !x86 in prepare_dynamic_rel diff --git a/lib/Makefile b/lib/Makefile index be0e648..be25e88 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -20,7 +20,7 @@ XCFG = $(or $(findstring -win,$T),-unx) # in order to use gcc, tyoe: make <target>-libtcc1-usegcc=yes arm-libtcc1-usegcc ?= no -CFLAGS:=$(CFLAGS) -fstack-protector +CFLAGS:=$(CFLAGS) -fno-stack-protector ifeq "$($(T)-libtcc1-usegcc)" "yes" XCC = $(CC) XAR = $(AR) |